diff options
| author | friendica <info@friendica.com> | 2014-10-19 16:12:05 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-10-19 16:12:05 -0700 |
| commit | bae3029c639bf6f9469dd93bfedc3dce0d8510d7 (patch) | |
| tree | f892b4bb5bc96c96ebd9df5d6b593b02def2c759 | |
| parent | 6d3619c8b15afdbf228cc0ca71de68efc0557fb1 (diff) | |
| download | volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.tar.gz volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.tar.bz2 volse-hubzilla-bae3029c639bf6f9469dd93bfedc3dce0d8510d7.zip | |
merge madness
64 files changed, 1177 insertions, 1253 deletions
diff --git a/doc/AdvancedSearch.md b/doc/AdvancedSearch.md index 5a9a5a3bc..df4a87482 100644 --- a/doc/AdvancedSearch.md +++ b/doc/AdvancedSearch.md @@ -51,7 +51,4 @@ Example: name="charlie brown" and country=canada and not gender=female - - - - +#include doc/macros/main_footer.bb; diff --git a/doc/Hooks.md b/doc/Hooks.md index 350068314..d7998a8e7 100644 --- a/doc/Hooks.md +++ b/doc/Hooks.md @@ -133,3 +133,5 @@ Hooks - Complete List * $a->module . '_pre_' . $selname * $a->module . '_pre_' . $selname +#include doc/macros/main_footer.bb; + diff --git a/doc/about.bb b/doc/about.bb index aa4fde54d..bd91970f6 100644 --- a/doc/about.bb +++ b/doc/about.bb @@ -20,5 +20,5 @@ Along the way, Red offers a number of unique goodies: [b]Privacy:[/b] Red identities (Zot IDs) can be deleted, backed up/downloaded, and cloned. The user is in full control of their data. Should you decide to delete all your content and erase your Zot ID, all you have to do is click on a link and it's immediately deleted from the hub. No questions, no fuss.
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/account_basics.bb b/doc/account_basics.bb index 3c5d28fbc..a8fd6e5fd 100644 --- a/doc/account_basics.bb +++ b/doc/account_basics.bb @@ -31,3 +31,5 @@ See Also [zrl=[baseurl]/help/permissions]Permissions[/zrl]
[zrl=[baseurl]/help/profiles]Profiles[/zrl]
[zrl=[baseurl]/help/remove_account]Remove Account[/zrl]
+
+#include doc/macros/main_footer.bb;
diff --git a/doc/accounts.bb b/doc/accounts.bb index bf57f1234..7c0378504 100644 --- a/doc/accounts.bb +++ b/doc/accounts.bb @@ -1,4 +1,4 @@ This one still needs to be written. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/accounts_profiles_channels_basics.bb b/doc/accounts_profiles_channels_basics.bb index f803f25e9..c064e99f1 100644 --- a/doc/accounts_profiles_channels_basics.bb +++ b/doc/accounts_profiles_channels_basics.bb @@ -15,5 +15,5 @@ Unlike other services Red Matrix offers you the advantage of creating [i]many mo During the registration you created your first [i]channel[/i]. Yes, besides several profiles you are able to have several channels. This might be a bit confusing in the beginning, but let's clear things up. You already have created one channel. You can use this one for the public, to communicate with people about every day life. But perhaps you are an avid book reader and many people are bored by that. So you open a [i]second channel[/i] just for the book lovers, where you all can talk about books as much as you like. Obviously this is a new stream of posts, with a new profile (... or new profile[i]s[/i] ...) and completely different contacts. Some connections might exist in both channels, but there will be some that are exclusive to only one of both. You yourself just switch between both of them just like you would in real life switch when talking to people you meet on the street or people you meet specially to talk about books. You can even connect to yourself, or better: to your other channel. :) [i]Think of a channel as different spaces dedicated to different topics where you meet with different people.[/i] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/addons.bb b/doc/addons.bb index a4b76929b..726b437ed 100644 --- a/doc/addons.bb +++ b/doc/addons.bb @@ -1,5 +1,5 @@ * [zrl=[baseurl]/help/addons_gnusocial]Posting To Gnu Social[/zrl] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/addons_gnusocial.bb b/doc/addons_gnusocial.bb index 664f1df39..339add5a9 100644 --- a/doc/addons_gnusocial.bb +++ b/doc/addons_gnusocial.bb @@ -60,5 +60,5 @@ If you don't choose this option, you will have an option to send a post to your If all goes well, you have just cross-posted your RedMatrix post to your account on a GNUsocial instance. -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/addons_footer.bb; diff --git a/doc/api_functions.bb b/doc/api_functions.bb index ade6efd42..c9d90c716 100644 --- a/doc/api_functions.bb +++ b/doc/api_functions.bb @@ -129,5 +129,5 @@ Red proposed API extensions to the Twitter API api/albums/destroy (R),J
api/friends/permissions (R),J
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/bbcode.html b/doc/bbcode.html index 97a0bbc6c..0f070eaa2 100644 --- a/doc/bbcode.html +++ b/doc/bbcode.html @@ -66,8 +66,8 @@ <li>[rpost=title]Text to post[/rpost] The observer will be returned to their home hub to enter a post with the specified title and body. Both are optional <br /> <li>[qr]text to post[/qr] - create a QR code.<br /> <br /> -Return to the <a href="/help/main">Main documentation page[/a] +#include doc/macros/main_footer.bb; </div> diff --git a/doc/campaign.bb b/doc/campaign.bb index f3d23baa6..b05846a0b 100644 --- a/doc/campaign.bb +++ b/doc/campaign.bb @@ -233,5 +233,5 @@ Raising more than our initial goal of funds, will speed up our development effor Awesome. We'd be more than happy to chat. You can find us {HERE}
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/channels.bb b/doc/channels.bb index 42253a664..82b70630c 100644 --- a/doc/channels.bb +++ b/doc/channels.bb @@ -26,5 +26,5 @@ The "Matrix" page contains all recent posts from across the matrix, ag As mentioned at the start, many other kinds of channel are possible, however, the creation procedure is the same. The difference between channels lies primarily in the permissions assigned. For example, a channel for sharing documents with colleagues at work would probably want more permissive settings for "Can write to my "public" file storage" than a personal account. For more information, see the permissions section.
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/checking_account_quota_usage.bb b/doc/checking_account_quota_usage.bb index 5bf5b3163..60d84005e 100644 --- a/doc/checking_account_quota_usage.bb +++ b/doc/checking_account_quota_usage.bb @@ -14,4 +14,4 @@ Visit the following URL in your browser: Example:
[observer.baseurl]/filestorage/[observer.webname]
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/cloud.bb b/doc/cloud.bb index e71da78e8..92b97a21c 100644 --- a/doc/cloud.bb +++ b/doc/cloud.bb @@ -24,4 +24,4 @@ See: [zrl=[baseurl]/help/cloud_desktop_clients]Cloud Desktop Clients[/zrl] When using WebDAV, the file is created with your channel's default file permissions and this cannot be changed from within the operating system. It also may not be as restrictive as you would like. What we've found is that the preferred method of making files private is to first create folders or directories; then visit "filestorage/{{username}}"; select the directory and change the permissions. Do this before you put anything into the directory. The directory permissions take precedence so you can then put files or other folders into that container and they will be protected from unwanted viewers by the directory permissions. It is common for folks to create a "personal" or "private" folder which is restricted to themselves. You can use this as a personal cloud to store anything from anywhere on the web or any computer and it is protected from others. You might also create folders for "family" and "friends" with permission granted to appropriate collections of channels.
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/cloud_desktop_clients.bb b/doc/cloud_desktop_clients.bb index 557acb472..2f099527f 100644 --- a/doc/cloud_desktop_clients.bb +++ b/doc/cloud_desktop_clients.bb @@ -18,4 +18,4 @@ Note: There have been reported issues with clients that use "chunked transfer encoding", which includes Apple iOS services, and also the "AnyClient" and "CyberDuck" tools. These work fine for downloads, but uploads often end up with files of zero size. This is caused by an incorrect implemention of chunked encoding in some current FCGI (fast-cgi) implementations. Apache running with PHP as a module does not have these issues, but when running under FCGI you may need to use alternative clients or use the web uploader. At the time of this writing the issue has been open and no updates provided for at least a year. If you encounter zero size files with other clients, please check the client notes; as there are occasional configuration issues which can also produce these symptoms.
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file +#include doc/macros/cloud_footer.bb;
diff --git a/doc/comanche.bb b/doc/comanche.bb index d329cc34b..19a74833e 100644 --- a/doc/comanche.bb +++ b/doc/comanche.bb @@ -28,10 +28,10 @@ Currently there are three layout templates, unless your site provides additional edgestwo - two column layout with fixed side margins
edgesthree - three column layout with fixed side margins
full - three column layout with fixed side margins and adds a "header" region beneath the navigation bar
- - redable - - A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column. +
+ redable
+
+ A template for reading longer texts. Three columns: aside, content and right_aside. For maximum readability it is advised to only use the middle content column.
[/code]
@@ -45,11 +45,11 @@ To choose a layout template, use the 'template' tag. To choose the "choklet" template with the "three" flavour:
[code]
- [template=three]choklet[/template] -[/code] - -Or the "redable" (sic) template: - + [template=three]choklet[/template]
+[/code]
+
+Or the "redable" (sic) template:
+
[code]
[template]redable[/template]
[/code]
@@ -188,4 +188,4 @@ The 'comment' tag is used to delimit comments. These comments will not appear on [/region]
[/code]
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/connecting_to_channels.bb b/doc/connecting_to_channels.bb index a067b6cf2..901565ad3 100644 --- a/doc/connecting_to_channels.bb +++ b/doc/connecting_to_channels.bb @@ -16,4 +16,4 @@ You may also connect with any channel by visiting the "Connections" pa Some channels are designated "Premium Channels" and may require some action on your part before a connection can be established. The Connect button will for these channels will take you to a page which lists in detail what terms the channel owner has set. If the terms are accepted, the connection will then proceed normally. In some cases, such as with celebrities and world-reknowned publishers, this may involve payment. If you do not agree to the terms, the connection will not proceed, or it may proceed but with reduced permissions allowed on your interactions with that channel.
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/credits.bb b/doc/credits.bb new file mode 100644 index 000000000..d13b99bdd --- /dev/null +++ b/doc/credits.bb @@ -0,0 +1,76 @@ +[b]Credits[/b] + +Mike Macgirvin +Thomas Willingham +Fabio Comuni +Simon L'nu +marijus +Tobias Diekershoff +fabrixxm +tommy tomson +Simon +zottel +Christian Vogeley +jeroenpraat +Michael Vogel +erik +Zach Prezkuta +Paolo T +Michael Meer +Michael +Abinoam P. Marques Jr +Tobias Hößl +Alexander Kampmann +Olaf Conradi +Paolo Tacconi +tobiasd +Devlon Duthie +Zvi ben Yaakov (a.k.a rdc) +Alexandre Hannud Abdo +Olivier Migeot +Chris Case +Klaus Weidenbach +Michael Johnston +olivierm +Vasudev Kamath +pixelroot +Max Weller +duthied +Martin Schmitt +Sebastian Egbers +Erkan Yilmaz +sasiflo +Stefan Parviainen +Haakon Meland Eriksen +Oliver Hartmann (23n) +Erik Lundin +habeascodice +sirius +Charles +Tony Baldwin +Hauke Zuehl +Keith Fernie +toclimb +Daniel Frank +Matthew Exon +Michal Supler +Tobias Luther +U-SOUND\mike +mrjive +nostupidzone +tonnerkiller +Antoine G +Christian Drechsler +Ludovic Grossard +RedMatrixCanada +Stanislav Lechev [0xAF] +aweiher +bufalo1973 +dsp1986 +felixgilles +ike +maase2 +mycocham +ndurchx +pafcu +Simó Albert i Beltran diff --git a/doc/dav_dolphin.bb b/doc/dav_dolphin.bb index 4429303d3..a1ebba394 100644 --- a/doc/dav_dolphin.bb +++ b/doc/dav_dolphin.bb @@ -6,4 +6,4 @@ When prompted for a username and password, enter your username (the first part o Note, if you are already logged in to the web interface via Konqueror, you will not be prompted for further authentication.
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file +#include doc/macros/cloud_footer.bb;
diff --git a/doc/dav_konqueror.bb b/doc/dav_konqueror.bb index f44c11fb2..79108e1d0 100644 --- a/doc/dav_konqueror.bb +++ b/doc/dav_konqueror.bb @@ -8,4 +8,5 @@ Additionally, if one has authenticated at a different hub during their normal br This functionality is normally restricted to the web interface, and is not available to any desktop software other than KDE.
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file +#include doc/macros/cloud_footer.bb;
+
diff --git a/doc/dav_mount.bb b/doc/dav_mount.bb index 62edc09d0..d8cb2e08e 100644 --- a/doc/dav_mount.bb +++ b/doc/dav_mount.bb @@ -82,5 +82,5 @@ If that still doesn't work, disable the cache. Note that this has a performance If it [i]still[/i] doesn't work, there is one more thing you can try. (This one is caused by a bug in older versions of dav2fs itself, so updating to a new version may also help). Enable weak etag dropping by setting [code]drop_weak_etags 1[/code]. Unmount and remount your filesystem to apply the changes.
+#include doc/macros/cloud_footer.bb;
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
diff --git a/doc/dav_nautilus.bb b/doc/dav_nautilus.bb index d3c478aa0..51663b6de 100644 --- a/doc/dav_nautilus.bb +++ b/doc/dav_nautilus.bb @@ -6,4 +6,4 @@ 4. You will be prompted for your username (same as above) and password
5. Your personal DAV directory will be shown in the window
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file +#include doc/macros/cloud_footer.bb;
diff --git a/doc/dav_nemo.bb b/doc/dav_nemo.bb index a2553c1d5..2c88b0782 100644 --- a/doc/dav_nemo.bb +++ b/doc/dav_nemo.bb @@ -15,5 +15,5 @@ Fill the dialog - Passwort: yourpasswort
Once open you can set a bookmark.
-
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file +
+#include doc/macros/cloud_footer.bb;
diff --git a/doc/dav_windows.bb b/doc/dav_windows.bb index 600944b68..0eaffd4d0 100644 --- a/doc/dav_windows.bb +++ b/doc/dav_windows.bb @@ -8,4 +8,4 @@ RedDav using Windows 7 graphical user interface wizard: 5. Type your Red account's user name. IMPORTANT - NO at-sign or domain name.
6. Type your Red password
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
\ No newline at end of file +#include doc/macros/cloud_footer.bb;
diff --git a/doc/debian_install.bb b/doc/debian_install.bb index f441025ae..f4e901dc6 100644 --- a/doc/debian_install.bb +++ b/doc/debian_install.bb @@ -29,4 +29,4 @@ To install Red for domain example.com, after the initial server setup run [code]bash setup-debian.sh red example.com[/code]
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/dev-function-overview.md b/doc/dev-function-overview.md index 3cda8f7c4..ecf9186ca 100644 --- a/doc/dev-function-overview.md +++ b/doc/dev-function-overview.md @@ -48,5 +48,5 @@ Returns the translated variant of $string for the current language or $string (d Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0; -Return to the [url=[baseurl]/help/main]Main documentation page[/url] +#include doc/macros/main_footer.bb; diff --git a/doc/developer_function_primer.bb b/doc/developer_function_primer.bb index 144664615..3d5fe82a9 100644 --- a/doc/developer_function_primer.bb +++ b/doc/developer_function_primer.bb @@ -44,4 +44,4 @@ Returns the translated variant of $string for the current language or $string (d Shorthand test to see if variable $var is set and is not empty. Tests vary by type. Returns false if $var or $key is not set. If variable is set, returns 1 if has 'non-zero' value, otherwise returns 0. -- e.g. x('') or x(0) returns 0;
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/developers.bb b/doc/developers.bb index a29a848e0..18e39c4ea 100644 --- a/doc/developers.bb +++ b/doc/developers.bb @@ -64,4 +64,4 @@ In the interests of consistency we adopt the following code styling. We may acce [li] Generally speaking, opening braces go on the same line as the thing which opens the brace. They are the last character on the line. Closing braces are on a line by themselves. [/li]
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/external-resource-links.bb b/doc/external-resource-links.bb index 70dfd2fcc..29eabce74 100644 --- a/doc/external-resource-links.bb +++ b/doc/external-resource-links.bb @@ -19,6 +19,6 @@ [*][url=https://github.com/zzottel/feed2red]feed2red.pl (posts Atom/RSS feeds to channel)[/url]
[b]Utilities[/b]
-[*][url=http://beardyunixer.com:1234/?p=debian-install-script;a=tree]Debian Install Script[/url]
+[*][url=http://gitweb.whogotzot.com/debian-install-script]Debian Install Script[/url]
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/extra_features.bb b/doc/extra_features.bb index 372ac6bbe..2e877375e 100644 --- a/doc/extra_features.bb +++ b/doc/extra_features.bb @@ -94,4 +94,4 @@ Ability to mark special posts with a star indicator Provide a personal tag cloud on your channel page
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/faq_admins.bb b/doc/faq_admins.bb index 1679ec246..60c1be5a8 100644 --- a/doc/faq_admins.bb +++ b/doc/faq_admins.bb @@ -45,4 +45,4 @@ valid SSL certificate rather than disabling port 443. [/ul] -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/faq_developers.bb b/doc/faq_developers.bb index 192dcb5c5..61843648a 100644 --- a/doc/faq_developers.bb +++ b/doc/faq_developers.bb @@ -1,6 +1,5 @@ [size=large][b]Frequently Asked Questions For Developers[/b][/size] -(...) still needs to be written (...) [ul] [*][b]What does $a mean?[/b] @@ -26,3 +25,7 @@ function foo() { } [/code] [/ul] + + +#include doc/macros/main_footer.bb; + diff --git a/doc/faq_users.bb b/doc/faq_members.bb index aac4a114c..a089b8b0c 100644 --- a/doc/faq_users.bb +++ b/doc/faq_members.bb @@ -12,6 +12,4 @@ You have probably disabled third party cookies. You need to enable them for rem There are also a lot of [b]private[/b] foreign language posts and auto-translation services would require us to transmit these private messages to the translation service; and we don't know what they will do with them on their servers. Actually we do know thanks to Edward Snowden. Our best bet is a project called [b][i]Apertium[/i][/b] which is an open source translator we can install locally. It is currently missing German translations - which are the most requested translation in the matrix. Once again, this will be implemented when we find somebody who really wants to make it happen. [/ul] - - -Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] +#include doc/macros/main_footer.bb; diff --git a/doc/features.bb b/doc/features.bb index 388f9bc91..fc977fcc1 100644 --- a/doc/features.bb +++ b/doc/features.bb @@ -108,4 +108,4 @@ Similar to any other modern blogging system, social network, or a micro-blogging [b][color=white]Previewing[/color][/b]
Post can be previewed prior to sending.
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file +#include doc/macros/main_footer.bb;
diff --git a/doc/git_for_non_developers.bb b/doc/git_for_non_developers.bb index aa87fba69..029a6eb77 100644 --- a/doc/git_for_non_developers.bb +++ b/doc/git_for_non_developers.bb @@ -68,4 +68,4 @@ git request-pull master https://example.com/project And simply send the output to the project maintainer.
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/hidden_configs.bb b/doc/hidden_configs.bb index 0fc04b766..7b7a688c4 100644 --- a/doc/hidden_configs.bb +++ b/doc/hidden_configs.bb @@ -100,4 +100,6 @@ This document assumes you're an administrator. the main logs as well. [b]system > hide_in_statistics[/b] Tell the red statistics servers to completely hide this hub in hub lists. -
\ No newline at end of file + +#include doc/macros/main_footer.bb; + diff --git a/doc/install.bb b/doc/install.bb index 1a35537aa..e68b4a230 100644 --- a/doc/install.bb +++ b/doc/install.bb @@ -1 +1,4 @@ #include install/INSTALL.txt;
+
+#include doc/macros/main_footer.bb;
+
diff --git a/doc/intro_for_developers.bb b/doc/intro_for_developers.bb index b44095d3d..50aedd0e2 100644 --- a/doc/intro_for_developers.bb +++ b/doc/intro_for_developers.bb @@ -109,4 +109,4 @@ At that point, if you need to add javascript or css files, add them to /js or /c Now you'll probably want to alter a template. These can be found in in /view/tpl OR view//tpl. All you should have to do is copy whatever you want to tweak from the first place to your theme's own tpl directory.
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/macros/addons_footer.bb b/doc/macros/addons_footer.bb new file mode 100644 index 000000000..f6b687a23 --- /dev/null +++ b/doc/macros/addons_footer.bb @@ -0,0 +1,2 @@ +Return to the [zrl=[baseurl]/help/addons]Addons documentation[/zrl] +Return to the [zrl=[baseurl]/help/addons]Main documentation[/zrl] diff --git a/doc/macros/cloud_footer.bb b/doc/macros/cloud_footer.bb new file mode 100644 index 000000000..798cc9ea6 --- /dev/null +++ b/doc/macros/cloud_footer.bb @@ -0,0 +1,2 @@ +Return to the [zrl=[baseurl]/help/cloud]Cloud documentation[/zrl] +Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/macros/main_footer.bb b/doc/macros/main_footer.bb new file mode 100644 index 000000000..08f671ded --- /dev/null +++ b/doc/macros/main_footer.bb @@ -0,0 +1 @@ +Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl] diff --git a/doc/macros/troubleshooting_footer.bb b/doc/macros/troubleshooting_footer.bb new file mode 100644 index 000000000..c7603a62b --- /dev/null +++ b/doc/macros/troubleshooting_footer.bb @@ -0,0 +1,2 @@ +[zrl=[baseurl]/help/troubleshooting]Troubleshooting documentation[/zrl] +[zrl=[baseurl]/help/troubleshooting]Documentation Main Page[/zrl] diff --git a/doc/main.bb b/doc/main.bb index 06559c327..5502db67d 100644 --- a/doc/main.bb +++ b/doc/main.bb @@ -36,7 +36,7 @@ Zot is the great new communicaton protocol invented especially for the Red Matri [zrl=[baseurl]/help/diaspora_compat]Diaspora Communications Compatibility (Diaspora and Friendica)[/zrl]
[size=large][b]Frequently Asked Questions For Members[/b][/size]
-[zrl=[baseurl]/help/faq_users]FAQ For Members[/zrl]
+[zrl=[baseurl]/help/faq_members]FAQ For Members[/zrl]
[size=large][b]For Hub Administrators[/b][/size]
[zrl=[baseurl]/help/install]Install[/zrl]
diff --git a/doc/permissions.bb b/doc/permissions.bb index c893ed84f..232ea9e96 100644 --- a/doc/permissions.bb +++ b/doc/permissions.bb @@ -107,4 +107,4 @@ The connection edit screen offers a slider to select a degree of friendship with The slider on the matrix page has both a minimum and maximum value. Posts will only be shown from people who fall between this range. Affinity has no relation to permissions, and is only useful in conjunction with the affinity tool feature.
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/plugins.bb b/doc/plugins.bb index 7709976c4..06801eb20 100644 --- a/doc/plugins.bb +++ b/doc/plugins.bb @@ -261,4 +261,4 @@ The Red Matrix has _install and _uninstall functions but these are used differen Changing these will often allow your plugin to function, but please double check all your permission and identity code because the concepts behind it are completely different in the Red Matrix. Many structured data names (especially DB schema columns) are also quite different.
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/problems-following-an-update.bb b/doc/problems-following-an-update.bb index 0b2c2e11a..a8a764cf1 100644 --- a/doc/problems-following-an-update.bb +++ b/doc/problems-following-an-update.bb @@ -34,4 +34,5 @@ Redbasic uses a few javascript libraries that are done differently, or entirely Should you report an issue with the theme developers then? No. Theme developers use their themes. Chances are, they know. Give them two or three days to catch up and [i]then[/i] report the issue if it's still not fixed. There are two workarounds for this situation. Firstly, you can temporarily use Redbasic. Secondly, most themes are open source too - open a pull request and make yourself a friend.
-Return to the [url=[baseurl]/help/troubleshooting]Troubleshooting documentation page[/url]
\ No newline at end of file +#include doc/macros/troubleshooting_footer.bb;
+
diff --git a/doc/profiles.bb b/doc/profiles.bb index 63b161962..5fcf5245a 100644 --- a/doc/profiles.bb +++ b/doc/profiles.bb @@ -32,4 +32,4 @@ On the directory page, you may search for people with published profiles. Curren On your Connnections page and in the directory there is a link to "Suggestions" or "Channel Suggestions", respectively. This will find channels who have matching and/or similar keywords. The more keywords you provide, the more relevant the search results that are returned. These are sorted by relevance.
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/red2pi.bb b/doc/red2pi.bb index 4ca58a382..d05cc57dd 100644 --- a/doc/red2pi.bb +++ b/doc/red2pi.bb @@ -342,4 +342,4 @@ Save and exit. Follow the instructions here:
[url=https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL]https://github.com/friendica/friendica/wiki/Running-Friendica-with-SSL[/url]
-Return to the [zrl=[baseurl]/help/main]Main documentation page[/zrl]
+#include doc/macros/main_footer.bb;
diff --git a/doc/registration.bb b/doc/registration.bb index 0aaa679c2..c507a86a6 100644 --- a/doc/registration.bb +++ b/doc/registration.bb @@ -31,4 +31,5 @@ See Also [zrl=[baseurl]/help/permissions]Permissions[/zrl]
[zrl=[baseurl]/help/remove_account]Remove Account[/zrl]
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
+
diff --git a/doc/remove_account.bb b/doc/remove_account.bb index adc08d8f9..feb3f249a 100644 --- a/doc/remove_account.bb +++ b/doc/remove_account.bb @@ -24,6 +24,4 @@ This is irreversible. All your channels will be deleted. If you have identity clones on other sites this only removes by default the channels instances which exists on this site.
-
-
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/schema_development.bb b/doc/schema_development.bb index 2890d5454..c92536d7a 100644 --- a/doc/schema_development.bb +++ b/doc/schema_development.bb @@ -73,4 +73,4 @@ theme are as follows: [li] sloppy_photos
Determins whether photos are "sloppy" or aligned. Set or unset (1 or '')[/li]
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/tags_and_mentions.bb b/doc/tags_and_mentions.bb index 477fbe291..d638492bb 100644 --- a/doc/tags_and_mentions.bb +++ b/doc/tags_and_mentions.bb @@ -66,5 +66,4 @@ will tag Robert Johnson, but we can only match one space. If the name was "Blind [/code]
are both equivalent.
-
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/troubleshooting.bb b/doc/troubleshooting.bb index f5572c6ed..d71b5f576 100644 --- a/doc/troubleshooting.bb +++ b/doc/troubleshooting.bb @@ -3,4 +3,4 @@ [li][zrl=[baseurl]/help/technical_faq]Technical FAQ[/zrl][/li]
[li][zrl=[baseurl]/help/problems-following-an-update]Problems following an update[/zrl][/li]
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
+#include doc/macros/main_footer.bb;
diff --git a/doc/webpages.bb b/doc/webpages.bb index 2bf7af762..780bde45c 100644 --- a/doc/webpages.bb +++ b/doc/webpages.bb @@ -10,6 +10,5 @@ The "page link title" box allows a user to specify the "pagelinkt Beneath the page creation box, a list of existing pages will appear with an "edit" link. Clicking this will take you to an editor, similar to that of the post editor, where you can make changes to your webpages.
-If you are the admin of a site, you can specify a channel whose webpages we will use at key points around the site. Presently, the only place this is implemented is the home page. If you specify the channel "admin" and then the channel called "admin" creates a webpage called "home", we will display it's content on your websites home page. We expect this functionality to be extended to other areas in future.
+#include doc/macros/main_footer.bb;
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
diff --git a/doc/what_is_zot.bb b/doc/what_is_zot.bb index 0e59d2d4c..67c0159e3 100644 --- a/doc/what_is_zot.bb +++ b/doc/what_is_zot.bb @@ -58,4 +58,4 @@ For more detailed, technical information about Zot, check out the following link - [url=https://github.com/friendica/red/blob/master/include/zot.php]Zot reference implementation in PHP[/url]
-Return to the [url=[baseurl]/help/main]Main documentation page[/url]
\ No newline at end of file +#include doc/macros/main_footer.bb;
diff --git a/include/datetime.php b/include/datetime.php index 84ab1e2fa..fe0f29c7a 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -130,135 +130,98 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d function dob($dob) { list($year,$month,$day) = sscanf($dob,'%4d-%2d-%2d'); - $y = datetime_convert('UTC',date_default_timezone_get(),'now','Y'); $f = get_config('system','birthday_input_format'); if(! $f) $f = 'ymd'; - $o = datesel($f,'',1920,$y,true,$year,$month,$day); - return $o; -} - -function datesel_format($f) { - - $o = ''; + $o = datesel($f,mktime(0,0,0,0,0,1900),mktime(),mktime(0,0,0,$month,$day,$year),'dob'); - if(strlen($f)) { - for($x = 0; $x < strlen($f); $x ++) { - switch($f[$x]) { - case 'y': - if(strlen($o)) - $o .= '-'; - $o .= t('year'); - break; - case 'm': - if(strlen($o)) - $o .= '-'; - $o .= t('month'); - break; - case 'd': - if(strlen($o)) - $o .= '-'; - $o .= t('day'); - break; - default: - break; - } - } - } return $o; } -// returns a date selector. -// $f = format string, e.g. 'ymd' or 'mdy' -// $pre = prefix (if needed) for HTML name and class fields -// $ymin = first year shown in selector dropdown -// $ymax = last year shown in selector dropdown -// $allow_blank = allow an empty response on any field -// $y = already selected year -// $m = already selected month -// $d = already selected day - +/** + * returns a date selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $min + * unix timestamp of minimum date + * @param $max + * unix timestap of maximum date + * @param $default + * unix timestamp of default date + * @param $id + * id and name of datetimepicker (defaults to "datetimepicker") + */ +function datesel($format, $min, $max, $default,$id = 'datepicker') { + return datetimesel($format,$min,$max,$default,$id,true,false); +} -function datesel($f,$pre,$ymin,$ymax,$allow_blank,$y,$m,$d) { +/** + * returns a date selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $h + * already selected hour + * @param $m + * already selected minute + * @param $id + * id and name of datetimepicker (defaults to "timepicker") + */ +function timesel($format,$h,$m,$id='timepicker') { + return datetimesel($format,mktime(),mktime(),mktime($h,$m),$id,false,true); +} +/** + * returns a datetime selector + * @param $format + * format string, e.g. 'ymd' or 'mdy'. Not currently supported + * @param $min + * unix timestamp of minimum date + * @param $max + * unix timestap of maximum date + * @param $default + * unix timestamp of default date + * @param $id + * id and name of datetimepicker (defaults to "datetimepicker") + * @param $pickdate + * true to show date picker (default) + * @param $picktime + * true to show time picker (default) + * @param $minfrom + * set minimum date from picker with id $minfrom (none by default) + * @param $maxfrom + * set maximum date from picker with id $maxfrom (none by default) + */ +function datetimesel($format, $min, $max, $default, $id = 'datetimepicker', $pickdate = true, $picktime = true, $minfrom = '', $maxfrom = '') { $o = ''; - if(strlen($f)) { - for($z = 0; $z < strlen($f); $z ++) { - if($f[$z] === 'y') { - - $o .= "<select name=\"{$pre}year\" class=\"{$pre}year\" size=\"1\">"; - if($allow_blank) { - $sel = (($y == '0000') ? " selected=\"selected\" " : ""); - $o .= "<option value=\"0000\" $sel ></option>"; - } - - if($ymax > $ymin) { - for($x = $ymax; $x >= $ymin; $x --) { - $sel = (($x == $y) ? " selected=\"selected\" " : ""); - $o .= "<option value=\"$x\" $sel>$x</option>"; - } - } - else { - for($x = $ymax; $x <= $ymin; $x ++) { - $sel = (($x == $y) ? " selected=\"selected\" " : ""); - $o .= "<option value=\"$x\" $sel>$x</option>"; - } - } - } - elseif($f[$z] == 'm') { - - $o .= "</select> <select name=\"{$pre}month\" class=\"{$pre}month\" size=\"1\">"; - for($x = (($allow_blank) ? 0 : 1); $x <= 12; $x ++) { - $sel = (($x == $m) ? " selected=\"selected\" " : ""); - $y = (($x) ? $x : ''); - $o .= "<option value=\"$x\" $sel>$y</option>"; - } - } - elseif($f[$z] == 'd') { - - $o .= "</select> <select name=\"{$pre}day\" class=\"{$pre}day\" size=\"1\">"; - for($x = (($allow_blank) ? 0 : 1); $x <= 31; $x ++) { - $sel = (($x == $d) ? " selected=\"selected\" " : ""); - $y = (($x) ? $x : ''); - $o .= "<option value=\"$x\" $sel>$y</option>"; - } - } - } - } + $dateformat = ''; + if($pickdate) $dateformat .= 'YYYY-MM-DD'; + if($pickdate && $picktime) $dateformat .= ' '; + if($picktime) $dateformat .= 'HH:mm'; - $o .= "</select>"; - return $o; -} + $mindate = $min ? "new Date($min*1000)" : ''; + $maxdate = $max ? "new Date($max*1000)" : ''; + + $defaultDate = $default ? ", defaultDate: new Date($default*1000)" : ''; + $pickers = ''; + if(!$pickdate) $pickers .= 'pickDate: false,'; + if(!$picktime) $pickers .= 'pickTime: false,'; -function timesel($pre,$h,$m) { + $extra_js = ''; + if($minfrom != '') + $extra_js .= "\$('#$minfrom').on('dp.change',function (e) { \$('#$id').data('DateTimePicker').setMinDate(e.date); });"; - $o = ''; - $o .= "<select name=\"{$pre}hour\" class=\"{$pre}hour\" size=\"1\">"; - for($x = 0; $x < 24; $x ++) { - $sel = (($x == $h) ? " selected=\"selected\" " : ""); - $o .= "<option value=\"$x\" $sel>$x</option>"; - } - $o .= "</select> : <select name=\"{$pre}minute\" class=\"{$pre}minute\" size=\"1\">"; - for($x = 0; $x < 60; $x ++) { - $sel = (($x == $m) ? " selected=\"selected\" " : ""); - $o .= "<option value=\"$x\" $sel>$x</option>"; - } + if($maxfrom != '') + $extra_js .= "\$('#$maxfrom').on('dp.change',function (e) { \$('#$id').data('DateTimePicker').setMaxDate(e.date); });"; - $o .= "</select>"; + $o .= "<div class='date' id='$id'><input type='text' placeholder='$dateformat' name='$id'/></div>"; + $o .= "<script type='text/javascript'>\$(function () {\$('#$id').datetimepicker({sideBySide: true, $pickers minDate: $mindate, maxDate: $maxdate, format: '$dateformat', useCurrent: false $defaultDate}); $extra_js});</script>"; return $o; } - - - - - - - // implements "3 seconds ago" etc. // based on $posted_date, (UTC). // Results relative to current timezone @@ -516,4 +479,4 @@ function update_birthdays() { } } } -}
\ No newline at end of file +} diff --git a/include/nav.php b/include/nav.php index ba817648b..f1f89db20 100644 --- a/include/nav.php +++ b/include/nav.php @@ -142,7 +142,7 @@ EOT; sprintf( t('%s - click to logout'), $observer['xchan_addr'])); } else { - $nav['loginmenu'][] = Array('rmagic',t('Remote login'),'',t('Click to authenticate to your home hub')); + $nav['loginmenu'][] = Array('rmagic',t('Remote authentication'),'',t('Click to authenticate to your home hub')); } /** diff --git a/mod/events.php b/mod/events.php index d24f84d44..86a2286b2 100755 --- a/mod/events.php +++ b/mod/events.php @@ -18,18 +18,6 @@ function events_post(&$a) { $start_text = escape_tags($_REQUEST['start_text']); $finish_text = escape_tags($_REQUEST['finish_text']); - $startyear = intval($_POST['startyear']); - $startmonth = intval($_POST['startmonth']); - $startday = intval($_POST['startday']); - $starthour = intval($_POST['starthour']); - $startminute = intval($_POST['startminute']); - - $finishyear = intval($_POST['finishyear']); - $finishmonth = intval($_POST['finishmonth']); - $finishday = intval($_POST['finishday']); - $finishhour = intval($_POST['finishhour']); - $finishminute = intval($_POST['finishminute']); - $adjust = intval($_POST['adjust']); $nofinish = intval($_POST['nofinish']); @@ -79,8 +67,10 @@ function events_post(&$a) { // and we'll waste a bunch of time responding to it. Time that // could've been spent doing something else. - if(strcmp($finish,$start) < 0) - $finish = $start; + if(strcmp($finish,$start) < 0) { + notice( t('Event can not end before it has started.') . EOL); + goaway($a->get_baseurl() . '/events/new'); + } $summary = escape_tags(trim($_POST['summary'])); $desc = escape_tags(trim($_POST['desc'])); @@ -530,11 +520,6 @@ function events_content(&$a) { } } - - - $dateformat = datesel_format($f); - $timeformat = t('hour:minute'); - require_once('include/acl_selectors.php'); $perm_defaults = array( @@ -554,24 +539,20 @@ function events_content(&$a) { '$mid' => $mid, '$title' => t('Event details'), - '$format_desc' => sprintf( t('Format is %s %s.'),$dateformat,$timeformat), '$desc' => t('Starting date and Title are required.'), '$catsenabled' => $catsenabled, '$placeholdercategory' => t('Categories (comma-separated list)'), '$category' => $category, '$s_text' => t('Event Starts:') . ' <span class="required" title="' . t('Required') . '">*</span>', - '$bootstrap' => 1, '$stext' => $stext, '$ftext' => $ftext, '$ModalCANCEL' => t('Cancel'), '$ModalOK' => t('OK'), - '$s_dsel' => datesel($f,'start',$syear+5,$syear,false,$syear,$smonth,$sday), - '$s_tsel' => timesel('start',$shour,$sminute), + '$s_dsel' => datetimesel($f,mktime(),mktime(0,0,0,0,0,$syear+5),mktime(),'start_text'), '$n_text' => t('Finish date/time is not known or not relevant'), '$n_checked' => $n_checked, '$f_text' => t('Event Finishes:'), - '$f_dsel' => datesel($f,'finish',$fyear+5,$fyear,false,$fyear,$fmonth,$fday), - '$f_tsel' => timesel('finish',$fhour,$fminute), + '$f_dsel' => datetimesel($f,mktime(),mktime(0,0,0,0,0,$fyear+5),mktime(),'finish_text',true,true,'start_text'), '$a_text' => t('Adjust for viewer timezone'), '$a_checked' => $a_checked, '$d_text' => t('Description:'), diff --git a/mod/photos.php b/mod/photos.php index 2b859b7f1..4c52c7ef7 100644 --- a/mod/photos.php +++ b/mod/photos.php @@ -956,7 +956,7 @@ function photos_content(&$a) { $edit = array( 'edit' => t('Edit photo'), - 'id' => $ph[0]['id'], + 'id' => $link_item['id'], //$ph[0]['id'], 'rotatecw' => t('Rotate CW (right)'), 'rotateccw' => t('Rotate CCW (left)'), 'albums' => $albums['albums'], @@ -1114,7 +1114,7 @@ function photos_content(&$a) { $photo_tpl = get_markup_template('photo_view.tpl'); $o .= replace_macros($photo_tpl, array( - '$id' => $ph[0]['id'], + '$id' => $link_item['id'], //$ph[0]['id'], '$album' => $album_e, '$tools' => $tools, '$lock' => $lock, diff --git a/mod/profiles.php b/mod/profiles.php index 5d0416e9a..14f24c5cf 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -233,41 +233,13 @@ function profiles_post(&$a) { return; } - if($_POST['dob']) { - $year = substr($_POST['dob'],0,4); - $month = substr($_POST['dob'],5,2); - $day = substr($_POST['dob'],8,2); - } - - $year = intval($_POST['year']); - if($year < 1900 || $year > 2100 || $year < 0) - $year = 0; - $month = intval($_POST['month']); - if(($month > 12) || ($month < 0)) - $month = 0; - $mtab = array(0,31,29,31,30,31,30,31,31,30,31,30,31); - $day = intval($_POST['day']); - if(($day > $mtab[$month]) || ($day < 0)) - $day = 0; - -// if($year && (! ($month && $day))) { -// $month = 1; $day = 1; -// } - - - $dob = '0000-00-00'; - $dob = sprintf('%04d-%02d-%02d',$year,$month,$day); - + $dob = $_POST['dob'] ? escape_tags(trim($_POST['dob'])) : '0000-00-00'; // FIXME: Needs to be validated? $name = escape_tags(trim($_POST['name'])); if($orig[0]['name'] != $name) $namechanged = true; - - - - $pdesc = escape_tags(trim($_POST['pdesc'])); $gender = escape_tags(trim($_POST['gender'])); $address = escape_tags(trim($_POST['address'])); @@ -654,7 +626,7 @@ logger('extra_fields: ' . print_r($extra_fields,true)); '$lbl_fullname' => t('Your Full Name:'), '$lbl_title' => t('Title/Description:'), '$lbl_gender' => t('Your Gender:'), - '$lbl_bd' => sprintf( t("Birthday \x28%s\x29:"),datesel_format($f)), + '$lbl_bd' => t("Birthday :"), '$lbl_address' => t('Street Address:'), '$lbl_city' => t('Locality/City:'), '$lbl_zip' => t('Postal/Zip Code:'), diff --git a/util/messages.po b/util/messages.po index ada12b442..7fafa754c 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2014-10-19.833\n" +"Project-Id-Version: 2014-10-10.824\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-10-19 16:08-0700\n" +"POT-Creation-Date: 2014-10-10 00:03-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -85,70 +85,71 @@ msgid "Visible to specific connections." msgstr "" #: ../../include/items.php:3927 ../../mod/display.php:32 -#: ../../mod/filestorage.php:26 ../../mod/admin.php:168 +#: ../../mod/filestorage.php:18 ../../mod/admin.php:168 #: ../../mod/admin.php:898 ../../mod/admin.php:1101 ../../mod/thing.php:76 #: ../../mod/viewsrc.php:20 msgid "Item not found." msgstr "" -#: ../../include/items.php:3994 ../../include/attach.php:116 -#: ../../include/attach.php:163 ../../include/attach.php:226 -#: ../../include/attach.php:240 ../../include/attach.php:280 -#: ../../include/attach.php:294 ../../include/attach.php:318 -#: ../../include/attach.php:511 ../../include/attach.php:584 -#: ../../include/photos.php:15 ../../include/chat.php:116 +#: ../../include/items.php:3989 ../../include/photos.php:15 +#: ../../include/attach.php:119 ../../include/attach.php:166 +#: ../../include/attach.php:229 ../../include/attach.php:243 +#: ../../include/attach.php:283 ../../include/attach.php:297 +#: ../../include/attach.php:322 ../../include/attach.php:513 +#: ../../include/attach.php:585 ../../include/chat.php:116 #: ../../mod/mood.php:112 ../../mod/mitem.php:73 ../../mod/achievements.php:30 #: ../../mod/settings.php:496 ../../mod/poke.php:128 ../../mod/api.php:26 #: ../../mod/api.php:31 ../../mod/authtest.php:13 ../../mod/profile.php:64 #: ../../mod/profile.php:72 ../../mod/block.php:22 ../../mod/block.php:72 -#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/bookmarks.php:46 -#: ../../mod/profiles.php:179 ../../mod/profiles.php:532 -#: ../../mod/photos.php:68 ../../mod/photos.php:526 ../../mod/channel.php:89 -#: ../../mod/channel.php:193 ../../mod/channel.php:236 ../../mod/chat.php:90 -#: ../../mod/chat.php:95 ../../mod/register.php:70 ../../mod/regmod.php:17 -#: ../../mod/common.php:35 ../../mod/network.php:12 -#: ../../mod/connections.php:169 ../../mod/connedit.php:254 -#: ../../mod/delegate.php:6 ../../mod/page.php:30 ../../mod/page.php:80 -#: ../../mod/events.php:190 ../../mod/setup.php:203 ../../mod/editblock.php:34 -#: ../../mod/pdledit.php:21 ../../mod/editlayout.php:48 -#: ../../mod/editpost.php:13 ../../mod/editwebpage.php:44 -#: ../../mod/editwebpage.php:83 ../../mod/profile_photo.php:263 +#: ../../mod/blocks.php:29 ../../mod/blocks.php:44 ../../mod/profiles.php:179 +#: ../../mod/profiles.php:560 ../../mod/webpages.php:40 +#: ../../mod/channel.php:89 ../../mod/channel.php:193 +#: ../../mod/channel.php:236 ../../mod/chat.php:90 ../../mod/chat.php:95 +#: ../../mod/register.php:70 ../../mod/regmod.php:17 ../../mod/common.php:35 +#: ../../mod/network.php:12 ../../mod/connections.php:169 +#: ../../mod/connedit.php:254 ../../mod/delegate.php:6 ../../mod/page.php:30 +#: ../../mod/page.php:80 ../../mod/photos.php:68 ../../mod/photos.php:526 +#: ../../mod/setup.php:203 ../../mod/editblock.php:34 ../../mod/pdledit.php:21 +#: ../../mod/editlayout.php:48 ../../mod/editpost.php:13 +#: ../../mod/editwebpage.php:44 ../../mod/editwebpage.php:83 +#: ../../mod/bookmarks.php:46 ../../mod/profile_photo.php:263 #: ../../mod/profile_photo.php:276 ../../mod/sources.php:66 -#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:67 -#: ../../mod/filestorage.php:82 ../../mod/filestorage.php:109 -#: ../../mod/fsuggest.php:78 ../../mod/suggest.php:26 ../../mod/group.php:9 -#: ../../mod/thing.php:247 ../../mod/thing.php:264 ../../mod/thing.php:299 -#: ../../mod/invite.php:13 ../../mod/invite.php:104 ../../mod/item.php:182 -#: ../../mod/item.php:190 ../../mod/item.php:929 ../../mod/layouts.php:27 -#: ../../mod/layouts.php:39 ../../mod/like.php:154 -#: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/viewsrc.php:14 ../../mod/mail.php:111 ../../mod/manage.php:6 -#: ../../mod/menu.php:44 ../../mod/webpages.php:40 ../../mod/message.php:16 -#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 -#: ../../mod/notifications.php:66 ../../mod/appman.php:66 -#: ../../mod/service_limits.php:7 ../../index.php:190 ../../index.php:365 +#: ../../mod/events.php:200 ../../mod/filestorage.php:10 +#: ../../mod/filestorage.php:59 ../../mod/filestorage.php:75 +#: ../../mod/filestorage.php:98 ../../mod/fsuggest.php:78 +#: ../../mod/suggest.php:26 ../../mod/group.php:9 ../../mod/thing.php:247 +#: ../../mod/thing.php:264 ../../mod/thing.php:299 ../../mod/invite.php:13 +#: ../../mod/invite.php:104 ../../mod/item.php:182 ../../mod/item.php:190 +#: ../../mod/item.php:929 ../../mod/layouts.php:27 ../../mod/layouts.php:39 +#: ../../mod/like.php:154 ../../mod/viewconnections.php:22 +#: ../../mod/viewconnections.php:27 ../../mod/viewsrc.php:14 +#: ../../mod/mail.php:111 ../../mod/manage.php:6 ../../mod/menu.php:44 +#: ../../mod/message.php:16 ../../mod/new_channel.php:68 +#: ../../mod/new_channel.php:99 ../../mod/notifications.php:66 +#: ../../mod/appman.php:66 ../../mod/service_limits.php:7 ../../index.php:190 +#: ../../index.php:365 msgid "Permission denied." msgstr "" -#: ../../include/items.php:4365 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4360 ../../mod/group.php:38 ../../mod/group.php:140 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4380 +#: ../../include/items.php:4375 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4387 +#: ../../include/items.php:4382 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4398 +#: ../../include/items.php:4393 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4401 +#: ../../include/items.php:4396 msgid "Connection not found." msgstr "" @@ -165,8 +166,8 @@ msgstr "" msgid "Site Admin" msgstr "" -#: ../../include/apps.php:127 ../../include/conversation.php:1570 -#: ../../include/nav.php:117 +#: ../../include/apps.php:127 ../../include/conversation.php:1566 +#: ../../include/nav.php:116 msgid "Bookmarks" msgstr "" @@ -174,65 +175,65 @@ msgstr "" msgid "Address Book" msgstr "" -#: ../../include/apps.php:129 ../../include/nav.php:125 ../../boot.php:1496 +#: ../../include/apps.php:129 ../../include/nav.php:124 ../../boot.php:1495 msgid "Login" msgstr "" -#: ../../include/apps.php:130 ../../include/nav.php:216 +#: ../../include/apps.php:130 ../../include/nav.php:217 #: ../../mod/manage.php:148 msgid "Channel Manager" msgstr "" -#: ../../include/apps.php:131 ../../include/nav.php:190 +#: ../../include/apps.php:131 ../../include/nav.php:191 msgid "Matrix" msgstr "" #: ../../include/apps.php:132 ../../include/widgets.php:521 -#: ../../include/nav.php:218 ../../mod/admin.php:953 ../../mod/admin.php:1158 +#: ../../include/nav.php:219 ../../mod/admin.php:953 ../../mod/admin.php:1158 msgid "Settings" msgstr "" -#: ../../include/apps.php:133 ../../include/conversation.php:1546 -#: ../../include/nav.php:106 ../../include/RedDAV/RedBrowser.php:241 +#: ../../include/apps.php:133 ../../include/conversation.php:1542 +#: ../../include/nav.php:105 ../../include/RedDAV/RedBrowser.php:238 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" -#: ../../include/apps.php:134 ../../include/conversation.php:1581 -#: ../../include/nav.php:121 ../../mod/webpages.php:129 +#: ../../include/apps.php:134 ../../include/conversation.php:1577 +#: ../../include/nav.php:120 ../../mod/webpages.php:86 msgid "Webpages" msgstr "" -#: ../../include/apps.php:135 ../../include/nav.php:193 +#: ../../include/apps.php:135 ../../include/nav.php:194 msgid "Channel Home" msgstr "" -#: ../../include/apps.php:136 ../../include/identity.php:1112 -#: ../../include/identity.php:1230 ../../mod/profperm.php:112 +#: ../../include/apps.php:136 ../../include/identity.php:1111 +#: ../../include/identity.php:1229 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/apps.php:137 ../../include/conversation.php:1537 -#: ../../include/nav.php:105 ../../mod/fbrowser.php:25 +#: ../../include/apps.php:137 ../../include/conversation.php:1533 +#: ../../include/nav.php:104 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" -#: ../../include/apps.php:138 ../../include/nav.php:212 -#: ../../mod/events.php:426 +#: ../../include/apps.php:138 ../../include/nav.php:213 +#: ../../mod/events.php:436 msgid "Events" msgstr "" -#: ../../include/apps.php:139 ../../include/nav.php:176 +#: ../../include/apps.php:139 ../../include/nav.php:177 #: ../../mod/directory.php:226 msgid "Directory" msgstr "" -#: ../../include/apps.php:140 ../../include/nav.php:168 ../../mod/help.php:60 +#: ../../include/apps.php:140 ../../include/nav.php:169 ../../mod/help.php:60 #: ../../mod/help.php:65 msgid "Help" msgstr "" -#: ../../include/apps.php:141 ../../include/nav.php:204 +#: ../../include/apps.php:141 ../../include/nav.php:205 msgid "Mail" msgstr "" @@ -240,16 +241,16 @@ msgstr "" msgid "Mood" msgstr "" -#: ../../include/apps.php:143 ../../include/conversation.php:951 +#: ../../include/apps.php:143 ../../include/conversation.php:947 msgid "Poke" msgstr "" -#: ../../include/apps.php:144 ../../include/nav.php:111 +#: ../../include/apps.php:144 ../../include/nav.php:110 msgid "Chat" msgstr "" #: ../../include/apps.php:145 ../../include/text.php:822 -#: ../../include/text.php:834 ../../include/nav.php:173 +#: ../../include/text.php:834 ../../include/nav.php:174 #: ../../mod/search.php:30 msgid "Search" msgstr "" @@ -300,123 +301,65 @@ msgid "Purchase" msgstr "" #: ../../include/apps.php:249 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:250 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:247 #: ../../include/menu.php:42 ../../include/ItemObject.php:100 #: ../../mod/settings.php:581 ../../mod/blocks.php:99 -#: ../../mod/connections.php:381 ../../mod/connections.php:394 -#: ../../mod/connections.php:413 ../../mod/editblock.php:111 -#: ../../mod/editlayout.php:106 ../../mod/editpost.php:112 -#: ../../mod/editwebpage.php:143 ../../mod/thing.php:233 -#: ../../mod/layouts.php:121 ../../mod/menu.php:59 ../../mod/webpages.php:131 +#: ../../mod/webpages.php:133 ../../mod/connections.php:381 +#: ../../mod/connections.php:394 ../../mod/connections.php:413 +#: ../../mod/editblock.php:111 ../../mod/editlayout.php:106 +#: ../../mod/editpost.php:112 ../../mod/editwebpage.php:143 +#: ../../mod/thing.php:233 ../../mod/layouts.php:121 ../../mod/menu.php:59 msgid "Edit" msgstr "" #: ../../include/apps.php:250 ../../include/conversation.php:638 -#: ../../include/RedDAV/RedBrowser.php:251 ../../include/ItemObject.php:120 -#: ../../mod/settings.php:582 ../../mod/photos.php:1064 -#: ../../mod/connedit.php:462 ../../mod/group.php:176 ../../mod/admin.php:732 +#: ../../include/RedDAV/RedBrowser.php:248 ../../include/ItemObject.php:120 +#: ../../mod/settings.php:582 ../../mod/connedit.php:462 +#: ../../mod/photos.php:1064 ../../mod/group.php:176 ../../mod/admin.php:732 #: ../../mod/admin.php:863 ../../mod/thing.php:234 msgid "Delete" msgstr "" #: ../../include/apps.php:331 ../../include/apps.php:382 -#: ../../include/conversation.php:1003 ../../include/RedDAV/RedBrowser.php:163 +#: ../../include/conversation.php:999 ../../include/RedDAV/RedBrowser.php:160 #: ../../mod/connedit.php:498 msgid "Unknown" msgstr "" -#: ../../include/attach.php:221 ../../include/attach.php:275 -msgid "Item was not found." -msgstr "" - -#: ../../include/attach.php:331 -msgid "No source file." -msgstr "" - -#: ../../include/attach.php:348 -msgid "Cannot locate file to replace" -msgstr "" - -#: ../../include/attach.php:366 -msgid "Cannot locate file to revise/update" -msgstr "" - -#: ../../include/attach.php:377 -#, php-format -msgid "File exceeds size limit of %d" -msgstr "" - -#: ../../include/attach.php:389 -#, php-format -msgid "You have reached your limit of %1$.0f Mbytes attachment storage." -msgstr "" - -#: ../../include/attach.php:472 -msgid "File upload failed. Possible system limit or action terminated." -msgstr "" - -#: ../../include/attach.php:484 -msgid "Stored file could not be verified. Upload failed." -msgstr "" - -#: ../../include/attach.php:526 ../../include/attach.php:543 -msgid "Path not available." -msgstr "" - -#: ../../include/attach.php:589 -msgid "Empty pathname" -msgstr "" - -#: ../../include/attach.php:605 -msgid "duplicate filename or path" -msgstr "" - -#: ../../include/attach.php:629 -msgid "Path not found." -msgstr "" - -#: ../../include/attach.php:680 -msgid "mkdir failed." -msgstr "" - -#: ../../include/attach.php:684 -msgid "database storage failed." -msgstr "" - #: ../../include/page_widgets.php:6 msgid "New Page" msgstr "" #: ../../include/page_widgets.php:39 ../../mod/blocks.php:102 -#: ../../mod/layouts.php:125 ../../mod/webpages.php:134 +#: ../../mod/webpages.php:136 ../../mod/layouts.php:125 msgid "View" msgstr "" -#: ../../include/page_widgets.php:40 ../../include/conversation.php:1114 -#: ../../include/ItemObject.php:608 ../../mod/photos.php:1015 -#: ../../mod/editblock.php:141 ../../mod/editlayout.php:135 -#: ../../mod/editpost.php:140 ../../mod/editwebpage.php:174 -#: ../../mod/webpages.php:135 +#: ../../include/page_widgets.php:40 ../../include/conversation.php:1110 +#: ../../include/ItemObject.php:606 ../../mod/webpages.php:137 +#: ../../mod/photos.php:1015 ../../mod/editblock.php:141 +#: ../../mod/editlayout.php:135 ../../mod/editpost.php:140 +#: ../../mod/editwebpage.php:174 msgid "Preview" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:136 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:138 msgid "Actions" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:137 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:139 msgid "Page Link" msgstr "" -#: ../../include/page_widgets.php:43 ../../mod/webpages.php:138 +#: ../../include/page_widgets.php:43 ../../mod/webpages.php:140 msgid "Title" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:139 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:141 msgid "Created" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:140 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:142 msgid "Edited" msgstr "" @@ -430,7 +373,7 @@ msgstr "" msgid "Categories" msgstr "" -#: ../../include/widgets.php:86 ../../include/nav.php:171 +#: ../../include/widgets.php:86 ../../include/nav.php:172 #: ../../mod/apps.php:33 msgid "Apps" msgstr "" @@ -439,7 +382,7 @@ msgstr "" msgid "System" msgstr "" -#: ../../include/widgets.php:89 ../../include/conversation.php:1449 +#: ../../include/widgets.php:89 ../../include/conversation.php:1445 msgid "Personal" msgstr "" @@ -452,7 +395,7 @@ msgid "Edit Personal App" msgstr "" #: ../../include/widgets.php:135 ../../include/widgets.php:175 -#: ../../include/conversation.php:948 ../../include/identity.php:832 +#: ../../include/conversation.php:944 ../../include/identity.php:831 #: ../../include/Contact.php:107 ../../mod/directory.php:183 #: ../../mod/dirprofile.php:164 ../../mod/suggest.php:51 #: ../../mod/match.php:62 @@ -536,8 +479,8 @@ msgstr "" msgid "Best Friends" msgstr "" -#: ../../include/widgets.php:407 ../../include/identity.php:381 -#: ../../include/identity.php:382 ../../include/identity.php:389 +#: ../../include/widgets.php:407 ../../include/identity.php:380 +#: ../../include/identity.php:381 ../../include/identity.php:388 #: ../../include/profile_selectors.php:80 ../../mod/connedit.php:495 msgid "Friends" msgstr "" @@ -612,7 +555,7 @@ msgstr "" msgid "Check Mail" msgstr "" -#: ../../include/widgets.php:545 ../../include/nav.php:209 +#: ../../include/widgets.php:545 ../../include/nav.php:210 msgid "New Message" msgstr "" @@ -628,15 +571,15 @@ msgstr "" msgid "Suggested Chatrooms" msgstr "" -#: ../../include/zot.php:655 +#: ../../include/zot.php:654 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:671 +#: ../../include/zot.php:670 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:1757 +#: ../../include/zot.php:1741 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -658,7 +601,7 @@ msgstr "" msgid "Photo storage failed." msgstr "" -#: ../../include/photos.php:340 ../../include/conversation.php:1540 +#: ../../include/photos.php:340 ../../include/conversation.php:1536 msgid "Photo Albums" msgstr "" @@ -678,13 +621,13 @@ msgstr "" msgid "Don't show" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/photos.php:604 -#: ../../mod/photos.php:970 ../../mod/chat.php:209 ../../mod/events.php:566 -#: ../../mod/filestorage.php:137 +#: ../../include/acl_selectors.php:248 ../../mod/chat.php:209 +#: ../../mod/photos.php:604 ../../mod/photos.php:970 +#: ../../mod/filestorage.php:128 msgid "Permissions" msgstr "" -#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:305 +#: ../../include/acl_selectors.php:249 ../../include/ItemObject.php:303 msgid "Close" msgstr "" @@ -711,10 +654,68 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/api.php:1072 +#: ../../include/api.php:1069 msgid "Public Timeline" msgstr "" +#: ../../include/attach.php:224 ../../include/attach.php:278 +msgid "Item was not found." +msgstr "" + +#: ../../include/attach.php:335 +msgid "No source file." +msgstr "" + +#: ../../include/attach.php:352 +msgid "Cannot locate file to replace" +msgstr "" + +#: ../../include/attach.php:370 +msgid "Cannot locate file to revise/update" +msgstr "" + +#: ../../include/attach.php:381 +#, php-format +msgid "File exceeds size limit of %d" +msgstr "" + +#: ../../include/attach.php:393 +#, php-format +msgid "You have reached your limit of %1$.0f Mbytes attachment storage." +msgstr "" + +#: ../../include/attach.php:475 +msgid "File upload failed. Possible system limit or action terminated." +msgstr "" + +#: ../../include/attach.php:487 +msgid "Stored file could not be verified. Upload failed." +msgstr "" + +#: ../../include/attach.php:528 ../../include/attach.php:545 +msgid "Path not available." +msgstr "" + +#: ../../include/attach.php:590 +msgid "Empty pathname" +msgstr "" + +#: ../../include/attach.php:606 +msgid "duplicate filename or path" +msgstr "" + +#: ../../include/attach.php:630 +msgid "Path not found." +msgstr "" + +#: ../../include/attach.php:681 +msgid "mkdir failed." +msgstr "" + +#: ../../include/attach.php:685 +msgid "database storage failed." +msgstr "" + #: ../../include/conversation.php:120 ../../include/text.php:1743 #: ../../include/diaspora.php:1924 ../../mod/subthread.php:72 #: ../../mod/subthread.php:174 ../../mod/tagger.php:45 ../../mod/like.php:294 @@ -782,396 +783,392 @@ msgid "Private Message" msgstr "" #: ../../include/conversation.php:652 ../../include/ItemObject.php:194 -msgid "Message signature validated" -msgstr "" - -#: ../../include/conversation.php:653 ../../include/ItemObject.php:195 -msgid "Message signature incorrect" +msgid "Message is verified" msgstr "" -#: ../../include/conversation.php:674 +#: ../../include/conversation.php:671 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:689 +#: ../../include/conversation.php:685 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:690 +#: ../../include/conversation.php:686 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:698 ../../include/ItemObject.php:265 +#: ../../include/conversation.php:694 ../../include/ItemObject.php:264 #, php-format msgid " from %s" msgstr "" -#: ../../include/conversation.php:701 ../../include/ItemObject.php:268 +#: ../../include/conversation.php:697 ../../include/ItemObject.php:267 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/conversation.php:702 ../../include/ItemObject.php:269 +#: ../../include/conversation.php:698 ../../include/ItemObject.php:268 #, php-format msgid "Expires: %s" msgstr "" -#: ../../include/conversation.php:717 +#: ../../include/conversation.php:713 msgid "View in context" msgstr "" -#: ../../include/conversation.php:719 ../../include/conversation.php:1153 -#: ../../include/ItemObject.php:310 ../../mod/photos.php:995 +#: ../../include/conversation.php:715 ../../include/conversation.php:1149 +#: ../../include/ItemObject.php:308 ../../mod/photos.php:995 #: ../../mod/editblock.php:120 ../../mod/editlayout.php:115 #: ../../mod/editpost.php:121 ../../mod/editwebpage.php:152 #: ../../mod/mail.php:234 ../../mod/mail.php:349 msgid "Please wait" msgstr "" -#: ../../include/conversation.php:843 +#: ../../include/conversation.php:839 msgid "remove" msgstr "" -#: ../../include/conversation.php:847 ../../include/nav.php:257 +#: ../../include/conversation.php:843 ../../include/nav.php:258 msgid "Loading..." msgstr "" -#: ../../include/conversation.php:848 +#: ../../include/conversation.php:844 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:942 +#: ../../include/conversation.php:938 msgid "View Source" msgstr "" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:939 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:944 +#: ../../include/conversation.php:940 msgid "View Status" msgstr "" -#: ../../include/conversation.php:945 ../../include/nav.php:99 +#: ../../include/conversation.php:941 ../../include/nav.php:98 #: ../../mod/connedit.php:415 ../../mod/connedit.php:529 msgid "View Profile" msgstr "" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:942 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:943 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:949 +#: ../../include/conversation.php:945 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:950 +#: ../../include/conversation.php:946 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1020 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1024 +#: ../../include/conversation.php:1020 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1028 +#: ../../include/conversation.php:1024 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1030 +#: ../../include/conversation.php:1026 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1036 +#: ../../include/conversation.php:1032 msgid "and" msgstr "" -#: ../../include/conversation.php:1039 +#: ../../include/conversation.php:1035 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1036 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1040 +#: ../../include/conversation.php:1036 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1097 +#: ../../include/conversation.php:1093 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:1098 ../../mod/mail.php:170 +#: ../../include/conversation.php:1094 ../../mod/mail.php:170 #: ../../mod/mail.php:282 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1099 +#: ../../include/conversation.php:1095 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1100 +#: ../../include/conversation.php:1096 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1101 +#: ../../include/conversation.php:1097 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1102 ../../mod/filer.php:49 +#: ../../include/conversation.php:1098 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1103 +#: ../../include/conversation.php:1099 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1104 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1100 ../../mod/editpost.php:52 #: ../../mod/mail.php:171 ../../mod/mail.php:283 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1128 ../../mod/photos.php:994 +#: ../../include/conversation.php:1124 ../../mod/photos.php:994 #: ../../mod/editblock.php:168 ../../mod/editlayout.php:161 #: ../../mod/editwebpage.php:201 ../../mod/layouts.php:122 msgid "Share" msgstr "" -#: ../../include/conversation.php:1130 ../../mod/editwebpage.php:139 +#: ../../include/conversation.php:1126 ../../mod/editwebpage.php:139 msgid "Page link title" msgstr "" -#: ../../include/conversation.php:1133 +#: ../../include/conversation.php:1129 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1134 ../../mod/editblock.php:112 +#: ../../include/conversation.php:1130 ../../mod/editblock.php:112 #: ../../mod/editlayout.php:107 ../../mod/editpost.php:113 #: ../../mod/editwebpage.php:144 ../../mod/mail.php:231 ../../mod/mail.php:345 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1135 +#: ../../include/conversation.php:1131 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1136 ../../mod/editblock.php:113 +#: ../../include/conversation.php:1132 ../../mod/editblock.php:113 #: ../../mod/editlayout.php:108 ../../mod/editpost.php:114 #: ../../mod/editwebpage.php:145 ../../mod/mail.php:232 ../../mod/mail.php:346 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1137 +#: ../../include/conversation.php:1133 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1138 ../../mod/editblock.php:114 +#: ../../include/conversation.php:1134 ../../mod/editblock.php:114 #: ../../mod/editlayout.php:109 ../../mod/editpost.php:115 #: ../../mod/editwebpage.php:146 ../../mod/mail.php:233 ../../mod/mail.php:347 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1139 +#: ../../include/conversation.php:1135 msgid "web link" msgstr "" -#: ../../include/conversation.php:1140 +#: ../../include/conversation.php:1136 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1141 +#: ../../include/conversation.php:1137 msgid "video link" msgstr "" -#: ../../include/conversation.php:1142 +#: ../../include/conversation.php:1138 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1143 +#: ../../include/conversation.php:1139 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1144 ../../mod/editblock.php:118 +#: ../../include/conversation.php:1140 ../../mod/editblock.php:118 #: ../../mod/editlayout.php:113 ../../mod/editpost.php:119 #: ../../mod/editwebpage.php:150 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1145 +#: ../../include/conversation.php:1141 msgid "set location" msgstr "" -#: ../../include/conversation.php:1146 ../../mod/editblock.php:119 +#: ../../include/conversation.php:1142 ../../mod/editblock.php:119 #: ../../mod/editlayout.php:114 ../../mod/editpost.php:120 #: ../../mod/editwebpage.php:151 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1147 +#: ../../include/conversation.php:1143 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1149 ../../mod/editblock.php:132 +#: ../../include/conversation.php:1145 ../../mod/editblock.php:132 #: ../../mod/editlayout.php:126 ../../mod/editpost.php:132 #: ../../mod/editwebpage.php:167 msgid "Set title" msgstr "" -#: ../../include/conversation.php:1152 ../../mod/events.php:544 -#: ../../mod/editblock.php:135 ../../mod/editlayout.php:129 -#: ../../mod/editpost.php:134 ../../mod/editwebpage.php:169 +#: ../../include/conversation.php:1148 ../../mod/editblock.php:135 +#: ../../mod/editlayout.php:129 ../../mod/editpost.php:134 +#: ../../mod/editwebpage.php:169 ../../mod/events.php:560 msgid "Categories (comma-separated list)" msgstr "" -#: ../../include/conversation.php:1154 ../../mod/editblock.php:121 +#: ../../include/conversation.php:1150 ../../mod/editblock.php:121 #: ../../mod/editlayout.php:116 ../../mod/editpost.php:122 #: ../../mod/editwebpage.php:153 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1155 +#: ../../include/conversation.php:1151 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1162 ../../mod/editblock.php:129 +#: ../../include/conversation.php:1158 ../../mod/editblock.php:129 #: ../../mod/editlayout.php:123 ../../mod/editpost.php:129 #: ../../mod/editwebpage.php:162 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1164 ../../mod/editblock.php:136 +#: ../../include/conversation.php:1160 ../../mod/editblock.php:136 #: ../../mod/editlayout.php:130 ../../mod/editpost.php:135 #: ../../mod/editwebpage.php:170 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1177 ../../mod/editblock.php:146 +#: ../../include/conversation.php:1173 ../../mod/editblock.php:146 #: ../../mod/editlayout.php:140 ../../mod/editpost.php:146 #: ../../mod/editwebpage.php:179 ../../mod/mail.php:238 ../../mod/mail.php:352 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1179 ../../include/ItemObject.php:611 +#: ../../include/conversation.php:1175 ../../include/ItemObject.php:609 #: ../../mod/editpost.php:148 ../../mod/mail.php:240 ../../mod/mail.php:354 msgid "Encrypt text" msgstr "" -#: ../../include/conversation.php:1181 ../../mod/events.php:550 -#: ../../mod/editpost.php:150 +#: ../../include/conversation.php:1177 ../../mod/editpost.php:150 +#: ../../mod/events.php:567 msgid "OK" msgstr "" -#: ../../include/conversation.php:1182 ../../mod/settings.php:520 -#: ../../mod/settings.php:546 ../../mod/events.php:549 -#: ../../mod/editpost.php:151 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 +#: ../../include/conversation.php:1178 ../../mod/settings.php:520 +#: ../../mod/settings.php:546 ../../mod/editpost.php:151 +#: ../../mod/fbrowser.php:82 ../../mod/fbrowser.php:117 +#: ../../mod/events.php:566 ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1426 +#: ../../include/conversation.php:1422 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1429 +#: ../../include/conversation.php:1425 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1434 +#: ../../include/conversation.php:1430 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1437 +#: ../../include/conversation.php:1433 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1441 +#: ../../include/conversation.php:1437 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1444 +#: ../../include/conversation.php:1440 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1452 +#: ../../include/conversation.php:1448 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1458 ../../mod/connections.php:211 +#: ../../include/conversation.php:1454 ../../mod/connections.php:211 #: ../../mod/connections.php:224 ../../mod/menu.php:61 msgid "New" msgstr "" -#: ../../include/conversation.php:1461 +#: ../../include/conversation.php:1457 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1467 +#: ../../include/conversation.php:1463 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1470 +#: ../../include/conversation.php:1466 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1477 +#: ../../include/conversation.php:1473 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1480 +#: ../../include/conversation.php:1476 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1516 ../../mod/admin.php:867 +#: ../../include/conversation.php:1512 ../../mod/admin.php:867 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1519 +#: ../../include/conversation.php:1515 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1528 +#: ../../include/conversation.php:1524 msgid "About" msgstr "" -#: ../../include/conversation.php:1531 +#: ../../include/conversation.php:1527 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1549 +#: ../../include/conversation.php:1545 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1558 ../../include/conversation.php:1561 +#: ../../include/conversation.php:1554 ../../include/conversation.php:1557 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1573 +#: ../../include/conversation.php:1569 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1584 +#: ../../include/conversation.php:1580 msgid "Manage Webpages" msgstr "" @@ -1450,7 +1447,7 @@ msgstr "" msgid "Click to open/close" msgstr "" -#: ../../include/text.php:1523 ../../mod/events.php:404 +#: ../../include/text.php:1523 ../../mod/events.php:414 msgid "Link to Source" msgstr "" @@ -1523,7 +1520,7 @@ msgstr "" msgid "wants" msgstr "" -#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:221 +#: ../../include/taxonomy.php:254 ../../include/ItemObject.php:220 msgid "like" msgstr "" @@ -1531,7 +1528,7 @@ msgstr "" msgid "likes" msgstr "" -#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:222 +#: ../../include/taxonomy.php:255 ../../include/ItemObject.php:221 msgid "dislike" msgstr "" @@ -1539,7 +1536,7 @@ msgstr "" msgid "dislikes" msgstr "" -#: ../../include/taxonomy.php:338 ../../include/identity.php:1138 +#: ../../include/taxonomy.php:338 ../../include/identity.php:1137 #: ../../include/ItemObject.php:146 msgctxt "noun" msgid "Like" @@ -1551,6 +1548,191 @@ msgstr[1] "" msgid "Default" msgstr "" +#: ../../include/nav.php:94 ../../include/nav.php:126 ../../boot.php:1494 +msgid "Logout" +msgstr "" + +#: ../../include/nav.php:94 ../../include/nav.php:126 +msgid "End this session" +msgstr "" + +#: ../../include/nav.php:97 ../../include/nav.php:160 +msgid "Home" +msgstr "" + +#: ../../include/nav.php:97 +msgid "Your posts and conversations" +msgstr "" + +#: ../../include/nav.php:98 +msgid "Your profile page" +msgstr "" + +#: ../../include/nav.php:100 +msgid "Edit Profiles" +msgstr "" + +#: ../../include/nav.php:100 +msgid "Manage/Edit profiles" +msgstr "" + +#: ../../include/nav.php:102 ../../include/identity.php:855 +msgid "Edit Profile" +msgstr "" + +#: ../../include/nav.php:102 +msgid "Edit your profile" +msgstr "" + +#: ../../include/nav.php:104 +msgid "Your photos" +msgstr "" + +#: ../../include/nav.php:105 +msgid "Your files" +msgstr "" + +#: ../../include/nav.php:110 +msgid "Your chatrooms" +msgstr "" + +#: ../../include/nav.php:116 +msgid "Your bookmarks" +msgstr "" + +#: ../../include/nav.php:120 +msgid "Your webpages" +msgstr "" + +#: ../../include/nav.php:124 +msgid "Sign in" +msgstr "" + +#: ../../include/nav.php:141 +#, php-format +msgid "%s - click to logout" +msgstr "" + +#: ../../include/nav.php:146 +msgid "Click to authenticate to your home hub" +msgstr "" + +#: ../../include/nav.php:160 +msgid "Home Page" +msgstr "" + +#: ../../include/nav.php:164 ../../mod/register.php:220 ../../boot.php:1471 +msgid "Register" +msgstr "" + +#: ../../include/nav.php:164 +msgid "Create an account" +msgstr "" + +#: ../../include/nav.php:169 +msgid "Help and documentation" +msgstr "" + +#: ../../include/nav.php:172 +msgid "Applications, utilities, links, games" +msgstr "" + +#: ../../include/nav.php:174 +msgid "Search site content" +msgstr "" + +#: ../../include/nav.php:177 +msgid "Channel Locator" +msgstr "" + +#: ../../include/nav.php:191 +msgid "Your matrix" +msgstr "" + +#: ../../include/nav.php:192 +msgid "Mark all matrix notifications seen" +msgstr "" + +#: ../../include/nav.php:194 +msgid "Channel home" +msgstr "" + +#: ../../include/nav.php:195 +msgid "Mark all channel notifications seen" +msgstr "" + +#: ../../include/nav.php:198 ../../mod/connections.php:406 +msgid "Connections" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Notices" +msgstr "" + +#: ../../include/nav.php:201 +msgid "Notifications" +msgstr "" + +#: ../../include/nav.php:202 +msgid "See all notifications" +msgstr "" + +#: ../../include/nav.php:203 ../../mod/notifications.php:99 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:205 +msgid "Private mail" +msgstr "" + +#: ../../include/nav.php:206 +msgid "See all private messages" +msgstr "" + +#: ../../include/nav.php:207 +msgid "Mark all private messages seen" +msgstr "" + +#: ../../include/nav.php:208 +msgid "Inbox" +msgstr "" + +#: ../../include/nav.php:209 +msgid "Outbox" +msgstr "" + +#: ../../include/nav.php:213 +msgid "Event Calendar" +msgstr "" + +#: ../../include/nav.php:214 +msgid "See all events" +msgstr "" + +#: ../../include/nav.php:215 +msgid "Mark all events seen" +msgstr "" + +#: ../../include/nav.php:217 +msgid "Manage Your Channels" +msgstr "" + +#: ../../include/nav.php:219 +msgid "Account/Channel Settings" +msgstr "" + +#: ../../include/nav.php:227 ../../mod/admin.php:123 +msgid "Admin" +msgstr "" + +#: ../../include/nav.php:227 +msgid "Site Setup and Configuration" +msgstr "" + +#: ../../include/nav.php:263 +msgid "Please wait..." +msgstr "" + #: ../../include/contact_selectors.php:56 msgid "Frequently" msgstr "" @@ -1588,7 +1770,7 @@ msgid "RSS/Atom" msgstr "" #: ../../include/contact_selectors.php:79 ../../mod/admin.php:728 -#: ../../mod/admin.php:737 ../../boot.php:1498 +#: ../../mod/admin.php:737 ../../boot.php:1497 msgid "Email" msgstr "" @@ -1692,8 +1874,8 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:40 ../../include/bb2diaspora.php:461 -#: ../../include/identity.php:883 ../../mod/directory.php:156 -#: ../../mod/dirprofile.php:105 ../../mod/events.php:560 +#: ../../include/identity.php:882 ../../mod/directory.php:156 +#: ../../mod/dirprofile.php:105 ../../mod/events.php:579 msgid "Location:" msgstr "" @@ -1778,193 +1960,87 @@ msgstr "" msgid "This action is not available under your subscription plan." msgstr "" -#: ../../include/nav.php:95 ../../include/nav.php:128 ../../boot.php:1495 -msgid "Logout" -msgstr "" - -#: ../../include/nav.php:95 ../../include/nav.php:128 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:98 ../../include/nav.php:159 -msgid "Home" -msgstr "" - -#: ../../include/nav.php:98 -msgid "Your posts and conversations" -msgstr "" - -#: ../../include/nav.php:99 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:101 -msgid "Edit Profiles" -msgstr "" - -#: ../../include/nav.php:101 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:103 ../../include/identity.php:856 -msgid "Edit Profile" -msgstr "" - -#: ../../include/nav.php:103 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:105 -msgid "Your photos" -msgstr "" - -#: ../../include/nav.php:106 -msgid "Your files" -msgstr "" - -#: ../../include/nav.php:111 -msgid "Your chatrooms" -msgstr "" - -#: ../../include/nav.php:117 -msgid "Your bookmarks" -msgstr "" - -#: ../../include/nav.php:121 -msgid "Your webpages" -msgstr "" - -#: ../../include/nav.php:125 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:142 -#, php-format -msgid "%s - click to logout" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:145 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:159 -msgid "Home Page" -msgstr "" - -#: ../../include/nav.php:163 ../../mod/register.php:220 ../../boot.php:1472 -msgid "Register" -msgstr "" - -#: ../../include/nav.php:163 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:168 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:171 -msgid "Applications, utilities, links, games" -msgstr "" - -#: ../../include/nav.php:173 -msgid "Search site content" -msgstr "" - -#: ../../include/nav.php:176 -msgid "Channel Locator" -msgstr "" - -#: ../../include/nav.php:190 -msgid "Your matrix" -msgstr "" - -#: ../../include/nav.php:191 -msgid "Mark all matrix notifications seen" -msgstr "" - -#: ../../include/nav.php:193 -msgid "Channel home" +#: ../../include/datetime.php:43 ../../include/datetime.php:45 +msgid "Miscellaneous" msgstr "" -#: ../../include/nav.php:194 -msgid "Mark all channel notifications seen" +#: ../../include/datetime.php:152 ../../include/datetime.php:284 +msgid "year" msgstr "" -#: ../../include/nav.php:197 ../../mod/connections.php:406 -msgid "Connections" +#: ../../include/datetime.php:157 ../../include/datetime.php:285 +msgid "month" msgstr "" -#: ../../include/nav.php:200 -msgid "Notices" +#: ../../include/datetime.php:162 ../../include/datetime.php:287 +msgid "day" msgstr "" -#: ../../include/nav.php:200 -msgid "Notifications" +#: ../../include/datetime.php:275 +msgid "never" msgstr "" -#: ../../include/nav.php:201 -msgid "See all notifications" +#: ../../include/datetime.php:281 +msgid "less than a second ago" msgstr "" -#: ../../include/nav.php:202 ../../mod/notifications.php:99 -msgid "Mark all system notifications seen" +#: ../../include/datetime.php:284 +msgid "years" msgstr "" -#: ../../include/nav.php:204 -msgid "Private mail" +#: ../../include/datetime.php:285 +msgid "months" msgstr "" -#: ../../include/nav.php:205 -msgid "See all private messages" +#: ../../include/datetime.php:286 +msgid "week" msgstr "" -#: ../../include/nav.php:206 -msgid "Mark all private messages seen" +#: ../../include/datetime.php:286 +msgid "weeks" msgstr "" -#: ../../include/nav.php:207 -msgid "Inbox" +#: ../../include/datetime.php:287 +msgid "days" msgstr "" -#: ../../include/nav.php:208 -msgid "Outbox" +#: ../../include/datetime.php:288 +msgid "hour" msgstr "" -#: ../../include/nav.php:212 -msgid "Event Calendar" +#: ../../include/datetime.php:288 +msgid "hours" msgstr "" -#: ../../include/nav.php:213 -msgid "See all events" +#: ../../include/datetime.php:289 +msgid "minute" msgstr "" -#: ../../include/nav.php:214 -msgid "Mark all events seen" +#: ../../include/datetime.php:289 +msgid "minutes" msgstr "" -#: ../../include/nav.php:216 -msgid "Manage Your Channels" +#: ../../include/datetime.php:290 +msgid "second" msgstr "" -#: ../../include/nav.php:218 -msgid "Account/Channel Settings" +#: ../../include/datetime.php:290 +msgid "seconds" msgstr "" -#: ../../include/nav.php:226 ../../mod/admin.php:123 -msgid "Admin" +#: ../../include/datetime.php:299 +#, php-format +msgid "%1$d %2$s ago" msgstr "" -#: ../../include/nav.php:226 -msgid "Site Setup and Configuration" +#: ../../include/datetime.php:504 +#, php-format +msgid "%1$s's birthday" msgstr "" -#: ../../include/nav.php:262 -msgid "Please wait..." +#: ../../include/datetime.php:505 +#, php-format +msgid "Happy Birthday %1$s" msgstr "" #: ../../include/dir_fns.php:56 @@ -2553,81 +2629,81 @@ msgstr "" msgid "$1 wrote:" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:106 -#: ../../include/RedDAV/RedBrowser.php:249 +#: ../../include/RedDAV/RedBrowser.php:103 +#: ../../include/RedDAV/RedBrowser.php:246 msgid "parent" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:130 +#: ../../include/RedDAV/RedBrowser.php:127 msgid "Collection" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:133 +#: ../../include/RedDAV/RedBrowser.php:130 msgid "Principal" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:136 +#: ../../include/RedDAV/RedBrowser.php:133 msgid "Addressbook" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:139 +#: ../../include/RedDAV/RedBrowser.php:136 msgid "Calendar" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:142 +#: ../../include/RedDAV/RedBrowser.php:139 msgid "Schedule Inbox" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:145 +#: ../../include/RedDAV/RedBrowser.php:142 msgid "Schedule Outbox" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:223 +#: ../../include/RedDAV/RedBrowser.php:220 #, php-format msgid "%1$s used" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:228 +#: ../../include/RedDAV/RedBrowser.php:225 #, php-format msgid "%1$s used of %2$s (%3$s%)" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:245 ../../mod/settings.php:521 +#: ../../include/RedDAV/RedBrowser.php:242 ../../mod/settings.php:521 #: ../../mod/settings.php:547 ../../mod/admin.php:868 msgid "Name" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:246 +#: ../../include/RedDAV/RedBrowser.php:243 msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:247 +#: ../../include/RedDAV/RedBrowser.php:244 msgid "Size" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:248 +#: ../../include/RedDAV/RedBrowser.php:245 msgid "Last Modified" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:252 +#: ../../include/RedDAV/RedBrowser.php:249 msgid "Total" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:304 +#: ../../include/RedDAV/RedBrowser.php:293 msgid "Create new folder" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/mitem.php:142 +#: ../../include/RedDAV/RedBrowser.php:294 ../../mod/mitem.php:142 #: ../../mod/menu.php:84 ../../mod/new_channel.php:122 msgid "Create" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:306 +#: ../../include/RedDAV/RedBrowser.php:295 msgid "Upload file" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:307 ../../mod/photos.php:745 -#: ../../mod/photos.php:1226 ../../mod/profile_photo.php:361 +#: ../../include/RedDAV/RedBrowser.php:296 ../../mod/photos.php:745 +#: ../../mod/photos.php:1225 ../../mod/profile_photo.php:361 msgid "Upload" msgstr "" @@ -2655,7 +2731,7 @@ msgstr "" msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/identity.php:200 ../../include/dimport.php:34 +#: ../../include/identity.php:200 msgid "" "Nickname has unsupported characters or is already being used on this site." msgstr "" @@ -2664,205 +2740,205 @@ msgstr "" msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/identity.php:342 +#: ../../include/identity.php:341 msgid "Default Profile" msgstr "" -#: ../../include/identity.php:635 +#: ../../include/identity.php:634 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:683 ../../mod/achievements.php:11 -#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/connect.php:13 -#: ../../mod/filestorage.php:48 ../../mod/layouts.php:8 -#: ../../mod/webpages.php:8 ../../mod/hcard.php:8 +#: ../../include/identity.php:682 ../../mod/achievements.php:11 +#: ../../mod/profile.php:16 ../../mod/blocks.php:10 ../../mod/webpages.php:8 +#: ../../mod/connect.php:13 ../../mod/filestorage.php:40 +#: ../../mod/layouts.php:8 ../../mod/hcard.php:8 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:846 ../../mod/profiles.php:722 +#: ../../include/identity.php:845 ../../mod/profiles.php:750 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:852 +#: ../../include/identity.php:851 msgid "Profiles" msgstr "" -#: ../../include/identity.php:852 +#: ../../include/identity.php:851 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:853 ../../mod/profiles.php:723 +#: ../../include/identity.php:852 ../../mod/profiles.php:751 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:867 ../../mod/profiles.php:734 +#: ../../include/identity.php:866 ../../mod/profiles.php:762 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:870 +#: ../../include/identity.php:869 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:871 ../../mod/profiles.php:617 -#: ../../mod/profiles.php:738 +#: ../../include/identity.php:870 ../../mod/profiles.php:645 +#: ../../mod/profiles.php:766 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:885 ../../include/identity.php:1122 +#: ../../include/identity.php:884 ../../include/identity.php:1121 #: ../../mod/directory.php:158 msgid "Gender:" msgstr "" -#: ../../include/identity.php:886 ../../include/identity.php:1166 +#: ../../include/identity.php:885 ../../include/identity.php:1165 #: ../../mod/directory.php:160 msgid "Status:" msgstr "" -#: ../../include/identity.php:887 ../../include/identity.php:1177 +#: ../../include/identity.php:886 ../../include/identity.php:1176 #: ../../mod/directory.php:162 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:888 ../../mod/dirprofile.php:151 +#: ../../include/identity.php:887 ../../mod/dirprofile.php:151 msgid "Online Now" msgstr "" -#: ../../include/identity.php:966 ../../include/identity.php:1046 +#: ../../include/identity.php:965 ../../include/identity.php:1045 #: ../../mod/ping.php:298 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:967 ../../include/identity.php:1047 +#: ../../include/identity.php:966 ../../include/identity.php:1046 msgid "F d" msgstr "" -#: ../../include/identity.php:1012 ../../include/identity.php:1087 +#: ../../include/identity.php:1011 ../../include/identity.php:1086 #: ../../mod/ping.php:320 msgid "[today]" msgstr "" -#: ../../include/identity.php:1024 +#: ../../include/identity.php:1023 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1025 +#: ../../include/identity.php:1024 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1080 +#: ../../include/identity.php:1079 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1098 +#: ../../include/identity.php:1097 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1099 +#: ../../include/identity.php:1098 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1120 ../../mod/settings.php:953 +#: ../../include/identity.php:1119 ../../mod/settings.php:953 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1127 +#: ../../include/identity.php:1126 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1151 +#: ../../include/identity.php:1150 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1152 +#: ../../include/identity.php:1151 msgid "j F" msgstr "" -#: ../../include/identity.php:1159 +#: ../../include/identity.php:1158 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1163 +#: ../../include/identity.php:1162 msgid "Age:" msgstr "" -#: ../../include/identity.php:1172 +#: ../../include/identity.php:1171 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1175 ../../mod/profiles.php:639 +#: ../../include/identity.php:1174 ../../mod/profiles.php:667 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/profiles.php:641 +#: ../../include/identity.php:1178 ../../mod/profiles.php:669 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1181 +#: ../../include/identity.php:1180 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1183 ../../mod/profiles.php:642 +#: ../../include/identity.php:1182 ../../mod/profiles.php:670 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1185 +#: ../../include/identity.php:1184 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1187 ../../mod/directory.php:164 +#: ../../include/identity.php:1186 ../../mod/directory.php:164 msgid "About:" msgstr "" -#: ../../include/identity.php:1189 +#: ../../include/identity.php:1188 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1191 ../../mod/profiles.php:645 +#: ../../include/identity.php:1190 ../../mod/profiles.php:673 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1193 ../../mod/profiles.php:646 +#: ../../include/identity.php:1192 ../../mod/profiles.php:674 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1196 +#: ../../include/identity.php:1195 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1198 +#: ../../include/identity.php:1197 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1200 +#: ../../include/identity.php:1199 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1202 +#: ../../include/identity.php:1201 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1204 +#: ../../include/identity.php:1203 msgid "Television:" msgstr "" -#: ../../include/identity.php:1206 +#: ../../include/identity.php:1205 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1208 +#: ../../include/identity.php:1207 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1210 +#: ../../include/identity.php:1209 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1212 +#: ../../include/identity.php:1211 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1232 +#: ../../include/identity.php:1231 msgid "Like this thing" msgstr "" @@ -2913,138 +2989,138 @@ msgstr "" msgid "starred" msgstr "" -#: ../../include/ItemObject.php:203 +#: ../../include/ItemObject.php:202 msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:221 ../../mod/photos.php:992 +#: ../../include/ItemObject.php:220 ../../mod/photos.php:992 msgid "I like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:222 ../../mod/photos.php:993 +#: ../../include/ItemObject.php:221 ../../mod/photos.php:993 msgid "I don't like this (toggle)" msgstr "" -#: ../../include/ItemObject.php:226 +#: ../../include/ItemObject.php:225 msgid "Share This" msgstr "" -#: ../../include/ItemObject.php:226 +#: ../../include/ItemObject.php:225 msgid "share" msgstr "" -#: ../../include/ItemObject.php:249 ../../include/ItemObject.php:250 +#: ../../include/ItemObject.php:248 ../../include/ItemObject.php:249 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../include/ItemObject.php:251 +#: ../../include/ItemObject.php:250 msgid "to" msgstr "" -#: ../../include/ItemObject.php:252 +#: ../../include/ItemObject.php:251 msgid "via" msgstr "" -#: ../../include/ItemObject.php:253 +#: ../../include/ItemObject.php:252 msgid "Wall-to-Wall" msgstr "" -#: ../../include/ItemObject.php:254 +#: ../../include/ItemObject.php:253 msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:290 +#: ../../include/ItemObject.php:288 msgid "Save Bookmarks" msgstr "" -#: ../../include/ItemObject.php:291 +#: ../../include/ItemObject.php:289 msgid "Add to Calendar" msgstr "" -#: ../../include/ItemObject.php:299 +#: ../../include/ItemObject.php:297 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:300 +#: ../../include/ItemObject.php:298 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../include/ItemObject.php:331 +#: ../../include/ItemObject.php:329 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:332 ../../include/js_strings.php:7 +#: ../../include/ItemObject.php:330 ../../include/js_strings.php:7 msgid "[+] show all" msgstr "" -#: ../../include/ItemObject.php:596 ../../mod/photos.php:1011 +#: ../../include/ItemObject.php:594 ../../mod/photos.php:1011 #: ../../mod/photos.php:1098 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:598 ../../include/js_strings.php:6 +#: ../../include/ItemObject.php:596 ../../include/js_strings.php:6 #: ../../mod/photos.php:1013 ../../mod/photos.php:1100 msgid "Comment" msgstr "" -#: ../../include/ItemObject.php:599 ../../mod/mood.php:135 +#: ../../include/ItemObject.php:597 ../../mod/mood.php:135 #: ../../mod/settings.php:519 ../../mod/settings.php:631 #: ../../mod/settings.php:660 ../../mod/settings.php:684 #: ../../mod/settings.php:760 ../../mod/settings.php:945 -#: ../../mod/poke.php:166 ../../mod/profiles.php:615 ../../mod/photos.php:563 -#: ../../mod/photos.php:672 ../../mod/photos.php:974 ../../mod/photos.php:1014 -#: ../../mod/photos.php:1101 ../../mod/chat.php:177 ../../mod/chat.php:211 -#: ../../mod/connect.php:92 ../../mod/connedit.php:540 -#: ../../mod/events.php:568 ../../mod/setup.php:307 ../../mod/setup.php:350 -#: ../../mod/pdledit.php:58 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/filestorage.php:146 -#: ../../mod/fsuggest.php:108 ../../mod/group.php:81 ../../mod/admin.php:414 -#: ../../mod/admin.php:725 ../../mod/admin.php:861 ../../mod/admin.php:994 -#: ../../mod/admin.php:1193 ../../mod/admin.php:1280 ../../mod/thing.php:284 -#: ../../mod/thing.php:327 ../../mod/import.php:480 ../../mod/invite.php:142 -#: ../../mod/mail.php:348 ../../mod/appman.php:99 ../../mod/poll.php:68 +#: ../../mod/poke.php:166 ../../mod/profiles.php:643 ../../mod/chat.php:177 +#: ../../mod/chat.php:211 ../../mod/connect.php:92 ../../mod/connedit.php:540 +#: ../../mod/photos.php:563 ../../mod/photos.php:672 ../../mod/photos.php:974 +#: ../../mod/photos.php:1014 ../../mod/photos.php:1101 ../../mod/setup.php:307 +#: ../../mod/setup.php:350 ../../mod/pdledit.php:58 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/events.php:586 +#: ../../mod/filestorage.php:137 ../../mod/fsuggest.php:108 +#: ../../mod/group.php:81 ../../mod/admin.php:414 ../../mod/admin.php:725 +#: ../../mod/admin.php:861 ../../mod/admin.php:994 ../../mod/admin.php:1193 +#: ../../mod/admin.php:1280 ../../mod/thing.php:284 ../../mod/thing.php:327 +#: ../../mod/import.php:480 ../../mod/invite.php:142 ../../mod/mail.php:348 +#: ../../mod/appman.php:99 ../../mod/poll.php:68 #: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/blogga/php/config.php:67 #: ../../view/theme/blogga/view/theme/blog/config.php:67 -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Submit" msgstr "" -#: ../../include/ItemObject.php:600 +#: ../../include/ItemObject.php:598 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:601 +#: ../../include/ItemObject.php:599 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:602 +#: ../../include/ItemObject.php:600 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:603 +#: ../../include/ItemObject.php:601 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:604 +#: ../../include/ItemObject.php:602 msgid "Code" msgstr "" -#: ../../include/ItemObject.php:605 +#: ../../include/ItemObject.php:603 msgid "Image" msgstr "" -#: ../../include/ItemObject.php:606 +#: ../../include/ItemObject.php:604 msgid "Link" msgstr "" -#: ../../include/ItemObject.php:607 +#: ../../include/ItemObject.php:605 msgid "Video" msgstr "" @@ -3547,89 +3623,6 @@ msgstr "" msgid "Custom/Expert Mode" msgstr "" -#: ../../include/datetime.php:43 ../../include/datetime.php:45 -msgid "Miscellaneous" -msgstr "" - -#: ../../include/datetime.php:238 -msgid "never" -msgstr "" - -#: ../../include/datetime.php:244 -msgid "less than a second ago" -msgstr "" - -#: ../../include/datetime.php:247 -msgid "year" -msgstr "" - -#: ../../include/datetime.php:247 -msgid "years" -msgstr "" - -#: ../../include/datetime.php:248 -msgid "month" -msgstr "" - -#: ../../include/datetime.php:248 -msgid "months" -msgstr "" - -#: ../../include/datetime.php:249 -msgid "week" -msgstr "" - -#: ../../include/datetime.php:249 -msgid "weeks" -msgstr "" - -#: ../../include/datetime.php:250 -msgid "day" -msgstr "" - -#: ../../include/datetime.php:250 -msgid "days" -msgstr "" - -#: ../../include/datetime.php:251 -msgid "hour" -msgstr "" - -#: ../../include/datetime.php:251 -msgid "hours" -msgstr "" - -#: ../../include/datetime.php:252 -msgid "minute" -msgstr "" - -#: ../../include/datetime.php:252 -msgid "minutes" -msgstr "" - -#: ../../include/datetime.php:253 -msgid "second" -msgstr "" - -#: ../../include/datetime.php:253 -msgid "seconds" -msgstr "" - -#: ../../include/datetime.php:262 -#, php-format -msgid "%1$d %2$s ago" -msgstr "" - -#: ../../include/datetime.php:467 -#, php-format -msgid "%1$s's birthday" -msgstr "" - -#: ../../include/datetime.php:468 -#, php-format -msgid "Happy Birthday %1$s" -msgstr "" - #: ../../mod/mood.php:132 msgid "Set your current mood and tell your friends" msgstr "" @@ -4019,13 +4012,13 @@ msgid "Publish your default profile in the network directory" msgstr "" #: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:574 +#: ../../mod/settings.php:973 ../../mod/api.php:106 ../../mod/profiles.php:602 #: ../../mod/admin.php:392 msgid "No" msgstr "" #: ../../mod/settings.php:891 ../../mod/settings.php:896 -#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:573 +#: ../../mod/settings.php:973 ../../mod/api.php:105 ../../mod/profiles.php:601 #: ../../mod/admin.php:394 msgid "Yes" msgstr "" @@ -4314,44 +4307,44 @@ msgstr "" msgid "Version %s" msgstr "" -#: ../../mod/siteinfo.php:111 +#: ../../mod/siteinfo.php:109 msgid "Installed plugins/addons/apps:" msgstr "" -#: ../../mod/siteinfo.php:124 +#: ../../mod/siteinfo.php:122 msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:132 +#: ../../mod/siteinfo.php:130 msgid "Red" msgstr "" -#: ../../mod/siteinfo.php:133 +#: ../../mod/siteinfo.php:131 msgid "" "This is a hub of the Red Matrix - a global cooperative network of " "decentralized privacy enhanced websites." msgstr "" -#: ../../mod/siteinfo.php:137 +#: ../../mod/siteinfo.php:134 msgid "Running at web location" msgstr "" -#: ../../mod/siteinfo.php:138 +#: ../../mod/siteinfo.php:135 msgid "" "Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more " "about the Red Matrix." msgstr "" -#: ../../mod/siteinfo.php:139 +#: ../../mod/siteinfo.php:136 msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/siteinfo.php:142 +#: ../../mod/siteinfo.php:139 msgid "" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../mod/siteinfo.php:144 +#: ../../mod/siteinfo.php:141 msgid "Site Administrators" msgstr "" @@ -4359,20 +4352,8 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../mod/bookmarks.php:38 -msgid "Bookmark added" -msgstr "" - -#: ../../mod/bookmarks.php:60 -msgid "My Bookmarks" -msgstr "" - -#: ../../mod/bookmarks.php:71 -msgid "My Connections Bookmarks" -msgstr "" - #: ../../mod/profiles.php:18 ../../mod/profiles.php:165 -#: ../../mod/profiles.php:222 ../../mod/profiles.php:547 +#: ../../mod/profiles.php:222 ../../mod/profiles.php:575 msgid "Profile not found." msgstr "" @@ -4400,236 +4381,237 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../mod/profiles.php:362 +#: ../../mod/profiles.php:390 msgid "Marital Status" msgstr "" -#: ../../mod/profiles.php:366 +#: ../../mod/profiles.php:394 msgid "Romantic Partner" msgstr "" -#: ../../mod/profiles.php:370 +#: ../../mod/profiles.php:398 msgid "Likes" msgstr "" -#: ../../mod/profiles.php:374 +#: ../../mod/profiles.php:402 msgid "Dislikes" msgstr "" -#: ../../mod/profiles.php:378 +#: ../../mod/profiles.php:406 msgid "Work/Employment" msgstr "" -#: ../../mod/profiles.php:381 +#: ../../mod/profiles.php:409 msgid "Religion" msgstr "" -#: ../../mod/profiles.php:385 +#: ../../mod/profiles.php:413 msgid "Political Views" msgstr "" -#: ../../mod/profiles.php:389 +#: ../../mod/profiles.php:417 msgid "Gender" msgstr "" -#: ../../mod/profiles.php:393 +#: ../../mod/profiles.php:421 msgid "Sexual Preference" msgstr "" -#: ../../mod/profiles.php:397 +#: ../../mod/profiles.php:425 msgid "Homepage" msgstr "" -#: ../../mod/profiles.php:401 +#: ../../mod/profiles.php:429 msgid "Interests" msgstr "" -#: ../../mod/profiles.php:405 ../../mod/admin.php:868 +#: ../../mod/profiles.php:433 ../../mod/admin.php:868 msgid "Address" msgstr "" -#: ../../mod/profiles.php:412 ../../mod/pubsites.php:25 +#: ../../mod/profiles.php:440 ../../mod/pubsites.php:25 msgid "Location" msgstr "" -#: ../../mod/profiles.php:495 +#: ../../mod/profiles.php:523 msgid "Profile updated." msgstr "" -#: ../../mod/profiles.php:572 +#: ../../mod/profiles.php:600 msgid "Hide your contact/friend list from viewers of this profile?" msgstr "" -#: ../../mod/profiles.php:614 +#: ../../mod/profiles.php:642 msgid "Edit Profile Details" msgstr "" -#: ../../mod/profiles.php:616 +#: ../../mod/profiles.php:644 msgid "View this profile" msgstr "" -#: ../../mod/profiles.php:618 +#: ../../mod/profiles.php:646 msgid "Change Profile Photo" msgstr "" -#: ../../mod/profiles.php:619 +#: ../../mod/profiles.php:647 msgid "Create a new profile using these settings" msgstr "" -#: ../../mod/profiles.php:620 +#: ../../mod/profiles.php:648 msgid "Clone this profile" msgstr "" -#: ../../mod/profiles.php:621 +#: ../../mod/profiles.php:649 msgid "Delete this profile" msgstr "" -#: ../../mod/profiles.php:623 +#: ../../mod/profiles.php:651 msgid "Import profile from file" msgstr "" -#: ../../mod/profiles.php:624 +#: ../../mod/profiles.php:652 msgid "Export profile to file" msgstr "" -#: ../../mod/profiles.php:625 +#: ../../mod/profiles.php:653 msgid "Profile Name:" msgstr "" -#: ../../mod/profiles.php:626 +#: ../../mod/profiles.php:654 msgid "Your Full Name:" msgstr "" -#: ../../mod/profiles.php:627 +#: ../../mod/profiles.php:655 msgid "Title/Description:" msgstr "" -#: ../../mod/profiles.php:628 +#: ../../mod/profiles.php:656 msgid "Your Gender:" msgstr "" -#: ../../mod/profiles.php:629 -msgid "Birthday :" +#: ../../mod/profiles.php:657 +#, php-format +msgid "Birthday (%s):" msgstr "" -#: ../../mod/profiles.php:630 +#: ../../mod/profiles.php:658 msgid "Street Address:" msgstr "" -#: ../../mod/profiles.php:631 +#: ../../mod/profiles.php:659 msgid "Locality/City:" msgstr "" -#: ../../mod/profiles.php:632 +#: ../../mod/profiles.php:660 msgid "Postal/Zip Code:" msgstr "" -#: ../../mod/profiles.php:633 +#: ../../mod/profiles.php:661 msgid "Country:" msgstr "" -#: ../../mod/profiles.php:634 +#: ../../mod/profiles.php:662 msgid "Region/State:" msgstr "" -#: ../../mod/profiles.php:635 +#: ../../mod/profiles.php:663 msgid "<span class=\"heart\">♥</span> Marital Status:" msgstr "" -#: ../../mod/profiles.php:636 +#: ../../mod/profiles.php:664 msgid "Who: (if applicable)" msgstr "" -#: ../../mod/profiles.php:637 +#: ../../mod/profiles.php:665 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../mod/profiles.php:638 +#: ../../mod/profiles.php:666 msgid "Since [date]:" msgstr "" -#: ../../mod/profiles.php:640 +#: ../../mod/profiles.php:668 msgid "Homepage URL:" msgstr "" -#: ../../mod/profiles.php:643 +#: ../../mod/profiles.php:671 msgid "Religious Views:" msgstr "" -#: ../../mod/profiles.php:644 +#: ../../mod/profiles.php:672 msgid "Keywords:" msgstr "" -#: ../../mod/profiles.php:647 +#: ../../mod/profiles.php:675 msgid "Example: fishing photography software" msgstr "" -#: ../../mod/profiles.php:648 +#: ../../mod/profiles.php:676 msgid "Used in directory listings" msgstr "" -#: ../../mod/profiles.php:649 +#: ../../mod/profiles.php:677 msgid "Tell us about yourself..." msgstr "" -#: ../../mod/profiles.php:650 +#: ../../mod/profiles.php:678 msgid "Hobbies/Interests" msgstr "" -#: ../../mod/profiles.php:651 +#: ../../mod/profiles.php:679 msgid "Contact information and Social Networks" msgstr "" -#: ../../mod/profiles.php:652 +#: ../../mod/profiles.php:680 msgid "My other channels" msgstr "" -#: ../../mod/profiles.php:653 +#: ../../mod/profiles.php:681 msgid "Musical interests" msgstr "" -#: ../../mod/profiles.php:654 +#: ../../mod/profiles.php:682 msgid "Books, literature" msgstr "" -#: ../../mod/profiles.php:655 +#: ../../mod/profiles.php:683 msgid "Television" msgstr "" -#: ../../mod/profiles.php:656 +#: ../../mod/profiles.php:684 msgid "Film/dance/culture/entertainment" msgstr "" -#: ../../mod/profiles.php:657 +#: ../../mod/profiles.php:685 msgid "Love/romance" msgstr "" -#: ../../mod/profiles.php:658 +#: ../../mod/profiles.php:686 msgid "Work/employment" msgstr "" -#: ../../mod/profiles.php:659 +#: ../../mod/profiles.php:687 msgid "School/education" msgstr "" -#: ../../mod/profiles.php:665 +#: ../../mod/profiles.php:693 msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:676 ../../mod/directory.php:143 +#: ../../mod/profiles.php:704 ../../mod/directory.php:143 #: ../../mod/dirprofile.php:92 msgid "Age: " msgstr "" -#: ../../mod/profiles.php:719 +#: ../../mod/profiles.php:747 msgid "Edit/Manage Profiles" msgstr "" -#: ../../mod/profiles.php:720 +#: ../../mod/profiles.php:748 msgid "Add profile things" msgstr "" -#: ../../mod/profiles.php:721 +#: ../../mod/profiles.php:749 msgid "Include desirable objects in your profile" msgstr "" @@ -4653,147 +4635,6 @@ msgstr "" msgid "All Connections" msgstr "" -#: ../../mod/photos.php:77 -msgid "Page owner information could not be retrieved." -msgstr "" - -#: ../../mod/photos.php:97 -msgid "Album not found." -msgstr "" - -#: ../../mod/photos.php:119 ../../mod/photos.php:673 -msgid "Delete Album" -msgstr "" - -#: ../../mod/photos.php:159 ../../mod/photos.php:975 -msgid "Delete Photo" -msgstr "" - -#: ../../mod/photos.php:443 ../../mod/search.php:13 ../../mod/directory.php:15 -#: ../../mod/dirprofile.php:9 ../../mod/display.php:9 -#: ../../mod/viewconnections.php:17 -msgid "Public access denied." -msgstr "" - -#: ../../mod/photos.php:453 -msgid "No photos selected" -msgstr "" - -#: ../../mod/photos.php:500 -msgid "Access to this item is restricted." -msgstr "" - -#: ../../mod/photos.php:574 -#, php-format -msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." -msgstr "" - -#: ../../mod/photos.php:577 -#, php-format -msgid "You have used %1$.2f Mbytes of photo storage." -msgstr "" - -#: ../../mod/photos.php:596 -msgid "Upload Photos" -msgstr "" - -#: ../../mod/photos.php:600 ../../mod/photos.php:668 -msgid "New album name: " -msgstr "" - -#: ../../mod/photos.php:601 -msgid "or existing album name: " -msgstr "" - -#: ../../mod/photos.php:602 -msgid "Do not show a status post for this upload" -msgstr "" - -#: ../../mod/photos.php:622 -msgid "Album name could not be decoded" -msgstr "" - -#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1148 -#: ../../mod/photos.php:1163 -msgid "Contact Photos" -msgstr "" - -#: ../../mod/photos.php:681 -msgid "Edit Album" -msgstr "" - -#: ../../mod/photos.php:687 -msgid "Show Newest First" -msgstr "" - -#: ../../mod/photos.php:689 -msgid "Show Oldest First" -msgstr "" - -#: ../../mod/photos.php:716 ../../mod/photos.php:1195 -msgid "View Photo" -msgstr "" - -#: ../../mod/photos.php:794 -msgid "Permission denied. Access to this item may be restricted." -msgstr "" - -#: ../../mod/photos.php:796 -msgid "Photo not available" -msgstr "" - -#: ../../mod/photos.php:856 -msgid "Use as profile photo" -msgstr "" - -#: ../../mod/photos.php:880 -msgid "View Full Size" -msgstr "" - -#: ../../mod/photos.php:924 ../../mod/delegate.php:130 ../../mod/tagrm.php:93 -msgid "Remove" -msgstr "" - -#: ../../mod/photos.php:958 -msgid "Edit photo" -msgstr "" - -#: ../../mod/photos.php:960 -msgid "Rotate CW (right)" -msgstr "" - -#: ../../mod/photos.php:961 -msgid "Rotate CCW (left)" -msgstr "" - -#: ../../mod/photos.php:964 -msgid "New album name" -msgstr "" - -#: ../../mod/photos.php:967 -msgid "Caption" -msgstr "" - -#: ../../mod/photos.php:969 -msgid "Add a Tag" -msgstr "" - -#: ../../mod/photos.php:972 -msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" -msgstr "" - -#: ../../mod/photos.php:1125 -msgid "In This Photo:" -msgstr "" - -#: ../../mod/photos.php:1201 -msgid "View Album" -msgstr "" - -#: ../../mod/photos.php:1224 -msgid "Recent Photos" -msgstr "" - #: ../../mod/pubsites.php:16 msgid "Public Sites" msgstr "" @@ -4974,6 +4815,10 @@ msgstr "" msgid "Please login." msgstr "" +#: ../../mod/cloud.php:130 +msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +msgstr "" + #: ../../mod/removeme.php:29 msgid "" "Channel removals are not allowed within 48 hours of changing the account " @@ -5549,6 +5394,10 @@ msgstr "" msgid "Potential Delegates" msgstr "" +#: ../../mod/delegate.php:130 ../../mod/photos.php:924 ../../mod/tagrm.php:93 +msgid "Remove" +msgstr "" + #: ../../mod/delegate.php:131 msgid "Add" msgstr "" @@ -5557,6 +5406,12 @@ msgstr "" msgid "No entries." msgstr "" +#: ../../mod/search.php:13 ../../mod/directory.php:15 +#: ../../mod/dirprofile.php:9 ../../mod/photos.php:443 ../../mod/display.php:9 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "" + #: ../../mod/directory.php:146 ../../mod/dirprofile.php:95 msgid "Gender: " msgstr "" @@ -5605,77 +5460,135 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../mod/events.php:71 -msgid "Event can not end before it has started." +#: ../../mod/photos.php:77 +msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/events.php:81 -msgid "Event title and start time are required." +#: ../../mod/photos.php:97 +msgid "Album not found." msgstr "" -#: ../../mod/events.php:95 -msgid "Event not found." +#: ../../mod/photos.php:119 ../../mod/photos.php:673 +msgid "Delete Album" msgstr "" -#: ../../mod/events.php:359 -msgid "l, F j" +#: ../../mod/photos.php:159 ../../mod/photos.php:975 +msgid "Delete Photo" msgstr "" -#: ../../mod/events.php:381 -msgid "Edit event" +#: ../../mod/photos.php:453 +msgid "No photos selected" msgstr "" -#: ../../mod/events.php:427 -msgid "Create New Event" +#: ../../mod/photos.php:500 +msgid "Access to this item is restricted." msgstr "" -#: ../../mod/events.php:428 -msgid "Previous" +#: ../../mod/photos.php:574 +#, php-format +msgid "You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage." msgstr "" -#: ../../mod/events.php:429 ../../mod/setup.php:261 -msgid "Next" +#: ../../mod/photos.php:577 +#, php-format +msgid "You have used %1$.2f Mbytes of photo storage." msgstr "" -#: ../../mod/events.php:541 -msgid "Event details" +#: ../../mod/photos.php:596 +msgid "Upload Photos" msgstr "" -#: ../../mod/events.php:542 -msgid "Starting date and Title are required." +#: ../../mod/photos.php:600 ../../mod/photos.php:668 +msgid "New album name: " msgstr "" -#: ../../mod/events.php:546 -msgid "Event Starts:" +#: ../../mod/photos.php:601 +msgid "or existing album name: " msgstr "" -#: ../../mod/events.php:546 ../../mod/events.php:562 ../../mod/appman.php:91 -#: ../../mod/appman.php:92 -msgid "Required" +#: ../../mod/photos.php:602 +msgid "Do not show a status post for this upload" msgstr "" -#: ../../mod/events.php:552 -msgid "Finish date/time is not known or not relevant" +#: ../../mod/photos.php:622 +msgid "Album name could not be decoded" msgstr "" -#: ../../mod/events.php:554 -msgid "Event Finishes:" +#: ../../mod/photos.php:657 ../../mod/photos.php:679 ../../mod/photos.php:1147 +#: ../../mod/photos.php:1162 +msgid "Contact Photos" msgstr "" -#: ../../mod/events.php:556 -msgid "Adjust for viewer timezone" +#: ../../mod/photos.php:681 +msgid "Edit Album" msgstr "" -#: ../../mod/events.php:558 -msgid "Description:" +#: ../../mod/photos.php:687 +msgid "Show Newest First" msgstr "" -#: ../../mod/events.php:562 -msgid "Title:" +#: ../../mod/photos.php:689 +msgid "Show Oldest First" msgstr "" -#: ../../mod/events.php:564 -msgid "Share this event" +#: ../../mod/photos.php:716 ../../mod/photos.php:1194 +msgid "View Photo" +msgstr "" + +#: ../../mod/photos.php:794 +msgid "Permission denied. Access to this item may be restricted." +msgstr "" + +#: ../../mod/photos.php:796 +msgid "Photo not available" +msgstr "" + +#: ../../mod/photos.php:856 +msgid "Use as profile photo" +msgstr "" + +#: ../../mod/photos.php:880 +msgid "View Full Size" +msgstr "" + +#: ../../mod/photos.php:958 +msgid "Edit photo" +msgstr "" + +#: ../../mod/photos.php:960 +msgid "Rotate CW (right)" +msgstr "" + +#: ../../mod/photos.php:961 +msgid "Rotate CCW (left)" +msgstr "" + +#: ../../mod/photos.php:964 +msgid "New album name" +msgstr "" + +#: ../../mod/photos.php:967 +msgid "Caption" +msgstr "" + +#: ../../mod/photos.php:969 +msgid "Add a Tag" +msgstr "" + +#: ../../mod/photos.php:972 +msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" +msgstr "" + +#: ../../mod/photos.php:1125 +msgid "In This Photo:" +msgstr "" + +#: ../../mod/photos.php:1200 +msgid "View Album" +msgstr "" + +#: ../../mod/photos.php:1223 +msgid "Recent Photos" msgstr "" #: ../../mod/setup.php:162 @@ -5714,6 +5627,10 @@ msgstr "" msgid "System check" msgstr "" +#: ../../mod/setup.php:261 ../../mod/events.php:439 +msgid "Next" +msgstr "" + #: ../../mod/setup.php:262 msgid "Check again" msgstr "" @@ -6140,8 +6057,16 @@ msgstr "" msgid "Delete Webpage" msgstr "" -#: ../../mod/cloud.php:130 -msgid "RedMatrix - Guests: Username: {your email address}, Password: +++" +#: ../../mod/bookmarks.php:38 +msgid "Bookmark added" +msgstr "" + +#: ../../mod/bookmarks.php:60 +msgid "My Bookmarks" +msgstr "" + +#: ../../mod/bookmarks.php:71 +msgid "My Connections Bookmarks" msgstr "" #: ../../mod/profile_photo.php:108 @@ -6283,35 +6208,109 @@ msgstr "" msgid "- select -" msgstr "" -#: ../../mod/filestorage.php:76 +#: ../../mod/events.php:91 +msgid "Event title and start time are required." +msgstr "" + +#: ../../mod/events.php:105 +msgid "Event not found." +msgstr "" + +#: ../../mod/events.php:369 +msgid "l, F j" +msgstr "" + +#: ../../mod/events.php:391 +msgid "Edit event" +msgstr "" + +#: ../../mod/events.php:437 +msgid "Create New Event" +msgstr "" + +#: ../../mod/events.php:438 +msgid "Previous" +msgstr "" + +#: ../../mod/events.php:536 +msgid "hour:minute" +msgstr "" + +#: ../../mod/events.php:556 +msgid "Event details" +msgstr "" + +#: ../../mod/events.php:557 +#, php-format +msgid "Format is %s %s." +msgstr "" + +#: ../../mod/events.php:558 +msgid "Starting date and Title are required." +msgstr "" + +#: ../../mod/events.php:562 +msgid "Event Starts:" +msgstr "" + +#: ../../mod/events.php:562 ../../mod/events.php:581 ../../mod/appman.php:91 +#: ../../mod/appman.php:92 +msgid "Required" +msgstr "" + +#: ../../mod/events.php:570 +msgid "Finish date/time is not known or not relevant" +msgstr "" + +#: ../../mod/events.php:572 +msgid "Event Finishes:" +msgstr "" + +#: ../../mod/events.php:575 +msgid "Adjust for viewer timezone" +msgstr "" + +#: ../../mod/events.php:577 +msgid "Description:" +msgstr "" + +#: ../../mod/events.php:581 +msgid "Title:" +msgstr "" + +#: ../../mod/events.php:583 +msgid "Share this event" +msgstr "" + +#: ../../mod/filestorage.php:68 msgid "Permission Denied." msgstr "" -#: ../../mod/filestorage.php:92 +#: ../../mod/filestorage.php:85 msgid "File not found." msgstr "" -#: ../../mod/filestorage.php:131 +#: ../../mod/filestorage.php:122 msgid "Edit file permissions" msgstr "" -#: ../../mod/filestorage.php:140 +#: ../../mod/filestorage.php:131 msgid "Set/edit permissions" msgstr "" -#: ../../mod/filestorage.php:141 +#: ../../mod/filestorage.php:132 msgid "Include all files and sub folders" msgstr "" -#: ../../mod/filestorage.php:142 +#: ../../mod/filestorage.php:133 msgid "Return to file list" msgstr "" -#: ../../mod/filestorage.php:144 +#: ../../mod/filestorage.php:135 msgid "Copy/paste this code to attach file to a post" msgstr "" -#: ../../mod/filestorage.php:145 +#: ../../mod/filestorage.php:136 msgid "Copy/paste this URL to link file from a web page" msgstr "" @@ -7398,7 +7397,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1506 +#: ../../mod/lostpass.php:85 ../../boot.php:1505 msgid "Password Reset" msgstr "" @@ -7863,14 +7862,6 @@ msgstr "" msgid "%s element installed" msgstr "" -#: ../../mod/locs.php:47 ../../mod/locs.php:74 -msgid "Location not found." -msgstr "" - -#: ../../mod/locs.php:78 -msgid "Primary location cannot be removed." -msgstr "" - #: ../../view/theme/apw/php/config.php:202 #: ../../view/theme/apw/php/config.php:236 msgid "Schema Default" @@ -7887,17 +7878,17 @@ msgstr "" #: ../../view/theme/apw/php/config.php:259 #: ../../view/theme/blogga/php/config.php:69 #: ../../view/theme/blogga/view/theme/blog/config.php:69 -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Theme settings" msgstr "" #: ../../view/theme/apw/php/config.php:260 -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Set scheme" msgstr "" #: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set font-size for posts and comments" msgstr "" @@ -8032,165 +8023,169 @@ msgstr "" msgid "Header image only on profile pages" msgstr "" -#: ../../view/theme/redbasic/php/config.php:84 +#: ../../view/theme/redbasic/php/config.php:86 msgid "Light (Red Matrix default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:115 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:125 +msgid "Set the background color of other content" +msgstr "" + +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set maximum width of conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Center conversation regions" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:133 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:134 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:135 msgid "Set size of followup author photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:136 msgid "Sloppy photo albums" msgstr "" -#: ../../view/theme/redbasic/php/config.php:133 +#: ../../view/theme/redbasic/php/config.php:136 msgid "Are you a clean desk or a messy desk person?" msgstr "" -#: ../../boot.php:1294 +#: ../../boot.php:1293 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1297 +#: ../../boot.php:1296 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1471 +#: ../../boot.php:1470 msgid "" "Create an account to access services and applications within the Red Matrix" msgstr "" -#: ../../boot.php:1499 +#: ../../boot.php:1498 msgid "Password" msgstr "" -#: ../../boot.php:1500 +#: ../../boot.php:1499 msgid "Remember me" msgstr "" -#: ../../boot.php:1505 +#: ../../boot.php:1504 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:1570 +#: ../../boot.php:1569 msgid "permission denied" msgstr "" -#: ../../boot.php:1571 +#: ../../boot.php:1570 msgid "Got Zot?" msgstr "" -#: ../../boot.php:2001 +#: ../../boot.php:2000 msgid "toggle mobile" msgstr "" diff --git a/view/tpl/event_form.tpl b/view/tpl/event_form.tpl index d91e44458..ade404125 100755 --- a/view/tpl/event_form.tpl +++ b/view/tpl/event_form.tpl @@ -3,8 +3,7 @@ <h3>{{$title}}</h3> <p> -{{if ! $bootstrap}} -{{$format_desc}} {{/if}}{{$desc}} +{{$desc}} </p> <form action="{{$post}}" method="post" > @@ -17,11 +16,7 @@ <input type="text" id="event-summary" name="summary" value="{{$t_orig}}" /> <div id="event-start-text">{{$s_text}}</div> -{{if $bootstrap}} -<i class="icon-calendar btn btn-default" onclick="eventGetStart(); return false;" /></i> <input type="text" name="start_text" id="start-text" value="{{$stext}}" /> -{{else}} -{{$s_dsel}} {{$s_tsel}} -{{/if}} +{{$s_dsel}} <div class="clear"></div><br /> @@ -31,11 +26,7 @@ <div id="event-finish-wrapper"> <div id="event-finish-text">{{$f_text}}</div> -{{if $bootstrap}} -<i class="icon-calendar btn btn-default" onclick="eventGetFinish(); return false;" /></i> <input type="text" name="finish_text" id="finish-text" value="{{$ftext}}" /> -{{else}} -{{$f_dsel}} {{$f_tsel}} -{{/if}} +{{$f_dsel}} </div> <div id="event-datetime-break"></div> @@ -73,81 +64,4 @@ <input id="event-submit" type="submit" name="submit" value="{{$submit}}" /> </form> -<!-- Modal for item expiry--> -<div class="modal" id="startModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="startModalLabel">{{$s_text}}</h4> - </div> - <!-- <div class="modal-body"> --> - <div class="modal-body form-group" style="width:90%"> - <div class="input-group input-group-sm date" id="datetimepickerstart"> - <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> - <span class="icon-calendar"></span> - </span> - <input id="start-date" value='{{$stext}}' type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/> - </div> - </div> - <!-- </div> --> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button> - <button id="start-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> -</div><!-- /.modal --> -<script type="text/javascript"> - $(function() { - $('#datetimepickerstart').datetimepicker({ - language: 'us', - icons: { - time: "icon-time", - date: "icon-calendar", - up: "icon-arrow-up", - down: "icon-arrow-down" - } - }); - }); -</script> - -<!-- Modal for item expiry--> -<div class="modal" id="finishModal" tabindex="-1" role="dialog" aria-labelledby="expiryModalLabel" aria-hidden="true"> - <div class="modal-dialog"> - <div class="modal-content"> - <div class="modal-header"> - <button type="button" class="close" data-dismiss="modal" aria-hidden="true">×</button> - <h4 class="modal-title" id="finishModalLabel">{{$s_text}}</h4> - </div> - <!-- <div class="modal-body"> --> - <div class="modal-body form-group" style="width:90%"> - <div class="input-group input-group-sm date" id="datetimepickerfinish"> - <span class="input-group-addon"><!-- <span class="glyphicon glyphicon-calendar"></span> --> - <span class="icon-calendar"></span> - </span> - <input id="finish-date" value='{{$ftext}}' type='text' class="form-control" data-date-format="YYYY-MM-DD HH:mm" size="20"/> - </div> - </div> - <!-- </div> --> - <div class="modal-footer"> - <button type="button" class="btn btn-default" data-dismiss="modal">{{$ModalCANCEL}}</button> - <button id="finish-modal-OKButton" type="button" class="btn btn-primary">{{$ModalOK}}</button> - </div> - </div><!-- /.modal-content --> - </div><!-- /.modal-dialog --> -</div><!-- /.modal --> -<script type="text/javascript"> - $(function() { - $('#datetimepickerfinish').datetimepicker({ - language: 'us', - icons: { - time: "icon-time", - date: "icon-calendar", - up: "icon-arrow-up", - down: "icon-arrow-down" - } - }); - }); -</script> </div> diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl index ac6cb1a9c..bc9d0ba37 100755 --- a/view/tpl/nav.tpl +++ b/view/tpl/nav.tpl @@ -47,6 +47,7 @@ </div> <div class="collapse navbar-collapse" id="navbar-collapse-1"> <ul class="nav navbar-nav navbar-left"> + {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} {{if !$userinfo}} {{if $nav.loginmenu}} <li class="{{$nav.loginmenu.0.2}}"><a data-toggle="dropdown" data-target="#" href="{{$nav.loginmenu.0.0}}" title="{{$nav.loginmenu.0.3}}" >{{$nav.loginmenu.0.1}} <span class="caret" id="usermenu-caret"></span></a> @@ -92,7 +93,6 @@ </li> {{/if}} - {{if $nav.register}}<li class="{{$nav.register.2}}"><a href="{{$nav.register.0}}" title="{{$nav.register.3}}" >{{$nav.register.1}}</a><li>{{/if}} {{if $nav.messages}} <li class="{{$sel.messages}} hidden-xs"> diff --git a/view/tpl/photo_view.tpl b/view/tpl/photo_view.tpl index 4a9c0dfe8..4961464dc 100755 --- a/view/tpl/photo_view.tpl +++ b/view/tpl/photo_view.tpl @@ -3,11 +3,21 @@ <h3><a href="{{$album.0}}">{{$album.1}}</a></h3> <div id="photo-edit-link-wrap"> -{{if $tools}} -<a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> + +{{if $lock}} +<div class="wall-item-lock dropdown"> + <i class="icon-lock lockview dropdown-toggle" data-toggle="dropdown" title="{{$lock}}" onclick="lockview(event,{{$id}});" ></i><ul id="panel-{{$id}}" class="lockview-panel dropdown-menu"></ul> +</div> {{/if}} -{{if $lock}} | <i class="lockview icon-lock" title="{{$lock}}" onclick="lockview(event,'photo/{{$id}}');"></i> {{/if}} + + +{{if $tools}} +<div> + <a id="photo-toprofile-link" href="{{$tools.profile.0}}">{{$tools.profile.1}}</a> </div> +{{/if}} + +<div class="clear"></div> {{if $prevlink}}<div id="photo-prev-link"><a href="{{$prevlink.0}}"><i class="icon-backward photo-icons"></i></div>{{/if}} <div id="photo-view-wrapper"> |