diff --git a/LICENSE b/LICENSE index 01f1c19d5c..42897de4ab 100644 --- a/LICENSE +++ b/LICENSE @@ -1,20 +1,525 @@ +Friendica Communications Server Copyright (c) 2010-2013 the Friendica Project -All rights reserved. -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: + This program is free software: you can redistribute it and/or modify + it under the terms of the GNU Affero General Public License as published by + the Free Software Foundation, either version 3 of the License, or + (at your option) any later version. -The above copyright notice and this permission notice shall be included in -all copies or substantial portions of the Software. + 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 Affero General Public License for more details. -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. + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + + GNU AFFERO GENERAL PUBLIC LICENSE + Version 3, 19 November 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The GNU Affero General Public License is a free, copyleft license for +software and other kinds of works, specifically designed to ensure +cooperation with the community in the case of network server software. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +our General Public Licenses are intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. + + 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 +them 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. + + Developers that use our General Public Licenses protect your rights +with two steps: (1) assert copyright on the software, and (2) offer +you this License which gives you legal permission to copy, distribute +and/or modify the software. + + A secondary benefit of defending all users' freedom is that +improvements made in alternate versions of the program, if they +receive widespread use, become available for other developers to +incorporate. Many developers of free software are heartened and +encouraged by the resulting cooperation. However, in the case of +software used on network servers, this result may fail to come about. +The GNU General Public License permits making a modified version and +letting the public access it on a server without ever releasing its +source code to the public. + + The GNU Affero General Public License is designed specifically to +ensure that, in such cases, the modified source code becomes available +to the community. It requires the operator of a network server to +provide the source code of the modified version running there to the +users of that server. Therefore, public use of a modified version, on +a publicly accessible server, gives the public access to the source +code of the modified version. + + An older license, called the Affero General Public License and +published by Affero, was designed to accomplish similar goals. This is +a different license, not a version of the Affero GPL, but Affero has +released a new version of the Affero GPL which permits relicensing under +this license. + + The precise terms and conditions for copying, distribution and +modification follow. + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU Affero General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a wok means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey 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; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with t + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + E to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If 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 convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Remote Network Interaction; Use with the GNU General Public License. + + Notwithstanding any other provision of this License, if you modify the +Program, your modified version must prominently offer all users +interacting with it remotely through a computer network (if your version +supports such interaction) an opportunity to receive the Corresponding +Source of your version by providing access to the Corresponding Source +from a network server at no charge, through some standard or customary +means of facilitating copying of software. This Corresponding Source +shall include the Corresponding Source for any work covered by version 3 +of the GNU General Public License that is incorporated pursuant to the +following paragraph. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the work with which it is combined will remain governed by version +3 of the GNU General Public License. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU Affero 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 that a certain numbered version of the GNU Affero General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version orch source file to most effectively +state 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 Affero General Public License as published by + the Free Software Foundation, either version 3 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 Affero General Public License for more details. + + You should have received a copy of the GNU Affero General Public License + along with this program. If not, see . + +Also add information on how to contact you by electronic and paper mail. + + If your software can interact with users remotely through a computer +network, you should also make sure that it provides a way for users to +get its source. For example, if your program is a web application, its +interface could display a "Source" link that leads users to an archive +of the code. There are many ways you could offer source, and different +solutions will be better for different programs; see section 13 for the +specific requirements. + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU AGPL, see +. diff --git a/boot.php b/boot.php index 71de66e68c..51cf674a35 100644 --- a/boot.php +++ b/boot.php @@ -12,7 +12,7 @@ require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('include/features.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.1.1706' ); +define ( 'FRIENDICA_VERSION', '3.1.1707' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1163 ); define ( 'EOL', "
\r\n" ); diff --git a/index.php b/index.php index 8e2376e918..d3a4cef44e 100644 --- a/index.php +++ b/index.php @@ -414,7 +414,9 @@ if(!$a->theme['stylesheet']) $stylesheet = current_theme_url(); else $stylesheet = $a->theme['stylesheet']; -$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet)); + +$a->page['htmlhead'] = str_replace('{{$stylesheet}}',$stylesheet,$a->page['htmlhead']); +//$a->page['htmlhead'] = replace_macros($a->page['htmlhead'], array('$stylesheet' => $stylesheet)); $page = $a->page; $profile = $a->profile; diff --git a/util/messages.po b/util/messages.po index cfa2cfe6db..8061060c8f 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.1.1706\n" +"Project-Id-Version: 3.1.1707\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-05-20 00:03-0700\n" +"POT-Creation-Date: 2013-05-21 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -21,7 +21,7 @@ msgstr "" #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 #: ../../include/nav.php:77 ../../mod/profperm.php:103 #: ../../mod/newmember.php:32 ../../view/theme/diabook/theme.php:88 -#: ../../boot.php:1946 +#: ../../boot.php:1947 msgid "Profile" msgstr "" @@ -30,7 +30,7 @@ msgid "Full Name:" msgstr "" #: ../../include/profile_advanced.php:17 ../../mod/directory.php:136 -#: ../../boot.php:1486 +#: ../../boot.php:1487 msgid "Gender:" msgstr "" @@ -51,7 +51,7 @@ msgid "Age:" msgstr "" #: ../../include/profile_advanced.php:37 ../../mod/directory.php:138 -#: ../../boot.php:1489 +#: ../../boot.php:1490 msgid "Status:" msgstr "" @@ -65,7 +65,7 @@ msgid "Sexual Preference:" msgstr "" #: ../../include/profile_advanced.php:48 ../../mod/directory.php:140 -#: ../../boot.php:1491 +#: ../../boot.php:1492 msgid "Homepage:" msgstr "" @@ -401,6 +401,25 @@ msgstr "" msgid "Send PM" msgstr "" +#: ../../include/bbcode.php:210 ../../include/bbcode.php:549 +msgid "Image/photo" +msgstr "" + +#: ../../include/bbcode.php:272 +#, php-format +msgid "" +"%s wrote the following post" +msgstr "" + +#: ../../include/bbcode.php:514 ../../include/bbcode.php:534 +msgid "$1 wrote:" +msgstr "" + +#: ../../include/bbcode.php:557 ../../include/bbcode.php:558 +msgid "Encrypted content" +msgstr "" + #: ../../include/acl_selectors.php:325 msgid "Visible to everybody" msgstr "" @@ -448,7 +467,7 @@ msgid "Finishes:" msgstr "" #: ../../include/bb2diaspora.php:415 ../../include/event.php:40 -#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1484 +#: ../../mod/directory.php:134 ../../mod/events.php:471 ../../boot.php:1485 msgid "Location:" msgstr "" @@ -702,7 +721,7 @@ msgid "Example: bob@example.com, http://example.com/barbara" msgstr "" #: ../../include/contact_widgets.php:9 ../../mod/suggest.php:88 -#: ../../mod/match.php:58 ../../boot.php:1416 +#: ../../mod/match.php:58 ../../boot.php:1417 msgid "Connect" msgstr "" @@ -779,7 +798,7 @@ msgstr[0] "" msgstr[1] "" #: ../../include/contact_widgets.php:204 ../../mod/content.php:629 -#: ../../object/Item.php:365 ../../boot.php:670 +#: ../../object/Item.php:365 ../../boot.php:671 msgid "show more" msgstr "" @@ -787,25 +806,6 @@ msgstr "" msgid " on Last.fm" msgstr "" -#: ../../include/bbcode.php:210 ../../include/bbcode.php:549 -msgid "Image/photo" -msgstr "" - -#: ../../include/bbcode.php:272 -#, php-format -msgid "" -"%s wrote the following post" -msgstr "" - -#: ../../include/bbcode.php:514 ../../include/bbcode.php:534 -msgid "$1 wrote:" -msgstr "" - -#: ../../include/bbcode.php:557 ../../include/bbcode.php:558 -msgid "Encrypted content" -msgstr "" - #: ../../include/network.php:877 msgid "view full size" msgstr "" @@ -1996,7 +1996,7 @@ msgstr "" msgid "Clear notifications" msgstr "" -#: ../../include/nav.php:73 ../../boot.php:1135 +#: ../../include/nav.php:73 ../../boot.php:1136 msgid "Logout" msgstr "" @@ -2004,7 +2004,7 @@ msgstr "" msgid "End this session" msgstr "" -#: ../../include/nav.php:76 ../../boot.php:1939 +#: ../../include/nav.php:76 ../../boot.php:1940 msgid "Status" msgstr "" @@ -2018,7 +2018,7 @@ msgid "Your profile page" msgstr "" #: ../../include/nav.php:78 ../../mod/fbrowser.php:25 -#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1953 +#: ../../view/theme/diabook/theme.php:90 ../../boot.php:1954 msgid "Photos" msgstr "" @@ -2027,7 +2027,7 @@ msgid "Your photos" msgstr "" #: ../../include/nav.php:79 ../../mod/events.php:370 -#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1970 +#: ../../view/theme/diabook/theme.php:91 ../../boot.php:1971 msgid "Events" msgstr "" @@ -2043,7 +2043,7 @@ msgstr "" msgid "Your personal photos" msgstr "" -#: ../../include/nav.php:91 ../../boot.php:1136 +#: ../../include/nav.php:91 ../../boot.php:1137 msgid "Login" msgstr "" @@ -2060,7 +2060,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1111 +#: ../../include/nav.php:108 ../../mod/register.php:275 ../../boot.php:1112 msgid "Register" msgstr "" @@ -2189,7 +2189,7 @@ msgstr "" msgid "Account settings" msgstr "" -#: ../../include/nav.php:169 ../../boot.php:1438 +#: ../../include/nav.php:169 ../../boot.php:1439 msgid "Profiles" msgstr "" @@ -2588,23 +2588,23 @@ msgstr "" msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:726 ../../boot.php:1444 ../../boot.php:1470 +#: ../../mod/profiles.php:726 ../../boot.php:1445 ../../boot.php:1471 msgid "Change profile photo" msgstr "" -#: ../../mod/profiles.php:727 ../../boot.php:1445 +#: ../../mod/profiles.php:727 ../../boot.php:1446 msgid "Create New Profile" msgstr "" -#: ../../mod/profiles.php:738 ../../boot.php:1455 +#: ../../mod/profiles.php:738 ../../boot.php:1456 msgid "Profile Image" msgstr "" -#: ../../mod/profiles.php:740 ../../boot.php:1458 +#: ../../mod/profiles.php:740 ../../boot.php:1459 msgid "visible to everybody" msgstr "" -#: ../../mod/profiles.php:741 ../../boot.php:1459 +#: ../../mod/profiles.php:741 ../../boot.php:1460 msgid "Edit visibility" msgstr "" @@ -2632,7 +2632,7 @@ msgstr "" msgid "All Contacts (with secure profile access)" msgstr "" -#: ../../mod/notes.php:44 ../../boot.php:1977 +#: ../../mod/notes.php:44 ../../boot.php:1978 msgid "Personal Notes" msgstr "" @@ -5571,7 +5571,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:84 ../../boot.php:1150 +#: ../../mod/lostpass.php:84 ../../boot.php:1151 msgid "Password Reset" msgstr "" @@ -5957,7 +5957,7 @@ msgstr "" msgid "Home Notifications" msgstr "" -#: ../../mod/photos.php:51 ../../boot.php:1956 +#: ../../mod/photos.php:51 ../../boot.php:1957 msgid "Photo Albums" msgstr "" @@ -6153,7 +6153,7 @@ msgstr "" #: ../../mod/photos.php:1551 ../../mod/photos.php:1595 #: ../../mod/photos.php:1678 ../../mod/content.php:732 -#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:669 +#: ../../object/Item.php:338 ../../object/Item.php:652 ../../boot.php:670 msgid "Comment" msgstr "" @@ -6342,7 +6342,7 @@ msgid "" "features and resources." msgstr "" -#: ../../mod/profile.php:21 ../../boot.php:1324 +#: ../../mod/profile.php:21 ../../boot.php:1325 msgid "Requested profile is not available." msgstr "" @@ -6981,128 +6981,128 @@ msgstr "" msgid "toggle mobile" msgstr "" -#: ../../boot.php:668 +#: ../../boot.php:669 msgid "Delete this item?" msgstr "" -#: ../../boot.php:671 +#: ../../boot.php:672 msgid "show fewer" msgstr "" -#: ../../boot.php:998 +#: ../../boot.php:999 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1000 +#: ../../boot.php:1001 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1110 +#: ../../boot.php:1111 msgid "Create a New Account" msgstr "" -#: ../../boot.php:1138 +#: ../../boot.php:1139 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:1139 +#: ../../boot.php:1140 msgid "Password: " msgstr "" -#: ../../boot.php:1140 +#: ../../boot.php:1141 msgid "Remember me" msgstr "" -#: ../../boot.php:1143 +#: ../../boot.php:1144 msgid "Or login using OpenID: " msgstr "" -#: ../../boot.php:1149 +#: ../../boot.php:1150 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1152 +#: ../../boot.php:1153 msgid "Website Terms of Service" msgstr "" -#: ../../boot.php:1153 +#: ../../boot.php:1154 msgid "terms of service" msgstr "" -#: ../../boot.php:1155 +#: ../../boot.php:1156 msgid "Website Privacy Policy" msgstr "" -#: ../../boot.php:1156 +#: ../../boot.php:1157 msgid "privacy policy" msgstr "" -#: ../../boot.php:1285 +#: ../../boot.php:1286 msgid "Requested account is not available." msgstr "" -#: ../../boot.php:1364 ../../boot.php:1468 +#: ../../boot.php:1365 ../../boot.php:1469 msgid "Edit profile" msgstr "" -#: ../../boot.php:1430 +#: ../../boot.php:1431 msgid "Message" msgstr "" -#: ../../boot.php:1438 +#: ../../boot.php:1439 msgid "Manage/edit profiles" msgstr "" -#: ../../boot.php:1567 ../../boot.php:1653 +#: ../../boot.php:1568 ../../boot.php:1654 msgid "g A l F d" msgstr "" -#: ../../boot.php:1568 ../../boot.php:1654 +#: ../../boot.php:1569 ../../boot.php:1655 msgid "F d" msgstr "" -#: ../../boot.php:1613 ../../boot.php:1694 +#: ../../boot.php:1614 ../../boot.php:1695 msgid "[today]" msgstr "" -#: ../../boot.php:1625 +#: ../../boot.php:1626 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:1626 +#: ../../boot.php:1627 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:1687 +#: ../../boot.php:1688 msgid "[No description]" msgstr "" -#: ../../boot.php:1705 +#: ../../boot.php:1706 msgid "Event Reminders" msgstr "" -#: ../../boot.php:1706 +#: ../../boot.php:1707 msgid "Events this week:" msgstr "" -#: ../../boot.php:1942 +#: ../../boot.php:1943 msgid "Status Messages and Posts" msgstr "" -#: ../../boot.php:1949 +#: ../../boot.php:1950 msgid "Profile Details" msgstr "" -#: ../../boot.php:1960 ../../boot.php:1963 +#: ../../boot.php:1961 ../../boot.php:1964 msgid "Videos" msgstr "" -#: ../../boot.php:1973 +#: ../../boot.php:1974 msgid "Events and Calendar" msgstr "" -#: ../../boot.php:1980 +#: ../../boot.php:1981 msgid "Only You Can See This" msgstr ""