diff options
Diffstat (limited to 'util')
| -rw-r--r-- | util/Doxyfile | 2 | ||||
| -rw-r--r-- | util/README | 2 | ||||
| -rwxr-xr-x | util/importdoc | 33 | ||||
| -rw-r--r-- | util/messages.po | 5008 | ||||
| -rwxr-xr-x | util/run_xgettext.sh | 6 | ||||
| -rwxr-xr-x | util/shredder/ShredOAuth.sh | 28 | ||||
| -rwxr-xr-x | util/shredder/shredder | 2 | ||||
| -rw-r--r-- | util/strings.php | 2278 | ||||
| -rw-r--r-- | util/zotsh/README.txt | 2 |
9 files changed, 4059 insertions, 3302 deletions
diff --git a/util/Doxyfile b/util/Doxyfile index f700c2abe..55acd46eb 100644 --- a/util/Doxyfile +++ b/util/Doxyfile @@ -1,6 +1,6 @@ INPUT = README.md index.php boot.php mod/ include/ util/ view/ version.inc RECURSIVE = YES -PROJECT_NAME = "The RedMatrix" +PROJECT_NAME = "The Hubzilla" PROJECT_LOGO = images/rm-64.png EXCLUDE = .htconfig.php library/ doc/ vendor/ .git/ util/zotsh/easywebdav/ EXCLUDE_PATTERNS = *smarty3* *strings.php *.out *test* diff --git a/util/README b/util/README index 9d8fe299c..991a3fe51 100644 --- a/util/README +++ b/util/README @@ -115,7 +115,7 @@ When strings are added or modified in source, you could run to extract strings from source files and join them with the existing .po file: new strings are added, the existing are not overwritten. -If you already translated the RedMatrix using strings.php, you could import your old +If you already translated the Hubzilla using strings.php, you could import your old translation to messages.po. Run: $ php util/php2po.php view/<language>/strings.php diff --git a/util/importdoc b/util/importdoc new file mode 100755 index 000000000..b89e12e97 --- /dev/null +++ b/util/importdoc @@ -0,0 +1,33 @@ +#!/usr/bin/env php +<?php + +require_once('include/cli_startup.php'); + +cli_startup(); + +require_once('mod/help.php'); + +function update_docs_dir($s) { + $f = basename($s); + $d = dirname($s); + if($s === 'doc/html') + return; + + $files = glob("$d/$f"); + if($files) { + foreach($files as $fi) { + if($fi === 'doc/html') + continue; + echo $fi . "\n"; + if(is_dir($fi)) + update_docs_dir("$fi/*"); + else + store_doc_file($fi); + } + } +} + +update_docs_dir('doc/*'); + + + diff --git a/util/messages.po b/util/messages.po index ae59da483..692012537 100644 --- a/util/messages.po +++ b/util/messages.po @@ -1,14 +1,20 @@ -# Red Matrix Project -# Copyright (C) 2012-2014 the Red Matrix Project +# Hubzilla Project +# Copyright (C) 2012-2014 the Hubzilla Project # This file is distributed under the same license as the Red package. # Mike Macgirvin, 2012 # #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-09-04.1145\n" +<<<<<<< HEAD +"Project-Id-Version: 2015-05-29.1047\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-04 00:04-0700\n" +"POT-Creation-Date: 2015-05-29 00:04-0700\n" +======= +"Project-Id-Version: 2015-07-03.1082\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-07-03 00:04-0700\n" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -24,107 +30,476 @@ msgstr "" #: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424 -#: ../../mod/photos.php:92 ../../mod/photos.php:637 +#: ../../mod/photos.php:91 ../../mod/photos.php:625 msgid "Profile Photos" msgstr "" -#: ../../include/menu.php:107 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266 -#: ../../include/ItemObject.php:100 ../../include/apps.php:254 -#: ../../mod/webpages.php:181 ../../mod/thing.php:255 -#: ../../mod/connections.php:242 ../../mod/connections.php:255 -#: ../../mod/connections.php:274 ../../mod/blocks.php:153 -#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133 -#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134 -#: ../../mod/menu.php:103 ../../mod/settings.php:650 ../../mod/layouts.php:183 -msgid "Edit" +#: ../../include/text.php:395 +msgid "prev" msgstr "" -#: ../../include/contact_selectors.php:56 -msgid "Frequently" +#: ../../include/text.php:397 +msgid "first" msgstr "" -#: ../../include/contact_selectors.php:57 -msgid "Hourly" +#: ../../include/text.php:426 +msgid "last" msgstr "" -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" +#: ../../include/text.php:429 +msgid "next" msgstr "" -#: ../../include/contact_selectors.php:59 -msgid "Daily" +#: ../../include/text.php:439 +msgid "older" msgstr "" -#: ../../include/contact_selectors.php:60 -msgid "Weekly" +#: ../../include/text.php:441 +msgid "newer" msgstr "" -#: ../../include/contact_selectors.php:61 -msgid "Monthly" +#: ../../include/text.php:834 +msgid "No connections" msgstr "" -#: ../../include/contact_selectors.php:76 -msgid "Friendica" +#: ../../include/text.php:848 +#, php-format +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/text.php:861 ../../mod/viewconnections.php:104 +msgid "View Connections" msgstr "" -#: ../../include/contact_selectors.php:77 -msgid "OStatus" +#: ../../include/text.php:918 ../../include/text.php:930 +#: ../../include/nav.php:165 ../../include/apps.php:147 +#: ../../mod/search.php:38 +msgid "Search" msgstr "" -#: ../../include/contact_selectors.php:78 -msgid "RSS/Atom" +#: ../../include/text.php:919 ../../include/text.php:931 +#: ../../include/widgets.php:192 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1448 +#: ../../mod/admin.php:1468 +msgid "Save" msgstr "" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822 -#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16 -#: ../../boot.php:1552 -msgid "Email" +#: ../../include/text.php:994 +msgid "poke" msgstr "" -#: ../../include/contact_selectors.php:80 -msgid "Diaspora" +#: ../../include/text.php:994 ../../include/conversation.php:243 +msgid "poked" msgstr "" -#: ../../include/contact_selectors.php:81 -msgid "Facebook" +#: ../../include/text.php:995 +msgid "ping" msgstr "" -#: ../../include/contact_selectors.php:82 -msgid "Zot!" +#: ../../include/text.php:995 +msgid "pinged" msgstr "" -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" +#: ../../include/text.php:996 +msgid "prod" msgstr "" -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" +#: ../../include/text.php:996 +msgid "prodded" msgstr "" -#: ../../include/contact_selectors.php:85 -msgid "MySpace" +#: ../../include/text.php:997 +msgid "slap" msgstr "" -#: ../../include/notify.php:23 -msgid "created a new post" +#: ../../include/text.php:997 +msgid "slapped" msgstr "" -#: ../../include/notify.php:24 +#: ../../include/text.php:998 +msgid "finger" +msgstr "" + +#: ../../include/text.php:998 +msgid "fingered" +msgstr "" + +#: ../../include/text.php:999 +msgid "rebuff" +msgstr "" + +#: ../../include/text.php:999 +msgid "rebuffed" +msgstr "" + +#: ../../include/text.php:1009 +msgid "happy" +msgstr "" + +#: ../../include/text.php:1010 +msgid "sad" +msgstr "" + +#: ../../include/text.php:1011 +msgid "mellow" +msgstr "" + +#: ../../include/text.php:1012 +msgid "tired" +msgstr "" + +#: ../../include/text.php:1013 +msgid "perky" +msgstr "" + +#: ../../include/text.php:1014 +msgid "angry" +msgstr "" + +#: ../../include/text.php:1015 +msgid "stupified" +msgstr "" + +#: ../../include/text.php:1016 +msgid "puzzled" +msgstr "" + +#: ../../include/text.php:1017 +msgid "interested" +msgstr "" + +#: ../../include/text.php:1018 +msgid "bitter" +msgstr "" + +#: ../../include/text.php:1019 +msgid "cheerful" +msgstr "" + +#: ../../include/text.php:1020 +msgid "alive" +msgstr "" + +#: ../../include/text.php:1021 +msgid "annoyed" +msgstr "" + +#: ../../include/text.php:1022 +msgid "anxious" +msgstr "" + +#: ../../include/text.php:1023 +msgid "cranky" +msgstr "" + +#: ../../include/text.php:1024 +msgid "disturbed" +msgstr "" + +#: ../../include/text.php:1025 +msgid "frustrated" +msgstr "" + +#: ../../include/text.php:1026 +msgid "depressed" +msgstr "" + +#: ../../include/text.php:1027 +msgid "motivated" +msgstr "" + +#: ../../include/text.php:1028 +msgid "relaxed" +msgstr "" + +#: ../../include/text.php:1029 +msgid "surprised" +msgstr "" + +#: ../../include/text.php:1201 +msgid "Monday" +msgstr "" + +#: ../../include/text.php:1201 +msgid "Tuesday" +msgstr "" + +#: ../../include/text.php:1201 +msgid "Wednesday" +msgstr "" + +#: ../../include/text.php:1201 +msgid "Thursday" +msgstr "" + +#: ../../include/text.php:1201 +msgid "Friday" +msgstr "" + +#: ../../include/text.php:1201 +msgid "Saturday" +msgstr "" + +#: ../../include/text.php:1201 +msgid "Sunday" +msgstr "" + +#: ../../include/text.php:1205 +msgid "January" +msgstr "" + +#: ../../include/text.php:1205 +msgid "February" +msgstr "" + +#: ../../include/text.php:1205 +msgid "March" +msgstr "" + +#: ../../include/text.php:1205 +msgid "April" +msgstr "" + +#: ../../include/text.php:1205 +msgid "May" +msgstr "" + +#: ../../include/text.php:1205 +msgid "June" +msgstr "" + +#: ../../include/text.php:1205 +msgid "July" +msgstr "" + +#: ../../include/text.php:1205 +msgid "August" +msgstr "" + +#: ../../include/text.php:1205 +msgid "September" +msgstr "" + +#: ../../include/text.php:1205 +msgid "October" +msgstr "" + +#: ../../include/text.php:1205 +msgid "November" +msgstr "" + +#: ../../include/text.php:1205 +msgid "December" +msgstr "" + +#: ../../include/text.php:1310 +msgid "unknown.???" +msgstr "" + +#: ../../include/text.php:1311 +msgid "bytes" +msgstr "" + +#: ../../include/text.php:1347 +msgid "remove category" +msgstr "" + +#: ../../include/text.php:1422 +msgid "remove from file" +msgstr "" + +#: ../../include/text.php:1498 ../../include/text.php:1509 +#: ../../mod/connedit.php:667 +msgid "Click to open/close" +msgstr "" + +#: ../../include/text.php:1665 ../../mod/events.php:444 +msgid "Link to Source" +msgstr "" + +#: ../../include/text.php:1686 ../../include/text.php:1757 +msgid "default" +msgstr "" + +#: ../../include/text.php:1694 +msgid "Page layout" +msgstr "" + +#: ../../include/text.php:1694 +msgid "You can create your own with the layouts tool" +msgstr "" + +#: ../../include/text.php:1735 +msgid "Page content type" +msgstr "" + +#: ../../include/text.php:1769 +msgid "Select an alternate language" +msgstr "" + +<<<<<<< HEAD +#: ../../include/text.php:1888 ../../include/conversation.php:120 +#: ../../include/diaspora.php:2082 ../../mod/like.php:346 +======= +#: ../../include/text.php:1888 ../../include/diaspora.php:2115 +#: ../../include/conversation.php:120 ../../mod/like.php:346 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 +#: ../../mod/tagger.php:43 +msgid "photo" +msgstr "" + +#: ../../include/text.php:1891 ../../include/conversation.php:123 +#: ../../mod/like.php:348 ../../mod/tagger.php:47 +msgid "event" +msgstr "" + +<<<<<<< HEAD +#: ../../include/text.php:1894 ../../include/conversation.php:148 +#: ../../include/diaspora.php:2082 ../../mod/like.php:346 +======= +#: ../../include/text.php:1894 ../../include/diaspora.php:2115 +#: ../../include/conversation.php:148 ../../mod/like.php:346 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 +msgid "status" +msgstr "" + +#: ../../include/text.php:1896 ../../include/conversation.php:150 +#: ../../mod/tagger.php:53 +msgid "comment" +msgstr "" + +#: ../../include/text.php:1901 +msgid "activity" +msgstr "" + +#: ../../include/text.php:2196 +msgid "Design Tools" +msgstr "" + +#: ../../include/text.php:2199 ../../mod/blocks.php:147 +msgid "Blocks" +msgstr "" + +#: ../../include/text.php:2200 ../../mod/menu.php:98 +msgid "Menus" +msgstr "" + +#: ../../include/text.php:2201 ../../mod/layouts.php:174 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:2202 +msgid "Pages" +msgstr "" + +#: ../../include/text.php:2553 ../../include/RedDAV/RedBrowser.php:131 +msgid "Collection" +msgstr "" + +#: ../../include/bbcode.php:122 ../../include/bbcode.php:761 +#: ../../include/bbcode.php:764 ../../include/bbcode.php:769 +#: ../../include/bbcode.php:772 ../../include/bbcode.php:775 +#: ../../include/bbcode.php:778 ../../include/bbcode.php:783 +#: ../../include/bbcode.php:786 ../../include/bbcode.php:791 +#: ../../include/bbcode.php:794 ../../include/bbcode.php:797 +#: ../../include/bbcode.php:800 +msgid "Image/photo" +msgstr "" + +<<<<<<< HEAD +#: ../../include/bbcode.php:161 ../../include/bbcode.php:811 +msgid "Encrypted content" +msgstr "" + +#: ../../include/bbcode.php:178 +======= +#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 +#: ../../mod/like.php:394 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format -msgid "commented on %s's post" +msgid "Install %s element: " +msgstr "" + +<<<<<<< HEAD +#: ../../include/bbcode.php:188 ../../mod/impel.php:37 +msgid "webpage" +msgstr "" + +#: ../../include/bbcode.php:191 ../../mod/impel.php:47 +msgid "layout" +msgstr "" + +#: ../../include/bbcode.php:194 ../../mod/impel.php:42 +msgid "block" +msgstr "" + +#: ../../include/bbcode.php:208 +msgid "QR code" +msgstr "" + +#: ../../include/bbcode.php:259 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +======= +#: ../../include/diaspora.php:2490 +msgid "Please choose" +msgstr "" + +#: ../../include/diaspora.php:2492 +msgid "Agree" +msgstr "" + +#: ../../include/diaspora.php:2494 +msgid "Disagree" +msgstr "" + +#: ../../include/diaspora.php:2496 +msgid "Abstain" +msgstr "" + +#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 +#: ../../include/network.php:1586 ../../include/enotify.php:59 +#: ../../mod/p.php:46 +msgid "$projectname" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgstr "" + +#: ../../include/bbcode.php:261 +msgid "post" +msgstr "" + +#: ../../include/bbcode.php:511 +msgid "Different viewers will see this text differently" +msgstr "" + +#: ../../include/bbcode.php:722 +msgid "$1 spoiler" msgstr "" -#: ../../include/Import/import_diaspora.php:17 -msgid "No username found in import file." +#: ../../include/bbcode.php:749 +msgid "$1 wrote:" msgstr "" +<<<<<<< HEAD +#: ../../include/notify.php:23 +msgid "created a new post" +msgstr "" + +#: ../../include/notify.php:24 +#, php-format +msgid "commented on %s's post" +======= #: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156 msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:562 +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 msgid "Import completed." +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../include/group.php:26 @@ -138,7 +513,7 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:254 ../../mod/admin.php:831 +#: ../../include/group.php:254 ../../mod/admin.php:822 msgid "All Channels" msgstr "" @@ -251,12 +626,12 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:235 ../../mod/events.php:649 +#: ../../include/datetime.php:235 ../../mod/events.php:635 #: ../../mod/appman.php:91 ../../mod/appman.php:92 msgid "Required" msgstr "" -#: ../../include/datetime.php:262 ../../boot.php:2353 +#: ../../include/datetime.php:262 ../../boot.php:2354 msgid "never" msgstr "" @@ -336,69 +711,41 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/dir_fns.php:126 -msgid "Directory Options" -msgstr "" - -#: ../../include/dir_fns.php:128 -msgid "Safe Mode" -msgstr "" - -#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129 -#: ../../include/dir_fns.php:130 ../../mod/api.php:106 -#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158 -#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91 -#: ../../mod/menu.php:147 ../../mod/filestorage.php:151 -#: ../../mod/filestorage.php:159 ../../mod/admin.php:428 -#: ../../mod/settings.php:579 ../../mod/removeme.php:60 -#: ../../mod/connedit.php:647 ../../mod/connedit.php:675 -#: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 -msgid "No" -msgstr "" - -#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129 -#: ../../include/dir_fns.php:130 ../../mod/api.php:105 -#: ../../mod/photos.php:568 ../../mod/mitem.php:157 ../../mod/mitem.php:158 -#: ../../mod/mitem.php:229 ../../mod/mitem.php:230 ../../mod/menu.php:91 -#: ../../mod/menu.php:147 ../../mod/filestorage.php:151 -#: ../../mod/filestorage.php:159 ../../mod/admin.php:430 -#: ../../mod/settings.php:579 ../../mod/removeme.php:60 -#: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 -msgid "Yes" -msgstr "" - -#: ../../include/dir_fns.php:129 -msgid "Public Forums Only" -msgstr "" - -#: ../../include/dir_fns.php:130 -msgid "This Website Only" -msgstr "" - #: ../../include/page_widgets.php:6 msgid "New Page" msgstr "" -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187 +#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 +#: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100 +#: ../../include/apps.php:254 ../../include/menu.php:103 +#: ../../mod/settings.php:649 ../../mod/webpages.php:180 +#: ../../mod/thing.php:227 ../../mod/connections.php:382 +#: ../../mod/connections.php:395 ../../mod/connections.php:414 +#: ../../mod/blocks.php:153 ../../mod/editlayout.php:139 +#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113 +#: ../../mod/menu.php:103 ../../mod/editblock.php:140 +#: ../../mod/layouts.php:183 +msgid "Edit" +msgstr "" + +#: ../../include/page_widgets.php:39 ../../mod/webpages.php:186 #: ../../mod/blocks.php:159 ../../mod/layouts.php:188 msgid "View" msgstr "" #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677 -#: ../../include/conversation.php:1166 ../../mod/webpages.php:188 -#: ../../mod/events.php:667 ../../mod/editpost.php:143 -#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214 -#: ../../mod/editblock.php:170 +#: ../../include/conversation.php:1155 ../../mod/webpages.php:187 +#: ../../mod/events.php:653 ../../mod/photos.php:970 +#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150 +#: ../../mod/editblock.php:176 msgid "Preview" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:188 msgid "Actions" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:189 msgid "Page Link" msgstr "" @@ -406,31 +753,95 @@ msgstr "" msgid "Title" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192 -#: ../../mod/blocks.php:150 ../../mod/menu.php:105 ../../mod/layouts.php:181 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:191 +#: ../../mod/blocks.php:150 ../../mod/layouts.php:181 msgid "Created" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193 -#: ../../mod/blocks.php:151 ../../mod/menu.php:106 ../../mod/layouts.php:182 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:192 +#: ../../mod/blocks.php:151 ../../mod/layouts.php:182 msgid "Edited" msgstr "" -#: ../../include/api.php:1234 +#: ../../include/api.php:1193 msgid "Public Timeline" msgstr "" -#: ../../include/comanche.php:34 ../../mod/admin.php:390 +#: ../../include/comanche.php:34 ../../mod/admin.php:386 #: ../../view/theme/apw/php/config.php:185 msgid "Default" msgstr "" +#: ../../include/dir_fns.php:143 +msgid "Directory Options" +msgstr "" + +#: ../../include/dir_fns.php:144 +msgid "Alphabetic" +msgstr "" + +#: ../../include/dir_fns.php:145 +msgid "Reverse Alphabetic" +msgstr "" + +#: ../../include/dir_fns.php:146 +msgid "Newest to Oldest" +msgstr "" + +#: ../../include/dir_fns.php:147 +msgid "Oldest to Newest" +msgstr "" + +#: ../../include/dir_fns.php:148 +msgid "Sort" +msgstr "" + +#: ../../include/dir_fns.php:152 +msgid "Safe Mode" +msgstr "" + +#: ../../include/dir_fns.php:154 +msgid "Public Forums Only" +msgstr "" + +#: ../../include/dir_fns.php:155 +msgid "This Website Only" +msgstr "" + +#: ../../include/event.php:19 ../../include/bb2diaspora.php:451 +msgid "l F d, Y \\@ g:i A" +msgstr "" + +#: ../../include/event.php:27 ../../include/bb2diaspora.php:457 +msgid "Starts:" +msgstr "" + +#: ../../include/event.php:37 ../../include/bb2diaspora.php:465 +msgid "Finishes:" +msgstr "" + +<<<<<<< HEAD +#: ../../include/event.php:47 ../../include/bb2diaspora.php:473 +#: ../../include/identity.php:875 ../../mod/events.php:647 +#: ../../mod/directory.php:234 +======= +#: ../../include/event.php:47 ../../include/bb2diaspora.php:481 +#: ../../include/identity.php:879 ../../mod/events.php:647 +#: ../../mod/directory.php:295 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgid "Location:" +msgstr "" + +#: ../../include/event.php:391 +msgid "This event has been added to your calendar." +msgstr "" + #: ../../include/js_strings.php:5 msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667 -#: ../../mod/photos.php:980 ../../mod/photos.php:1098 +#: ../../mod/photos.php:968 ../../mod/photos.php:1086 msgid "Comment" msgstr "" @@ -458,7 +869,7 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: ../../include/js_strings.php:13 ../../mod/photos.php:40 +#: ../../include/js_strings.php:13 ../../mod/photos.php:39 msgid "everybody" msgstr "" @@ -487,7 +898,6 @@ msgid "Rate This Channel (this is public)" msgstr "" #: ../../include/js_strings.php:20 ../../mod/rate.php:156 -#: ../../mod/connedit.php:683 msgid "Rating" msgstr "" @@ -496,26 +906,48 @@ msgid "Describe (optional)" msgstr "" #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668 -#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:303 -#: ../../mod/thing.php:346 ../../mod/events.php:494 ../../mod/events.php:670 -#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654 -#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099 -#: ../../mod/pdledit.php:58 ../../mod/import.php:592 ../../mod/chat.php:177 -#: ../../mod/chat.php:211 ../../mod/mitem.php:232 ../../mod/rate.php:167 -#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104 -#: ../../mod/sources.php:138 ../../mod/filestorage.php:156 -#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166 -#: ../../mod/profiles.php:667 ../../mod/setup.php:327 ../../mod/setup.php:367 -#: ../../mod/admin.php:453 ../../mod/admin.php:819 ../../mod/admin.php:986 -#: ../../mod/admin.php:1118 ../../mod/admin.php:1312 ../../mod/admin.php:1397 -#: ../../mod/settings.php:588 ../../mod/settings.php:692 -#: ../../mod/settings.php:718 ../../mod/settings.php:746 -#: ../../mod/settings.php:769 ../../mod/settings.php:854 -#: ../../mod/settings.php:1050 ../../mod/mood.php:134 -#: ../../mod/connedit.php:704 ../../mod/mail.php:355 ../../mod/appman.php:99 -#: ../../mod/pconfig.php:108 ../../mod/poll.php:68 -#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256 +<<<<<<< HEAD +#: ../../mod/settings.php:587 ../../mod/settings.php:689 +#: ../../mod/settings.php:715 ../../mod/settings.php:743 +#: ../../mod/settings.php:766 ../../mod/settings.php:848 +#: ../../mod/settings.php:1044 ../../mod/xchan.php:11 ../../mod/connect.php:93 +#: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656 +#: ../../mod/group.php:81 ../../mod/photos.php:565 ../../mod/photos.php:642 +#: ../../mod/photos.php:929 ../../mod/photos.php:969 ../../mod/photos.php:1087 +#: ../../mod/pdledit.php:58 ../../mod/import.php:504 ../../mod/chat.php:177 +#: ../../mod/chat.php:211 ../../mod/rate.php:167 ../../mod/invite.php:142 +#: ../../mod/locs.php:105 ../../mod/sources.php:104 ../../mod/sources.php:138 +#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 +#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327 +#: ../../mod/setup.php:367 ../../mod/admin.php:446 ../../mod/admin.php:810 +#: ../../mod/admin.php:977 ../../mod/admin.php:1109 ../../mod/admin.php:1303 +#: ../../mod/admin.php:1388 ../../mod/mitem.php:237 ../../mod/mood.php:134 +#: ../../mod/connedit.php:679 ../../mod/mail.php:355 ../../mod/appman.php:99 +#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 +#: ../../view/theme/apw/php/config.php:256 +#: ../../view/theme/redbasic/php/config.php:97 +======= +#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275 +#: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 +#: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941 +#: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58 +#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211 +#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 +#: ../../mod/sources.php:104 ../../mod/sources.php:138 +#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 +#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327 +#: ../../mod/setup.php:367 ../../mod/admin.php:453 ../../mod/admin.php:819 +#: ../../mod/admin.php:986 ../../mod/admin.php:1118 ../../mod/admin.php:1312 +#: ../../mod/admin.php:1397 ../../mod/settings.php:588 +#: ../../mod/settings.php:692 ../../mod/settings.php:718 +#: ../../mod/settings.php:746 ../../mod/settings.php:769 +#: ../../mod/settings.php:854 ../../mod/settings.php:1050 +#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:688 +#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/pconfig.php:108 +#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 +#: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/redbasic/php/config.php:99 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Submit" msgstr "" @@ -600,363 +1032,8 @@ msgstr "" msgid "timeago.numbers" msgstr "" -#: ../../include/text.php:391 -msgid "prev" -msgstr "" - -#: ../../include/text.php:393 -msgid "first" -msgstr "" - -#: ../../include/text.php:422 -msgid "last" -msgstr "" - -#: ../../include/text.php:425 -msgid "next" -msgstr "" - -#: ../../include/text.php:435 -msgid "older" -msgstr "" - -#: ../../include/text.php:437 -msgid "newer" -msgstr "" - -#: ../../include/text.php:830 -msgid "No connections" -msgstr "" - -#: ../../include/text.php:844 -#, php-format -msgid "%d Connection" -msgid_plural "%d Connections" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/text.php:857 ../../mod/viewconnections.php:104 -msgid "View Connections" -msgstr "" - -#: ../../include/text.php:914 ../../include/text.php:926 -#: ../../include/nav.php:165 ../../include/apps.php:147 -#: ../../mod/search.php:38 -msgid "Search" -msgstr "" - -#: ../../include/text.php:915 ../../include/text.php:927 -#: ../../include/widgets.php:192 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457 -#: ../../mod/admin.php:1477 -msgid "Save" -msgstr "" - -#: ../../include/text.php:990 -msgid "poke" -msgstr "" - -#: ../../include/text.php:990 ../../include/conversation.php:243 -msgid "poked" -msgstr "" - -#: ../../include/text.php:991 -msgid "ping" -msgstr "" - -#: ../../include/text.php:991 -msgid "pinged" -msgstr "" - -#: ../../include/text.php:992 -msgid "prod" -msgstr "" - -#: ../../include/text.php:992 -msgid "prodded" -msgstr "" - -#: ../../include/text.php:993 -msgid "slap" -msgstr "" - -#: ../../include/text.php:993 -msgid "slapped" -msgstr "" - -#: ../../include/text.php:994 -msgid "finger" -msgstr "" - -#: ../../include/text.php:994 -msgid "fingered" -msgstr "" - -#: ../../include/text.php:995 -msgid "rebuff" -msgstr "" - -#: ../../include/text.php:995 -msgid "rebuffed" -msgstr "" - -#: ../../include/text.php:1005 -msgid "happy" -msgstr "" - -#: ../../include/text.php:1006 -msgid "sad" -msgstr "" - -#: ../../include/text.php:1007 -msgid "mellow" -msgstr "" - -#: ../../include/text.php:1008 -msgid "tired" -msgstr "" - -#: ../../include/text.php:1009 -msgid "perky" -msgstr "" - -#: ../../include/text.php:1010 -msgid "angry" -msgstr "" - -#: ../../include/text.php:1011 -msgid "stupified" -msgstr "" - -#: ../../include/text.php:1012 -msgid "puzzled" -msgstr "" - -#: ../../include/text.php:1013 -msgid "interested" -msgstr "" - -#: ../../include/text.php:1014 -msgid "bitter" -msgstr "" - -#: ../../include/text.php:1015 -msgid "cheerful" -msgstr "" - -#: ../../include/text.php:1016 -msgid "alive" -msgstr "" - -#: ../../include/text.php:1017 -msgid "annoyed" -msgstr "" - -#: ../../include/text.php:1018 -msgid "anxious" -msgstr "" - -#: ../../include/text.php:1019 -msgid "cranky" -msgstr "" - -#: ../../include/text.php:1020 -msgid "disturbed" -msgstr "" - -#: ../../include/text.php:1021 -msgid "frustrated" -msgstr "" - -#: ../../include/text.php:1022 -msgid "depressed" -msgstr "" - -#: ../../include/text.php:1023 -msgid "motivated" -msgstr "" - -#: ../../include/text.php:1024 -msgid "relaxed" -msgstr "" - -#: ../../include/text.php:1025 -msgid "surprised" -msgstr "" - -#: ../../include/text.php:1197 -msgid "Monday" -msgstr "" - -#: ../../include/text.php:1197 -msgid "Tuesday" -msgstr "" - -#: ../../include/text.php:1197 -msgid "Wednesday" -msgstr "" - -#: ../../include/text.php:1197 -msgid "Thursday" -msgstr "" - -#: ../../include/text.php:1197 -msgid "Friday" -msgstr "" - -#: ../../include/text.php:1197 -msgid "Saturday" -msgstr "" - -#: ../../include/text.php:1197 -msgid "Sunday" -msgstr "" - -#: ../../include/text.php:1201 -msgid "January" -msgstr "" - -#: ../../include/text.php:1201 -msgid "February" -msgstr "" - -#: ../../include/text.php:1201 -msgid "March" -msgstr "" - -#: ../../include/text.php:1201 -msgid "April" -msgstr "" - -#: ../../include/text.php:1201 -msgid "May" -msgstr "" - -#: ../../include/text.php:1201 -msgid "June" -msgstr "" - -#: ../../include/text.php:1201 -msgid "July" -msgstr "" - -#: ../../include/text.php:1201 -msgid "August" -msgstr "" - -#: ../../include/text.php:1201 -msgid "September" -msgstr "" - -#: ../../include/text.php:1201 -msgid "October" -msgstr "" - -#: ../../include/text.php:1201 -msgid "November" -msgstr "" - -#: ../../include/text.php:1201 -msgid "December" -msgstr "" - -#: ../../include/text.php:1306 -msgid "unknown.???" -msgstr "" - -#: ../../include/text.php:1307 -msgid "bytes" -msgstr "" - -#: ../../include/text.php:1343 -msgid "remove category" -msgstr "" - -#: ../../include/text.php:1418 -msgid "remove from file" -msgstr "" - -#: ../../include/text.php:1494 ../../include/text.php:1505 -msgid "Click to open/close" -msgstr "" - -#: ../../include/text.php:1661 ../../mod/events.php:457 -msgid "Link to Source" -msgstr "" - -#: ../../include/text.php:1682 ../../include/text.php:1753 -msgid "default" -msgstr "" - -#: ../../include/text.php:1690 -msgid "Page layout" -msgstr "" - -#: ../../include/text.php:1690 -msgid "You can create your own with the layouts tool" -msgstr "" - -#: ../../include/text.php:1731 -msgid "Page content type" -msgstr "" - -#: ../../include/text.php:1765 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/text.php:1884 ../../include/diaspora.php:2119 -#: ../../include/conversation.php:120 ../../mod/like.php:346 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:43 -msgid "photo" -msgstr "" - -#: ../../include/text.php:1887 ../../include/conversation.php:123 -#: ../../mod/like.php:348 ../../mod/tagger.php:47 -msgid "event" -msgstr "" - -#: ../../include/text.php:1890 ../../include/diaspora.php:2119 -#: ../../include/conversation.php:148 ../../mod/like.php:346 -#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -msgid "status" -msgstr "" - -#: ../../include/text.php:1892 ../../include/conversation.php:150 -#: ../../mod/tagger.php:53 -msgid "comment" -msgstr "" - -#: ../../include/text.php:1897 -msgid "activity" -msgstr "" - -#: ../../include/text.php:2192 -msgid "Design Tools" -msgstr "" - -#: ../../include/text.php:2195 ../../mod/blocks.php:147 -msgid "Blocks" -msgstr "" - -#: ../../include/text.php:2196 ../../mod/menu.php:98 -msgid "Menus" -msgstr "" - -#: ../../include/text.php:2197 ../../mod/layouts.php:174 -msgid "Layouts" -msgstr "" - -#: ../../include/text.php:2198 -msgid "Pages" -msgstr "" - -#: ../../include/text.php:2549 ../../include/RedDAV/RedBrowser.php:131 -msgid "Collection" -msgstr "" - #: ../../include/RedDAV/RedBrowser.php:107 -#: ../../include/RedDAV/RedBrowser.php:265 +#: ../../include/RedDAV/RedBrowser.php:268 msgid "parent" msgstr "" @@ -980,9 +1057,9 @@ msgstr "" msgid "Schedule Outbox" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1030 +#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019 #: ../../include/apps.php:336 ../../include/apps.php:387 -#: ../../mod/photos.php:693 ../../mod/photos.php:1131 +#: ../../mod/photos.php:681 ../../mod/photos.php:1119 msgid "Unknown" msgstr "" @@ -997,7 +1074,7 @@ msgid "%1$s used of %2$s (%3$s%)" msgstr "" #: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98 -#: ../../include/conversation.php:1620 ../../include/apps.php:135 +#: ../../include/conversation.php:1609 ../../include/apps.php:135 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" @@ -1011,51 +1088,60 @@ msgid "Shared" msgstr "" #: ../../include/RedDAV/RedBrowser.php:256 -#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180 -#: ../../mod/blocks.php:152 ../../mod/menu.php:109 -#: ../../mod/new_channel.php:121 ../../mod/layouts.php:175 +#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:179 +#: ../../mod/blocks.php:152 ../../mod/menu.php:107 ../../mod/layouts.php:175 +#: ../../mod/new_channel.php:121 msgid "Create" msgstr "" #: ../../include/RedDAV/RedBrowser.php:257 -#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362 -#: ../../mod/photos.php:718 ../../mod/photos.php:1248 +#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362 +#: ../../mod/photos.php:706 ../../mod/photos.php:1236 msgid "Upload" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:994 -#: ../../mod/settings.php:590 ../../mod/settings.php:616 +#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:589 +#: ../../mod/settings.php:615 ../../mod/admin.php:985 #: ../../mod/sharedwithme.php:95 msgid "Name" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:262 +#: ../../include/RedDAV/RedBrowser.php:265 msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97 +#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97 msgid "Size" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98 +#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98 msgid "Last Modified" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120 -#: ../../include/conversation.php:671 ../../include/apps.php:255 -#: ../../mod/webpages.php:183 ../../mod/thing.php:256 ../../mod/group.php:176 +#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120 +#: ../../include/conversation.php:660 ../../include/apps.php:255 +<<<<<<< HEAD +#: ../../mod/settings.php:650 ../../mod/webpages.php:182 +#: ../../mod/thing.php:228 ../../mod/group.php:176 ../../mod/blocks.php:155 +#: ../../mod/photos.php:1050 ../../mod/editlayout.php:107 +#: ../../mod/editwebpage.php:225 ../../mod/admin.php:817 +#: ../../mod/admin.php:979 ../../mod/editblock.php:113 +#: ../../mod/connedit.php:543 +======= +#: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176 #: ../../mod/blocks.php:155 ../../mod/photos.php:1062 -#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225 -#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988 -#: ../../mod/settings.php:651 ../../mod/connedit.php:563 +#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225 +#: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113 +#: ../../mod/settings.php:651 ../../mod/connedit.php:549 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Delete" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:302 +#: ../../include/RedDAV/RedBrowser.php:305 msgid "Create new folder" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:304 +#: ../../include/RedDAV/RedBrowser.php:307 msgid "Upload file" msgstr "" @@ -1072,12 +1158,6 @@ msgstr "" msgid "$Projectname Notification" msgstr "" -#: ../../include/network.php:1586 ../../include/enotify.php:59 -#: ../../include/diaspora.php:2522 ../../include/diaspora.php:2533 -#: ../../mod/p.php:46 -msgid "$projectname" -msgstr "" - #: ../../include/network.php:1588 ../../include/enotify.php:61 msgid "Thank You," msgstr "" @@ -1199,7 +1279,7 @@ msgid "" "(320px) photo thumbnails" msgstr "" -#: ../../include/features.php:59 ../../include/widgets.php:548 +#: ../../include/features.php:59 ../../include/widgets.php:546 #: ../../mod/sources.php:88 msgid "Channel Sources" msgstr "" @@ -1352,7 +1432,7 @@ msgid "Categories" msgstr "" #: ../../include/widgets.php:91 ../../include/nav.php:163 -#: ../../mod/apps.php:36 +#: ../../mod/apps.php:34 msgid "Apps" msgstr "" @@ -1360,7 +1440,7 @@ msgstr "" msgid "System" msgstr "" -#: ../../include/widgets.php:94 ../../include/conversation.php:1515 +#: ../../include/widgets.php:94 ../../include/conversation.php:1504 msgid "Personal" msgstr "" @@ -1373,9 +1453,14 @@ msgid "Edit Personal App" msgstr "" #: ../../include/widgets.php:136 ../../include/widgets.php:175 -#: ../../include/Contact.php:107 ../../include/conversation.php:956 -#: ../../include/identity.php:903 ../../mod/directory.php:316 +#: ../../include/Contact.php:107 ../../include/conversation.php:945 +<<<<<<< HEAD +#: ../../include/identity.php:824 ../../mod/match.php:64 +#: ../../mod/directory.php:302 ../../mod/suggest.php:52 +======= +#: ../../include/identity.php:828 ../../mod/directory.php:309 #: ../../mod/match.php:64 ../../mod/suggest.php:52 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Connect" msgstr "" @@ -1383,7 +1468,7 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../include/widgets.php:143 ../../mod/connections.php:128 +#: ../../include/widgets.php:143 ../../mod/connections.php:268 msgid "Suggestions" msgstr "" @@ -1425,141 +1510,147 @@ msgstr "" msgid "Archives" msgstr "" -#: ../../include/widgets.php:429 ../../mod/connedit.php:583 +#: ../../include/widgets.php:427 ../../mod/connedit.php:578 msgid "Me" msgstr "" -#: ../../include/widgets.php:430 ../../mod/connedit.php:584 +#: ../../include/widgets.php:428 ../../mod/connedit.php:579 msgid "Family" msgstr "" -#: ../../include/widgets.php:431 ../../include/identity.php:394 +#: ../../include/widgets.php:429 ../../include/identity.php:394 #: ../../include/identity.php:395 ../../include/identity.php:402 +<<<<<<< HEAD +#: ../../include/profile_selectors.php:80 ../../mod/settings.php:344 +#: ../../mod/settings.php:348 ../../mod/settings.php:349 +#: ../../mod/settings.php:352 ../../mod/settings.php:363 +#: ../../mod/connedit.php:574 +======= #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345 #: ../../mod/settings.php:349 ../../mod/settings.php:350 #: ../../mod/settings.php:353 ../../mod/settings.php:364 -#: ../../mod/connedit.php:585 +#: ../../mod/connedit.php:580 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Friends" msgstr "" -#: ../../include/widgets.php:432 ../../mod/connedit.php:586 +#: ../../include/widgets.php:430 ../../mod/connedit.php:581 msgid "Acquaintances" msgstr "" -#: ../../include/widgets.php:433 ../../mod/connections.php:91 -#: ../../mod/connections.php:106 ../../mod/connedit.php:587 +#: ../../include/widgets.php:431 ../../mod/connections.php:231 +#: ../../mod/connections.php:246 ../../mod/connedit.php:582 msgid "All" msgstr "" -#: ../../include/widgets.php:452 +#: ../../include/widgets.php:450 msgid "Refresh" msgstr "" -#: ../../include/widgets.php:487 +#: ../../include/widgets.php:485 msgid "Account settings" msgstr "" -#: ../../include/widgets.php:493 +#: ../../include/widgets.php:491 msgid "Channel settings" msgstr "" -#: ../../include/widgets.php:499 +#: ../../include/widgets.php:497 msgid "Additional features" msgstr "" -#: ../../include/widgets.php:505 +#: ../../include/widgets.php:503 msgid "Feature/Addon settings" msgstr "" -#: ../../include/widgets.php:511 +#: ../../include/widgets.php:509 msgid "Display settings" msgstr "" -#: ../../include/widgets.php:517 +#: ../../include/widgets.php:515 msgid "Connected apps" msgstr "" -#: ../../include/widgets.php:523 +#: ../../include/widgets.php:521 msgid "Export channel" msgstr "" -#: ../../include/widgets.php:532 ../../mod/connedit.php:674 +#: ../../include/widgets.php:530 ../../mod/connedit.php:659 msgid "Connection Default Permissions" msgstr "" -#: ../../include/widgets.php:540 +#: ../../include/widgets.php:538 msgid "Premium Channel Settings" msgstr "" -#: ../../include/widgets.php:556 ../../include/nav.php:208 -#: ../../include/apps.php:134 ../../mod/admin.php:1079 -#: ../../mod/admin.php:1279 +#: ../../include/widgets.php:554 ../../include/nav.php:208 +#: ../../include/apps.php:134 ../../mod/admin.php:1070 +#: ../../mod/admin.php:1270 msgid "Settings" msgstr "" -#: ../../include/widgets.php:569 ../../mod/message.php:31 +#: ../../include/widgets.php:567 ../../mod/message.php:31 #: ../../mod/mail.php:128 msgid "Messages" msgstr "" -#: ../../include/widgets.php:572 +#: ../../include/widgets.php:570 msgid "Check Mail" msgstr "" -#: ../../include/widgets.php:577 ../../include/nav.php:199 +#: ../../include/widgets.php:575 ../../include/nav.php:199 msgid "New Message" msgstr "" -#: ../../include/widgets.php:652 +#: ../../include/widgets.php:650 msgid "Chat Rooms" msgstr "" -#: ../../include/widgets.php:672 +#: ../../include/widgets.php:670 msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/widgets.php:692 +#: ../../include/widgets.php:690 msgid "Suggested Chatrooms" msgstr "" -#: ../../include/widgets.php:819 ../../include/widgets.php:877 +#: ../../include/widgets.php:817 ../../include/widgets.php:875 msgid "photo/image" msgstr "" -#: ../../include/widgets.php:972 ../../include/widgets.php:974 +#: ../../include/widgets.php:970 ../../include/widgets.php:972 msgid "Rate Me" msgstr "" -#: ../../include/widgets.php:978 +#: ../../include/widgets.php:976 msgid "View Ratings" msgstr "" -#: ../../include/widgets.php:989 +#: ../../include/widgets.php:987 msgid "Public Hubs" msgstr "" -#: ../../include/event.php:22 ../../include/bb2diaspora.php:459 -msgid "l F d, Y \\@ g:i A" -msgstr "" - -#: ../../include/event.php:30 ../../include/bb2diaspora.php:465 -msgid "Starts:" +<<<<<<< HEAD +#: ../../include/enotify.php:58 +msgid "$Projectname Notification" msgstr "" -#: ../../include/event.php:40 ../../include/bb2diaspora.php:473 -msgid "Finishes:" +#: ../../include/enotify.php:59 ../../include/diaspora.php:2467 +#: ../../include/diaspora.php:2478 ../../mod/p.php:46 +msgid "$projectname" msgstr "" -#: ../../include/event.php:50 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:954 ../../mod/directory.php:302 -#: ../../mod/events.php:661 -msgid "Location:" +#: ../../include/enotify.php:61 +msgid "Thank You," msgstr "" -#: ../../include/event.php:535 -msgid "This event has been added to your calendar." +#: ../../include/enotify.php:63 +#, php-format +msgid "%s Administrator" msgstr "" +======= +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -1738,42 +1829,86 @@ msgstr "" msgid "[Red:Notify]" msgstr "" -#: ../../include/message.php:18 -msgid "No recipient provided." +#: ../../include/contact_selectors.php:56 +msgid "Frequently" msgstr "" -#: ../../include/message.php:23 -msgid "[no subject]" +#: ../../include/contact_selectors.php:57 +msgid "Hourly" msgstr "" -#: ../../include/message.php:45 -msgid "Unable to determine sender." +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" msgstr "" -#: ../../include/message.php:200 -msgid "Stored post could not be verified." +#: ../../include/contact_selectors.php:59 +msgid "Daily" msgstr "" -#: ../../include/diaspora.php:2148 ../../include/conversation.php:164 -#: ../../mod/like.php:394 -#, php-format -msgid "%1$s likes %2$s's %3$s" +#: ../../include/contact_selectors.php:60 +msgid "Weekly" msgstr "" -#: ../../include/diaspora.php:2494 -msgid "Please choose" +#: ../../include/contact_selectors.php:61 +msgid "Monthly" msgstr "" -#: ../../include/diaspora.php:2496 -msgid "Agree" +#: ../../include/contact_selectors.php:76 +msgid "Friendica" msgstr "" -#: ../../include/diaspora.php:2498 -msgid "Disagree" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" msgstr "" -#: ../../include/diaspora.php:2500 -msgid "Abstain" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:813 +#: ../../mod/admin.php:822 ../../mod/id.php:15 ../../mod/id.php:16 +#: ../../boot.php:1552 +msgid "Email" +msgstr "" + +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" +msgstr "" + +#: ../../include/contact_selectors.php:81 +msgid "Facebook" +msgstr "" + +#: ../../include/contact_selectors.php:82 +msgid "Zot!" +msgstr "" + +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" +msgstr "" + +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/contact_selectors.php:85 +msgid "MySpace" +msgstr "" + +#: ../../include/message.php:18 +msgid "No recipient provided." +msgstr "" + +#: ../../include/message.php:23 +msgid "[no subject]" +msgstr "" + +#: ../../include/message.php:45 +msgid "Unable to determine sender." +msgstr "" + +#: ../../include/message.php:200 +msgid "Stored post could not be verified." msgstr "" #: ../../include/follow.php:28 @@ -1792,31 +1927,27 @@ msgstr "" msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:135 ../../include/follow.php:206 +#: ../../include/follow.php:135 ../../include/follow.php:197 msgid "Protocol disabled." msgstr "" -#: ../../include/follow.php:144 -msgid "Protocol blocked for this channel." -msgstr "" - -#: ../../include/follow.php:179 +#: ../../include/follow.php:170 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:195 +#: ../../include/follow.php:186 msgid "local account not found." msgstr "" -#: ../../include/follow.php:224 +#: ../../include/follow.php:215 msgid "Cannot connect to yourself." msgstr "" -#: ../../include/ItemObject.php:89 ../../include/conversation.php:678 +#: ../../include/ItemObject.php:89 ../../include/conversation.php:667 msgid "Private Message" msgstr "" -#: ../../include/ItemObject.php:126 ../../include/conversation.php:670 +#: ../../include/ItemObject.php:126 ../../include/conversation.php:659 msgid "Select" msgstr "" @@ -1849,22 +1980,22 @@ msgid "I abstain" msgstr "" #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 -#: ../../include/conversation.php:1688 ../../mod/photos.php:1015 -#: ../../mod/photos.php:1027 +#: ../../include/conversation.php:1677 ../../mod/photos.php:1003 +#: ../../mod/photos.php:1015 msgid "View all" msgstr "" #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396 -#: ../../include/conversation.php:1712 ../../include/identity.php:1213 -#: ../../mod/photos.php:1019 +#: ../../include/conversation.php:1701 ../../include/identity.php:1134 +#: ../../mod/photos.php:1007 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715 -#: ../../mod/photos.php:1024 +#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704 +#: ../../mod/photos.php:1012 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -1887,11 +2018,11 @@ msgstr "" msgid "starred" msgstr "" -#: ../../include/ItemObject.php:227 ../../include/conversation.php:685 +#: ../../include/ItemObject.php:227 ../../include/conversation.php:674 msgid "Message signature validated" msgstr "" -#: ../../include/ItemObject.php:228 ../../include/conversation.php:686 +#: ../../include/ItemObject.php:228 ../../include/conversation.php:675 msgid "Message signature incorrect" msgstr "" @@ -1899,7 +2030,7 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:254 ../../mod/photos.php:959 +#: ../../include/ItemObject.php:254 ../../mod/photos.php:947 msgid "I like this (toggle)" msgstr "" @@ -1907,7 +2038,7 @@ msgstr "" msgid "like" msgstr "" -#: ../../include/ItemObject.php:255 ../../mod/photos.php:960 +#: ../../include/ItemObject.php:255 ../../mod/photos.php:948 msgid "I don't like this (toggle)" msgstr "" @@ -1951,17 +2082,17 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:312 ../../include/conversation.php:727 +#: ../../include/ItemObject.php:312 ../../include/conversation.php:716 #, php-format msgid "from %s" msgstr "" -#: ../../include/ItemObject.php:315 ../../include/conversation.php:730 +#: ../../include/ItemObject.php:315 ../../include/conversation.php:719 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/ItemObject.php:316 ../../include/conversation.php:731 +#: ../../include/ItemObject.php:316 ../../include/conversation.php:720 #, php-format msgid "Expires: %s" msgstr "" @@ -1978,61 +2109,61 @@ msgstr "" msgid "Mark all seen" msgstr "" -#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145 +#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146 +#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134 msgctxt "noun" msgid "Dislikes" msgstr "" #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249 -#: ../../mod/photos.php:1151 +#: ../../mod/photos.php:1139 msgid "Close" msgstr "" -#: ../../include/ItemObject.php:364 ../../include/conversation.php:748 -#: ../../include/conversation.php:1220 ../../mod/editpost.php:123 -#: ../../mod/photos.php:962 ../../mod/editlayout.php:147 -#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149 +#: ../../include/ItemObject.php:364 ../../include/conversation.php:737 +#: ../../include/conversation.php:1209 ../../mod/photos.php:950 +#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192 +#: ../../mod/editpost.php:130 ../../mod/editblock.php:155 #: ../../mod/mail.php:241 ../../mod/mail.php:356 msgid "Please wait" msgstr "" -#: ../../include/ItemObject.php:665 ../../mod/photos.php:978 -#: ../../mod/photos.php:1096 +#: ../../include/ItemObject.php:665 ../../mod/photos.php:966 +#: ../../mod/photos.php:1084 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:669 ../../include/conversation.php:1192 -#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134 -#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135 +#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181 +#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179 +#: ../../mod/editpost.php:114 ../../mod/editblock.php:141 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:670 ../../include/conversation.php:1193 -#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135 -#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136 +#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182 +#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180 +#: ../../mod/editpost.php:115 ../../mod/editblock.php:142 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:671 ../../include/conversation.php:1194 -#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136 -#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137 +#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183 +#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181 +#: ../../mod/editpost.php:116 ../../mod/editblock.php:143 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:672 ../../include/conversation.php:1195 -#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137 -#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138 +#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184 +#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182 +#: ../../mod/editpost.php:117 ../../mod/editblock.php:144 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:673 ../../include/conversation.php:1196 -#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138 -#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139 +#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185 +#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183 +#: ../../mod/editpost.php:118 ../../mod/editblock.php:145 msgid "Code" msgstr "" @@ -2048,8 +2179,8 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:680 ../../include/conversation.php:1247 -#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361 +#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236 +#: ../../mod/editpost.php:158 ../../mod/mail.php:247 ../../mod/mail.php:361 msgid "Encrypt text" msgstr "" @@ -2061,7 +2192,7 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:212 +#: ../../include/Contact.php:215 ../../mod/admin.php:730 #, php-format msgid "User '%s' deleted" msgstr "" @@ -2070,7 +2201,7 @@ msgstr "" msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:461 +#: ../../include/bb2diaspora.php:453 msgid "$Projectname event notification:" msgstr "" @@ -2090,8 +2221,8 @@ msgstr "" msgid "Your posts and conversations" msgstr "" -#: ../../include/nav.php:91 ../../include/conversation.php:953 -#: ../../mod/connedit.php:510 +#: ../../include/nav.php:91 ../../include/conversation.php:942 +#: ../../mod/connedit.php:500 ../../mod/connedit.php:666 msgid "View Profile" msgstr "" @@ -2107,7 +2238,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:95 ../../include/identity.php:926 +#: ../../include/nav.php:95 ../../include/identity.php:847 msgid "Edit Profile" msgstr "" @@ -2115,7 +2246,7 @@ msgstr "" msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:97 ../../include/conversation.php:1611 +#: ../../include/nav.php:97 ../../include/conversation.php:1600 #: ../../include/apps.php:139 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" @@ -2136,7 +2267,7 @@ msgstr "" msgid "Your chatrooms" msgstr "" -#: ../../include/nav.php:109 ../../include/conversation.php:1646 +#: ../../include/nav.php:109 ../../include/conversation.php:1635 #: ../../include/apps.php:129 msgid "Bookmarks" msgstr "" @@ -2145,8 +2276,8 @@ msgstr "" msgid "Your bookmarks" msgstr "" -#: ../../include/nav.php:113 ../../include/conversation.php:1656 -#: ../../include/apps.php:136 ../../mod/webpages.php:178 +#: ../../include/nav.php:113 ../../include/conversation.php:1645 +#: ../../include/apps.php:136 ../../mod/webpages.php:177 msgid "Webpages" msgstr "" @@ -2205,6 +2336,7 @@ msgid "Search site content" msgstr "" #: ../../include/nav.php:168 ../../include/apps.php:141 +#: ../../mod/directory.php:366 msgid "Directory" msgstr "" @@ -2236,7 +2368,7 @@ msgstr "" msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:187 ../../mod/connections.php:267 +#: ../../include/nav.php:187 ../../mod/connections.php:407 msgid "Connections" msgstr "" @@ -2281,7 +2413,7 @@ msgid "Outbox" msgstr "" #: ../../include/nav.php:202 ../../include/apps.php:140 -#: ../../mod/events.php:486 +#: ../../mod/events.php:472 msgid "Events" msgstr "" @@ -2318,7 +2450,7 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:247 ../../include/conversation.php:861 +#: ../../include/nav.php:247 ../../include/conversation.php:850 msgid "Loading..." msgstr "" @@ -2532,6 +2664,12 @@ msgstr "" msgid "channel" msgstr "" +#: ../../include/conversation.php:164 ../../include/diaspora.php:2111 +#: ../../mod/like.php:394 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + #: ../../include/conversation.php:167 ../../mod/like.php:396 #, php-format msgid "%1$s doesn't like %2$s's %3$s" @@ -2553,528 +2691,590 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:583 ../../mod/photos.php:996 +#: ../../include/conversation.php:572 ../../mod/photos.php:984 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:583 ../../mod/photos.php:996 +#: ../../include/conversation.php:572 ../../mod/photos.php:984 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:584 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:584 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:584 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:585 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:585 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:585 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../include/conversation.php:703 +#: ../../include/conversation.php:692 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:718 +#: ../../include/conversation.php:707 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:719 +#: ../../include/conversation.php:708 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:746 +#: ../../include/conversation.php:735 msgid "View in context" msgstr "" -#: ../../include/conversation.php:857 +#: ../../include/conversation.php:846 msgid "remove" msgstr "" -#: ../../include/conversation.php:862 +#: ../../include/conversation.php:851 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:950 +#: ../../include/conversation.php:939 msgid "View Source" msgstr "" -#: ../../include/conversation.php:951 +#: ../../include/conversation.php:940 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:952 +#: ../../include/conversation.php:941 msgid "View Status" msgstr "" -#: ../../include/conversation.php:954 +#: ../../include/conversation.php:943 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:955 +#: ../../include/conversation.php:944 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:957 +#: ../../include/conversation.php:946 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:958 +#: ../../include/conversation.php:947 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:959 ../../include/apps.php:145 +#: ../../include/conversation.php:948 ../../include/apps.php:145 msgid "Poke" msgstr "" -#: ../../include/conversation.php:1073 +#: ../../include/conversation.php:1062 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1073 +#: ../../include/conversation.php:1062 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1077 +#: ../../include/conversation.php:1066 #, 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:1079 +#: ../../include/conversation.php:1068 #, 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:1085 +#: ../../include/conversation.php:1074 msgid "and" msgstr "" -#: ../../include/conversation.php:1088 +#: ../../include/conversation.php:1077 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1089 +#: ../../include/conversation.php:1078 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1089 +#: ../../include/conversation.php:1078 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1151 +#: ../../include/conversation.php:1140 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:1152 ../../mod/mail.php:174 +#: ../../include/conversation.php:1141 ../../mod/mail.php:174 #: ../../mod/mail.php:289 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1153 +#: ../../include/conversation.php:1142 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1154 +#: ../../include/conversation.php:1143 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1155 +#: ../../include/conversation.php:1144 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1156 ../../mod/filer.php:49 +#: ../../include/conversation.php:1145 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1157 +#: ../../include/conversation.php:1146 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1158 ../../mod/editpost.php:47 +#: ../../include/conversation.php:1147 ../../mod/editpost.php:52 #: ../../mod/mail.php:175 ../../mod/mail.php:290 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1185 ../../mod/webpages.php:182 -#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184 +#: ../../include/conversation.php:1174 ../../mod/webpages.php:181 +#: ../../mod/blocks.php:154 ../../mod/photos.php:949 ../../mod/layouts.php:184 msgid "Share" msgstr "" -#: ../../include/conversation.php:1187 +#: ../../include/conversation.php:1176 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1190 +#: ../../include/conversation.php:1179 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1197 ../../mod/editpost.php:112 -#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184 -#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352 +#: ../../include/conversation.php:1186 ../../mod/editlayout.php:145 +#: ../../mod/editwebpage.php:184 ../../mod/editpost.php:119 +#: ../../mod/editblock.php:147 ../../mod/mail.php:238 ../../mod/mail.php:352 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1198 +#: ../../include/conversation.php:1187 msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1199 ../../mod/editpost.php:113 -#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185 -#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353 +#: ../../include/conversation.php:1188 ../../mod/editlayout.php:146 +#: ../../mod/editwebpage.php:185 ../../mod/editpost.php:120 +#: ../../mod/editblock.php:148 ../../mod/mail.php:239 ../../mod/mail.php:353 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1200 +#: ../../include/conversation.php:1189 msgid "attach file" msgstr "" -#: ../../include/conversation.php:1201 ../../mod/editpost.php:114 -#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186 -#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354 +#: ../../include/conversation.php:1190 ../../mod/editlayout.php:147 +#: ../../mod/editwebpage.php:186 ../../mod/editpost.php:121 +#: ../../mod/editblock.php:149 ../../mod/mail.php:240 ../../mod/mail.php:354 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1202 +#: ../../include/conversation.php:1191 msgid "web link" msgstr "" -#: ../../include/conversation.php:1203 +#: ../../include/conversation.php:1192 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1204 +#: ../../include/conversation.php:1193 msgid "video link" msgstr "" -#: ../../include/conversation.php:1205 +#: ../../include/conversation.php:1194 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1206 +#: ../../include/conversation.php:1195 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1207 ../../mod/editpost.php:118 -#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190 -#: ../../mod/editblock.php:147 +#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151 +#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125 +#: ../../mod/editblock.php:153 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1208 +#: ../../include/conversation.php:1197 msgid "set location" msgstr "" -#: ../../include/conversation.php:1209 ../../mod/editpost.php:120 +#: ../../include/conversation.php:1198 ../../mod/editpost.php:127 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1212 ../../mod/editpost.php:119 -#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191 -#: ../../mod/editblock.php:148 +#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152 +#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126 +#: ../../mod/editblock.php:154 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1213 +#: ../../include/conversation.php:1202 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1215 ../../mod/editpost.php:135 -#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161 +#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207 +#: ../../mod/editpost.php:142 ../../mod/editblock.php:167 msgid "Title (optional)" msgstr "" -#: ../../include/conversation.php:1219 ../../mod/editpost.php:137 -#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209 -#: ../../mod/editblock.php:164 +#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168 +#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:144 +#: ../../mod/editblock.php:170 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1221 ../../mod/editpost.php:124 -#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193 -#: ../../mod/editblock.php:150 +#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154 +#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131 +#: ../../mod/editblock.php:156 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1222 +#: ../../include/conversation.php:1211 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1230 ../../mod/editpost.php:132 -#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202 -#: ../../mod/editblock.php:158 +#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161 +#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:139 +#: ../../mod/editblock.php:164 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1232 ../../mod/editpost.php:138 -#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210 -#: ../../mod/editblock.php:165 +#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169 +#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:145 +#: ../../mod/editblock.php:171 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../include/conversation.php:1245 ../../mod/editpost.php:149 -#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219 -#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359 +#: ../../include/conversation.php:1234 ../../mod/editlayout.php:178 +#: ../../mod/editwebpage.php:219 ../../mod/editpost.php:156 +#: ../../mod/editblock.php:181 ../../mod/mail.php:245 ../../mod/mail.php:359 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1249 ../../mod/events.php:651 -#: ../../mod/editpost.php:153 +#: ../../include/conversation.php:1238 ../../mod/events.php:637 +#: ../../mod/editpost.php:160 msgid "OK" msgstr "" -#: ../../include/conversation.php:1250 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:134 ../../mod/events.php:650 ../../mod/fbrowser.php:82 -#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154 -#: ../../mod/settings.php:589 ../../mod/settings.php:615 +#: ../../include/conversation.php:1239 ../../mod/settings.php:588 +#: ../../mod/settings.php:614 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 +#: ../../mod/events.php:636 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1492 +#: ../../include/conversation.php:1481 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1495 +#: ../../include/conversation.php:1484 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1500 +#: ../../include/conversation.php:1489 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1503 +#: ../../include/conversation.php:1492 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1507 +#: ../../include/conversation.php:1496 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1510 +#: ../../include/conversation.php:1499 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1518 +#: ../../include/conversation.php:1507 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1524 ../../mod/connections.php:72 -#: ../../mod/connections.php:85 ../../mod/menu.php:107 +#: ../../include/conversation.php:1513 ../../mod/connections.php:212 +#: ../../mod/connections.php:225 ../../mod/menu.php:105 msgid "New" msgstr "" -#: ../../include/conversation.php:1527 +#: ../../include/conversation.php:1516 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1533 +#: ../../include/conversation.php:1522 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1536 +#: ../../include/conversation.php:1525 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1543 +#: ../../include/conversation.php:1532 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1546 +#: ../../include/conversation.php:1535 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1590 ../../mod/admin.php:993 +#: ../../include/conversation.php:1579 ../../mod/admin.php:984 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1593 +#: ../../include/conversation.php:1582 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1602 +#: ../../include/conversation.php:1591 msgid "About" msgstr "" -#: ../../include/conversation.php:1605 +#: ../../include/conversation.php:1594 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1614 ../../include/photos.php:359 +#: ../../include/conversation.php:1603 ../../include/photos.php:359 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1623 +#: ../../include/conversation.php:1612 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1633 ../../include/conversation.php:1636 +#: ../../include/conversation.php:1622 ../../include/conversation.php:1625 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1649 +#: ../../include/conversation.php:1638 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1659 +#: ../../include/conversation.php:1648 msgid "Manage Webpages" msgstr "" -#: ../../include/conversation.php:1718 +#: ../../include/conversation.php:1707 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1721 +#: ../../include/conversation.php:1710 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1724 +#: ../../include/conversation.php:1713 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1727 +#: ../../include/conversation.php:1716 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1730 +#: ../../include/conversation.php:1719 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1733 +#: ../../include/conversation.php:1722 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" msgstr[0] "" msgstr[1] "" -#: ../../include/items.php:413 ../../mod/like.php:270 +#: ../../include/items.php:399 ../../mod/like.php:270 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23 -#: ../../mod/bulksetclose.php:11 ../../index.php:392 +#: ../../mod/bulksetclose.php:11 ../../index.php:381 msgid "Permission denied" msgstr "" -#: ../../include/items.php:1038 ../../include/items.php:1084 +#: ../../include/items.php:1020 ../../include/items.php:1066 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1310 +<<<<<<< HEAD +#: ../../include/items.php:1234 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1312 +#: ../../include/items.php:1236 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1314 +#: ../../include/items.php:1238 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1316 +#: ../../include/items.php:1240 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1318 +#: ../../include/items.php:1242 +======= +#: ../../include/items.php:1304 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1306 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1308 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1310 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1312 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1320 +<<<<<<< HEAD +#: ../../include/items.php:1244 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1246 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1248 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:4060 ../../mod/thing.php:74 +======= +#: ../../include/items.php:1314 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1322 +#: ../../include/items.php:1316 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1324 +#: ../../include/items.php:1318 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4218 ../../mod/thing.php:74 -#: ../../mod/filestorage.php:27 ../../mod/viewsrc.php:20 -#: ../../mod/admin.php:167 ../../mod/admin.php:1025 ../../mod/admin.php:1225 -#: ../../mod/display.php:36 +#: ../../include/items.php:4195 ../../mod/thing.php:74 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../mod/display.php:36 ../../mod/filestorage.php:27 +#: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1016 +#: ../../mod/admin.php:1216 msgid "Item not found." msgstr "" -#: ../../include/items.php:4291 ../../include/attach.php:137 +<<<<<<< HEAD +#: ../../include/items.php:4133 ../../include/photos.php:26 +#: ../../include/attach.php:137 ../../include/attach.php:184 +#: ../../include/attach.php:247 ../../include/attach.php:261 +#: ../../include/attach.php:305 ../../include/attach.php:319 +#: ../../include/attach.php:350 ../../include/attach.php:546 +#: ../../include/attach.php:618 ../../include/chat.php:131 +======= +#: ../../include/items.php:4268 ../../include/attach.php:137 #: ../../include/attach.php:184 ../../include/attach.php:247 #: ../../include/attach.php:261 ../../include/attach.php:305 #: ../../include/attach.php:319 ../../include/attach.php:350 #: ../../include/attach.php:546 ../../include/attach.php:618 #: ../../include/chat.php:131 ../../include/photos.php:26 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/profile.php:64 ../../mod/profile.php:72 -#: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/api.php:26 -#: ../../mod/api.php:31 ../../mod/webpages.php:69 ../../mod/thing.php:269 -#: ../../mod/thing.php:284 ../../mod/thing.php:318 -#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277 -#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178 -#: ../../mod/events.php:232 ../../mod/group.php:9 ../../mod/item.php:206 -#: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12 -#: ../../mod/common.php:35 ../../mod/connections.php:29 -#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13 -#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13 +#: ../../mod/achievements.php:30 ../../mod/manage.php:6 +#: ../../mod/settings.php:569 ../../mod/api.php:26 ../../mod/api.php:31 +#: ../../mod/webpages.php:69 ../../mod/thing.php:241 ../../mod/thing.php:256 +#: ../../mod/thing.php:290 ../../mod/profile_photo.php:264 +#: ../../mod/profile_photo.php:277 ../../mod/block.php:22 +#: ../../mod/block.php:72 ../../mod/like.php:178 ../../mod/events.php:219 +#: ../../mod/group.php:9 ../../mod/common.php:35 ../../mod/connections.php:169 +#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:68 +#: ../../mod/pdledit.php:21 ../../mod/authtest.php:13 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 -#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:109 -#: ../../mod/editwebpage.php:64 ../../mod/editwebpage.php:86 -#: ../../mod/editwebpage.php:101 ../../mod/editwebpage.php:125 -#: ../../mod/rate.php:110 ../../mod/editblock.php:65 ../../mod/invite.php:13 -#: ../../mod/invite.php:104 ../../mod/locs.php:77 ../../mod/sources.php:66 -#: ../../mod/menu.php:69 ../../mod/filestorage.php:18 -#: ../../mod/filestorage.php:73 ../../mod/filestorage.php:88 -#: ../../mod/filestorage.php:115 ../../mod/fsuggest.php:78 -#: ../../mod/poke.php:128 ../../mod/profiles.php:188 +#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64 +#: ../../mod/editwebpage.php:86 ../../mod/editwebpage.php:101 +#: ../../mod/editwebpage.php:125 ../../mod/rate.php:110 +#: ../../mod/editpost.php:13 ../../mod/invite.php:13 ../../mod/invite.php:104 +#: ../../mod/locs.php:77 ../../mod/sources.php:66 ../../mod/menu.php:69 +#: ../../mod/filestorage.php:18 ../../mod/filestorage.php:73 +#: ../../mod/filestorage.php:88 ../../mod/filestorage.php:115 +#: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/profiles.php:188 #: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 -#: ../../mod/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71 -#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:348 +<<<<<<< HEAD +#: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206 +#: ../../mod/item.php:214 ../../mod/item.php:974 ../../mod/layouts.php:69 +#: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71 +#: ../../mod/message.php:16 ../../mod/mitem.php:115 ../../mod/mood.php:111 +#: ../../mod/connedit.php:331 ../../mod/mail.php:114 +#: ../../mod/notifications.php:66 ../../mod/regmod.php:17 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 +#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28 +#: ../../mod/page.php:82 ../../mod/bookmarks.php:46 ../../mod/channel.php:100 +#: ../../mod/channel.php:219 ../../mod/channel.php:262 +#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7 +#: ../../mod/sharedwithme.php:7 ../../index.php:182 ../../index.php:382 +msgid "Permission denied." +msgstr "" + +#: ../../include/items.php:4535 ../../mod/group.php:38 ../../mod/group.php:140 +======= +#: ../../mod/editblock.php:65 ../../mod/register.php:72 +#: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16 +#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337 #: ../../mod/mail.php:114 ../../mod/notifications.php:66 #: ../../mod/regmod.php:17 ../../mod/new_channel.php:68 #: ../../mod/new_channel.php:99 ../../mod/appman.php:66 @@ -3083,33 +3283,71 @@ msgstr "" #: ../../mod/channel.php:100 ../../mod/channel.php:219 #: ../../mod/channel.php:262 ../../mod/suggest.php:26 #: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7 -#: ../../index.php:182 ../../index.php:393 +#: ../../index.php:182 ../../index.php:382 msgid "Permission denied." msgstr "" -#: ../../include/items.php:4693 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4670 ../../mod/group.php:38 ../../mod/group.php:140 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4709 +<<<<<<< HEAD +#: ../../include/items.php:4551 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4716 +#: ../../include/items.php:4558 +======= +#: ../../include/items.php:4686 +msgid "Collection is empty." +msgstr "" + +#: ../../include/items.php:4693 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4726 ../../mod/connedit.php:674 +<<<<<<< HEAD +#: ../../include/items.php:4568 +======= +#: ../../include/items.php:4703 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4728 +<<<<<<< HEAD +#: ../../include/items.php:4570 +======= +#: ../../include/items.php:4705 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Connection not found." msgstr "" +#: ../../include/photos.php:94 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: ../../include/photos.php:101 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 +msgid "Unable to process image" +msgstr "" + +#: ../../include/photos.php:199 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:363 +msgid "Upload New Photos" +msgstr "" + #: ../../include/zot.php:666 msgid "Invalid data packet" msgstr "" @@ -3118,7 +3356,7 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2133 +#: ../../include/zot.php:2126 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -3150,7 +3388,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:457 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:450 msgid "Advanced" msgstr "" @@ -3170,12 +3408,20 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379 -#: ../../mod/directory.php:384 ../../mod/connections.php:273 +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413 +<<<<<<< HEAD +#: ../../mod/directory.php:362 ../../mod/directory.php:367 +msgid "Find" +msgstr "" + +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366 +======= +#: ../../mod/directory.php:372 ../../mod/directory.php:377 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383 +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:376 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/suggest.php:60 msgid "Channel Suggestions" msgstr "" @@ -3215,8 +3461,8 @@ msgstr "" msgid "Don't show" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/events.php:668 -#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209 +#: ../../include/acl_selectors.php:248 ../../mod/events.php:654 +#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209 #: ../../mod/filestorage.php:147 msgid "Permissions" msgstr "" @@ -3316,206 +3562,218 @@ msgstr "" msgid "Default Profile" msgstr "" -#: ../../include/identity.php:706 +#: ../../include/identity.php:631 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:753 ../../mod/profile.php:16 +#: ../../include/identity.php:678 ../../mod/profile.php:16 #: ../../mod/achievements.php:11 ../../mod/webpages.php:29 #: ../../mod/connect.php:13 ../../mod/hcard.php:8 ../../mod/blocks.php:29 #: ../../mod/editlayout.php:27 ../../mod/editwebpage.php:28 -#: ../../mod/editblock.php:29 ../../mod/filestorage.php:54 +#: ../../mod/filestorage.php:54 ../../mod/editblock.php:29 #: ../../mod/layouts.php:29 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:916 ../../mod/profiles.php:774 +#: ../../include/identity.php:837 ../../mod/profiles.php:774 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:922 +#: ../../include/identity.php:843 msgid "Profiles" msgstr "" -#: ../../include/identity.php:922 +#: ../../include/identity.php:843 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:923 ../../mod/profiles.php:775 +#: ../../include/identity.php:844 ../../mod/profiles.php:775 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:938 ../../mod/profiles.php:786 +#: ../../include/identity.php:859 ../../mod/profiles.php:786 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:941 +#: ../../include/identity.php:862 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:942 ../../mod/profiles.php:669 +#: ../../include/identity.php:863 ../../mod/profiles.php:669 #: ../../mod/profiles.php:790 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:958 ../../include/identity.php:1197 +#: ../../include/identity.php:879 ../../include/identity.php:1118 msgid "Gender:" msgstr "" -#: ../../include/identity.php:959 ../../include/identity.php:1241 +#: ../../include/identity.php:880 ../../include/identity.php:1162 msgid "Status:" msgstr "" -#: ../../include/identity.php:960 ../../include/identity.php:1252 +#: ../../include/identity.php:881 ../../include/identity.php:1173 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:961 +#: ../../include/identity.php:882 msgid "Online Now" msgstr "" -#: ../../include/identity.php:1044 ../../include/identity.php:1122 +#: ../../include/identity.php:965 ../../include/identity.php:1043 #: ../../mod/ping.php:324 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:1045 ../../include/identity.php:1123 +#: ../../include/identity.php:966 ../../include/identity.php:1044 msgid "F d" msgstr "" -#: ../../include/identity.php:1090 ../../include/identity.php:1162 +#: ../../include/identity.php:1011 ../../include/identity.php:1083 #: ../../mod/ping.php:346 msgid "[today]" msgstr "" -#: ../../include/identity.php:1101 +#: ../../include/identity.php:1022 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1102 +#: ../../include/identity.php:1023 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1155 +#: ../../include/identity.php:1076 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1173 +#: ../../include/identity.php:1094 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1174 +#: ../../include/identity.php:1095 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1187 ../../include/identity.php:1304 +#: ../../include/identity.php:1108 ../../include/identity.php:1225 #: ../../include/apps.php:138 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/identity.php:1195 ../../mod/settings.php:1056 +#: ../../include/identity.php:1116 ../../mod/settings.php:1050 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1202 +#: ../../include/identity.php:1123 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1226 +#: ../../include/identity.php:1147 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1227 +#: ../../include/identity.php:1148 msgid "j F" msgstr "" -#: ../../include/identity.php:1234 +#: ../../include/identity.php:1155 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1238 ../../mod/directory.php:297 +<<<<<<< HEAD +#: ../../include/identity.php:1159 +======= +#: ../../include/identity.php:1163 ../../mod/directory.php:290 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Age:" msgstr "" -#: ../../include/identity.php:1247 +#: ../../include/identity.php:1168 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1250 ../../mod/profiles.php:691 +#: ../../include/identity.php:1171 ../../mod/profiles.php:691 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1254 ../../mod/directory.php:313 +<<<<<<< HEAD +#: ../../include/identity.php:1175 ../../mod/profiles.php:693 +======= +#: ../../include/identity.php:1179 ../../mod/directory.php:306 #: ../../mod/profiles.php:693 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1256 +#: ../../include/identity.php:1177 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1258 ../../mod/profiles.php:694 +#: ../../include/identity.php:1179 ../../mod/profiles.php:694 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1260 +#: ../../include/identity.php:1181 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1262 ../../mod/directory.php:315 +<<<<<<< HEAD +#: ../../include/identity.php:1183 +======= +#: ../../include/identity.php:1187 ../../mod/directory.php:308 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "About:" msgstr "" -#: ../../include/identity.php:1264 +#: ../../include/identity.php:1185 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1266 ../../mod/profiles.php:697 +#: ../../include/identity.php:1187 ../../mod/profiles.php:697 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1268 ../../mod/profiles.php:698 +#: ../../include/identity.php:1189 ../../mod/profiles.php:698 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1270 +#: ../../include/identity.php:1191 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1272 +#: ../../include/identity.php:1193 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1274 +#: ../../include/identity.php:1195 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1276 +#: ../../include/identity.php:1197 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1278 +#: ../../include/identity.php:1199 msgid "Television:" msgstr "" -#: ../../include/identity.php:1280 +#: ../../include/identity.php:1201 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1282 +#: ../../include/identity.php:1203 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1284 +#: ../../include/identity.php:1205 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1286 +#: ../../include/identity.php:1207 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1306 +#: ../../include/identity.php:1227 msgid "Like this thing" msgstr "" @@ -3801,7 +4059,7 @@ msgid "Profile Photo" msgstr "" #: ../../include/apps.php:247 ../../mod/settings.php:84 -#: ../../mod/settings.php:614 +#: ../../mod/settings.php:613 msgid "Update" msgstr "" @@ -3813,17 +4071,19 @@ msgstr "" msgid "Purchase" msgstr "" -#: ../../include/bbcode.php:122 ../../include/bbcode.php:768 -#: ../../include/bbcode.php:771 ../../include/bbcode.php:776 -#: ../../include/bbcode.php:779 ../../include/bbcode.php:782 -#: ../../include/bbcode.php:785 ../../include/bbcode.php:790 -#: ../../include/bbcode.php:793 ../../include/bbcode.php:798 -#: ../../include/bbcode.php:801 ../../include/bbcode.php:804 -#: ../../include/bbcode.php:807 +<<<<<<< HEAD +======= +#: ../../include/bbcode.php:122 ../../include/bbcode.php:764 +#: ../../include/bbcode.php:767 ../../include/bbcode.php:772 +#: ../../include/bbcode.php:775 ../../include/bbcode.php:778 +#: ../../include/bbcode.php:781 ../../include/bbcode.php:786 +#: ../../include/bbcode.php:789 ../../include/bbcode.php:794 +#: ../../include/bbcode.php:797 ../../include/bbcode.php:800 +#: ../../include/bbcode.php:803 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:161 ../../include/bbcode.php:818 +#: ../../include/bbcode.php:161 ../../include/bbcode.php:814 msgid "Encrypted content" msgstr "" @@ -3832,54 +4092,48 @@ msgstr "" msgid "Install %s element: " msgstr "" -#: ../../include/bbcode.php:182 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "" - -#: ../../include/bbcode.php:192 ../../mod/impel.php:37 +#: ../../include/bbcode.php:188 ../../mod/impel.php:37 msgid "webpage" msgstr "" -#: ../../include/bbcode.php:195 ../../mod/impel.php:47 +#: ../../include/bbcode.php:191 ../../mod/impel.php:47 msgid "layout" msgstr "" -#: ../../include/bbcode.php:198 ../../mod/impel.php:42 +#: ../../include/bbcode.php:194 ../../mod/impel.php:42 msgid "block" msgstr "" -#: ../../include/bbcode.php:201 ../../mod/impel.php:54 +#: ../../include/bbcode.php:197 ../../mod/impel.php:54 msgid "menu" msgstr "" -#: ../../include/bbcode.php:215 +#: ../../include/bbcode.php:211 msgid "QR code" msgstr "" -#: ../../include/bbcode.php:266 +#: ../../include/bbcode.php:262 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:268 ../../mod/tagger.php:51 +#: ../../include/bbcode.php:264 ../../mod/tagger.php:51 msgid "post" msgstr "" -#: ../../include/bbcode.php:518 +#: ../../include/bbcode.php:514 msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/bbcode.php:729 +#: ../../include/bbcode.php:725 msgid "$1 spoiler" msgstr "" -#: ../../include/bbcode.php:756 +#: ../../include/bbcode.php:752 msgid "$1 wrote:" msgstr "" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../include/chat.php:23 msgid "Missing room name" msgstr "" @@ -3900,25 +4154,20 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../include/photos.php:94 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:101 -msgid "Image file is empty." +#: ../../include/diaspora.php:2439 +msgid "Please choose" msgstr "" -#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 -msgid "Unable to process image" +#: ../../include/diaspora.php:2441 +msgid "Agree" msgstr "" -#: ../../include/photos.php:199 -msgid "Photo storage failed." +#: ../../include/diaspora.php:2443 +msgid "Disagree" msgstr "" -#: ../../include/photos.php:363 -msgid "Upload New Photos" +#: ../../include/diaspora.php:2445 +msgid "Abstain" msgstr "" #: ../../mod/achievements.php:34 @@ -3964,93 +4213,611 @@ msgstr "" msgid "Delegated Channels" msgstr "" -#: ../../mod/directory.php:59 ../../mod/photos.php:441 ../../mod/search.php:13 -#: ../../mod/ratings.php:82 ../../mod/viewconnections.php:17 -#: ../../mod/display.php:13 -msgid "Public access denied." +<<<<<<< HEAD +#: ../../mod/settings.php:76 +msgid "Name is required" msgstr "" -#: ../../mod/directory.php:234 +#: ../../mod/settings.php:80 +msgid "Key and Secret are required" +msgstr "" + +#: ../../mod/settings.php:129 +msgid "Diaspora Policy Settings updated." +msgstr "" + +#: ../../mod/settings.php:237 +msgid "Passwords do not match. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:241 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:255 +msgid "Password changed." +msgstr "" + +#: ../../mod/settings.php:257 +msgid "Password update failed. Please try again." +msgstr "" + +#: ../../mod/settings.php:271 +msgid "Not valid email." +msgstr "" + +#: ../../mod/settings.php:274 +msgid "Protected email address. Cannot change to that email." +msgstr "" + +#: ../../mod/settings.php:283 +msgid "System failure storing new email. Please try again." +msgstr "" + +#: ../../mod/settings.php:522 +msgid "Settings updated." +msgstr "" + +#: ../../mod/settings.php:578 ../../mod/api.php:106 ../../mod/photos.php:556 +#: ../../mod/menu.php:91 ../../mod/filestorage.php:151 +#: ../../mod/filestorage.php:159 ../../mod/admin.php:424 +#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554 +msgid "No" +msgstr "" + +#: ../../mod/settings.php:578 ../../mod/api.php:105 ../../mod/photos.php:556 +#: ../../mod/menu.php:91 ../../mod/filestorage.php:151 +#: ../../mod/filestorage.php:159 ../../mod/admin.php:426 +#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554 +msgid "Yes" +msgstr "" + +#: ../../mod/settings.php:586 ../../mod/settings.php:612 +#: ../../mod/settings.php:648 +msgid "Add application" +msgstr "" + +#: ../../mod/settings.php:589 +msgid "Name of application" +msgstr "" + +#: ../../mod/settings.php:590 ../../mod/settings.php:616 +msgid "Consumer Key" +msgstr "" + +#: ../../mod/settings.php:590 ../../mod/settings.php:591 +msgid "Automatically generated - change if desired. Max length 20" +======= +#: ../../mod/xchan.php:6 +msgid "Xchan Lookup" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgstr "" + +#: ../../mod/settings.php:591 ../../mod/settings.php:617 +msgid "Consumer Secret" +msgstr "" + +#: ../../mod/settings.php:592 ../../mod/settings.php:618 +msgid "Redirect" +msgstr "" + +#: ../../mod/settings.php:592 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" +msgstr "" + +#: ../../mod/settings.php:593 ../../mod/settings.php:619 +msgid "Icon url" +msgstr "" + +#: ../../mod/settings.php:593 +msgid "Optional" +msgstr "" + +#: ../../mod/settings.php:604 +msgid "You can't edit this application." +msgstr "" + +#: ../../mod/settings.php:647 +msgid "Connected Apps" +msgstr "" + +#: ../../mod/settings.php:651 +msgid "Client key starts with" +msgstr "" + +#: ../../mod/settings.php:652 +msgid "No name" +msgstr "" + +#: ../../mod/settings.php:653 +msgid "Remove authorization" +msgstr "" + +#: ../../mod/settings.php:667 +msgid "No feature settings configured" +msgstr "" + +#: ../../mod/settings.php:683 +msgid "Feature/Addon Settings" +msgstr "" + +#: ../../mod/settings.php:685 +msgid "Settings for the built-in Diaspora emulator" +msgstr "" + +#: ../../mod/settings.php:686 +msgid "Allow any Diaspora member to comment on your public posts" +msgstr "" + +#: ../../mod/settings.php:687 +msgid "Diaspora Policy Settings" +msgstr "" + +#: ../../mod/settings.php:688 +msgid "Prevent your hashtags from being redirected to other sites" +msgstr "" + +#: ../../mod/settings.php:712 +msgid "Account Settings" +msgstr "" + +#: ../../mod/settings.php:713 +msgid "Enter New Password:" +msgstr "" + +#: ../../mod/settings.php:714 +msgid "Confirm New Password:" +msgstr "" + +#: ../../mod/settings.php:714 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: ../../mod/settings.php:716 ../../mod/settings.php:1051 +msgid "Email Address:" +msgstr "" + +#: ../../mod/settings.php:717 ../../mod/removeaccount.php:61 +msgid "Remove Account" +msgstr "" + +#: ../../mod/settings.php:718 +msgid "Remove this account including all its channels" +msgstr "" + +#: ../../mod/settings.php:734 +msgid "Off" +msgstr "" + +#: ../../mod/settings.php:734 +msgid "On" +msgstr "" + +#: ../../mod/settings.php:741 +msgid "Additional Features" +msgstr "" + +#: ../../mod/settings.php:765 +msgid "Connector Settings" +msgstr "" + +#: ../../mod/settings.php:804 +msgid "No special theme for mobile devices" +msgstr "" + +#: ../../mod/settings.php:807 #, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" +msgid "%s - (Experimental)" +msgstr "" -#: ../../mod/directory.php:245 -msgid "Gender: " +#: ../../mod/settings.php:810 ../../mod/admin.php:396 +msgid "mobile" msgstr "" -#: ../../mod/directory.php:247 -msgid "Status: " +#: ../../mod/settings.php:846 +msgid "Display Settings" msgstr "" -#: ../../mod/directory.php:249 -msgid "Homepage: " +#: ../../mod/settings.php:852 +msgid "Display Theme:" +msgstr "" + +#: ../../mod/settings.php:853 +msgid "Mobile Theme:" +msgstr "" + +#: ../../mod/settings.php:854 +msgid "Enable user zoom on mobile devices" +msgstr "" + +#: ../../mod/settings.php:855 +msgid "Update browser every xx seconds" +msgstr "" + +#: ../../mod/settings.php:855 +msgid "Minimum of 10 seconds, no maximum" +msgstr "" + +#: ../../mod/settings.php:856 +msgid "Maximum number of conversations to load at any time:" +msgstr "" + +#: ../../mod/settings.php:856 +msgid "Maximum of 100 items" +msgstr "" + +#: ../../mod/settings.php:857 +msgid "Show emoticons (smilies) as images" +msgstr "" + +#: ../../mod/settings.php:858 +msgid "Link post titles to source" +msgstr "" + +#: ../../mod/settings.php:859 +msgid "System Page Layout Editor - (advanced)" +msgstr "" + +#: ../../mod/settings.php:862 +msgid "Use blog/list mode on channel page" +msgstr "" + +#: ../../mod/settings.php:862 ../../mod/settings.php:863 +msgid "(comments displayed separately)" +msgstr "" + +#: ../../mod/settings.php:863 +msgid "Use blog/list mode on matrix page" +msgstr "" + +#: ../../mod/settings.php:864 +msgid "Channel page max height of content (in pixels)" +msgstr "" + +#: ../../mod/settings.php:864 ../../mod/settings.php:865 +msgid "click to expand content exceeding this height" +msgstr "" + +#: ../../mod/settings.php:865 +msgid "Matrix page max height of content (in pixels)" +msgstr "" + +#: ../../mod/settings.php:899 +msgid "Nobody except yourself" +msgstr "" + +#: ../../mod/settings.php:900 +msgid "Only those you specifically allow" +msgstr "" + +#: ../../mod/settings.php:901 +msgid "Approved connections" +msgstr "" + +#: ../../mod/settings.php:902 +msgid "Any connections" msgstr "" -#: ../../mod/directory.php:308 ../../mod/events.php:659 +#: ../../mod/settings.php:903 +msgid "Anybody on this website" +msgstr "" + +#: ../../mod/settings.php:904 +msgid "Anybody in this network" +msgstr "" + +#: ../../mod/settings.php:905 +msgid "Anybody authenticated" +msgstr "" + +#: ../../mod/settings.php:906 +msgid "Anybody on the internet" +msgstr "" + +#: ../../mod/settings.php:980 +msgid "Publish your default profile in the network directory" +msgstr "" + +#: ../../mod/settings.php:985 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: ../../mod/settings.php:989 ../../mod/profile_photo.php:366 +msgid "or" +msgstr "" + +#: ../../mod/settings.php:994 +msgid "Your channel address is" +msgstr "" + +#: ../../mod/settings.php:1042 +msgid "Channel Settings" +msgstr "" + +#: ../../mod/settings.php:1049 +msgid "Basic Settings" +msgstr "" + +#: ../../mod/settings.php:1052 +msgid "Your Timezone:" +msgstr "" + +#: ../../mod/settings.php:1053 +msgid "Default Post Location:" +msgstr "" + +#: ../../mod/settings.php:1053 +msgid "Geographical location to display on your posts" +msgstr "" + +#: ../../mod/settings.php:1054 +msgid "Use Browser Location:" +msgstr "" + +#: ../../mod/settings.php:1056 +msgid "Adult Content" +msgstr "" + +#: ../../mod/settings.php:1056 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" +msgstr "" + +#: ../../mod/settings.php:1058 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:1060 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "" + +#: ../../mod/settings.php:1062 +msgid "Hide my online presence" +msgstr "" + +#: ../../mod/settings.php:1062 +msgid "Prevents displaying in your profile that you are online" +msgstr "" + +#: ../../mod/settings.php:1064 +msgid "Simple Privacy Settings:" +msgstr "" + +#: ../../mod/settings.php:1065 +msgid "" +"Very Public - <em>extremely permissive (should be used with caution)</em>" +msgstr "" + +#: ../../mod/settings.php:1066 +msgid "" +"Typical - <em>default public, privacy when desired (similar to social " +"network permissions but with improved privacy)</em>" +msgstr "" + +#: ../../mod/settings.php:1067 +msgid "Private - <em>default private, never open or public</em>" +msgstr "" + +#: ../../mod/settings.php:1068 +msgid "Blocked - <em>default blocked to/from everybody</em>" +msgstr "" + +#: ../../mod/settings.php:1070 +msgid "Allow others to tag your posts" +msgstr "" + +#: ../../mod/settings.php:1070 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" +msgstr "" + +#: ../../mod/settings.php:1072 +msgid "Advanced Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:1074 +msgid "Expire other channel content after this many days" +msgstr "" + +#: ../../mod/settings.php:1074 +msgid "0 or blank prevents expiration" +msgstr "" + +#: ../../mod/settings.php:1075 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../mod/settings.php:1075 +msgid "May reduce spam activity" +msgstr "" + +#: ../../mod/settings.php:1076 +msgid "Default Post Permissions" +msgstr "" + +#: ../../mod/settings.php:1077 ../../mod/mitem.php:159 ../../mod/mitem.php:229 +msgid "(click to open/close)" +msgstr "" + +#: ../../mod/settings.php:1081 +msgid "Channel permissions category:" +msgstr "" + +#: ../../mod/settings.php:1087 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: ../../mod/settings.php:1087 +msgid "Useful to reduce spamming" +msgstr "" + +#: ../../mod/settings.php:1090 +msgid "Notification Settings" +msgstr "" + +#: ../../mod/settings.php:1091 +msgid "By default post a status message when:" +msgstr "" + +#: ../../mod/settings.php:1092 +msgid "accepting a friend request" +msgstr "" + +#: ../../mod/settings.php:1093 +msgid "joining a forum/community" +msgstr "" + +#: ../../mod/settings.php:1094 +msgid "making an <em>interesting</em> profile change" +msgstr "" + +#: ../../mod/settings.php:1095 +msgid "Send a notification email when:" +msgstr "" + +#: ../../mod/settings.php:1096 +msgid "You receive a connection request" +msgstr "" + +#: ../../mod/settings.php:1097 +msgid "Your connections are confirmed" +msgstr "" + +<<<<<<< HEAD +#: ../../mod/settings.php:1098 +msgid "Someone writes on your profile wall" +======= +#: ../../mod/events.php:645 ../../mod/directory.php:301 msgid "Description:" msgstr "" -#: ../../mod/directory.php:317 -msgid "Public Forum:" +#: ../../mod/events.php:649 +msgid "Title:" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" -#: ../../mod/directory.php:320 -msgid "Keywords: " +#: ../../mod/settings.php:1099 +msgid "Someone writes a followup comment" msgstr "" -#: ../../mod/directory.php:323 -msgid "Don't suggest" +#: ../../mod/settings.php:1100 +msgid "You receive a private message" msgstr "" -#: ../../mod/directory.php:325 -msgid "Common connections:" +#: ../../mod/settings.php:1101 +msgid "You receive a friend suggestion" msgstr "" -#: ../../mod/directory.php:374 -msgid "Global Directory" +#: ../../mod/settings.php:1102 +msgid "You are tagged in a post" msgstr "" -#: ../../mod/directory.php:374 -msgid "Local Directory" +#: ../../mod/settings.php:1103 +msgid "You are poked/prodded/etc. in a post" msgstr "" -#: ../../mod/directory.php:380 -msgid "Finding:" +#: ../../mod/settings.php:1106 +msgid "Show visual notifications including:" msgstr "" -#: ../../mod/directory.php:385 -msgid "next page" +#: ../../mod/settings.php:1108 +msgid "Unseen matrix activity" msgstr "" -#: ../../mod/directory.php:385 -msgid "previous page" +#: ../../mod/settings.php:1109 +msgid "Unseen channel activity" +msgstr "" + +#: ../../mod/settings.php:1110 +msgid "Unseen private messages" msgstr "" -#: ../../mod/directory.php:386 -msgid "Sort options" +#: ../../mod/settings.php:1110 ../../mod/settings.php:1115 +#: ../../mod/settings.php:1116 ../../mod/settings.php:1117 +msgid "Recommended" msgstr "" -#: ../../mod/directory.php:387 -msgid "Alphabetic" +#: ../../mod/settings.php:1111 +msgid "Upcoming events" msgstr "" -#: ../../mod/directory.php:388 -msgid "Reverse Alphabetic" +#: ../../mod/settings.php:1112 +msgid "Events today" msgstr "" -#: ../../mod/directory.php:389 -msgid "Newest to Oldest" +#: ../../mod/settings.php:1113 +msgid "Upcoming birthdays" msgstr "" -#: ../../mod/directory.php:390 -msgid "Oldest to Newest" +#: ../../mod/settings.php:1113 +msgid "Not available in all themes" msgstr "" -#: ../../mod/directory.php:407 -msgid "No entries (some entries may be hidden)." +#: ../../mod/settings.php:1114 +msgid "System (personal) notifications" +msgstr "" + +#: ../../mod/settings.php:1115 +msgid "System info messages" +msgstr "" + +#: ../../mod/settings.php:1116 +msgid "System critical alerts" +msgstr "" + +#: ../../mod/settings.php:1117 +msgid "New connections" +msgstr "" + +#: ../../mod/settings.php:1118 +msgid "System Registrations" +msgstr "" + +#: ../../mod/settings.php:1119 +msgid "" +"Also show new wall posts, private messages and connections under Notices" +msgstr "" + +#: ../../mod/settings.php:1121 +msgid "Notify me of events this many days in advance" +msgstr "" + +#: ../../mod/settings.php:1121 +msgid "Must be greater than 0" +msgstr "" + +#: ../../mod/settings.php:1123 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: ../../mod/settings.php:1124 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: ../../mod/settings.php:1127 +msgid "" +"Please enable expert mode (in <a href=\"settings/features\">Settings > " +"Additional features</a>) to adjust!" +msgstr "" + +#: ../../mod/settings.php:1128 +msgid "Miscellaneous Settings" +msgstr "" + +#: ../../mod/settings.php:1130 +msgid "Personal menu to display in your channel pages" +msgstr "" + +#: ../../mod/settings.php:1131 ../../mod/removeme.php:61 +msgid "Remove Channel" +msgstr "" + +#: ../../mod/settings.php:1132 +msgid "Remove this channel." msgstr "" #: ../../mod/xchan.php:6 @@ -4061,7 +4828,7 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../mod/xchan.php:37 ../../mod/mitem.php:114 ../../mod/menu.php:156 +#: ../../mod/xchan.php:37 ../../mod/menu.php:152 ../../mod/mitem.php:120 msgid "Not found." msgstr "" @@ -4083,7 +4850,7 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/webpages.php:191 +#: ../../mod/webpages.php:190 msgid "Page Title" msgstr "" @@ -4103,7 +4870,7 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../mod/tagrm.php:133 ../../mod/photos.php:887 +#: ../../mod/tagrm.php:133 ../../mod/photos.php:875 msgid "Remove" msgstr "" @@ -4154,56 +4921,65 @@ msgstr "" msgid "Thing updated" msgstr "" -#: ../../mod/thing.php:167 +#: ../../mod/thing.php:153 msgid "Object store: failed" msgstr "" -#: ../../mod/thing.php:171 +#: ../../mod/thing.php:157 msgid "Thing added" msgstr "" -#: ../../mod/thing.php:203 +#: ../../mod/thing.php:175 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../mod/thing.php:254 +#: ../../mod/thing.php:226 msgid "Show Thing" msgstr "" -#: ../../mod/thing.php:261 +#: ../../mod/thing.php:233 msgid "item not found." msgstr "" -#: ../../mod/thing.php:289 +#: ../../mod/thing.php:261 msgid "Edit Thing" msgstr "" -#: ../../mod/thing.php:291 ../../mod/thing.php:338 +#: ../../mod/thing.php:263 ../../mod/thing.php:310 msgid "Select a profile" msgstr "" -#: ../../mod/thing.php:295 ../../mod/thing.php:341 +#: ../../mod/thing.php:267 ../../mod/thing.php:313 msgid "Post an activity" msgstr "" -#: ../../mod/thing.php:295 ../../mod/thing.php:341 +<<<<<<< HEAD +#: ../../mod/thing.php:267 ../../mod/thing.php:313 msgid "Only sends to viewers of the applicable profile" msgstr "" -#: ../../mod/thing.php:297 ../../mod/thing.php:343 +#: ../../mod/thing.php:269 ../../mod/thing.php:315 msgid "Name of thing e.g. something" +======= +#: ../../mod/connections.php:94 ../../mod/connedit.php:220 +msgid "Connection updated." +msgstr "" + +#: ../../mod/connections.php:96 ../../mod/connedit.php:222 +msgid "Failed to update connection record." +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" -#: ../../mod/thing.php:299 ../../mod/thing.php:344 +#: ../../mod/thing.php:271 ../../mod/thing.php:316 msgid "URL of thing (optional)" msgstr "" -#: ../../mod/thing.php:301 ../../mod/thing.php:345 +#: ../../mod/thing.php:273 ../../mod/thing.php:317 msgid "URL for photo of thing (optional)" msgstr "" -#: ../../mod/thing.php:336 +#: ../../mod/thing.php:308 msgid "Add Thing to your Profile" msgstr "" @@ -4216,6 +4992,15 @@ msgstr "" msgid "Fetching URL returns error: %1$s" msgstr "" +#: ../../mod/home.php:53 ../../mod/siteinfo.php:155 +msgid "$Projectname" +msgstr "" + +#: ../../mod/home.php:124 +#, php-format +msgid "Welcome to %s" +msgstr "" + #: ../../mod/profile_photo.php:108 msgid "Image uploaded but image cropping failed." msgstr "" @@ -4255,10 +5040,6 @@ msgstr "" msgid "Upload Profile Photo" msgstr "" -#: ../../mod/profile_photo.php:366 ../../mod/settings.php:995 -msgid "or" -msgstr "" - #: ../../mod/profile_photo.php:366 msgid "skip this step" msgstr "" @@ -4279,8 +5060,74 @@ msgstr "" msgid "Done Editing" msgstr "" +<<<<<<< HEAD #: ../../mod/profile_photo.php:428 msgid "Image uploaded successfully." +======= +#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 +#: ../../mod/display.php:13 ../../mod/ratings.php:82 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "" + +#: ../../mod/directory.php:227 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/directory.php:238 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:240 +msgid "Status: " +msgstr "" + +#: ../../mod/directory.php:242 +msgid "Homepage: " +msgstr "" + +#: ../../mod/directory.php:310 +msgid "Public Forum:" +msgstr "" + +#: ../../mod/directory.php:313 +msgid "Keywords: " +msgstr "" + +#: ../../mod/directory.php:316 +msgid "Don't suggest" +msgstr "" + +#: ../../mod/directory.php:318 +msgid "Common connections:" +msgstr "" + +#: ../../mod/directory.php:367 +msgid "Global Directory" +msgstr "" + +#: ../../mod/directory.php:367 +msgid "Local Directory" +msgstr "" + +#: ../../mod/directory.php:373 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:378 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:378 +msgid "previous page" +msgstr "" + +#: ../../mod/directory.php:394 +msgid "No entries (some entries may be hidden)." +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/profile_photo.php:430 @@ -4292,16 +5139,16 @@ msgstr "" msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/block.php:27 ../../mod/page.php:36 +#: ../../mod/block.php:27 ../../mod/page.php:33 msgid "Invalid item." msgstr "" -#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:52 +#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:49 msgid "Channel not found." msgstr "" -#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:79 -#: ../../mod/page.php:89 ../../index.php:241 +#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106 +#: ../../mod/page.php:85 ../../index.php:230 msgid "Page not found." msgstr "" @@ -4365,121 +5212,109 @@ msgstr "" msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../mod/like.php:493 +#: ../../mod/like.php:492 msgid "Action completed." msgstr "" -#: ../../mod/like.php:494 +#: ../../mod/like.php:493 msgid "Thank you." msgstr "" -#: ../../mod/events.php:21 -msgid "Calendar entries imported." -msgstr "" - -#: ../../mod/events.php:23 -msgid "No calendar entries found." -msgstr "" - -#: ../../mod/events.php:101 +#: ../../mod/events.php:87 msgid "Event can not end before it has started." msgstr "" -#: ../../mod/events.php:103 ../../mod/events.php:112 ../../mod/events.php:130 +#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116 msgid "Unable to generate preview." msgstr "" -#: ../../mod/events.php:110 +#: ../../mod/events.php:96 msgid "Event title and start time are required." msgstr "" -#: ../../mod/events.php:128 +#: ../../mod/events.php:114 msgid "Event not found." msgstr "" -#: ../../mod/events.php:409 +#: ../../mod/events.php:396 msgid "l, F j" msgstr "" -#: ../../mod/events.php:431 +#: ../../mod/events.php:418 msgid "Edit event" msgstr "" -#: ../../mod/events.php:432 +#: ../../mod/events.php:419 msgid "Delete event" msgstr "" -#: ../../mod/events.php:466 -msgid "calendar" -msgstr "" - -#: ../../mod/events.php:487 +#: ../../mod/events.php:473 msgid "Create New Event" msgstr "" -#: ../../mod/events.php:488 ../../mod/photos.php:839 +#: ../../mod/events.php:474 ../../mod/photos.php:827 msgid "Previous" msgstr "" -#: ../../mod/events.php:489 ../../mod/photos.php:848 ../../mod/setup.php:281 +#: ../../mod/events.php:475 ../../mod/photos.php:836 ../../mod/setup.php:281 msgid "Next" msgstr "" -#: ../../mod/events.php:490 +#: ../../mod/events.php:476 msgid "Export" msgstr "" -#: ../../mod/events.php:493 -msgid "Import" -msgstr "" - -#: ../../mod/events.php:518 +#: ../../mod/events.php:504 msgid "Event removed" msgstr "" -#: ../../mod/events.php:521 +#: ../../mod/events.php:507 msgid "Failed to remove event" msgstr "" -#: ../../mod/events.php:641 +#: ../../mod/events.php:627 msgid "Event details" msgstr "" -#: ../../mod/events.php:642 +#: ../../mod/events.php:628 msgid "Starting date and Title are required." msgstr "" -#: ../../mod/events.php:644 +#: ../../mod/events.php:630 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/events.php:646 +#: ../../mod/events.php:632 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:653 +#: ../../mod/events.php:639 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:655 +#: ../../mod/events.php:641 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:657 ../../mod/events.php:658 +#: ../../mod/events.php:643 ../../mod/events.php:644 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:657 +#: ../../mod/events.php:643 msgid "" "Important for events that happen in a particular place. Not practical for " "global holidays." msgstr "" -#: ../../mod/events.php:663 +#: ../../mod/events.php:645 +msgid "Description:" +msgstr "" + +#: ../../mod/events.php:649 msgid "Title:" msgstr "" -#: ../../mod/events.php:665 +#: ../../mod/events.php:651 msgid "Share this event" msgstr "" @@ -4533,7 +5368,7 @@ msgstr "" msgid "View ratings" msgstr "" -#: ../../mod/rpost.php:131 ../../mod/editpost.php:158 +#: ../../mod/rpost.php:131 ../../mod/editpost.php:42 msgid "Edit post" msgstr "" @@ -4561,6 +5396,7 @@ msgstr "" msgid "Collection Name: " msgstr "" +<<<<<<< HEAD #: ../../mod/group.php:89 ../../mod/group.php:186 msgid "Members are visible to other channels" msgstr "" @@ -4602,10 +5438,6 @@ msgstr "" msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:64 -msgid "$Projectname" -msgstr "" - #: ../../mod/siteinfo.php:156 msgid "" "This is a hub of $Projectname - a global cooperative network of " @@ -4625,84 +5457,107 @@ msgid "Running at web location" msgstr "" #: ../../mod/siteinfo.php:164 +======= +#: ../../mod/import.php:110 +msgid "The data provided is not compatible with this project." +msgstr "" + +#: ../../mod/import.php:115 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "" + +#: ../../mod/import.php:135 msgid "" -"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " -"about $Projectname." +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/siteinfo.php:165 -msgid "Bug reports and issues: please visit" +#: ../../mod/import.php:176 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/siteinfo.php:167 -msgid "$projectname issues" +#: ../../mod/import.php:186 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/siteinfo.php:168 -msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" +#: ../../mod/import.php:516 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/siteinfo.php:170 -msgid "Site Administrators" +#: ../../mod/import.php:521 +msgid "Import Channel" msgstr "" -#: ../../mod/item.php:174 -msgid "Unable to locate original post." +#: ../../mod/import.php:522 +msgid "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file." msgstr "" -#: ../../mod/item.php:440 -msgid "Empty post discarded." +#: ../../mod/import.php:523 +msgid "File to Upload" msgstr "" -#: ../../mod/item.php:480 -msgid "Executable content type not permitted to this channel." +#: ../../mod/import.php:524 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/item.php:901 -msgid "System error. Post not saved." +#: ../../mod/import.php:525 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/item.php:1119 -msgid "Unable to obtain post information from database." +#: ../../mod/import.php:526 +msgid "Your old login email address" msgstr "" -#: ../../mod/item.php:1126 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../mod/import.php:527 +msgid "Your old login password" msgstr "" -#: ../../mod/item.php:1133 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." +#: ../../mod/import.php:528 +msgid "" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." msgstr "" -#: ../../mod/network.php:91 -msgid "No such group" +#: ../../mod/import.php:529 +msgid "Make this hub my primary location" msgstr "" -#: ../../mod/network.php:129 -msgid "No such channel" +#: ../../mod/import.php:530 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../mod/network.php:143 -msgid "Search Results For:" +#: ../../mod/import.php:531 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgid "" +"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " +"about $Projectname." msgstr "" -#: ../../mod/network.php:198 -msgid "Collection is empty" +#: ../../mod/siteinfo.php:165 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/network.php:207 -msgid "Collection: " +#: ../../mod/siteinfo.php:168 +msgid "" +"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com" msgstr "" -#: ../../mod/network.php:226 -msgid "Connection: " +#: ../../mod/siteinfo.php:170 +msgid "Site Administrators" msgstr "" -#: ../../mod/network.php:233 -msgid "Invalid connection." +#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 +msgid "Help:" +msgstr "" + +#: ../../mod/help.php:76 ../../index.php:227 +msgid "Not Found" msgstr "" #: ../../mod/common.php:10 @@ -4721,80 +5576,96 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../mod/connections.php:52 ../../mod/connections.php:153 +#: ../../mod/connections.php:37 ../../mod/connedit.php:75 +msgid "Could not access contact record." +msgstr "" + +#: ../../mod/connections.php:51 ../../mod/connedit.php:99 +msgid "Could not locate selected profile." +msgstr "" + +#: ../../mod/connections.php:94 ../../mod/connedit.php:214 +msgid "Connection updated." +msgstr "" + +#: ../../mod/connections.php:96 ../../mod/connedit.php:216 +msgid "Failed to update connection record." +msgstr "" + +#: ../../mod/connections.php:192 ../../mod/connections.php:293 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:57 ../../mod/connections.php:160 +#: ../../mod/connections.php:197 ../../mod/connections.php:300 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:62 ../../mod/connections.php:174 +#: ../../mod/connections.php:202 ../../mod/connections.php:314 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:67 ../../mod/connections.php:167 +#: ../../mod/connections.php:207 ../../mod/connections.php:307 msgid "Archived" msgstr "" -#: ../../mod/connections.php:131 +#: ../../mod/connections.php:271 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:134 +#: ../../mod/connections.php:274 msgid "New Connections" msgstr "" -#: ../../mod/connections.php:137 +#: ../../mod/connections.php:277 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:140 ../../mod/profperm.php:139 +#: ../../mod/connections.php:280 ../../mod/profperm.php:139 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:143 +#: ../../mod/connections.php:283 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:146 +#: ../../mod/connections.php:286 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:149 +#: ../../mod/connections.php:289 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:156 +#: ../../mod/connections.php:296 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:163 +#: ../../mod/connections.php:303 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:170 +#: ../../mod/connections.php:310 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:177 +#: ../../mod/connections.php:317 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:232 +#: ../../mod/connections.php:372 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:233 +#: ../../mod/connections.php:373 msgid "Edit connection" msgstr "" -#: ../../mod/connections.php:271 +#: ../../mod/connections.php:411 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:272 +#: ../../mod/connections.php:412 msgid "Finding: " msgstr "" @@ -4806,175 +5677,167 @@ msgstr "" msgid "Block Title" msgstr "" -#: ../../mod/editpost.php:20 ../../mod/editlayout.php:76 -#: ../../mod/editwebpage.php:77 ../../mod/editblock.php:78 -#: ../../mod/editblock.php:94 -msgid "Item not found" -msgstr "" - -#: ../../mod/editpost.php:31 -msgid "Item is not editable" -msgstr "" - -#: ../../mod/editpost.php:48 -msgid "Delete item?" -msgstr "" - -#: ../../mod/editpost.php:115 ../../mod/editlayout.php:142 -#: ../../mod/editwebpage.php:187 ../../mod/editblock.php:144 -msgid "Insert YouTube video" -msgstr "" - -#: ../../mod/editpost.php:116 ../../mod/editlayout.php:143 -#: ../../mod/editwebpage.php:188 ../../mod/editblock.php:145 -msgid "Insert Vorbis [.ogg] video" -msgstr "" - -#: ../../mod/editpost.php:117 ../../mod/editlayout.php:144 -#: ../../mod/editwebpage.php:189 ../../mod/editblock.php:146 -msgid "Insert Vorbis [.ogg] audio" +#: ../../mod/tagger.php:96 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" #: ../../mod/cloud.php:120 msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" -#: ../../mod/photos.php:78 +#: ../../mod/photos.php:77 msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/photos.php:98 +#: ../../mod/photos.php:97 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:120 ../../mod/photos.php:655 +#: ../../mod/photos.php:119 ../../mod/photos.php:643 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:160 ../../mod/photos.php:942 +<<<<<<< HEAD +#: ../../mod/photos.php:159 ../../mod/photos.php:930 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:452 +#: ../../mod/photos.php:429 ../../mod/search.php:13 ../../mod/display.php:13 +#: ../../mod/ratings.php:82 ../../mod/directory.php:47 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +======= +#: ../../mod/rate.php:161 ../../mod/connedit.php:669 +msgid "Rating (this information is public)" +msgstr "" + +#: ../../mod/rate.php:162 ../../mod/connedit.php:670 +#: ../../mod/connedit.php:674 +msgid "Optionally explain your rating (this information is public)" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgstr "" + +#: ../../mod/photos.php:440 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:496 +#: ../../mod/photos.php:484 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:535 +#: ../../mod/photos.php:523 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:538 +#: ../../mod/photos.php:526 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:562 +#: ../../mod/photos.php:550 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927 +#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915 msgid "Enter a new album name" msgstr "" -#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928 +#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../mod/photos.php:568 +#: ../../mod/photos.php:556 msgid "Create a status post for this upload" msgstr "" -#: ../../mod/photos.php:596 +#: ../../mod/photos.php:584 msgid "Album name could not be decoded" msgstr "" -#: ../../mod/photos.php:637 ../../mod/photos.php:1169 -#: ../../mod/photos.php:1185 +#: ../../mod/photos.php:625 ../../mod/photos.php:1157 +#: ../../mod/photos.php:1173 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:661 +#: ../../mod/photos.php:649 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:663 +#: ../../mod/photos.php:651 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:687 ../../mod/photos.php:1217 +#: ../../mod/photos.php:675 ../../mod/photos.php:1205 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:716 +#: ../../mod/photos.php:704 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:761 +#: ../../mod/photos.php:749 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:763 +#: ../../mod/photos.php:751 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:821 +#: ../../mod/photos.php:809 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:828 +#: ../../mod/photos.php:816 msgid "Private Photo" msgstr "" -#: ../../mod/photos.php:843 +#: ../../mod/photos.php:831 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:921 +#: ../../mod/photos.php:909 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:923 +#: ../../mod/photos.php:911 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:924 +#: ../../mod/photos.php:912 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:931 +#: ../../mod/photos.php:919 msgid "Caption" msgstr "" -#: ../../mod/photos.php:933 +#: ../../mod/photos.php:921 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:937 +#: ../../mod/photos.php:925 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../mod/photos.php:940 +#: ../../mod/photos.php:928 msgid "Flag as adult in album view" msgstr "" -#: ../../mod/photos.php:1132 +#: ../../mod/photos.php:1120 msgid "In This Photo:" msgstr "" -#: ../../mod/photos.php:1137 +#: ../../mod/photos.php:1125 msgid "Map" msgstr "" -#: ../../mod/photos.php:1223 +#: ../../mod/photos.php:1211 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1246 +#: ../../mod/photos.php:1234 msgid "Recent Photos" msgstr "" @@ -5077,76 +5940,76 @@ msgstr "" msgid "Your service plan only allows %d channels." msgstr "" -#: ../../mod/import.php:60 +#: ../../mod/import.php:51 msgid "Nothing to import." msgstr "" -#: ../../mod/import.php:84 +#: ../../mod/import.php:75 msgid "Unable to download data from old server" msgstr "" -#: ../../mod/import.php:90 +#: ../../mod/import.php:81 msgid "Imported file is empty." msgstr "" -#: ../../mod/import.php:110 -msgid "The data provided is not compatible with this project." -msgstr "" - -#: ../../mod/import.php:115 -#, php-format -msgid "Warning: Database versions differ by %1$d updates." -msgstr "" - -#: ../../mod/import.php:135 +#: ../../mod/import.php:106 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/import.php:176 +#: ../../mod/import.php:127 +msgid "Unable to create a unique channel address. Import failed." +msgstr "" + +#: ../../mod/import.php:147 msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/import.php:186 +#: ../../mod/import.php:157 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:574 +#: ../../mod/import.php:475 +msgid "Import completed." +msgstr "" + +#: ../../mod/import.php:487 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:579 +#: ../../mod/import.php:492 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:580 +#: ../../mod/import.php:493 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " -"provide an export file." +"provide an export file. Only identity and connections/relationships will be " +"imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:581 +#: ../../mod/import.php:494 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:582 +#: ../../mod/import.php:495 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:583 +#: ../../mod/import.php:496 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:584 +#: ../../mod/import.php:497 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:585 +#: ../../mod/import.php:498 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:586 +#: ../../mod/import.php:499 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -5154,38 +6017,52 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:587 +#: ../../mod/import.php:500 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/import.php:588 -msgid "" -"Import existing posts if possible (experimental - limited by available memory" +#: ../../mod/import.php:501 +msgid "Import existing posts if possible" msgstr "" -#: ../../mod/import.php:589 -msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +#: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77 +#: ../../mod/editpost.php:20 ../../mod/editblock.php:78 +#: ../../mod/editblock.php:94 +msgid "Item not found" msgstr "" -#: ../../mod/editlayout.php:111 +#: ../../mod/editlayout.php:106 +msgid "Edit Layout" +msgstr "" + +#: ../../mod/editlayout.php:117 msgid "Delete layout?" msgstr "" -#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124 +#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:187 +#: ../../mod/editpost.php:122 ../../mod/editblock.php:150 +msgid "Insert YouTube video" +msgstr "" + +#: ../../mod/editlayout.php:149 ../../mod/editwebpage.php:188 +#: ../../mod/editpost.php:123 ../../mod/editblock.php:151 +msgid "Insert Vorbis [.ogg] video" +msgstr "" + +#: ../../mod/editlayout.php:150 ../../mod/editwebpage.php:189 +#: ../../mod/editpost.php:124 ../../mod/editblock.php:152 +msgid "Insert Vorbis [.ogg] audio" +msgstr "" + +#: ../../mod/editlayout.php:164 ../../mod/layouts.php:124 msgid "Layout Description (Optional)" msgstr "" -#: ../../mod/editlayout.php:160 ../../mod/layouts.php:121 +#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121 #: ../../mod/layouts.php:179 msgid "Layout Name" msgstr "" -#: ../../mod/editlayout.php:177 -msgid "Edit Layout" -msgstr "" - #: ../../mod/chat.php:19 ../../mod/channel.php:25 msgid "You must be logged in to see this page." msgstr "" @@ -5227,126 +6104,6 @@ msgstr "" msgid "%1$s's Chatrooms" msgstr "" -#: ../../mod/mitem.php:24 ../../mod/menu.php:134 -msgid "Menu not found." -msgstr "" - -#: ../../mod/mitem.php:48 -msgid "Unable to create element." -msgstr "" - -#: ../../mod/mitem.php:71 -msgid "Unable to update menu element." -msgstr "" - -#: ../../mod/mitem.php:86 -msgid "Unable to add menu element." -msgstr "" - -#: ../../mod/mitem.php:152 ../../mod/mitem.php:223 -msgid "Menu Item Permissions" -msgstr "" - -#: ../../mod/mitem.php:153 ../../mod/mitem.php:224 ../../mod/settings.php:1083 -msgid "(click to open/close)" -msgstr "" - -#: ../../mod/mitem.php:155 ../../mod/mitem.php:171 -msgid "Link Name" -msgstr "" - -#: ../../mod/mitem.php:156 ../../mod/mitem.php:228 -msgid "Link or Submenu Target" -msgstr "" - -#: ../../mod/mitem.php:156 -msgid "Enter URL of the link or select a menu name to create a submenu" -msgstr "" - -#: ../../mod/mitem.php:157 ../../mod/mitem.php:229 -msgid "Use magic-auth if available" -msgstr "" - -#: ../../mod/mitem.php:158 ../../mod/mitem.php:230 -msgid "Open link in new window" -msgstr "" - -#: ../../mod/mitem.php:159 ../../mod/mitem.php:231 -msgid "Order in list" -msgstr "" - -#: ../../mod/mitem.php:159 ../../mod/mitem.php:231 -msgid "Higher numbers will sink to bottom of listing" -msgstr "" - -#: ../../mod/mitem.php:160 -msgid "Submit and finish" -msgstr "" - -#: ../../mod/mitem.php:161 -msgid "Submit and continue" -msgstr "" - -#: ../../mod/mitem.php:169 -msgid "Menu:" -msgstr "" - -#: ../../mod/mitem.php:172 -msgid "Link Target" -msgstr "" - -#: ../../mod/mitem.php:175 -msgid "Edit menu" -msgstr "" - -#: ../../mod/mitem.php:178 -msgid "Edit element" -msgstr "" - -#: ../../mod/mitem.php:179 -msgid "Drop element" -msgstr "" - -#: ../../mod/mitem.php:180 -msgid "New element" -msgstr "" - -#: ../../mod/mitem.php:181 -msgid "Edit this menu container" -msgstr "" - -#: ../../mod/mitem.php:182 -msgid "Add menu element" -msgstr "" - -#: ../../mod/mitem.php:183 -msgid "Delete this menu item" -msgstr "" - -#: ../../mod/mitem.php:184 -msgid "Edit this menu item" -msgstr "" - -#: ../../mod/mitem.php:201 -msgid "Menu item not found." -msgstr "" - -#: ../../mod/mitem.php:212 -msgid "Menu item deleted." -msgstr "" - -#: ../../mod/mitem.php:214 -msgid "Menu item could not be deleted." -msgstr "" - -#: ../../mod/mitem.php:221 -msgid "Edit Menu Element" -msgstr "" - -#: ../../mod/mitem.php:227 -msgid "Link text" -msgstr "" - #: ../../mod/editwebpage.php:152 msgid "Delete webpage?" msgstr "" @@ -5371,7 +6128,7 @@ msgstr "" msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103 +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 #, php-format msgid "Site Member (%s)" msgstr "" @@ -5387,52 +6144,52 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:86 ../../boot.php:1558 +#: ../../mod/lostpass.php:85 ../../boot.php:1558 msgid "Password Reset" msgstr "" -#: ../../mod/lostpass.php:87 +#: ../../mod/lostpass.php:86 msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/lostpass.php:88 +#: ../../mod/lostpass.php:87 msgid "Your new password is" msgstr "" -#: ../../mod/lostpass.php:89 +#: ../../mod/lostpass.php:88 msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/lostpass.php:90 +#: ../../mod/lostpass.php:89 msgid "click here to login" msgstr "" -#: ../../mod/lostpass.php:91 +#: ../../mod/lostpass.php:90 msgid "" "Your password may be changed from the <em>Settings</em> page after " "successful login." msgstr "" -#: ../../mod/lostpass.php:108 +#: ../../mod/lostpass.php:107 #, php-format msgid "Your password has changed at %s" msgstr "" -#: ../../mod/lostpass.php:123 +#: ../../mod/lostpass.php:122 msgid "Forgot your Password?" msgstr "" -#: ../../mod/lostpass.php:124 +#: ../../mod/lostpass.php:123 msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "" -#: ../../mod/lostpass.php:125 +#: ../../mod/lostpass.php:124 msgid "Email Address" msgstr "" -#: ../../mod/lostpass.php:126 +#: ../../mod/lostpass.php:125 msgid "Reset" msgstr "" @@ -5445,20 +6202,20 @@ msgstr "" msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../mod/rate.php:161 +#: ../../mod/rate.php:161 ../../mod/connedit.php:663 msgid "Rating (this information is public)" msgstr "" -#: ../../mod/rate.php:162 +#: ../../mod/rate.php:162 ../../mod/connedit.php:664 msgid "Optionally explain your rating (this information is public)" msgstr "" -#: ../../mod/editblock.php:117 -msgid "Delete block?" +#: ../../mod/editpost.php:31 +msgid "Item is not editable" msgstr "" -#: ../../mod/editblock.php:179 -msgid "Edit Block" +#: ../../mod/editpost.php:53 +msgid "Delete item?" msgstr "" #: ../../mod/invite.php:25 @@ -5649,11 +6406,11 @@ msgstr "" msgid "Allow Bookmarks" msgstr "" -#: ../../mod/menu.php:91 ../../mod/menu.php:147 +#: ../../mod/menu.php:91 ../../mod/menu.php:143 msgid "Menu may be used to store saved bookmarks" msgstr "" -#: ../../mod/menu.php:92 ../../mod/menu.php:149 +#: ../../mod/menu.php:92 msgid "Submit and proceed" msgstr "" @@ -5661,54 +6418,62 @@ msgstr "" msgid "Drop" msgstr "" -#: ../../mod/menu.php:108 +#: ../../mod/menu.php:106 msgid "Bookmarks allowed" msgstr "" -#: ../../mod/menu.php:110 +#: ../../mod/menu.php:108 msgid "Delete this menu" msgstr "" -#: ../../mod/menu.php:111 ../../mod/menu.php:144 +#: ../../mod/menu.php:109 ../../mod/menu.php:140 msgid "Edit menu contents" msgstr "" -#: ../../mod/menu.php:112 +#: ../../mod/menu.php:110 msgid "Edit this menu" msgstr "" -#: ../../mod/menu.php:126 +#: ../../mod/menu.php:124 msgid "Menu could not be deleted." msgstr "" -#: ../../mod/menu.php:139 +#: ../../mod/menu.php:132 ../../mod/mitem.php:24 +msgid "Menu not found." +msgstr "" + +#: ../../mod/menu.php:137 msgid "Edit Menu" msgstr "" -#: ../../mod/menu.php:143 +#: ../../mod/menu.php:139 msgid "Add or remove entries to this menu" msgstr "" -#: ../../mod/menu.php:145 +#: ../../mod/menu.php:141 msgid "Menu name" msgstr "" -#: ../../mod/menu.php:145 +#: ../../mod/menu.php:141 msgid "Must be unique, only seen by you" msgstr "" -#: ../../mod/menu.php:146 +#: ../../mod/menu.php:142 msgid "Menu title" msgstr "" -#: ../../mod/menu.php:146 +#: ../../mod/menu.php:142 msgid "Menu title as seen by others" msgstr "" -#: ../../mod/menu.php:147 +#: ../../mod/menu.php:143 msgid "Allow bookmarks" msgstr "" +#: ../../mod/menu.php:145 +msgid "Modify" +msgstr "" + #: ../../mod/filestorage.php:82 msgid "Permission Denied." msgstr "" @@ -5810,12 +6575,16 @@ msgstr "" msgid "Visible To" msgstr "" -#: ../../mod/impel.php:191 +#: ../../mod/impel.php:54 +msgid "menu" +msgstr "" + +#: ../../mod/impel.php:186 #, php-format msgid "%s element installed" msgstr "" -#: ../../mod/impel.php:194 +#: ../../mod/impel.php:189 #, php-format msgid "%s element installation failed" msgstr "" @@ -5893,7 +6662,7 @@ msgstr "" msgid "Interests" msgstr "" -#: ../../mod/profiles.php:447 ../../mod/admin.php:994 +#: ../../mod/profiles.php:447 ../../mod/admin.php:985 msgid "Address" msgstr "" @@ -5949,8 +6718,18 @@ msgstr "" msgid "Title/Description:" msgstr "" +<<<<<<< HEAD #: ../../mod/profiles.php:680 msgid "Your Gender:" +======= +#: ../../mod/tagger.php:96 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "" + +#: ../../mod/uexport.php:33 ../../mod/uexport.php:34 +msgid "Export Channel" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/profiles.php:681 @@ -6061,7 +6840,7 @@ msgstr "" msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:728 +#: ../../mod/profiles.php:728 ../../mod/directory.php:218 msgid "Age: " msgstr "" @@ -6516,27 +7295,89 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../mod/tagger.php:96 +#: ../../mod/directory.php:224 #, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/directory.php:236 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:238 +msgid "Status: " +msgstr "" + +#: ../../mod/directory.php:240 +msgid "Homepage: " +msgstr "" + +#: ../../mod/directory.php:243 +msgid "Hometown: " +msgstr "" + +#: ../../mod/directory.php:245 +msgid "About: " +msgstr "" + +#: ../../mod/directory.php:303 +msgid "Public Forum:" +msgstr "" + +<<<<<<< HEAD +#: ../../mod/directory.php:306 +msgid "Keywords: " +msgstr "" + +#: ../../mod/directory.php:311 +#, php-format +msgid "Common connections: %s" +======= +#: ../../mod/admin.php:827 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 +msgid "Block" +msgstr "" + +#: ../../mod/admin.php:828 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 +msgid "Unblock" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgstr "" + +#: ../../mod/directory.php:363 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:368 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:368 +msgid "previous page" msgstr "" -#: ../../mod/uexport.php:45 ../../mod/uexport.php:46 +#: ../../mod/directory.php:385 +msgid "No entries (some entries may be hidden)." +msgstr "" + +#: ../../mod/uexport.php:33 ../../mod/uexport.php:34 msgid "Export Channel" msgstr "" -#: ../../mod/uexport.php:47 +#: ../../mod/uexport.php:35 msgid "" "Export your basic channel information to a small file. This acts as a " "backup of your connections, permissions, profile and basic data, which can " "be used to import your data to a new hub, but\tdoes not contain your content." msgstr "" -#: ../../mod/uexport.php:48 +#: ../../mod/uexport.php:36 msgid "Export Content" msgstr "" -#: ../../mod/uexport.php:49 +#: ../../mod/uexport.php:37 msgid "" "Export your channel information and all the content to a JSON backup. This " "backs up all of your connections, permissions, profile data and all of your " @@ -6562,7 +7403,7 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:93 ../../mod/admin.php:452 +#: ../../mod/admin.php:93 ../../mod/admin.php:445 msgid "Site" msgstr "" @@ -6570,15 +7411,15 @@ msgstr "" msgid "Accounts" msgstr "" -#: ../../mod/admin.php:95 ../../mod/admin.php:985 +#: ../../mod/admin.php:95 ../../mod/admin.php:976 msgid "Channels" msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:1077 ../../mod/admin.php:1117 +#: ../../mod/admin.php:96 ../../mod/admin.php:1068 ../../mod/admin.php:1108 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:1277 ../../mod/admin.php:1311 +#: ../../mod/admin.php:97 ../../mod/admin.php:1268 ../../mod/admin.php:1302 msgid "Themes" msgstr "" @@ -6594,7 +7435,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1396 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1387 msgid "Logs" msgstr "" @@ -6638,10 +7479,10 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:240 ../../mod/admin.php:451 ../../mod/admin.php:548 -#: ../../mod/admin.php:817 ../../mod/admin.php:984 ../../mod/admin.php:1076 -#: ../../mod/admin.php:1116 ../../mod/admin.php:1276 ../../mod/admin.php:1310 -#: ../../mod/admin.php:1395 +#: ../../mod/admin.php:240 ../../mod/admin.php:444 ../../mod/admin.php:539 +#: ../../mod/admin.php:808 ../../mod/admin.php:975 ../../mod/admin.php:1067 +#: ../../mod/admin.php:1107 ../../mod/admin.php:1267 ../../mod/admin.php:1301 +#: ../../mod/admin.php:1386 msgid "Administration" msgstr "" @@ -6653,7 +7494,7 @@ msgstr "" msgid "Registered accounts" msgstr "" -#: ../../mod/admin.php:245 ../../mod/admin.php:552 +#: ../../mod/admin.php:245 ../../mod/admin.php:543 msgid "Pending registrations" msgstr "" @@ -6661,7 +7502,7 @@ msgstr "" msgid "Registered channels" msgstr "" -#: ../../mod/admin.php:247 ../../mod/admin.php:553 +#: ../../mod/admin.php:247 ../../mod/admin.php:544 msgid "Active plugins" msgstr "" @@ -6669,680 +7510,654 @@ msgstr "" msgid "Version" msgstr "" -#: ../../mod/admin.php:363 +#: ../../mod/admin.php:359 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:400 ../../mod/settings.php:813 -msgid "mobile" -msgstr "" - -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:398 msgid "experimental" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:400 msgid "unsupported" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:425 msgid "Yes - with approval" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:431 msgid "My site is not a public server" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:432 msgid "My site has paid access only" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:433 msgid "My site has free access only" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:434 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../mod/admin.php:454 ../../mod/register.php:207 +#: ../../mod/admin.php:447 ../../mod/register.php:207 msgid "Registration" msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:448 msgid "File upload" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:449 msgid "Policies" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:454 msgid "Site name" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:455 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:456 msgid "Administrator Information" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:456 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:457 msgid "System language" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:458 msgid "System theme" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:458 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:459 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:459 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:461 msgid "Enable Diaspora Protocol" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:461 msgid "Communicate with Diaspora and Friendica - experimental" msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:462 msgid "Allow Feeds as Connections" msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:462 msgid "(Heavy system resource usage)" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:463 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:463 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:464 msgid "Does this site allow new member registration?" msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:465 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:466 msgid "Register text" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:466 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:474 -msgid "Site homepage to show visitors (default: login box)" -msgstr "" - -#: ../../mod/admin.php:474 -msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " -"webpage called 'home' or 'include:home.html' to include a file." -msgstr "" - -#: ../../mod/admin.php:475 -msgid "Preserve site homepage URL" -msgstr "" - -#: ../../mod/admin.php:475 -msgid "" -"Present the site homepage in a frame at the original location instead of " -"redirecting" -msgstr "" - -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:467 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:467 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:468 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:468 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:469 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:469 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:470 msgid "Not allowed email domains" msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:470 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:471 msgid "Block public" msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:471 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:472 msgid "Verify Email Addresses" msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:472 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:473 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:473 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:474 msgid "Disable discovery tab" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:474 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "" -#: ../../mod/admin.php:484 -msgid "login on Homepage" +#: ../../mod/admin.php:475 +msgid "No login on Homepage" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:475 msgid "" -"Present a login box to visitors on the home page if no other content has " -"been configured." +"Check to hide the login form from your sites homepage when visitors arrive " +"who are not logged in (e.g. when you put the content of the homepage in via " +"the site channel)." msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:477 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:478 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:479 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:479 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:480 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:480 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:481 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:481 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:482 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:482 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:483 msgid "Expiration period in days for imported (matrix/network) content" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:483 msgid "0 for no expiration of imported content" msgstr "" -#: ../../mod/admin.php:540 +#: ../../mod/admin.php:531 msgid "No server found" msgstr "" -#: ../../mod/admin.php:547 ../../mod/admin.php:831 +#: ../../mod/admin.php:538 ../../mod/admin.php:822 msgid "ID" msgstr "" -#: ../../mod/admin.php:547 +#: ../../mod/admin.php:538 msgid "for channel" msgstr "" -#: ../../mod/admin.php:547 +#: ../../mod/admin.php:538 msgid "on server" msgstr "" -#: ../../mod/admin.php:547 +#: ../../mod/admin.php:538 msgid "Status" msgstr "" -#: ../../mod/admin.php:549 +#: ../../mod/admin.php:540 msgid "Server" msgstr "" -#: ../../mod/admin.php:566 +#: ../../mod/admin.php:557 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:567 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:579 +#: ../../mod/admin.php:570 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:583 +#: ../../mod/admin.php:574 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:586 +#: ../../mod/admin.php:577 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:602 +#: ../../mod/admin.php:593 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:606 +#: ../../mod/admin.php:597 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:608 +#: ../../mod/admin.php:599 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:609 +#: ../../mod/admin.php:600 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:641 +#: ../../mod/admin.php:632 msgid "Queue Statistics" msgstr "" -#: ../../mod/admin.php:642 +#: ../../mod/admin.php:633 msgid "Total Entries" msgstr "" -#: ../../mod/admin.php:643 +#: ../../mod/admin.php:634 msgid "Priority" msgstr "" -#: ../../mod/admin.php:644 +#: ../../mod/admin.php:635 msgid "Destination URL" msgstr "" -#: ../../mod/admin.php:645 +#: ../../mod/admin.php:636 msgid "Mark hub permanently offline" msgstr "" -#: ../../mod/admin.php:646 +#: ../../mod/admin.php:637 msgid "Empty queue for this hub" msgstr "" -#: ../../mod/admin.php:647 +#: ../../mod/admin.php:638 msgid "Last known contact" msgstr "" -#: ../../mod/admin.php:683 +#: ../../mod/admin.php:674 #, php-format -msgid "%s account blocked/unblocked" -msgid_plural "%s account blocked/unblocked" +msgid "%s user blocked/unblocked" +msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:682 #, php-format -msgid "%s account deleted" -msgid_plural "%s accounts deleted" +msgid "%s user deleted" +msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:727 +#: ../../mod/admin.php:718 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:739 -#, php-format -msgid "Account '%s' deleted" -msgstr "" - -#: ../../mod/admin.php:747 +#: ../../mod/admin.php:738 #, php-format -msgid "Account '%s' blocked" +msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:755 +#: ../../mod/admin.php:746 #, php-format -msgid "Account '%s' unblocked" +msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:818 ../../mod/admin.php:830 +#: ../../mod/admin.php:809 ../../mod/admin.php:821 msgid "Users" msgstr "" -#: ../../mod/admin.php:820 ../../mod/admin.php:987 +#: ../../mod/admin.php:811 ../../mod/admin.php:978 msgid "select all" msgstr "" -#: ../../mod/admin.php:821 +#: ../../mod/admin.php:812 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:822 +#: ../../mod/admin.php:813 msgid "Request date" msgstr "" -#: ../../mod/admin.php:823 +#: ../../mod/admin.php:814 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:824 ../../mod/connedit.php:699 +#: ../../mod/admin.php:815 msgid "Approve" msgstr "" -#: ../../mod/admin.php:825 +#: ../../mod/admin.php:816 msgid "Deny" msgstr "" -#: ../../mod/admin.php:827 ../../mod/connedit.php:531 +#: ../../mod/admin.php:818 ../../mod/connedit.php:517 +#: ../../mod/connedit.php:720 msgid "Block" msgstr "" -#: ../../mod/admin.php:828 ../../mod/connedit.php:531 +#: ../../mod/admin.php:819 ../../mod/connedit.php:517 +#: ../../mod/connedit.php:720 msgid "Unblock" msgstr "" -#: ../../mod/admin.php:831 +#: ../../mod/admin.php:822 msgid "Register date" msgstr "" -#: ../../mod/admin.php:831 +#: ../../mod/admin.php:822 msgid "Last login" msgstr "" -#: ../../mod/admin.php:831 +#: ../../mod/admin.php:822 msgid "Expires" msgstr "" -#: ../../mod/admin.php:831 +#: ../../mod/admin.php:822 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:833 +#: ../../mod/admin.php:824 msgid "" -"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " -"on this site will be permanently deleted!\\n\\nAre you sure?" +"Selected users will be deleted!\\n\\nEverything these users had posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:834 +#: ../../mod/admin.php:825 msgid "" -"The account {0} will be deleted!\\n\\nEverything this account has posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" +"The user {0} will be deleted!\\n\\nEverything this user has posted on this " +"site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:870 +#: ../../mod/admin.php:861 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channels censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:879 +#: ../../mod/admin.php:870 #, php-format msgid "%s channel code allowed/disallowed" msgid_plural "%s channels code allowed/disallowed" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:886 +#: ../../mod/admin.php:877 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:906 +#: ../../mod/admin.php:897 msgid "Channel not found" msgstr "" -#: ../../mod/admin.php:917 +#: ../../mod/admin.php:908 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:929 +#: ../../mod/admin.php:920 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:929 +#: ../../mod/admin.php:920 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:940 +#: ../../mod/admin.php:931 #, php-format msgid "Channel '%s' code allowed" msgstr "" -#: ../../mod/admin.php:940 +#: ../../mod/admin.php:931 #, php-format msgid "Channel '%s' code disallowed" msgstr "" -#: ../../mod/admin.php:989 +#: ../../mod/admin.php:980 msgid "Censor" msgstr "" -#: ../../mod/admin.php:990 +#: ../../mod/admin.php:981 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:991 +#: ../../mod/admin.php:982 msgid "Allow Code" msgstr "" -#: ../../mod/admin.php:992 +#: ../../mod/admin.php:983 msgid "Disallow Code" msgstr "" -#: ../../mod/admin.php:994 +#: ../../mod/admin.php:985 msgid "UID" msgstr "" -#: ../../mod/admin.php:996 +#: ../../mod/admin.php:987 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:997 +#: ../../mod/admin.php:988 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:1037 +#: ../../mod/admin.php:1028 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:1041 +#: ../../mod/admin.php:1032 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:1051 ../../mod/admin.php:1249 +#: ../../mod/admin.php:1042 ../../mod/admin.php:1240 msgid "Disable" msgstr "" -#: ../../mod/admin.php:1054 ../../mod/admin.php:1251 +#: ../../mod/admin.php:1045 ../../mod/admin.php:1242 msgid "Enable" msgstr "" -#: ../../mod/admin.php:1078 ../../mod/admin.php:1278 +#: ../../mod/admin.php:1069 ../../mod/admin.php:1269 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:1086 ../../mod/admin.php:1288 +#: ../../mod/admin.php:1077 ../../mod/admin.php:1279 msgid "Author: " msgstr "" -#: ../../mod/admin.php:1087 ../../mod/admin.php:1289 +#: ../../mod/admin.php:1078 ../../mod/admin.php:1280 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1214 +#: ../../mod/admin.php:1205 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1270 +#: ../../mod/admin.php:1261 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1316 +#: ../../mod/admin.php:1307 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1317 +#: ../../mod/admin.php:1308 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1341 +#: ../../mod/admin.php:1332 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1398 +#: ../../mod/admin.php:1389 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1404 +#: ../../mod/admin.php:1395 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1405 +#: ../../mod/admin.php:1396 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1405 +#: ../../mod/admin.php:1396 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1406 +#: ../../mod/admin.php:1397 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1452 +#: ../../mod/admin.php:1443 msgid "New Profile Field" msgstr "" -#: ../../mod/admin.php:1453 ../../mod/admin.php:1473 +#: ../../mod/admin.php:1444 ../../mod/admin.php:1464 msgid "Field nickname" msgstr "" -#: ../../mod/admin.php:1453 ../../mod/admin.php:1473 +#: ../../mod/admin.php:1444 ../../mod/admin.php:1464 msgid "System name of field" msgstr "" -#: ../../mod/admin.php:1454 ../../mod/admin.php:1474 +#: ../../mod/admin.php:1445 ../../mod/admin.php:1465 msgid "Input type" msgstr "" -#: ../../mod/admin.php:1455 ../../mod/admin.php:1475 +#: ../../mod/admin.php:1446 ../../mod/admin.php:1466 msgid "Field Name" msgstr "" -#: ../../mod/admin.php:1455 ../../mod/admin.php:1475 +#: ../../mod/admin.php:1446 ../../mod/admin.php:1466 msgid "Label on profile pages" msgstr "" -#: ../../mod/admin.php:1456 ../../mod/admin.php:1476 +#: ../../mod/admin.php:1447 ../../mod/admin.php:1467 msgid "Help text" msgstr "" -#: ../../mod/admin.php:1456 ../../mod/admin.php:1476 +#: ../../mod/admin.php:1447 ../../mod/admin.php:1467 msgid "Additional info (optional)" msgstr "" -#: ../../mod/admin.php:1466 +#: ../../mod/admin.php:1457 msgid "Field definition not found" msgstr "" -#: ../../mod/admin.php:1472 +#: ../../mod/admin.php:1463 msgid "Edit Profile Field" msgstr "" @@ -7354,6 +8169,14 @@ msgstr "" msgid "Post successful." msgstr "" +#: ../../mod/editblock.php:112 +msgid "Edit Block" +msgstr "" + +#: ../../mod/editblock.php:123 +msgid "Delete block?" +msgstr "" + #: ../../mod/register.php:44 msgid "Maximum daily site registrations exceeded. Please try again tomorrow." msgstr "" @@ -7468,691 +8291,252 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720 -msgid "Remove Account" -msgstr "" - -#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 -msgid "Help:" -msgstr "" - -#: ../../mod/help.php:76 ../../index.php:238 -msgid "Not Found" -msgstr "" - -#: ../../mod/help.php:100 -msgid "$Projectname Documentation" -msgstr "" - -#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 -#: ../../mod/update_network.php:23 ../../mod/update_search.php:46 -#: ../../mod/update_home.php:21 ../../mod/update_public.php:21 -msgid "[Embedded content - reload page to view]" -msgstr "" - -#: ../../mod/lockview.php:37 -msgid "Remote privacy information not available." -msgstr "" - -#: ../../mod/lockview.php:58 -msgid "Visible to:" -msgstr "" - -#: ../../mod/settings.php:76 -msgid "Name is required" -msgstr "" - -#: ../../mod/settings.php:80 -msgid "Key and Secret are required" -msgstr "" - -#: ../../mod/settings.php:130 -msgid "Diaspora Policy Settings updated." -msgstr "" - -#: ../../mod/settings.php:238 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:242 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:256 -msgid "Password changed." -msgstr "" - -#: ../../mod/settings.php:258 -msgid "Password update failed. Please try again." -msgstr "" - -#: ../../mod/settings.php:272 -msgid "Not valid email." -msgstr "" - -#: ../../mod/settings.php:275 -msgid "Protected email address. Cannot change to that email." -msgstr "" - -#: ../../mod/settings.php:284 -msgid "System failure storing new email. Please try again." -msgstr "" - -#: ../../mod/settings.php:523 -msgid "Settings updated." -msgstr "" - -#: ../../mod/settings.php:587 ../../mod/settings.php:613 -#: ../../mod/settings.php:649 -msgid "Add application" -msgstr "" - -#: ../../mod/settings.php:590 -msgid "Name of application" -msgstr "" - -#: ../../mod/settings.php:591 ../../mod/settings.php:617 -msgid "Consumer Key" -msgstr "" - -#: ../../mod/settings.php:591 ../../mod/settings.php:592 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - -#: ../../mod/settings.php:592 ../../mod/settings.php:618 -msgid "Consumer Secret" -msgstr "" - -#: ../../mod/settings.php:593 ../../mod/settings.php:619 -msgid "Redirect" -msgstr "" - -#: ../../mod/settings.php:593 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" -msgstr "" - -#: ../../mod/settings.php:594 ../../mod/settings.php:620 -msgid "Icon url" -msgstr "" - -#: ../../mod/settings.php:594 -msgid "Optional" -msgstr "" - -#: ../../mod/settings.php:605 -msgid "You can't edit this application." -msgstr "" - -#: ../../mod/settings.php:648 -msgid "Connected Apps" -msgstr "" - -#: ../../mod/settings.php:652 -msgid "Client key starts with" -msgstr "" - -#: ../../mod/settings.php:653 -msgid "No name" -msgstr "" - -#: ../../mod/settings.php:654 -msgid "Remove authorization" -msgstr "" - -#: ../../mod/settings.php:668 -msgid "No feature settings configured" -msgstr "" - -#: ../../mod/settings.php:685 -msgid "Feature/Addon Settings" -msgstr "" - -#: ../../mod/settings.php:687 -msgid "Settings for the built-in Diaspora emulator" -msgstr "" - -#: ../../mod/settings.php:688 -msgid "Allow any Diaspora member to comment on your public posts" -msgstr "" - -#: ../../mod/settings.php:689 -msgid "Enable the Diaspora protocol for this channel" -msgstr "" - -#: ../../mod/settings.php:690 -msgid "Diaspora Policy Settings" -msgstr "" - -#: ../../mod/settings.php:691 -msgid "Prevent your hashtags from being redirected to other sites" -msgstr "" - -#: ../../mod/settings.php:715 -msgid "Account Settings" -msgstr "" - -#: ../../mod/settings.php:716 -msgid "Enter New Password:" -msgstr "" - -#: ../../mod/settings.php:717 -msgid "Confirm New Password:" -msgstr "" - -#: ../../mod/settings.php:717 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: ../../mod/settings.php:719 ../../mod/settings.php:1057 -msgid "Email Address:" -msgstr "" - -#: ../../mod/settings.php:721 -msgid "Remove this account including all its channels" -msgstr "" - -#: ../../mod/settings.php:737 -msgid "Off" +#: ../../mod/item.php:174 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/settings.php:737 -msgid "On" +#: ../../mod/item.php:440 +msgid "Empty post discarded." msgstr "" -#: ../../mod/settings.php:744 -msgid "Additional Features" +#: ../../mod/item.php:480 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/settings.php:768 -msgid "Connector Settings" +#: ../../mod/item.php:897 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/settings.php:807 -msgid "No special theme for mobile devices" +#: ../../mod/item.php:1115 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../mod/settings.php:810 +#: ../../mod/item.php:1122 #, php-format -msgid "%s - (Experimental)" -msgstr "" - -#: ../../mod/settings.php:849 -msgid "Display Settings" -msgstr "" - -#: ../../mod/settings.php:850 -msgid "Theme Settings" -msgstr "" - -#: ../../mod/settings.php:851 -msgid "Custom Theme Settings" -msgstr "" - -#: ../../mod/settings.php:852 -msgid "Content Settings" -msgstr "" - -#: ../../mod/settings.php:858 -msgid "Display Theme:" -msgstr "" - -#: ../../mod/settings.php:859 -msgid "Mobile Theme:" -msgstr "" - -#: ../../mod/settings.php:860 -msgid "Enable user zoom on mobile devices" -msgstr "" - -#: ../../mod/settings.php:861 -msgid "Update browser every xx seconds" -msgstr "" - -#: ../../mod/settings.php:861 -msgid "Minimum of 10 seconds, no maximum" -msgstr "" - -#: ../../mod/settings.php:862 -msgid "Maximum number of conversations to load at any time:" -msgstr "" - -#: ../../mod/settings.php:862 -msgid "Maximum of 100 items" -msgstr "" - -#: ../../mod/settings.php:863 -msgid "Show emoticons (smilies) as images" -msgstr "" - -#: ../../mod/settings.php:864 -msgid "Link post titles to source" -msgstr "" - -#: ../../mod/settings.php:865 -msgid "System Page Layout Editor - (advanced)" -msgstr "" - -#: ../../mod/settings.php:868 -msgid "Use blog/list mode on channel page" -msgstr "" - -#: ../../mod/settings.php:868 ../../mod/settings.php:869 -msgid "(comments displayed separately)" -msgstr "" - -#: ../../mod/settings.php:869 -msgid "Use blog/list mode on matrix page" -msgstr "" - -#: ../../mod/settings.php:870 -msgid "Channel page max height of content (in pixels)" -msgstr "" - -#: ../../mod/settings.php:870 ../../mod/settings.php:871 -msgid "click to expand content exceeding this height" -msgstr "" - -#: ../../mod/settings.php:871 -msgid "Matrix page max height of content (in pixels)" -msgstr "" - -#: ../../mod/settings.php:905 -msgid "Nobody except yourself" -msgstr "" - -#: ../../mod/settings.php:906 -msgid "Only those you specifically allow" -msgstr "" - -#: ../../mod/settings.php:907 -msgid "Approved connections" -msgstr "" - -#: ../../mod/settings.php:908 -msgid "Any connections" -msgstr "" - -#: ../../mod/settings.php:909 -msgid "Anybody on this website" -msgstr "" - -#: ../../mod/settings.php:910 -msgid "Anybody in this network" -msgstr "" - -#: ../../mod/settings.php:911 -msgid "Anybody authenticated" -msgstr "" - -#: ../../mod/settings.php:912 -msgid "Anybody on the internet" -msgstr "" - -#: ../../mod/settings.php:986 -msgid "Publish your default profile in the network directory" -msgstr "" - -#: ../../mod/settings.php:991 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: ../../mod/settings.php:1000 -msgid "Your channel address is" -msgstr "" - -#: ../../mod/settings.php:1048 -msgid "Channel Settings" -msgstr "" - -#: ../../mod/settings.php:1055 -msgid "Basic Settings" -msgstr "" - -#: ../../mod/settings.php:1058 -msgid "Your Timezone:" -msgstr "" - -#: ../../mod/settings.php:1059 -msgid "Default Post Location:" -msgstr "" - -#: ../../mod/settings.php:1059 -msgid "Geographical location to display on your posts" -msgstr "" - -#: ../../mod/settings.php:1060 -msgid "Use Browser Location:" -msgstr "" - -#: ../../mod/settings.php:1062 -msgid "Adult Content" -msgstr "" - -#: ../../mod/settings.php:1062 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "" - -#: ../../mod/settings.php:1064 -msgid "Security and Privacy Settings" -msgstr "" - -#: ../../mod/settings.php:1066 -msgid "Your permissions are already configured. Click to view/adjust" -msgstr "" - -#: ../../mod/settings.php:1068 -msgid "Hide my online presence" -msgstr "" - -#: ../../mod/settings.php:1068 -msgid "Prevents displaying in your profile that you are online" -msgstr "" - -#: ../../mod/settings.php:1070 -msgid "Simple Privacy Settings:" -msgstr "" - -#: ../../mod/settings.php:1071 -msgid "" -"Very Public - <em>extremely permissive (should be used with caution)</em>" -msgstr "" - -#: ../../mod/settings.php:1072 -msgid "" -"Typical - <em>default public, privacy when desired (similar to social " -"network permissions but with improved privacy)</em>" -msgstr "" - -#: ../../mod/settings.php:1073 -msgid "Private - <em>default private, never open or public</em>" -msgstr "" - -#: ../../mod/settings.php:1074 -msgid "Blocked - <em>default blocked to/from everybody</em>" -msgstr "" - -#: ../../mod/settings.php:1076 -msgid "Allow others to tag your posts" -msgstr "" - -#: ../../mod/settings.php:1076 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" -msgstr "" - -#: ../../mod/settings.php:1078 -msgid "Advanced Privacy Settings" -msgstr "" - -#: ../../mod/settings.php:1080 -msgid "Expire other channel content after this many days" -msgstr "" - -#: ../../mod/settings.php:1080 -msgid "0 or blank prevents expiration" -msgstr "" - -#: ../../mod/settings.php:1081 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../mod/settings.php:1081 -msgid "May reduce spam activity" -msgstr "" - -#: ../../mod/settings.php:1082 -msgid "Default Post Permissions" -msgstr "" - -#: ../../mod/settings.php:1087 -msgid "Channel permissions category:" -msgstr "" - -#: ../../mod/settings.php:1093 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: ../../mod/settings.php:1093 -msgid "Useful to reduce spamming" -msgstr "" - -#: ../../mod/settings.php:1096 -msgid "Notification Settings" -msgstr "" - -#: ../../mod/settings.php:1097 -msgid "By default post a status message when:" -msgstr "" - -#: ../../mod/settings.php:1098 -msgid "accepting a friend request" +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/settings.php:1099 -msgid "joining a forum/community" +#: ../../mod/item.php:1129 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/settings.php:1100 -msgid "making an <em>interesting</em> profile change" +#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 +#: ../../mod/update_network.php:23 ../../mod/update_search.php:46 +#: ../../mod/update_home.php:21 +msgid "[Embedded content - reload page to view]" msgstr "" -#: ../../mod/settings.php:1101 -msgid "Send a notification email when:" +#: ../../mod/lockview.php:37 +msgid "Remote privacy information not available." msgstr "" -#: ../../mod/settings.php:1102 -msgid "You receive a connection request" +#: ../../mod/lockview.php:58 +msgid "Visible to:" msgstr "" -#: ../../mod/settings.php:1103 -msgid "Your connections are confirmed" +#: ../../mod/layouts.php:176 +msgid "Comanche page description language help" msgstr "" -#: ../../mod/settings.php:1104 -msgid "Someone writes on your profile wall" +#: ../../mod/layouts.php:180 +msgid "Layout Description" msgstr "" -#: ../../mod/settings.php:1105 -msgid "Someone writes a followup comment" +#: ../../mod/layouts.php:185 +msgid "Download PDL file" msgstr "" -#: ../../mod/settings.php:1106 -msgid "You receive a private message" +#: ../../mod/id.php:11 +msgid "First Name" msgstr "" -#: ../../mod/settings.php:1107 -msgid "You receive a friend suggestion" +#: ../../mod/id.php:12 +msgid "Last Name" msgstr "" -#: ../../mod/settings.php:1108 -msgid "You are tagged in a post" +#: ../../mod/id.php:13 +msgid "Nickname" msgstr "" -#: ../../mod/settings.php:1109 -msgid "You are poked/prodded/etc. in a post" +#: ../../mod/id.php:14 +msgid "Full Name" msgstr "" -#: ../../mod/settings.php:1112 -msgid "Show visual notifications including:" +#: ../../mod/id.php:20 +msgid "Profile Photo 16px" msgstr "" -#: ../../mod/settings.php:1114 -msgid "Unseen matrix activity" +#: ../../mod/id.php:21 +msgid "Profile Photo 32px" msgstr "" -#: ../../mod/settings.php:1115 -msgid "Unseen channel activity" +#: ../../mod/id.php:22 +msgid "Profile Photo 48px" msgstr "" -#: ../../mod/settings.php:1116 -msgid "Unseen private messages" +#: ../../mod/id.php:23 +msgid "Profile Photo 64px" msgstr "" -#: ../../mod/settings.php:1116 ../../mod/settings.php:1121 -#: ../../mod/settings.php:1122 ../../mod/settings.php:1123 -msgid "Recommended" +#: ../../mod/id.php:24 +msgid "Profile Photo 80px" msgstr "" -#: ../../mod/settings.php:1117 -msgid "Upcoming events" +#: ../../mod/id.php:25 +msgid "Profile Photo 128px" msgstr "" -#: ../../mod/settings.php:1118 -msgid "Events today" +#: ../../mod/id.php:26 +msgid "Timezone" msgstr "" -#: ../../mod/settings.php:1119 -msgid "Upcoming birthdays" +#: ../../mod/id.php:27 +msgid "Homepage URL" msgstr "" -#: ../../mod/settings.php:1119 -msgid "Not available in all themes" +#: ../../mod/id.php:29 +msgid "Birth Year" msgstr "" -#: ../../mod/settings.php:1120 -msgid "System (personal) notifications" +#: ../../mod/id.php:30 +msgid "Birth Month" msgstr "" -#: ../../mod/settings.php:1121 -msgid "System info messages" +#: ../../mod/id.php:31 +msgid "Birth Day" msgstr "" -#: ../../mod/settings.php:1122 -msgid "System critical alerts" +#: ../../mod/id.php:32 +msgid "Birthdate" msgstr "" -#: ../../mod/settings.php:1123 -msgid "New connections" +#: ../../mod/message.php:41 +msgid "Conversation removed." msgstr "" -#: ../../mod/settings.php:1124 -msgid "System Registrations" +#: ../../mod/message.php:56 +msgid "No messages." msgstr "" -#: ../../mod/settings.php:1125 -msgid "" -"Also show new wall posts, private messages and connections under Notices" +#: ../../mod/message.php:72 ../../mod/mail.php:336 +msgid "Delete conversation" msgstr "" -#: ../../mod/settings.php:1127 -msgid "Notify me of events this many days in advance" +#: ../../mod/message.php:74 +msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/settings.php:1127 -msgid "Must be greater than 0" +#: ../../mod/mitem.php:51 +msgid "Unable to create element." msgstr "" -#: ../../mod/settings.php:1129 -msgid "Advanced Account/Page Type Settings" +#: ../../mod/mitem.php:74 +msgid "Unable to update menu element." msgstr "" -#: ../../mod/settings.php:1130 -msgid "Change the behaviour of this account for special situations" +#: ../../mod/mitem.php:89 +msgid "Unable to add menu element." msgstr "" -#: ../../mod/settings.php:1133 -msgid "" -"Please enable expert mode (in <a href=\"settings/features\">Settings > " -"Additional features</a>) to adjust!" +#: ../../mod/mitem.php:158 ../../mod/mitem.php:228 +msgid "Menu Item Permissions" msgstr "" -#: ../../mod/settings.php:1134 -msgid "Miscellaneous Settings" +#: ../../mod/mitem.php:161 ../../mod/mitem.php:176 +msgid "Link Name" msgstr "" -#: ../../mod/settings.php:1136 -msgid "Personal menu to display in your channel pages" +#: ../../mod/mitem.php:162 ../../mod/mitem.php:233 +msgid "Link or Submenu Target" msgstr "" -#: ../../mod/settings.php:1137 ../../mod/removeme.php:61 -msgid "Remove Channel" +#: ../../mod/mitem.php:162 +msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "" -#: ../../mod/settings.php:1138 -msgid "Remove this channel." +#: ../../mod/mitem.php:163 ../../mod/mitem.php:234 +msgid "Use magic-auth if available" msgstr "" -#: ../../mod/id.php:11 -msgid "First Name" +#: ../../mod/mitem.php:164 ../../mod/mitem.php:235 +msgid "Open link in new window" msgstr "" -#: ../../mod/id.php:12 -msgid "Last Name" +#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 +msgid "Order in list" msgstr "" -#: ../../mod/id.php:13 -msgid "Nickname" +#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 +msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/id.php:14 -msgid "Full Name" +#: ../../mod/mitem.php:166 +msgid "Submit and finish" msgstr "" -#: ../../mod/id.php:20 -msgid "Profile Photo 16px" +#: ../../mod/mitem.php:167 +msgid "Submit and continue" msgstr "" -#: ../../mod/id.php:21 -msgid "Profile Photo 32px" +#: ../../mod/mitem.php:174 +msgid "Menu:" msgstr "" -#: ../../mod/id.php:22 -msgid "Profile Photo 48px" +#: ../../mod/mitem.php:177 +msgid "Link Target" msgstr "" -#: ../../mod/id.php:23 -msgid "Profile Photo 64px" +#: ../../mod/mitem.php:180 +msgid "Edit menu" msgstr "" -#: ../../mod/id.php:24 -msgid "Profile Photo 80px" +#: ../../mod/mitem.php:183 +msgid "Edit element" msgstr "" -#: ../../mod/id.php:25 -msgid "Profile Photo 128px" +#: ../../mod/mitem.php:184 +msgid "Drop element" msgstr "" -#: ../../mod/id.php:26 -msgid "Timezone" +#: ../../mod/mitem.php:185 +msgid "New element" msgstr "" -#: ../../mod/id.php:27 -msgid "Homepage URL" +#: ../../mod/mitem.php:186 +msgid "Edit this menu container" msgstr "" -#: ../../mod/id.php:29 -msgid "Birth Year" +#: ../../mod/mitem.php:187 +msgid "Add menu element" msgstr "" -#: ../../mod/id.php:30 -msgid "Birth Month" +#: ../../mod/mitem.php:188 +msgid "Delete this menu item" msgstr "" -#: ../../mod/id.php:31 -msgid "Birth Day" +#: ../../mod/mitem.php:189 +msgid "Edit this menu item" msgstr "" -#: ../../mod/id.php:32 -msgid "Birthdate" +#: ../../mod/mitem.php:206 +msgid "Menu item not found." msgstr "" -#: ../../mod/message.php:41 -msgid "Conversation removed." +#: ../../mod/mitem.php:217 +msgid "Menu item deleted." msgstr "" -#: ../../mod/message.php:56 -msgid "No messages." +#: ../../mod/mitem.php:219 +msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/message.php:72 ../../mod/mail.php:336 -msgid "Delete conversation" +#: ../../mod/mitem.php:226 +msgid "Edit Menu Element" msgstr "" -#: ../../mod/message.php:74 -msgid "D, d M Y - g:i A" +#: ../../mod/mitem.php:232 +msgid "Link text" msgstr "" #: ../../mod/mood.php:131 @@ -8191,254 +8575,327 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/connedit.php:75 -msgid "Could not access contact record." +#: ../../mod/connedit.php:268 +msgid "is now connected to" msgstr "" -#: ../../mod/connedit.php:99 -msgid "Could not locate selected profile." +#: ../../mod/connedit.php:381 +msgid "Could not access address book record." msgstr "" -#: ../../mod/connedit.php:219 -msgid "Connection updated." +#: ../../mod/connedit.php:395 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connedit.php:221 -msgid "Failed to update connection record." +#: ../../mod/connedit.php:402 +msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connedit.php:267 -msgid "is now connected to" +#: ../../mod/connedit.php:403 +msgid "Channel has been blocked" msgstr "" -#: ../../mod/connedit.php:392 -msgid "Could not access address book record." +#: ../../mod/connedit.php:407 ../../mod/connedit.php:419 +#: ../../mod/connedit.php:431 ../../mod/connedit.php:443 +#: ../../mod/connedit.php:459 +msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connedit.php:406 -msgid "Refresh failed - channel is currently unavailable." +#: ../../mod/connedit.php:414 +msgid "Channel has been unignored" msgstr "" -#: ../../mod/connedit.php:418 ../../mod/connedit.php:430 -#: ../../mod/connedit.php:442 ../../mod/connedit.php:454 -#: ../../mod/connedit.php:470 -msgid "Unable to set address book parameters." +#: ../../mod/connedit.php:415 +msgid "Channel has been ignored" msgstr "" -#: ../../mod/connedit.php:494 +#: ../../mod/connedit.php:426 +msgid "Channel has been unarchived" +msgstr "" + +#: ../../mod/connedit.php:427 +msgid "Channel has been archived" +msgstr "" + +#: ../../mod/connedit.php:438 +msgid "Channel has been unhidden" +msgstr "" + +#: ../../mod/connedit.php:439 +msgid "Channel has been hidden" +msgstr "" + +#: ../../mod/connedit.php:454 +msgid "Channel has been approved" +msgstr "" + +#: ../../mod/connedit.php:455 +msgid "Channel has been unapproved" +msgstr "" + +#: ../../mod/connedit.php:483 msgid "Connection has been removed." msgstr "" -#: ../../mod/connedit.php:513 +#: ../../mod/connedit.php:503 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connedit.php:517 +#: ../../mod/connedit.php:507 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connedit.php:520 +#: ../../mod/connedit.php:510 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connedit.php:524 +#: ../../mod/connedit.php:514 msgid "Recent Activity" msgstr "" -#: ../../mod/connedit.php:527 +#: ../../mod/connedit.php:517 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connedit.php:534 +#: ../../mod/connedit.php:526 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../mod/connedit.php:535 -msgid "This connection is blocked!" -msgstr "" - -#: ../../mod/connedit.php:539 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 msgid "Unignore" msgstr "" -#: ../../mod/connedit.php:539 ../../mod/notifications.php:51 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 +#: ../../mod/notifications.php:51 msgid "Ignore" msgstr "" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:533 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../mod/connedit.php:543 -msgid "This connection is ignored!" -msgstr "" - -#: ../../mod/connedit.php:547 +#: ../../mod/connedit.php:536 msgid "Unarchive" msgstr "" -#: ../../mod/connedit.php:547 +#: ../../mod/connedit.php:536 msgid "Archive" msgstr "" -#: ../../mod/connedit.php:550 +#: ../../mod/connedit.php:539 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../mod/connedit.php:551 -msgid "This connection is archived!" -msgstr "" - -#: ../../mod/connedit.php:555 +#: ../../mod/connedit.php:542 msgid "Unhide" msgstr "" -#: ../../mod/connedit.php:555 +#: ../../mod/connedit.php:542 msgid "Hide" msgstr "" -#: ../../mod/connedit.php:558 +#: ../../mod/connedit.php:545 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../mod/connedit.php:559 -msgid "This connection is hidden!" -msgstr "" - -#: ../../mod/connedit.php:566 +#: ../../mod/connedit.php:552 msgid "Delete this connection" msgstr "" -#: ../../mod/connedit.php:647 +#: ../../mod/connedit.php:643 ../../mod/connedit.php:684 msgid "Approve this connection" msgstr "" -#: ../../mod/connedit.php:647 +#: ../../mod/connedit.php:643 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connedit.php:652 -msgid "Set Affinity" +#: ../../mod/connedit.php:659 +#, php-format +msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connedit.php:655 -msgid "Set Profile" +#: ../../mod/connedit.php:660 +msgid "Apply these permissions automatically" msgstr "" -#: ../../mod/connedit.php:658 -msgid "Set Affinity & Profile" +#: ../../mod/connedit.php:664 +msgid "Apply the permissions indicated on this page to all new connections." msgstr "" -#: ../../mod/connedit.php:675 -msgid "Apply these permissions automatically" +#: ../../mod/connedit.php:668 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connedit.php:677 -msgid "This connection's address is" +#: ../../mod/connedit.php:672 +msgid "Only import posts with this text" msgstr "" -#: ../../mod/connedit.php:680 +#: ../../mod/connedit.php:672 ../../mod/connedit.php:673 msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." +"words one per line or #tags or /patterns/, leave blank to import all posts" msgstr "" -#: ../../mod/connedit.php:682 -msgid "Slide to adjust your degree of friendship" +#: ../../mod/connedit.php:673 +msgid "Do not import posts with this text" msgstr "" -#: ../../mod/connedit.php:684 -msgid "Slide to adjust your rating" +#: ../../mod/connedit.php:680 +msgid "" +"Default permissions for your channel type have (just) been applied. They " +"have not yet been submitted. Please review the permissions on this page and " +"make any desired changes at this time. This new connection may <em>not</em> " +"be able to communicate with you until you submit this page, which will " +"install and apply the selected permissions." msgstr "" -#: ../../mod/connedit.php:685 ../../mod/connedit.php:690 -msgid "Optionally explain your rating" +#: ../../mod/connedit.php:683 +msgid "inherited" +msgstr "" + +#: ../../mod/connedit.php:686 +msgid "Connection has no individual permissions!" msgstr "" #: ../../mod/connedit.php:687 -msgid "Custom Filter" +msgid "" +"This may be appropriate based on your <a href=\"settings\">privacy settings</" +"a>, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connedit.php:688 -msgid "Only import posts with this text" +#: ../../mod/connedit.php:689 +msgid "Profile Visibility" msgstr "" -#: ../../mod/connedit.php:688 ../../mod/connedit.php:689 +#: ../../mod/connedit.php:690 +#, php-format msgid "" -"words one per line or #tags or /patterns/, leave blank to import all posts" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../mod/connedit.php:689 -msgid "Do not import posts with this text" +#: ../../mod/connedit.php:691 +msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connedit.php:691 -msgid "This information is public!" +#: ../../mod/connedit.php:692 +msgid "Edit contact notes" msgstr "" -#: ../../mod/connedit.php:696 -msgid "Connection Pending Approval" +#: ../../mod/connedit.php:694 +msgid "Their Settings" +msgstr "" + +#: ../../mod/connedit.php:695 +msgid "My Settings" msgstr "" #: ../../mod/connedit.php:697 -msgid "Connection Request" +msgid "" +"Default permissions for this channel type have (just) been applied. They " +"have <em>not</em> been saved and there are currently no stored default " +"permissions. Please review/edit the applied settings and click [Submit] to " +"finalize." msgstr "" #: ../../mod/connedit.php:698 -#, php-format -msgid "" -"(%s) would like to connect with you. Please approve this connection to allow " -"communication." +msgid "Clear/Disable Automatic Permissions" +msgstr "" + +#: ../../mod/connedit.php:699 +msgid "Forum Members" msgstr "" #: ../../mod/connedit.php:700 -msgid "Approve Later" +msgid "Soapbox" +msgstr "" + +#: ../../mod/connedit.php:701 +msgid "Full Sharing (typical social network permissions)" +msgstr "" + +#: ../../mod/connedit.php:702 +msgid "Cautious Sharing " msgstr "" #: ../../mod/connedit.php:703 -msgid "inherited" +msgid "Follow Only" msgstr "" -#: ../../mod/connedit.php:705 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../mod/connedit.php:704 +msgid "Individual Permissions" msgstr "" -#: ../../mod/connedit.php:707 -msgid "Their Settings" +#: ../../mod/connedit.php:705 +msgid "" +"Some permissions may be inherited from your channel <a href=\"settings" +"\">privacy settings</a>, which have higher priority than individual " +"settings. Changing those inherited settings on this page will have no effect." msgstr "" -#: ../../mod/connedit.php:708 -msgid "My Settings" +#: ../../mod/connedit.php:706 +msgid "Advanced Permissions" msgstr "" -#: ../../mod/connedit.php:710 -msgid "Individual Permissions" +#: ../../mod/connedit.php:707 +msgid "Simple Permissions (select one and submit)" msgstr "" #: ../../mod/connedit.php:711 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." +#, php-format +msgid "Visit %s's profile - %s" msgstr "" #: ../../mod/connedit.php:712 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can change those settings here but they wont have " -"any impact unless the inherited setting changes." +msgid "Block/Unblock contact" msgstr "" #: ../../mod/connedit.php:713 +msgid "Ignore contact" +msgstr "" + +#: ../../mod/connedit.php:714 +msgid "Repair URL settings" +msgstr "" + +#: ../../mod/connedit.php:715 +msgid "View conversations" +msgstr "" + +#: ../../mod/connedit.php:717 +msgid "Delete contact" +msgstr "" + +#: ../../mod/connedit.php:721 msgid "Last update:" msgstr "" +#: ../../mod/connedit.php:723 +msgid "Update public posts" +msgstr "" + +#: ../../mod/connedit.php:725 +msgid "Update now" +msgstr "" + +#: ../../mod/connedit.php:731 +msgid "Currently blocked" +msgstr "" + +#: ../../mod/connedit.php:732 +msgid "Currently ignored" +msgstr "" + +#: ../../mod/connedit.php:733 +msgid "Currently archived" +msgstr "" + +#: ../../mod/connedit.php:734 +msgid "Currently pending" +msgstr "" + #: ../../mod/rmagic.php:40 msgid "" "We encountered a problem while logging in with the OpenID you provided. " @@ -8660,25 +9117,36 @@ msgstr "" msgid "posted an event" msgstr "" -#: ../../mod/layouts.php:176 -msgid "Comanche page description language help" +#: ../../mod/network.php:91 +msgid "No such group" msgstr "" -#: ../../mod/layouts.php:180 -msgid "Layout Description" +#: ../../mod/network.php:129 +msgid "No such channel" msgstr "" -#: ../../mod/layouts.php:185 -msgid "Download PDL file" +#: ../../mod/network.php:143 +msgid "Search Results For:" msgstr "" -#: ../../mod/home.php:73 -#, php-format -msgid "Welcome to %s" +#: ../../mod/network.php:198 +msgid "Collection is empty" msgstr "" -#: ../../mod/page.php:126 -msgid "Lorem Ipsum" +#: ../../mod/network.php:207 +msgid "Collection: " +msgstr "" + +#: ../../mod/network.php:226 +msgid "Connection: " +msgstr "" + +#: ../../mod/network.php:233 +msgid "Invalid connection." +msgstr "" + +#: ../../mod/page.php:122 +msgid "Ipsum Lorem" msgstr "" #: ../../mod/bookmarks.php:38 @@ -8760,7 +9228,7 @@ msgid "Monospace" msgstr "" #: ../../view/theme/apw/php/config.php:259 -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Theme settings" msgstr "" @@ -8769,7 +9237,7 @@ msgid "Set scheme" msgstr "" #: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set font-size for posts and comments" msgstr "" @@ -8890,130 +9358,130 @@ msgid "Right offset of the aside element" msgstr "" #: ../../view/theme/redbasic/php/config.php:82 -msgid "Light (Red Matrix default)" +msgid "Light (Hubzilla default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Select scheme" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:111 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Example: 14px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:125 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set maximum width of content region in pixel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Leave empty for default width" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Center page content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set size of followup author photos" msgstr "" @@ -9029,7 +9497,7 @@ msgstr "" #: ../../boot.php:1525 msgid "" -"Create an account to access services and applications within the Red Matrix" +"Create an account to access services and applications within the Hubzilla" msgstr "" #: ../../boot.php:1553 @@ -9044,24 +9512,24 @@ msgstr "" msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2177 +#: ../../boot.php:2178 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2312 +#: ../../boot.php:2313 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2315 +#: ../../boot.php:2316 #, php-format msgid "[red] Website SSL error for %s" msgstr "" -#: ../../boot.php:2352 +#: ../../boot.php:2353 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2356 +#: ../../boot.php:2357 #, php-format msgid "[red] Cron tasks not running on %s" msgstr "" diff --git a/util/run_xgettext.sh b/util/run_xgettext.sh index 3eca8a8b3..c85ab53df 100755 --- a/util/run_xgettext.sh +++ b/util/run_xgettext.sh @@ -65,12 +65,12 @@ then sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER//g" "$OUTFILE" sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.//g" "$OUTFILE" sed -i "s/PACKAGE VERSION//g" "$OUTFILE" - sed -i "s/PACKAGE/RedMatrix $ADDONNAME addon/g" "$OUTFILE" + sed -i "s/PACKAGE/Hubzilla $ADDONNAME addon/g" "$OUTFILE" sed -i "s/CHARSET/UTF-8/g" "$OUTFILE" sed -i '/^\"Plural-Forms/d' "$OUTFILE" else - sed -i "s/SOME DESCRIPTIVE TITLE./Red Matrix Project/g" "$OUTFILE" - sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Red Matrix Project/g" "$OUTFILE" + sed -i "s/SOME DESCRIPTIVE TITLE./Hubzilla Project/g" "$OUTFILE" + sed -i "s/YEAR THE PACKAGE'S COPYRIGHT HOLDER/2012-2014 the Hubzilla Project/g" "$OUTFILE" sed -i "s/FIRST AUTHOR <EMAIL@ADDRESS>, YEAR./Mike Macgirvin, 2012/g" "$OUTFILE" sed -i "s/PACKAGE VERSION/$F9KVERSION/g" "$OUTFILE" sed -i "s/PACKAGE/Red/g" "$OUTFILE" diff --git a/util/shredder/ShredOAuth.sh b/util/shredder/ShredOAuth.sh index f39d6f7c4..e21bea353 100755 --- a/util/shredder/ShredOAuth.sh +++ b/util/shredder/ShredOAuth.sh @@ -27,13 +27,13 @@ F_API_VERSION="1" # Friendica API endpoints -F_ACCOUNF_UPDATE_PROFILE_IMAGE="${redmatrix_url}/api/account/update_profile_image" -F_STATUSES_UPDATE="${redmatrix_url}/api/statuses/update" -F_STATUSES_HOME_TIMELINE="${redmatrix_url}/api/statuses/home_timeline" +F_ACCOUNF_UPDATE_PROFILE_IMAGE="${hubzilla_url}/api/account/update_profile_image" +F_STATUSES_UPDATE="${hubzilla_url}/api/statuses/update" +F_STATUSES_HOME_TIMELINE="${hubzilla_url}/api/statuses/home_timeline" -F_REQUESF_TOKEN=${redmatrix_url}'/api/oauth/request_token' -F_ACCESS_TOKEN=${redmatrix_url}'/api/oauth/access_token' -F_AUTHORIZE_TOKEN=${redmatrix_url}'/api/oauth/authorize' +F_REQUESF_TOKEN=${hubzilla_url}'/api/oauth/request_token' +F_ACCESS_TOKEN=${hubzilla_url}'/api/oauth/access_token' +F_AUTHORIZE_TOKEN=${hubzilla_url}'/api/oauth/authorize' # Source OAuth.sh @@ -76,7 +76,7 @@ FO_access_token_helper () { # Request Token - local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')" + local auth_header="$(_OAuth_authorization_header 'Authorization' "$hubzilla_url/" "$oauth_consumer_key" "$oauth_consumer_secret" '' '' "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_REQUESF_TOKEN" "$(OAuth_param 'oauth_callback' 'oob')"), $(OAuth_param_quote 'oauth_callback' 'oob')" # echo $auth_header # echo $F_REQUESF_TOKEN @@ -95,7 +95,7 @@ FO_access_token_helper () { # Access Token - local auth_header="$(_OAuth_authorization_header 'Authorization' "$redmatrix_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")" + local auth_header="$(_OAuth_authorization_header 'Authorization' "$hubzilla_url/" "$oauth_consumer_key" "$oauth_consumer_secret" "$_oauth_token" "$_oauth_token_secret" "$oauth_signature_method" "$oauth_version" "$(OAuth_nonce)" "$(OAuth_timestamp)" 'POST' "$F_ACCESS_TOKEN" "$(OAuth_param 'oauth_verifier' "$PIN")"), $(OAuth_param_quote 'oauth_verifier' "$PIN")" resp=$(curl -s -d "" -H "$auth_header" "$F_ACCESS_TOKEN") FO_rval=$? @@ -133,7 +133,7 @@ FO_statuses_update () { [[ "$3" != "" ]] && params[${#params[@]}]=$(OAuth_param 'in_reply_to_status_id' "$3") && local in_reply_to_status_id=( '--data-urlencode' "in_reply_to_status_id=$3" ) - local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]}) + local auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'POST' "$F_STATUSES_UPDATE.$format" ${params[@]}) FO_ret=$(curl -s -H "$auth_header" --data-urlencode "status=$2" --data-urlencode "source=shred" ${in_reply_to_status_id[@]} "$F_STATUSES_UPDATE.$format") @@ -163,7 +163,7 @@ FO_statuses_home_timeline () { $(OAuth_param 'count' $count) ) - local auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]}) + local auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'GET' "$F_STATUSES_HOME_TIMELINE.$format" ${params[@]}) convscreen=$(OAuth_PE "$screen_name"); FO_ret=$(curl -s --get "${F_STATUSES_HOME_TIMELINE}.${format}" --data "screen_name=${convscreen}&count=${count}" --header "${auth_header}") @@ -204,12 +204,12 @@ FO_command () { local auth_header=''; if [ "$post" == '1' ]; then - auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'POST' "${redmatrix_url}/api/${command}.json" ${params[@]}) - FO_ret=$(curl -s "${redmatrix_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}") + auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'POST' "${hubzilla_url}/api/${command}.json" ${params[@]}) + FO_ret=$(curl -s "${hubzilla_url}/api/${command}.json" --data-urlencode "${data}" --header "${auth_header}") else - auth_header=$(OAuth_authorization_header 'Authorization' "$redmatrix_url" '' '' 'GET' "${redmatrix_url}/api/${command}.json" ${params[@]}) - FO_ret=$(curl -s --get "${redmatrix_url}/api/${command}.json" --data "${data}" --header "${auth_header}") + auth_header=$(OAuth_authorization_header 'Authorization' "$hubzilla_url" '' '' 'GET' "${hubzilla_url}/api/${command}.json" ${params[@]}) + FO_ret=$(curl -s --get "${hubzilla_url}/api/${command}.json" --data "${data}" --header "${auth_header}") fi diff --git a/util/shredder/shredder b/util/shredder/shredder index ac84f0541..61e6b1fd4 100755 --- a/util/shredder/shredder +++ b/util/shredder/shredder @@ -45,7 +45,7 @@ Use -h -c command to get options for the command. show_config_help () { echo "Please create $FCLI_RC with: -redmatrix_url=YOR_SERVER_URL (no trailing /) +hubzilla_url=YOR_SERVER_URL (no trailing /) oauth_consumer_key=YOUR_CONSUMER_KEY oauth_consumer_secret=YOUR_CONSUMER_SECRET diff --git a/util/strings.php b/util/strings.php index cfd6538e0..e3fdb6461 100644 --- a/util/strings.php +++ b/util/strings.php @@ -3,10 +3,382 @@ ; $a->strings["Cannot locate DNS info for database server '%s'"] = ""; $a->strings["Profile Photos"] = ""; -$a->strings["Embedded content"] = ""; -$a->strings["Embedding disabled"] = ""; +$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = ""; $a->strings["created a new post"] = ""; $a->strings["commented on %s's post"] = ""; +$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = ""; +$a->strings["Default privacy group for new contacts"] = ""; +$a->strings["All Channels"] = ""; +$a->strings["edit"] = ""; +$a->strings["Collections"] = ""; +$a->strings["Edit collection"] = ""; +$a->strings["Add new collection"] = ""; +$a->strings["Channels not in any collection"] = ""; +$a->strings["add"] = ""; +$a->strings["Not a valid email address"] = ""; +$a->strings["Your email domain is not among those allowed on this site"] = ""; +$a->strings["Your email address is already registered at this site."] = ""; +$a->strings["An invitation is required."] = ""; +$a->strings["Invitation could not be verified."] = ""; +$a->strings["Please enter the required information."] = ""; +$a->strings["Failed to store account information."] = ""; +$a->strings["Registration confirmation for %s"] = ""; +$a->strings["Registration request at %s"] = ""; +$a->strings["Administrator"] = ""; +$a->strings["your registration password"] = ""; +$a->strings["Registration details for %s"] = ""; +$a->strings["Account approved."] = ""; +$a->strings["Registration revoked for %s"] = ""; +$a->strings["Account verified. Please login."] = ""; +$a->strings["Click here to upgrade."] = ""; +$a->strings["This action exceeds the limits set by your subscription plan."] = ""; +$a->strings["This action is not available under your subscription plan."] = ""; +$a->strings["Miscellaneous"] = ""; +$a->strings["YYYY-MM-DD or MM-DD"] = ""; +$a->strings["Required"] = ""; +$a->strings["never"] = ""; +$a->strings["less than a second ago"] = ""; +$a->strings["year"] = ""; +$a->strings["years"] = ""; +$a->strings["month"] = ""; +$a->strings["months"] = ""; +$a->strings["week"] = ""; +$a->strings["weeks"] = ""; +$a->strings["day"] = ""; +$a->strings["days"] = ""; +$a->strings["hour"] = ""; +$a->strings["hours"] = ""; +$a->strings["minute"] = ""; +$a->strings["minutes"] = ""; +$a->strings["second"] = ""; +$a->strings["seconds"] = ""; +$a->strings["__ctx:e.g. 22 hours ago, 1 minute ago__ %1\$d %2\$s ago"] = ""; +$a->strings["%1\$s's birthday"] = ""; +$a->strings["Happy Birthday %1\$s"] = ""; +$a->strings["New Page"] = ""; +$a->strings["Edit"] = ""; +$a->strings["View"] = ""; +$a->strings["Preview"] = ""; +$a->strings["Actions"] = ""; +$a->strings["Page Link"] = ""; +$a->strings["Title"] = ""; +$a->strings["Created"] = ""; +$a->strings["Edited"] = ""; +$a->strings["Public Timeline"] = ""; +$a->strings["Default"] = ""; +$a->strings["Directory Options"] = ""; +$a->strings["Alphabetic"] = ""; +$a->strings["Reverse Alphabetic"] = ""; +$a->strings["Newest to Oldest"] = ""; +$a->strings["Oldest to Newest"] = ""; +$a->strings["Sort"] = ""; +$a->strings["Safe Mode"] = ""; +$a->strings["Public Forums Only"] = ""; +$a->strings["This Website Only"] = ""; +$a->strings["l F d, Y \\@ g:i A"] = ""; +$a->strings["Starts:"] = ""; +$a->strings["Finishes:"] = ""; +$a->strings["Location:"] = ""; +$a->strings["This event has been added to your calendar."] = ""; +$a->strings["Delete this item?"] = ""; +$a->strings["Comment"] = ""; +$a->strings["[+] show all"] = ""; +$a->strings["[-] show less"] = ""; +$a->strings["[+] expand"] = ""; +$a->strings["[-] collapse"] = ""; +$a->strings["Password too short"] = ""; +$a->strings["Passwords do not match"] = ""; +$a->strings["everybody"] = ""; +$a->strings["Secret Passphrase"] = ""; +$a->strings["Passphrase hint"] = ""; +$a->strings["Notice: Permissions have changed but have not yet been submitted."] = ""; +$a->strings["close all"] = ""; +$a->strings["Nothing new here"] = ""; +$a->strings["Rate This Channel (this is public)"] = ""; +$a->strings["Rating"] = ""; +$a->strings["Describe (optional)"] = ""; +$a->strings["Submit"] = ""; +$a->strings["Please enter a link URL"] = ""; +$a->strings["Unsaved changes. Are you sure you wish to leave this page?"] = ""; +$a->strings["timeago.prefixAgo"] = ""; +$a->strings["timeago.prefixFromNow"] = ""; +$a->strings["ago"] = ""; +$a->strings["from now"] = ""; +$a->strings["less than a minute"] = ""; +$a->strings["about a minute"] = ""; +$a->strings["%d minutes"] = ""; +$a->strings["about an hour"] = ""; +$a->strings["about %d hours"] = ""; +$a->strings["a day"] = ""; +$a->strings["%d days"] = ""; +$a->strings["about a month"] = ""; +$a->strings["%d months"] = ""; +$a->strings["about a year"] = ""; +$a->strings["%d years"] = ""; +$a->strings[" "] = ""; +$a->strings["timeago.numbers"] = ""; +$a->strings["parent"] = ""; +$a->strings["Collection"] = ""; +$a->strings["Principal"] = ""; +$a->strings["Addressbook"] = ""; +$a->strings["Calendar"] = ""; +$a->strings["Schedule Inbox"] = ""; +$a->strings["Schedule Outbox"] = ""; +$a->strings["Unknown"] = ""; +$a->strings["%1\$s used"] = ""; +$a->strings["%1\$s used of %2\$s (%3\$s%)"] = ""; +$a->strings["Files"] = ""; +$a->strings["Total"] = ""; +$a->strings["Shared"] = ""; +$a->strings["Create"] = ""; +$a->strings["Upload"] = ""; +$a->strings["Name"] = ""; +$a->strings["Type"] = ""; +$a->strings["Size"] = ""; +$a->strings["Last Modified"] = ""; +$a->strings["Delete"] = ""; +$a->strings["Create new folder"] = ""; +$a->strings["Upload file"] = ""; +$a->strings["%1\$s's bookmarks"] = ""; +$a->strings["view full size"] = ""; +$a->strings["General Features"] = ""; +$a->strings["Content Expiration"] = ""; +$a->strings["Remove posts/comments and/or private messages at a future time"] = ""; +$a->strings["Multiple Profiles"] = ""; +$a->strings["Ability to create multiple profiles"] = ""; +$a->strings["Advanced Profiles"] = ""; +$a->strings["Additional profile sections and selections"] = ""; +$a->strings["Profile Import/Export"] = ""; +$a->strings["Save and load profile details across sites/channels"] = ""; +$a->strings["Web Pages"] = ""; +$a->strings["Provide managed web pages on your channel"] = ""; +$a->strings["Private Notes"] = ""; +$a->strings["Enables a tool to store notes and reminders"] = ""; +$a->strings["Navigation Channel Select"] = ""; +$a->strings["Change channels directly from within the navigation dropdown menu"] = ""; +$a->strings["Photo Location"] = ""; +$a->strings["If location data is available on uploaded photos, link this to a map."] = ""; +$a->strings["Expert Mode"] = ""; +$a->strings["Enable Expert Mode to provide advanced configuration options"] = ""; +$a->strings["Premium Channel"] = ""; +$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = ""; +$a->strings["Post Composition Features"] = ""; +$a->strings["Use Markdown"] = ""; +$a->strings["Allow use of \"Markdown\" to format posts"] = ""; +$a->strings["Large Photos"] = ""; +$a->strings["Include large (640px) photo thumbnails in posts. If not enabled, use small (320px) photo thumbnails"] = ""; +$a->strings["Channel Sources"] = ""; +$a->strings["Automatically import channel content from other channels or feeds"] = ""; +$a->strings["Even More Encryption"] = ""; +$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = ""; +$a->strings["Enable voting tools"] = ""; +$a->strings["Provide a class of post which others can vote on"] = ""; +$a->strings["Network and Stream Filtering"] = ""; +$a->strings["Search by Date"] = ""; +$a->strings["Ability to select posts by date ranges"] = ""; +$a->strings["Collections Filter"] = ""; +$a->strings["Enable widget to display Network posts only from selected collections"] = ""; +$a->strings["Saved Searches"] = ""; +$a->strings["Save search terms for re-use"] = ""; +$a->strings["Network Personal Tab"] = ""; +$a->strings["Enable tab to display only Network posts that you've interacted on"] = ""; +$a->strings["Network New Tab"] = ""; +$a->strings["Enable tab to display all new Network activity"] = ""; +$a->strings["Affinity Tool"] = ""; +$a->strings["Filter stream activity by depth of relationships"] = ""; +$a->strings["Suggest Channels"] = ""; +$a->strings["Show channel suggestions"] = ""; +$a->strings["Post/Comment Tools"] = ""; +$a->strings["Tagging"] = ""; +$a->strings["Ability to tag existing posts"] = ""; +$a->strings["Post Categories"] = ""; +$a->strings["Add categories to your posts"] = ""; +$a->strings["Saved Folders"] = ""; +$a->strings["Ability to file posts under folders"] = ""; +$a->strings["Dislike Posts"] = ""; +$a->strings["Ability to dislike posts/comments"] = ""; +$a->strings["Star Posts"] = ""; +$a->strings["Ability to mark special posts with a star indicator"] = ""; +$a->strings["Tag Cloud"] = ""; +$a->strings["Provide a personal tag cloud on your channel page"] = ""; +$a->strings["Categories"] = ""; +$a->strings["Apps"] = ""; +$a->strings["System"] = ""; +$a->strings["Personal"] = ""; +$a->strings["Create Personal App"] = ""; +$a->strings["Edit Personal App"] = ""; +$a->strings["Connect"] = ""; +$a->strings["Ignore/Hide"] = ""; +$a->strings["Suggestions"] = ""; +$a->strings["See more..."] = ""; +$a->strings["You have %1$.0f of %2$.0f allowed connections."] = ""; +$a->strings["Add New Connection"] = ""; +$a->strings["Enter the channel address"] = ""; +$a->strings["Example: bob@example.com, http://example.com/barbara"] = ""; +$a->strings["Notes"] = ""; +$a->strings["Save"] = ""; +$a->strings["Remove term"] = ""; +$a->strings["Everything"] = ""; +$a->strings["Archives"] = ""; +$a->strings["Me"] = ""; +$a->strings["Family"] = ""; +$a->strings["Friends"] = ""; +$a->strings["Acquaintances"] = ""; +$a->strings["All"] = ""; +$a->strings["Refresh"] = ""; +$a->strings["Account settings"] = ""; +$a->strings["Channel settings"] = ""; +$a->strings["Additional features"] = ""; +$a->strings["Feature/Addon settings"] = ""; +$a->strings["Display settings"] = ""; +$a->strings["Connected apps"] = ""; +$a->strings["Export channel"] = ""; +$a->strings["Connection Default Permissions"] = ""; +$a->strings["Premium Channel Settings"] = ""; +$a->strings["Settings"] = ""; +$a->strings["Messages"] = ""; +$a->strings["Check Mail"] = ""; +$a->strings["New Message"] = ""; +$a->strings["Chat Rooms"] = ""; +$a->strings["Bookmarked Chatrooms"] = ""; +$a->strings["Suggested Chatrooms"] = ""; +$a->strings["photo/image"] = ""; +$a->strings["Rate Me"] = ""; +$a->strings["View Ratings"] = ""; +$a->strings["Public Hubs"] = ""; +$a->strings["\$Projectname Notification"] = ""; +$a->strings["\$projectname"] = ""; +$a->strings["Thank You,"] = ""; +$a->strings["%s Administrator"] = ""; +$a->strings["%s <!item_type!>"] = ""; +$a->strings["[Red:Notify] New mail received at %s"] = ""; +$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = ""; +$a->strings["%1\$s sent you %2\$s."] = ""; +$a->strings["a private message"] = ""; +$a->strings["Please visit %s to view and/or reply to your private messages."] = ""; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = ""; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = ""; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = ""; +$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = ""; +$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = ""; +$a->strings["Please visit %s to view and/or reply to the conversation."] = ""; +$a->strings["[Red:Notify] %s posted to your profile wall"] = ""; +$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = ""; +$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = ""; +$a->strings["[Red:Notify] %s tagged you"] = ""; +$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = ""; +$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = ""; +$a->strings["[Red:Notify] %1\$s poked you"] = ""; +$a->strings["%1\$s, %2\$s poked you at %3\$s"] = ""; +$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = ""; +$a->strings["[Red:Notify] %s tagged your post"] = ""; +$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = ""; +$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = ""; +$a->strings["[Red:Notify] Introduction received"] = ""; +$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = ""; +$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = ""; +$a->strings["You may visit their profile at %s"] = ""; +$a->strings["Please visit %s to approve or reject the connection request."] = ""; +$a->strings["[Red:Notify] Friend suggestion received"] = ""; +$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = ""; +$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = ""; +$a->strings["Name:"] = ""; +$a->strings["Photo:"] = ""; +$a->strings["Please visit %s to approve or reject the suggestion."] = ""; +$a->strings["[Red:Notify]"] = ""; +$a->strings["Frequently"] = ""; +$a->strings["Hourly"] = ""; +$a->strings["Twice daily"] = ""; +$a->strings["Daily"] = ""; +$a->strings["Weekly"] = ""; +$a->strings["Monthly"] = ""; +$a->strings["Friendica"] = ""; +$a->strings["OStatus"] = ""; +$a->strings["RSS/Atom"] = ""; +$a->strings["Email"] = ""; +$a->strings["Diaspora"] = ""; +$a->strings["Facebook"] = ""; +$a->strings["Zot!"] = ""; +$a->strings["LinkedIn"] = ""; +$a->strings["XMPP/IM"] = ""; +$a->strings["MySpace"] = ""; +$a->strings["No recipient provided."] = ""; +$a->strings["[no subject]"] = ""; +$a->strings["Unable to determine sender."] = ""; +$a->strings["Stored post could not be verified."] = ""; +$a->strings["Channel is blocked on this site."] = ""; +$a->strings["Channel location missing."] = ""; +$a->strings["Response from remote channel was incomplete."] = ""; +$a->strings["Channel was deleted and no longer exists."] = ""; +$a->strings["Protocol disabled."] = ""; +$a->strings["Channel discovery failed."] = ""; +$a->strings["local account not found."] = ""; +$a->strings["Cannot connect to yourself."] = ""; +$a->strings["Private Message"] = ""; +$a->strings["Select"] = ""; +$a->strings["Save to Folder"] = ""; +$a->strings["I will attend"] = ""; +$a->strings["I will not attend"] = ""; +$a->strings["I might attend"] = ""; +$a->strings["I agree"] = ""; +$a->strings["I disagree"] = ""; +$a->strings["I abstain"] = ""; +$a->strings["View all"] = ""; +$a->strings["__ctx:noun__ Like"] = array( + 0 => "", + 1 => "", +); +$a->strings["__ctx:noun__ Dislike"] = array( + 0 => "", + 1 => "", +); +$a->strings["Add Star"] = ""; +$a->strings["Remove Star"] = ""; +$a->strings["Toggle Star Status"] = ""; +$a->strings["starred"] = ""; +$a->strings["Message signature validated"] = ""; +$a->strings["Message signature incorrect"] = ""; +$a->strings["Add Tag"] = ""; +$a->strings["I like this (toggle)"] = ""; +$a->strings["like"] = ""; +$a->strings["I don't like this (toggle)"] = ""; +$a->strings["dislike"] = ""; +$a->strings["Share This"] = ""; +$a->strings["share"] = ""; +$a->strings["%d comment"] = array( + 0 => "", + 1 => "", +); +$a->strings["View %s's profile - %s"] = ""; +$a->strings["to"] = ""; +$a->strings["via"] = ""; +$a->strings["Wall-to-Wall"] = ""; +$a->strings["via Wall-To-Wall:"] = ""; +$a->strings["from %s"] = ""; +$a->strings["last edited: %s"] = ""; +$a->strings["Expires: %s"] = ""; +$a->strings["Save Bookmarks"] = ""; +$a->strings["Add to Calendar"] = ""; +$a->strings["Mark all seen"] = ""; +$a->strings["__ctx:noun__ Likes"] = ""; +$a->strings["__ctx:noun__ Dislikes"] = ""; +$a->strings["Close"] = ""; +$a->strings["Please wait"] = ""; +$a->strings["This is you"] = ""; +$a->strings["Bold"] = ""; +$a->strings["Italic"] = ""; +$a->strings["Underline"] = ""; +$a->strings["Quote"] = ""; +$a->strings["Code"] = ""; +$a->strings["Image"] = ""; +$a->strings["Insert Link"] = ""; +$a->strings["Video"] = ""; +$a->strings["Encrypt text"] = ""; +$a->strings["New window"] = ""; +$a->strings["Open the selected location in a different window or browser tab"] = ""; +$a->strings["User '%s' deleted"] = ""; +$a->strings["Attachments:"] = ""; +$a->strings["\$Projectname event notification:"] = ""; $a->strings["prev"] = ""; $a->strings["first"] = ""; $a->strings["last"] = ""; @@ -20,7 +392,6 @@ $a->strings["%d Connection"] = array( ); $a->strings["View Connections"] = ""; $a->strings["Search"] = ""; -$a->strings["Save"] = ""; $a->strings["poke"] = ""; $a->strings["poked"] = ""; $a->strings["ping"] = ""; @@ -79,84 +450,21 @@ $a->strings["remove category"] = ""; $a->strings["remove from file"] = ""; $a->strings["Click to open/close"] = ""; $a->strings["Link to Source"] = ""; -$a->strings["Select a page layout: "] = ""; $a->strings["default"] = ""; -$a->strings["Page content type: "] = ""; +$a->strings["Page layout"] = ""; +$a->strings["You can create your own with the layouts tool"] = ""; +$a->strings["Page content type"] = ""; $a->strings["Select an alternate language"] = ""; $a->strings["photo"] = ""; $a->strings["event"] = ""; $a->strings["status"] = ""; $a->strings["comment"] = ""; $a->strings["activity"] = ""; -$a->strings["Design"] = ""; +$a->strings["Design Tools"] = ""; $a->strings["Blocks"] = ""; $a->strings["Menus"] = ""; $a->strings["Layouts"] = ""; $a->strings["Pages"] = ""; -$a->strings["New Page"] = ""; -$a->strings["Edit"] = ""; -$a->strings["View"] = ""; -$a->strings["Preview"] = ""; -$a->strings["Actions"] = ""; -$a->strings["Page Link"] = ""; -$a->strings["Title"] = ""; -$a->strings["Created"] = ""; -$a->strings["Edited"] = ""; -$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = ""; -$a->strings["Not a valid email address"] = ""; -$a->strings["Your email domain is not among those allowed on this site"] = ""; -$a->strings["Your email address is already registered at this site."] = ""; -$a->strings["An invitation is required."] = ""; -$a->strings["Invitation could not be verified."] = ""; -$a->strings["Please enter the required information."] = ""; -$a->strings["Failed to store account information."] = ""; -$a->strings["Registration confirmation for %s"] = ""; -$a->strings["Registration request at %s"] = ""; -$a->strings["Administrator"] = ""; -$a->strings["your registration password"] = ""; -$a->strings["Registration details for %s"] = ""; -$a->strings["Account approved."] = ""; -$a->strings["Registration revoked for %s"] = ""; -$a->strings["Account verified. Please login."] = ""; -$a->strings["Permission denied."] = ""; -$a->strings["Image exceeds website size limit of %lu bytes"] = ""; -$a->strings["Image file is empty."] = ""; -$a->strings["Unable to process image"] = ""; -$a->strings["Photo storage failed."] = ""; -$a->strings["Photo Albums"] = ""; -$a->strings["Upload New Photos"] = ""; -$a->strings["Visible to everybody"] = ""; -$a->strings["Show"] = ""; -$a->strings["Don't show"] = ""; -$a->strings["Permissions"] = ""; -$a->strings["Close"] = ""; -$a->strings[" and "] = ""; -$a->strings["public profile"] = ""; -$a->strings["%1\$s changed %2\$s to “%3\$s”"] = ""; -$a->strings["Visit %1\$s's %2\$s"] = ""; -$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = ""; -$a->strings["Public Timeline"] = ""; -$a->strings["Item was not found."] = ""; -$a->strings["No source file."] = ""; -$a->strings["Cannot locate file to replace"] = ""; -$a->strings["Cannot locate file to revise/update"] = ""; -$a->strings["File exceeds size limit of %d"] = ""; -$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = ""; -$a->strings["File upload failed. Possible system limit or action terminated."] = ""; -$a->strings["Stored file could not be verified. Upload failed."] = ""; -$a->strings["Path not available."] = ""; -$a->strings["Empty pathname"] = ""; -$a->strings["duplicate filename or path"] = ""; -$a->strings["Path not found."] = ""; -$a->strings["mkdir failed."] = ""; -$a->strings["database storage failed."] = ""; -$a->strings["Click here to upgrade."] = ""; -$a->strings["This action exceeds the limits set by your subscription plan."] = ""; -$a->strings["This action is not available under your subscription plan."] = ""; -$a->strings["l F d, Y \\@ g:i A"] = ""; -$a->strings["Starts:"] = ""; -$a->strings["Finishes:"] = ""; -$a->strings["Location:"] = ""; $a->strings["Logout"] = ""; $a->strings["End this session"] = ""; $a->strings["Home"] = ""; @@ -169,7 +477,6 @@ $a->strings["Edit Profile"] = ""; $a->strings["Edit your profile"] = ""; $a->strings["Photos"] = ""; $a->strings["Your photos"] = ""; -$a->strings["Files"] = ""; $a->strings["Your files"] = ""; $a->strings["Chat"] = ""; $a->strings["Your chatrooms"] = ""; @@ -180,17 +487,17 @@ $a->strings["Your webpages"] = ""; $a->strings["Login"] = ""; $a->strings["Sign in"] = ""; $a->strings["%s - click to logout"] = ""; +$a->strings["Remote authentication"] = ""; $a->strings["Click to authenticate to your home hub"] = ""; $a->strings["Home Page"] = ""; $a->strings["Register"] = ""; $a->strings["Create an account"] = ""; $a->strings["Help"] = ""; $a->strings["Help and documentation"] = ""; -$a->strings["Apps"] = ""; $a->strings["Applications, utilities, links, games"] = ""; $a->strings["Search site content"] = ""; $a->strings["Directory"] = ""; -$a->strings["Channel Locator"] = ""; +$a->strings["Channel Directory"] = ""; $a->strings["Matrix"] = ""; $a->strings["Your matrix"] = ""; $a->strings["Mark all matrix notifications seen"] = ""; @@ -208,183 +515,100 @@ $a->strings["See all private messages"] = ""; $a->strings["Mark all private messages seen"] = ""; $a->strings["Inbox"] = ""; $a->strings["Outbox"] = ""; -$a->strings["New Message"] = ""; $a->strings["Events"] = ""; $a->strings["Event Calendar"] = ""; $a->strings["See all events"] = ""; $a->strings["Mark all events seen"] = ""; -$a->strings["Channel Select"] = ""; +$a->strings["Channel Manager"] = ""; $a->strings["Manage Your Channels"] = ""; -$a->strings["Settings"] = ""; $a->strings["Account/Channel Settings"] = ""; $a->strings["Admin"] = ""; $a->strings["Site Setup and Configuration"] = ""; -$a->strings["Nothing new here"] = ""; +$a->strings["Loading..."] = ""; +$a->strings["@name, #tag, content"] = ""; $a->strings["Please wait..."] = ""; -$a->strings["%1\$s's bookmarks"] = ""; $a->strings["Tags"] = ""; $a->strings["Keywords"] = ""; $a->strings["have"] = ""; $a->strings["has"] = ""; $a->strings["want"] = ""; $a->strings["wants"] = ""; -$a->strings["like"] = ""; $a->strings["likes"] = ""; -$a->strings["dislike"] = ""; $a->strings["dislikes"] = ""; -$a->strings["__ctx:noun__ Like"] = array( - 0 => "", - 1 => "", -); -$a->strings["Default"] = ""; -$a->strings["Frequently"] = ""; -$a->strings["Hourly"] = ""; -$a->strings["Twice daily"] = ""; -$a->strings["Daily"] = ""; -$a->strings["Weekly"] = ""; -$a->strings["Monthly"] = ""; -$a->strings["Friendica"] = ""; -$a->strings["OStatus"] = ""; -$a->strings["RSS/Atom"] = ""; -$a->strings["Email"] = ""; -$a->strings["Diaspora"] = ""; -$a->strings["Facebook"] = ""; -$a->strings["Zot!"] = ""; -$a->strings["LinkedIn"] = ""; -$a->strings["XMPP/IM"] = ""; -$a->strings["MySpace"] = ""; -$a->strings["%d invitation available"] = array( - 0 => "", - 1 => "", -); -$a->strings["Advanced"] = ""; -$a->strings["Find Channels"] = ""; -$a->strings["Enter name or interest"] = ""; -$a->strings["Connect/Follow"] = ""; -$a->strings["Examples: Robert Morgenstein, Fishing"] = ""; -$a->strings["Find"] = ""; -$a->strings["Channel Suggestions"] = ""; -$a->strings["Random Profile"] = ""; -$a->strings["Invite Friends"] = ""; -$a->strings["Exammple: name=fred and country=iceland"] = ""; -$a->strings["Advanced Find"] = ""; -$a->strings["Saved Folders"] = ""; -$a->strings["Everything"] = ""; -$a->strings["Categories"] = ""; -$a->strings["%d connection in common"] = array( - 0 => "", - 1 => "", -); -$a->strings["show more"] = ""; -$a->strings["This event has been added to your calendar."] = ""; -$a->strings["Invalid data packet"] = ""; -$a->strings["Unable to verify channel signature"] = ""; -$a->strings["Unable to verify site signature for %s"] = ""; -$a->strings["Miscellaneous"] = ""; -$a->strings["year"] = ""; -$a->strings["month"] = ""; -$a->strings["day"] = ""; -$a->strings["never"] = ""; -$a->strings["less than a second ago"] = ""; -$a->strings["years"] = ""; -$a->strings["months"] = ""; -$a->strings["week"] = ""; -$a->strings["weeks"] = ""; -$a->strings["days"] = ""; -$a->strings["hour"] = ""; -$a->strings["hours"] = ""; -$a->strings["minute"] = ""; -$a->strings["minutes"] = ""; -$a->strings["second"] = ""; -$a->strings["seconds"] = ""; -$a->strings["%1\$d %2\$s ago"] = ""; -$a->strings["%1\$s's birthday"] = ""; -$a->strings["Happy Birthday %1\$s"] = ""; -$a->strings["Sort Options"] = ""; -$a->strings["Alphabetic"] = ""; -$a->strings["Reverse Alphabetic"] = ""; -$a->strings["Newest to Oldest"] = ""; -$a->strings["Enable Safe Search"] = ""; -$a->strings["Disable Safe Search"] = ""; -$a->strings["Safe Mode"] = ""; -$a->strings["Red Matrix Notification"] = ""; -$a->strings["redmatrix"] = ""; -$a->strings["Thank You,"] = ""; -$a->strings["%s Administrator"] = ""; -$a->strings["%s <!item_type!>"] = ""; -$a->strings["[Red:Notify] New mail received at %s"] = ""; -$a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = ""; -$a->strings["%1\$s sent you %2\$s."] = ""; -$a->strings["a private message"] = ""; -$a->strings["Please visit %s to view and/or reply to your private messages."] = ""; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = ""; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = ""; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = ""; -$a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = ""; -$a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = ""; -$a->strings["Please visit %s to view and/or reply to the conversation."] = ""; -$a->strings["[Red:Notify] %s posted to your profile wall"] = ""; -$a->strings["%1\$s, %2\$s posted to your profile wall at %3\$s"] = ""; -$a->strings["%1\$s, %2\$s posted to [zrl=%3\$s]your wall[/zrl]"] = ""; -$a->strings["[Red:Notify] %s tagged you"] = ""; -$a->strings["%1\$s, %2\$s tagged you at %3\$s"] = ""; -$a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = ""; -$a->strings["[Red:Notify] %1\$s poked you"] = ""; -$a->strings["%1\$s, %2\$s poked you at %3\$s"] = ""; -$a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = ""; -$a->strings["[Red:Notify] %s tagged your post"] = ""; -$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = ""; -$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = ""; -$a->strings["[Red:Notify] Introduction received"] = ""; -$a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = ""; -$a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = ""; -$a->strings["You may visit their profile at %s"] = ""; -$a->strings["Please visit %s to approve or reject the connection request."] = ""; -$a->strings["[Red:Notify] Friend suggestion received"] = ""; -$a->strings["%1\$s, you've received a friend suggestion from '%2\$s' at %3\$s"] = ""; -$a->strings["%1\$s, you've received [zrl=%2\$s]a friend suggestion[/zrl] for %3\$s from %4\$s."] = ""; -$a->strings["Name:"] = ""; -$a->strings["Photo:"] = ""; -$a->strings["Please visit %s to approve or reject the suggestion."] = ""; -$a->strings["parent"] = ""; -$a->strings["Collection"] = ""; -$a->strings["Principal"] = ""; -$a->strings["Addressbook"] = ""; -$a->strings["Calendar"] = ""; -$a->strings["Schedule Inbox"] = ""; -$a->strings["Schedule Outbox"] = ""; -$a->strings["Unknown"] = ""; -$a->strings["%1\$s used"] = ""; -$a->strings["%1\$s used of %2\$s (%3\$s%)"] = ""; -$a->strings["Name"] = ""; -$a->strings["Type"] = ""; -$a->strings["Size"] = ""; -$a->strings["Last Modified"] = ""; -$a->strings["Delete"] = ""; -$a->strings["Total"] = ""; -$a->strings["Create new folder"] = ""; -$a->strings["Create"] = ""; -$a->strings["Upload file"] = ""; -$a->strings["Upload"] = ""; +$a->strings[" and "] = ""; +$a->strings["public profile"] = ""; +$a->strings["%1\$s changed %2\$s to “%3\$s”"] = ""; +$a->strings["Visit %1\$s's %2\$s"] = ""; +$a->strings["%1\$s has an updated %2\$s, changing %3\$s."] = ""; +$a->strings["Permission denied"] = ""; +$a->strings["(Unknown)"] = ""; +$a->strings["Visible to anybody on the internet."] = ""; +$a->strings["Visible to you only."] = ""; +$a->strings["Visible to anybody in this network."] = ""; +$a->strings["Visible to anybody authenticated."] = ""; +$a->strings["Visible to anybody on %s."] = ""; +$a->strings["Visible to all connections."] = ""; +$a->strings["Visible to approved connections."] = ""; +$a->strings["Visible to specific connections."] = ""; +$a->strings["Item not found."] = ""; +$a->strings["Permission denied."] = ""; +$a->strings["Collection not found."] = ""; +$a->strings["Collection is empty."] = ""; +$a->strings["Collection: %s"] = ""; +$a->strings["Connection: %s"] = ""; +$a->strings["Connection not found."] = ""; +$a->strings["Can view my normal stream and posts"] = ""; +$a->strings["Can view my default channel profile"] = ""; +$a->strings["Can view my photo albums"] = ""; +$a->strings["Can view my connections"] = ""; +$a->strings["Can view my file storage"] = ""; +$a->strings["Can view my webpages"] = ""; +$a->strings["Can send me their channel stream and posts"] = ""; +$a->strings["Can post on my channel page (\"wall\")"] = ""; +$a->strings["Can comment on or like my posts"] = ""; +$a->strings["Can send me private mail messages"] = ""; +$a->strings["Can post photos to my photo albums"] = ""; +$a->strings["Can like/dislike stuff"] = ""; +$a->strings["Profiles and things other than posts/comments"] = ""; +$a->strings["Can forward to all my channel contacts via post @mentions"] = ""; +$a->strings["Advanced - useful for creating group forum channels"] = ""; +$a->strings["Can chat with me (when available)"] = ""; +$a->strings["Can write to my file storage"] = ""; +$a->strings["Can edit my webpages"] = ""; +$a->strings["Can source my public posts in derived channels"] = ""; +$a->strings["Somewhat advanced - very useful in open communities"] = ""; +$a->strings["Can administer my channel resources"] = ""; +$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = ""; +$a->strings["Social Networking"] = ""; +$a->strings["Mostly Public"] = ""; +$a->strings["Restricted"] = ""; +$a->strings["Private"] = ""; +$a->strings["Community Forum"] = ""; +$a->strings["Feed Republish"] = ""; +$a->strings["Special Purpose"] = ""; +$a->strings["Celebrity/Soapbox"] = ""; +$a->strings["Group Repository"] = ""; +$a->strings["Other"] = ""; +$a->strings["Custom/Expert Mode"] = ""; $a->strings["channel"] = ""; $a->strings["%1\$s likes %2\$s's %3\$s"] = ""; $a->strings["%1\$s doesn't like %2\$s's %3\$s"] = ""; $a->strings["%1\$s is now connected with %2\$s"] = ""; $a->strings["%1\$s poked %2\$s"] = ""; $a->strings["__ctx:mood__ %1\$s is %2\$s"] = ""; -$a->strings["Select"] = ""; -$a->strings["Private Message"] = ""; -$a->strings["Message is verified"] = ""; +$a->strings["__ctx:title__ Likes"] = ""; +$a->strings["__ctx:title__ Dislikes"] = ""; +$a->strings["__ctx:title__ Agree"] = ""; +$a->strings["__ctx:title__ Disagree"] = ""; +$a->strings["__ctx:title__ Abstain"] = ""; +$a->strings["__ctx:title__ Attending"] = ""; +$a->strings["__ctx:title__ Not attending"] = ""; +$a->strings["__ctx:title__ Might attend"] = ""; $a->strings["View %s's profile @ %s"] = ""; $a->strings["Categories:"] = ""; $a->strings["Filed under:"] = ""; -$a->strings[" from %s"] = ""; -$a->strings["last edited: %s"] = ""; -$a->strings["Expires: %s"] = ""; $a->strings["View in context"] = ""; -$a->strings["Please wait"] = ""; $a->strings["remove"] = ""; -$a->strings["Loading..."] = ""; $a->strings["Delete Selected Items"] = ""; $a->strings["View Source"] = ""; $a->strings["Follow Thread"] = ""; @@ -420,7 +644,7 @@ $a->strings["Save to Folder:"] = ""; $a->strings["Where are you right now?"] = ""; $a->strings["Expires YYYY-MM-DD HH:MM"] = ""; $a->strings["Share"] = ""; -$a->strings["Page link title"] = ""; +$a->strings["Page link name"] = ""; $a->strings["Post as"] = ""; $a->strings["Upload photo"] = ""; $a->strings["upload photo"] = ""; @@ -434,16 +658,16 @@ $a->strings["Insert audio link"] = ""; $a->strings["audio link"] = ""; $a->strings["Set your location"] = ""; $a->strings["set location"] = ""; +$a->strings["Toggle voting"] = ""; $a->strings["Clear browser location"] = ""; $a->strings["clear location"] = ""; -$a->strings["Set title"] = ""; -$a->strings["Categories (comma-separated list)"] = ""; +$a->strings["Title (optional)"] = ""; +$a->strings["Categories (optional, comma-separated list)"] = ""; $a->strings["Permission settings"] = ""; $a->strings["permissions"] = ""; $a->strings["Public post"] = ""; $a->strings["Example: bob@example.com, mary@example.com"] = ""; $a->strings["Set expiration date"] = ""; -$a->strings["Encrypt text"] = ""; $a->strings["OK"] = ""; $a->strings["Cancel"] = ""; $a->strings["Discover"] = ""; @@ -452,7 +676,6 @@ $a->strings["Commented Order"] = ""; $a->strings["Sort by Comment Date"] = ""; $a->strings["Posted Order"] = ""; $a->strings["Sort by Post Date"] = ""; -$a->strings["Personal"] = ""; $a->strings["Posts that mention or involve you"] = ""; $a->strings["New"] = ""; $a->strings["Activity Stream - by date"] = ""; @@ -464,88 +687,94 @@ $a->strings["Channel"] = ""; $a->strings["Status Messages and Posts"] = ""; $a->strings["About"] = ""; $a->strings["Profile Details"] = ""; +$a->strings["Photo Albums"] = ""; $a->strings["Files and Storage"] = ""; $a->strings["Chatrooms"] = ""; $a->strings["Saved Bookmarks"] = ""; $a->strings["Manage Webpages"] = ""; -$a->strings["General Features"] = ""; -$a->strings["Content Expiration"] = ""; -$a->strings["Remove posts/comments and/or private messages at a future time"] = ""; -$a->strings["Multiple Profiles"] = ""; -$a->strings["Ability to create multiple profiles"] = ""; -$a->strings["Advanced Profiles"] = ""; -$a->strings["Additional profile sections and selections"] = ""; -$a->strings["Profile Import/Export"] = ""; -$a->strings["Save and load profile details across sites/channels"] = ""; -$a->strings["Web Pages"] = ""; -$a->strings["Provide managed web pages on your channel"] = ""; -$a->strings["Private Notes"] = ""; -$a->strings["Enables a tool to store notes and reminders"] = ""; -$a->strings["Extended Identity Sharing"] = ""; -$a->strings["Share your identity with all websites on the internet. When disabled, identity is only shared with sites in the matrix."] = ""; -$a->strings["Expert Mode"] = ""; -$a->strings["Enable Expert Mode to provide advanced configuration options"] = ""; -$a->strings["Premium Channel"] = ""; -$a->strings["Allows you to set restrictions and terms on those that connect with your channel"] = ""; -$a->strings["Post Composition Features"] = ""; -$a->strings["Use Markdown"] = ""; -$a->strings["Allow use of \"Markdown\" to format posts"] = ""; -$a->strings["Post Preview"] = ""; -$a->strings["Allow previewing posts and comments before publishing them"] = ""; -$a->strings["Channel Sources"] = ""; -$a->strings["Automatically import channel content from other channels or feeds"] = ""; -$a->strings["Even More Encryption"] = ""; -$a->strings["Allow optional encryption of content end-to-end with a shared secret key"] = ""; -$a->strings["Network and Stream Filtering"] = ""; -$a->strings["Search by Date"] = ""; -$a->strings["Ability to select posts by date ranges"] = ""; -$a->strings["Collections Filter"] = ""; -$a->strings["Enable widget to display Network posts only from selected collections"] = ""; -$a->strings["Saved Searches"] = ""; -$a->strings["Save search terms for re-use"] = ""; -$a->strings["Network Personal Tab"] = ""; -$a->strings["Enable tab to display only Network posts that you've interacted on"] = ""; -$a->strings["Network New Tab"] = ""; -$a->strings["Enable tab to display all new Network activity"] = ""; -$a->strings["Affinity Tool"] = ""; -$a->strings["Filter stream activity by depth of relationships"] = ""; -$a->strings["Suggest Channels"] = ""; -$a->strings["Show channel suggestions"] = ""; -$a->strings["Post/Comment Tools"] = ""; -$a->strings["Edit Sent Posts"] = ""; -$a->strings["Edit and correct posts and comments after sending"] = ""; -$a->strings["Tagging"] = ""; -$a->strings["Ability to tag existing posts"] = ""; -$a->strings["Post Categories"] = ""; -$a->strings["Add categories to your posts"] = ""; -$a->strings["Ability to file posts under folders"] = ""; -$a->strings["Dislike Posts"] = ""; -$a->strings["Ability to dislike posts/comments"] = ""; -$a->strings["Star Posts"] = ""; -$a->strings["Ability to mark special posts with a star indicator"] = ""; -$a->strings["Tag Cloud"] = ""; -$a->strings["Provide a personal tag cloud on your channel page"] = ""; -$a->strings["Channel is blocked on this site."] = ""; -$a->strings["Channel location missing."] = ""; -$a->strings["Response from remote channel was incomplete."] = ""; -$a->strings["Channel was deleted and no longer exists."] = ""; -$a->strings["Channel discovery failed."] = ""; -$a->strings["local account not found."] = ""; -$a->strings["Cannot connect to yourself."] = ""; -$a->strings["Missing room name"] = ""; -$a->strings["Duplicate room name"] = ""; -$a->strings["Invalid room specifier."] = ""; -$a->strings["Room not found."] = ""; -$a->strings["Room is full"] = ""; -$a->strings["A deleted group with this name was revived. Existing item permissions <strong>may</strong> apply to this group and any future members. If this is not what you intended, please create another group with a different name."] = ""; -$a->strings["Default privacy group for new contacts"] = ""; -$a->strings["All Channels"] = ""; -$a->strings["edit"] = ""; -$a->strings["Collections"] = ""; -$a->strings["Edit collection"] = ""; -$a->strings["Create a new collection"] = ""; -$a->strings["Channels not in any collection"] = ""; -$a->strings["add"] = ""; +$a->strings["__ctx:noun__ Attending"] = array( + 0 => "", + 1 => "", +); +$a->strings["__ctx:noun__ Not Attending"] = array( + 0 => "", + 1 => "", +); +$a->strings["__ctx:noun__ Undecided"] = array( + 0 => "", + 1 => "", +); +$a->strings["__ctx:noun__ Agree"] = array( + 0 => "", + 1 => "", +); +$a->strings["__ctx:noun__ Disagree"] = array( + 0 => "", + 1 => "", +); +$a->strings["__ctx:noun__ Abstain"] = array( + 0 => "", + 1 => "", +); +$a->strings["Image/photo"] = ""; +$a->strings["Encrypted content"] = ""; +$a->strings["Install design element: "] = ""; +$a->strings["QR code"] = ""; +$a->strings["%1\$s wrote the following %2\$s %3\$s"] = ""; +$a->strings["post"] = ""; +$a->strings["Different viewers will see this text differently"] = ""; +$a->strings["$1 spoiler"] = ""; +$a->strings["$1 wrote:"] = ""; +$a->strings["Image exceeds website size limit of %lu bytes"] = ""; +$a->strings["Image file is empty."] = ""; +$a->strings["Unable to process image"] = ""; +$a->strings["Photo storage failed."] = ""; +$a->strings["Upload New Photos"] = ""; +$a->strings["Invalid data packet"] = ""; +$a->strings["Unable to verify channel signature"] = ""; +$a->strings["Unable to verify site signature for %s"] = ""; +$a->strings["Embedded content"] = ""; +$a->strings["Embedding disabled"] = ""; +$a->strings["Logged out."] = ""; +$a->strings["Failed authentication"] = ""; +$a->strings["Login failed."] = ""; +$a->strings["%d invitation available"] = array( + 0 => "", + 1 => "", +); +$a->strings["Advanced"] = ""; +$a->strings["Find Channels"] = ""; +$a->strings["Enter name or interest"] = ""; +$a->strings["Connect/Follow"] = ""; +$a->strings["Examples: Robert Morgenstein, Fishing"] = ""; +$a->strings["Find"] = ""; +$a->strings["Channel Suggestions"] = ""; +$a->strings["Random Profile"] = ""; +$a->strings["Invite Friends"] = ""; +$a->strings["Advanced example: name=fred and country=iceland"] = ""; +$a->strings["%d connection in common"] = array( + 0 => "", + 1 => "", +); +$a->strings["show more"] = ""; +$a->strings["Visible to your default audience"] = ""; +$a->strings["Show"] = ""; +$a->strings["Don't show"] = ""; +$a->strings["Permissions"] = ""; +$a->strings["Item was not found."] = ""; +$a->strings["No source file."] = ""; +$a->strings["Cannot locate file to replace"] = ""; +$a->strings["Cannot locate file to revise/update"] = ""; +$a->strings["File exceeds size limit of %d"] = ""; +$a->strings["You have reached your limit of %1$.0f Mbytes attachment storage."] = ""; +$a->strings["File upload failed. Possible system limit or action terminated."] = ""; +$a->strings["Stored file could not be verified. Upload failed."] = ""; +$a->strings["Path not available."] = ""; +$a->strings["Empty pathname"] = ""; +$a->strings["duplicate filename or path"] = ""; +$a->strings["Path not found."] = ""; +$a->strings["mkdir failed."] = ""; +$a->strings["database storage failed."] = ""; $a->strings["Unable to obtain identity information from database"] = ""; $a->strings["Empty name"] = ""; $a->strings["Name too long"] = ""; @@ -555,10 +784,8 @@ $a->strings["Reserved nickname. Please choose another."] = ""; $a->strings["Nickname has unsupported characters or is already being used on this site."] = ""; $a->strings["Unable to retrieve created identity"] = ""; $a->strings["Default Profile"] = ""; -$a->strings["Friends"] = ""; $a->strings["Requested channel is not available."] = ""; $a->strings["Requested profile is not available."] = ""; -$a->strings["Connect"] = ""; $a->strings["Change profile photo"] = ""; $a->strings["Profiles"] = ""; $a->strings["Manage/edit profiles"] = ""; @@ -605,128 +832,6 @@ $a->strings["Love/Romance:"] = ""; $a->strings["Work/employment:"] = ""; $a->strings["School/education:"] = ""; $a->strings["Like this thing"] = ""; -$a->strings["view full size"] = ""; -$a->strings["Site Admin"] = ""; -$a->strings["Address Book"] = ""; -$a->strings["Mood"] = ""; -$a->strings["Probe"] = ""; -$a->strings["Suggest"] = ""; -$a->strings["Update"] = ""; -$a->strings["Install"] = ""; -$a->strings["Purchase"] = ""; -$a->strings["Image/photo"] = ""; -$a->strings["Encrypted content"] = ""; -$a->strings["QR code"] = ""; -$a->strings["%1\$s wrote the following %2\$s %3\$s"] = ""; -$a->strings["post"] = ""; -$a->strings["$1 wrote:"] = ""; -$a->strings["No recipient provided."] = ""; -$a->strings["[no subject]"] = ""; -$a->strings["Unable to determine sender."] = ""; -$a->strings["Stored post could not be verified."] = ""; -$a->strings["System"] = ""; -$a->strings["Create Personal App"] = ""; -$a->strings["Edit Personal App"] = ""; -$a->strings["Ignore/Hide"] = ""; -$a->strings["Suggestions"] = ""; -$a->strings["See more..."] = ""; -$a->strings["You have %1$.0f of %2$.0f allowed connections."] = ""; -$a->strings["Add New Connection"] = ""; -$a->strings["Enter the channel address"] = ""; -$a->strings["Example: bob@example.com, http://example.com/barbara"] = ""; -$a->strings["Notes"] = ""; -$a->strings["Remove term"] = ""; -$a->strings["Archives"] = ""; -$a->strings["Refresh"] = ""; -$a->strings["Me"] = ""; -$a->strings["Best Friends"] = ""; -$a->strings["Co-workers"] = ""; -$a->strings["Former Friends"] = ""; -$a->strings["Acquaintances"] = ""; -$a->strings["Everybody"] = ""; -$a->strings["Account settings"] = ""; -$a->strings["Channel settings"] = ""; -$a->strings["Additional features"] = ""; -$a->strings["Feature settings"] = ""; -$a->strings["Display settings"] = ""; -$a->strings["Connected apps"] = ""; -$a->strings["Export channel"] = ""; -$a->strings["Automatic Permissions (Advanced)"] = ""; -$a->strings["Premium Channel Settings"] = ""; -$a->strings["Check Mail"] = ""; -$a->strings["Chat Rooms"] = ""; -$a->strings["Bookmarked Chatrooms"] = ""; -$a->strings["Suggested Chatrooms"] = ""; -$a->strings["Save to Folder"] = ""; -$a->strings["View all"] = ""; -$a->strings["__ctx:noun__ Dislike"] = array( - 0 => "", - 1 => "", -); -$a->strings["Add Star"] = ""; -$a->strings["Remove Star"] = ""; -$a->strings["Toggle Star Status"] = ""; -$a->strings["starred"] = ""; -$a->strings["Add Tag"] = ""; -$a->strings["I like this (toggle)"] = ""; -$a->strings["I don't like this (toggle)"] = ""; -$a->strings["Share This"] = ""; -$a->strings["share"] = ""; -$a->strings["View %s's profile - %s"] = ""; -$a->strings["to"] = ""; -$a->strings["via"] = ""; -$a->strings["Wall-to-Wall"] = ""; -$a->strings["via Wall-To-Wall:"] = ""; -$a->strings["Save Bookmarks"] = ""; -$a->strings["Add to Calendar"] = ""; -$a->strings["__ctx:noun__ Likes"] = ""; -$a->strings["__ctx:noun__ Dislikes"] = ""; -$a->strings["%d comment"] = array( - 0 => "", - 1 => "", -); -$a->strings["[+] show all"] = ""; -$a->strings["This is you"] = ""; -$a->strings["Comment"] = ""; -$a->strings["Submit"] = ""; -$a->strings["Bold"] = ""; -$a->strings["Italic"] = ""; -$a->strings["Underline"] = ""; -$a->strings["Quote"] = ""; -$a->strings["Code"] = ""; -$a->strings["Image"] = ""; -$a->strings["Link"] = ""; -$a->strings["Video"] = ""; -$a->strings["Delete this item?"] = ""; -$a->strings["[-] show less"] = ""; -$a->strings["[+] expand"] = ""; -$a->strings["[-] collapse"] = ""; -$a->strings["Password too short"] = ""; -$a->strings["Passwords do not match"] = ""; -$a->strings["everybody"] = ""; -$a->strings["Secret Passphrase"] = ""; -$a->strings["Passphrase hint"] = ""; -$a->strings["Notice: Permissions have changed but have not yet been submitted."] = ""; -$a->strings["close all"] = ""; -$a->strings["timeago.prefixAgo"] = ""; -$a->strings["timeago.prefixFromNow"] = ""; -$a->strings["ago"] = ""; -$a->strings["from now"] = ""; -$a->strings["less than a minute"] = ""; -$a->strings["about a minute"] = ""; -$a->strings["%d minutes"] = ""; -$a->strings["about an hour"] = ""; -$a->strings["about %d hours"] = ""; -$a->strings["a day"] = ""; -$a->strings["%d days"] = ""; -$a->strings["about a month"] = ""; -$a->strings["%d months"] = ""; -$a->strings["about a year"] = ""; -$a->strings["%d years"] = ""; -$a->strings[" "] = ""; -$a->strings["timeago.numbers"] = ""; -$a->strings["New window"] = ""; -$a->strings["Open the selected location in a different window or browser tab"] = ""; $a->strings["Male"] = ""; $a->strings["Female"] = ""; $a->strings["Currently Male"] = ""; @@ -739,7 +844,6 @@ $a->strings["Transsexual"] = ""; $a->strings["Hermaphrodite"] = ""; $a->strings["Neuter"] = ""; $a->strings["Non-specific"] = ""; -$a->strings["Other"] = ""; $a->strings["Undecided"] = ""; $a->strings["Males"] = ""; $a->strings["Females"] = ""; @@ -784,74 +888,43 @@ $a->strings["Uncertain"] = ""; $a->strings["It's complicated"] = ""; $a->strings["Don't care"] = ""; $a->strings["Ask me"] = ""; -$a->strings["Logged out."] = ""; -$a->strings["Failed authentication"] = ""; -$a->strings["Login failed."] = ""; -$a->strings["Permission denied"] = ""; -$a->strings["(Unknown)"] = ""; -$a->strings["Item not found."] = ""; -$a->strings["Collection not found."] = ""; -$a->strings["Collection is empty."] = ""; -$a->strings["Collection: %s"] = ""; -$a->strings["Connection: %s"] = ""; -$a->strings["Connection not found."] = ""; -$a->strings["Can view my \"public\" stream and posts"] = ""; -$a->strings["Can view my \"public\" channel profile"] = ""; -$a->strings["Can view my \"public\" photo albums"] = ""; -$a->strings["Can view my \"public\" address book"] = ""; -$a->strings["Can view my \"public\" file storage"] = ""; -$a->strings["Can view my \"public\" pages"] = ""; -$a->strings["Can send me their channel stream and posts"] = ""; -$a->strings["Can post on my channel page (\"wall\")"] = ""; -$a->strings["Can comment on or like my posts"] = ""; -$a->strings["Can send me private mail messages"] = ""; -$a->strings["Can post photos to my photo albums"] = ""; -$a->strings["Can like/dislike stuff"] = ""; -$a->strings["Can forward to all my channel contacts via post @mentions"] = ""; -$a->strings["Advanced - useful for creating group forum channels"] = ""; -$a->strings["Can chat with me (when available)"] = ""; -$a->strings["Can write to my \"public\" file storage"] = ""; -$a->strings["Can edit my \"public\" pages"] = ""; -$a->strings["Can source my \"public\" posts in derived channels"] = ""; -$a->strings["Somewhat advanced - very useful in open communities"] = ""; -$a->strings["Can administer my channel resources"] = ""; -$a->strings["Extremely advanced. Leave this alone unless you know what you are doing"] = ""; -$a->strings["Set your current mood and tell your friends"] = ""; -$a->strings["Menu not found."] = ""; -$a->strings["Menu element updated."] = ""; -$a->strings["Unable to update menu element."] = ""; -$a->strings["Menu element added."] = ""; -$a->strings["Unable to add menu element."] = ""; -$a->strings["Not found."] = ""; -$a->strings["Manage Menu Elements"] = ""; -$a->strings["Edit menu"] = ""; -$a->strings["Edit element"] = ""; -$a->strings["Drop element"] = ""; -$a->strings["New element"] = ""; -$a->strings["Edit this menu container"] = ""; -$a->strings["Add menu element"] = ""; -$a->strings["Delete this menu item"] = ""; -$a->strings["Edit this menu item"] = ""; -$a->strings["New Menu Element"] = ""; -$a->strings["Menu Item Permissions"] = ""; -$a->strings["(click to open/close)"] = ""; -$a->strings["Link text"] = ""; -$a->strings["URL of link"] = ""; -$a->strings["Use Red magic-auth if available"] = ""; -$a->strings["Open link in new window"] = ""; -$a->strings["Order in list"] = ""; -$a->strings["Higher numbers will sink to bottom of listing"] = ""; -$a->strings["Menu item not found."] = ""; -$a->strings["Menu item deleted."] = ""; -$a->strings["Menu item could not be deleted."] = ""; -$a->strings["Edit Menu Element"] = ""; -$a->strings["Modify"] = ""; -$a->strings["sent you a private message"] = ""; -$a->strings["added your channel"] = ""; -$a->strings["posted an event"] = ""; -$a->strings["network"] = ""; +$a->strings["Site Admin"] = ""; +$a->strings["Address Book"] = ""; +$a->strings["Mood"] = ""; +$a->strings["Probe"] = ""; +$a->strings["Suggest"] = ""; +$a->strings["Random Channel"] = ""; +$a->strings["Invite"] = ""; +$a->strings["Features"] = ""; +$a->strings["Language"] = ""; +$a->strings["Post"] = ""; +$a->strings["Profile Photo"] = ""; +$a->strings["Update"] = ""; +$a->strings["Install"] = ""; +$a->strings["Purchase"] = ""; +$a->strings["Missing room name"] = ""; +$a->strings["Duplicate room name"] = ""; +$a->strings["Invalid room specifier."] = ""; +$a->strings["Room not found."] = ""; +$a->strings["Room is full"] = ""; +$a->strings["Please choose"] = ""; +$a->strings["Agree"] = ""; +$a->strings["Disagree"] = ""; +$a->strings["Abstain"] = ""; +$a->strings["projectname"] = ""; +$a->strings["Some blurb about what to do when you're new here"] = ""; +$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = ""; +$a->strings["Create a new channel"] = ""; +$a->strings["Current Channel"] = ""; +$a->strings["Switch to one of your channels by selecting it."] = ""; +$a->strings["Default Channel"] = ""; +$a->strings["Make Default"] = ""; +$a->strings["%d new messages"] = ""; +$a->strings["%d new introductions"] = ""; +$a->strings["Delegated Channels"] = ""; $a->strings["Name is required"] = ""; $a->strings["Key and Secret are required"] = ""; +$a->strings["Diaspora Policy Settings updated."] = ""; $a->strings["Passwords do not match. Password unchanged."] = ""; $a->strings["Empty passwords are not allowed. Password unchanged."] = ""; $a->strings["Password changed."] = ""; @@ -860,6 +933,8 @@ $a->strings["Not valid email."] = ""; $a->strings["Protected email address. Cannot change to that email."] = ""; $a->strings["System failure storing new email. Please try again."] = ""; $a->strings["Settings updated."] = ""; +$a->strings["No"] = ""; +$a->strings["Yes"] = ""; $a->strings["Add application"] = ""; $a->strings["Name of application"] = ""; $a->strings["Consumer Key"] = ""; @@ -875,30 +950,42 @@ $a->strings["Client key starts with"] = ""; $a->strings["No name"] = ""; $a->strings["Remove authorization"] = ""; $a->strings["No feature settings configured"] = ""; -$a->strings["Feature Settings"] = ""; +$a->strings["Feature/Addon Settings"] = ""; +$a->strings["Settings for the built-in Diaspora emulator"] = ""; +$a->strings["Allow any Diaspora member to comment on your public posts"] = ""; +$a->strings["Diaspora Policy Settings"] = ""; +$a->strings["Prevent your hashtags from being redirected to other sites"] = ""; $a->strings["Account Settings"] = ""; -$a->strings["Password Settings"] = ""; -$a->strings["New Password:"] = ""; -$a->strings["Confirm:"] = ""; +$a->strings["Enter New Password:"] = ""; +$a->strings["Confirm New Password:"] = ""; $a->strings["Leave password fields blank unless changing"] = ""; $a->strings["Email Address:"] = ""; $a->strings["Remove Account"] = ""; -$a->strings["Warning: This action is permanent and cannot be reversed."] = ""; +$a->strings["Remove this account including all its channels"] = ""; $a->strings["Off"] = ""; $a->strings["On"] = ""; $a->strings["Additional Features"] = ""; $a->strings["Connector Settings"] = ""; $a->strings["No special theme for mobile devices"] = ""; $a->strings["%s - (Experimental)"] = ""; +$a->strings["mobile"] = ""; $a->strings["Display Settings"] = ""; $a->strings["Display Theme:"] = ""; $a->strings["Mobile Theme:"] = ""; +$a->strings["Enable user zoom on mobile devices"] = ""; $a->strings["Update browser every xx seconds"] = ""; $a->strings["Minimum of 10 seconds, no maximum"] = ""; $a->strings["Maximum number of conversations to load at any time:"] = ""; $a->strings["Maximum of 100 items"] = ""; -$a->strings["Don't show emoticons"] = ""; +$a->strings["Show emoticons (smilies) as images"] = ""; +$a->strings["Link post titles to source"] = ""; $a->strings["System Page Layout Editor - (advanced)"] = ""; +$a->strings["Use blog/list mode on channel page"] = ""; +$a->strings["(comments displayed separately)"] = ""; +$a->strings["Use blog/list mode on matrix page"] = ""; +$a->strings["Channel page max height of content (in pixels)"] = ""; +$a->strings["click to expand content exceeding this height"] = ""; +$a->strings["Matrix page max height of content (in pixels)"] = ""; $a->strings["Nobody except yourself"] = ""; $a->strings["Only those you specifically allow"] = ""; $a->strings["Approved connections"] = ""; @@ -908,8 +995,6 @@ $a->strings["Anybody in this network"] = ""; $a->strings["Anybody authenticated"] = ""; $a->strings["Anybody on the internet"] = ""; $a->strings["Publish your default profile in the network directory"] = ""; -$a->strings["No"] = ""; -$a->strings["Yes"] = ""; $a->strings["Allow us to suggest you as a potential friend to new members?"] = ""; $a->strings["or"] = ""; $a->strings["Your channel address is"] = ""; @@ -922,6 +1007,7 @@ $a->strings["Use Browser Location:"] = ""; $a->strings["Adult Content"] = ""; $a->strings["This channel frequently or regularly publishes adult content. (Please tag any adult material and/or nudity with #NSFW)"] = ""; $a->strings["Security and Privacy Settings"] = ""; +$a->strings["Your permissions are already configured. Click to view/adjust"] = ""; $a->strings["Hide my online presence"] = ""; $a->strings["Prevents displaying in your profile that you are online"] = ""; $a->strings["Simple Privacy Settings:"] = ""; @@ -937,6 +1023,8 @@ $a->strings["0 or blank prevents expiration"] = ""; $a->strings["Maximum Friend Requests/Day:"] = ""; $a->strings["May reduce spam activity"] = ""; $a->strings["Default Post Permissions"] = ""; +$a->strings["(click to open/close)"] = ""; +$a->strings["Channel permissions category:"] = ""; $a->strings["Maximum private messages per day from unknown people:"] = ""; $a->strings["Useful to reduce spamming"] = ""; $a->strings["Notification Settings"] = ""; @@ -953,28 +1041,70 @@ $a->strings["You receive a private message"] = ""; $a->strings["You receive a friend suggestion"] = ""; $a->strings["You are tagged in a post"] = ""; $a->strings["You are poked/prodded/etc. in a post"] = ""; +$a->strings["Show visual notifications including:"] = ""; +$a->strings["Unseen matrix activity"] = ""; +$a->strings["Unseen channel activity"] = ""; +$a->strings["Unseen private messages"] = ""; +$a->strings["Recommended"] = ""; +$a->strings["Upcoming events"] = ""; +$a->strings["Events today"] = ""; +$a->strings["Upcoming birthdays"] = ""; +$a->strings["Not available in all themes"] = ""; +$a->strings["System (personal) notifications"] = ""; +$a->strings["System info messages"] = ""; +$a->strings["System critical alerts"] = ""; +$a->strings["New connections"] = ""; +$a->strings["System Registrations"] = ""; +$a->strings["Also show new wall posts, private messages and connections under Notices"] = ""; +$a->strings["Notify me of events this many days in advance"] = ""; +$a->strings["Must be greater than 0"] = ""; $a->strings["Advanced Account/Page Type Settings"] = ""; $a->strings["Change the behaviour of this account for special situations"] = ""; $a->strings["Please enable expert mode (in <a href=\"settings/features\">Settings > Additional features</a>) to adjust!"] = ""; $a->strings["Miscellaneous Settings"] = ""; $a->strings["Personal menu to display in your channel pages"] = ""; -$a->strings["Remove this channel"] = ""; -$a->strings["Poke/Prod"] = ""; -$a->strings["poke, prod or do other things to somebody"] = ""; -$a->strings["Recipient"] = ""; -$a->strings["Choose what you wish to do to recipient"] = ""; -$a->strings["Make this post private"] = ""; +$a->strings["Remove Channel"] = ""; +$a->strings["Remove this channel."] = ""; +$a->strings["Xchan Lookup"] = ""; +$a->strings["Lookup xchan beginning with (or webbie): "] = ""; +$a->strings["Not found."] = ""; $a->strings["Authorize application connection"] = ""; $a->strings["Return to your app and insert this Securty Code:"] = ""; $a->strings["Please login to continue."] = ""; $a->strings["Do you want to authorize this application to access your posts and contacts, and/or create new posts for you?"] = ""; -$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = ""; -$a->strings["Welcome %s. Remote authentication successful."] = ""; +$a->strings["Page Title"] = ""; +$a->strings["Channel added."] = ""; +$a->strings["Tag removed"] = ""; +$a->strings["Remove Item Tag"] = ""; +$a->strings["Select a tag to remove: "] = ""; +$a->strings["Remove"] = ""; +$a->strings["Continue"] = ""; +$a->strings["Premium Channel Setup"] = ""; +$a->strings["Enable premium channel connection restrictions"] = ""; +$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = ""; +$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = ""; +$a->strings["Potential connections will then see the following text before proceeding:"] = ""; +$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = ""; +$a->strings["(No specific instructions have been provided by the channel owner.)"] = ""; +$a->strings["Restricted or Premium Channel"] = ""; +$a->strings["Thing updated"] = ""; +$a->strings["Object store: failed"] = ""; +$a->strings["Thing added"] = ""; +$a->strings["OBJ: %1\$s %2\$s %3\$s"] = ""; +$a->strings["Show Thing"] = ""; +$a->strings["item not found."] = ""; +$a->strings["Edit Thing"] = ""; +$a->strings["Select a profile"] = ""; +$a->strings["Post an activity"] = ""; +$a->strings["Only sends to viewers of the applicable profile"] = ""; +$a->strings["Name of thing e.g. something"] = ""; +$a->strings["URL of thing (optional)"] = ""; +$a->strings["URL for photo of thing (optional)"] = ""; +$a->strings["Add Thing to your Profile"] = ""; $a->strings["Item not available."] = ""; $a->strings["Fetching URL returns error: %1\$s"] = ""; -$a->strings["Invalid item."] = ""; -$a->strings["Channel not found."] = ""; -$a->strings["Page not found."] = ""; +$a->strings["\$Projectname"] = ""; +$a->strings["Welcome to %s"] = ""; $a->strings["Image uploaded but image cropping failed."] = ""; $a->strings["Image resize failed."] = ""; $a->strings["Shift-reload the page or clear browser cache if the new photo does not display immediately."] = ""; @@ -992,287 +1122,97 @@ $a->strings["Done Editing"] = ""; $a->strings["Image uploaded successfully."] = ""; $a->strings["Image upload failed."] = ""; $a->strings["Image size reduction [%s] failed."] = ""; -$a->strings["Block Name"] = ""; -$a->strings["Profile not found."] = ""; -$a->strings["Profile deleted."] = ""; -$a->strings["Profile-"] = ""; -$a->strings["New profile created."] = ""; -$a->strings["Profile unavailable to clone."] = ""; -$a->strings["Profile unavailable to export."] = ""; -$a->strings["Profile Name is required."] = ""; -$a->strings["Marital Status"] = ""; -$a->strings["Romantic Partner"] = ""; -$a->strings["Likes"] = ""; -$a->strings["Dislikes"] = ""; -$a->strings["Work/Employment"] = ""; -$a->strings["Religion"] = ""; -$a->strings["Political Views"] = ""; -$a->strings["Gender"] = ""; -$a->strings["Sexual Preference"] = ""; -$a->strings["Homepage"] = ""; -$a->strings["Interests"] = ""; -$a->strings["Address"] = ""; -$a->strings["Location"] = ""; -$a->strings["Profile updated."] = ""; -$a->strings["Hide your contact/friend list from viewers of this profile?"] = ""; -$a->strings["Edit Profile Details"] = ""; -$a->strings["View this profile"] = ""; -$a->strings["Change Profile Photo"] = ""; -$a->strings["Create a new profile using these settings"] = ""; -$a->strings["Clone this profile"] = ""; -$a->strings["Delete this profile"] = ""; -$a->strings["Import profile from file"] = ""; -$a->strings["Export profile to file"] = ""; -$a->strings["Profile Name:"] = ""; -$a->strings["Your Full Name:"] = ""; -$a->strings["Title/Description:"] = ""; -$a->strings["Your Gender:"] = ""; -$a->strings["Birthday (%s):"] = ""; -$a->strings["Street Address:"] = ""; -$a->strings["Locality/City:"] = ""; -$a->strings["Postal/Zip Code:"] = ""; -$a->strings["Country:"] = ""; -$a->strings["Region/State:"] = ""; -$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = ""; -$a->strings["Who: (if applicable)"] = ""; -$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = ""; -$a->strings["Since [date]:"] = ""; -$a->strings["Homepage URL:"] = ""; -$a->strings["Religious Views:"] = ""; -$a->strings["Keywords:"] = ""; -$a->strings["Example: fishing photography software"] = ""; -$a->strings["Used in directory listings"] = ""; -$a->strings["Tell us about yourself..."] = ""; -$a->strings["Hobbies/Interests"] = ""; -$a->strings["Contact information and Social Networks"] = ""; -$a->strings["My other channels"] = ""; -$a->strings["Musical interests"] = ""; -$a->strings["Books, literature"] = ""; -$a->strings["Television"] = ""; -$a->strings["Film/dance/culture/entertainment"] = ""; -$a->strings["Love/romance"] = ""; -$a->strings["Work/employment"] = ""; -$a->strings["School/education"] = ""; -$a->strings["This is your <strong>public</strong> profile.<br />It <strong>may</strong> be visible to anybody using the internet."] = ""; -$a->strings["Age: "] = ""; -$a->strings["Edit/Manage Profiles"] = ""; -$a->strings["Add profile things"] = ""; -$a->strings["Include desirable objects in your profile"] = ""; -$a->strings["Bookmark added"] = ""; -$a->strings["My Bookmarks"] = ""; -$a->strings["My Connections Bookmarks"] = ""; -$a->strings["Invalid profile identifier."] = ""; -$a->strings["Profile Visibility Editor"] = ""; -$a->strings["Click on a contact to add or remove."] = ""; -$a->strings["Visible To"] = ""; -$a->strings["All Connections"] = ""; +$a->strings["Invalid item."] = ""; +$a->strings["Channel not found."] = ""; +$a->strings["Page not found."] = ""; +$a->strings["Like/Dislike"] = ""; +$a->strings["This action is restricted to members."] = ""; +$a->strings["Please <a href=\"rmagic\">login with your \$Projectname ID</a> or <a href=\"register\">register as a new \$Projectname member</a> to continue."] = ""; +$a->strings["Invalid request."] = ""; +$a->strings["thing"] = ""; +$a->strings["Channel unavailable."] = ""; +$a->strings["Previous action reversed."] = ""; +$a->strings["%1\$s agrees with %2\$s's %3\$s"] = ""; +$a->strings["%1\$s doesn't agree with %2\$s's %3\$s"] = ""; +$a->strings["%1\$s abstains from a decision on %2\$s's %3\$s"] = ""; +$a->strings["%1\$s is attending %2\$s's %3\$s"] = ""; +$a->strings["%1\$s is not attending %2\$s's %3\$s"] = ""; +$a->strings["%1\$s may attend %2\$s's %3\$s"] = ""; +$a->strings["Action completed."] = ""; +$a->strings["Thank you."] = ""; +$a->strings["Event can not end before it has started."] = ""; +$a->strings["Unable to generate preview."] = ""; +$a->strings["Event title and start time are required."] = ""; +$a->strings["Event not found."] = ""; +$a->strings["l, F j"] = ""; +$a->strings["Edit event"] = ""; +$a->strings["Delete event"] = ""; +$a->strings["Create New Event"] = ""; +$a->strings["Previous"] = ""; +$a->strings["Next"] = ""; +$a->strings["Export"] = ""; +$a->strings["Event removed"] = ""; +$a->strings["Failed to remove event"] = ""; +$a->strings["Event details"] = ""; +$a->strings["Starting date and Title are required."] = ""; +$a->strings["Categories (comma-separated list)"] = ""; +$a->strings["Event Starts:"] = ""; +$a->strings["Finish date/time is not known or not relevant"] = ""; +$a->strings["Event Finishes:"] = ""; +$a->strings["Adjust for viewer timezone"] = ""; +$a->strings["Important for events that happen in a particular place. Not practical for global holidays."] = ""; +$a->strings["Description:"] = ""; +$a->strings["Title:"] = ""; +$a->strings["Share this event"] = ""; +$a->strings["%1\$s is following %2\$s's %3\$s"] = ""; $a->strings["Public Sites"] = ""; -$a->strings["The listed sites allow public registration into the Red Matrix. All sites in the matrix are interlinked so membership on any of them conveys membership in the matrix as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = ""; +$a->strings["The listed sites allow public registration for the \$Projectname network. All sites in the network are interlinked so membership on any of them conveys membership in the network as a whole. Some sites may require subscription or provide tiered service plans. The provider links <strong>may</strong> provide additional details."] = ""; +$a->strings["Rate this hub"] = ""; $a->strings["Site URL"] = ""; $a->strings["Access Type"] = ""; $a->strings["Registration Policy"] = ""; -$a->strings["You must be logged in to see this page."] = ""; -$a->strings["Insufficient permissions. Request redirected to profile page."] = ""; -$a->strings["Select a bookmark folder"] = ""; -$a->strings["Save Bookmark"] = ""; -$a->strings["URL of bookmark"] = ""; -$a->strings["Description"] = ""; -$a->strings["Or enter new bookmark folder name"] = ""; -$a->strings["Room not found"] = ""; -$a->strings["Leave Room"] = ""; -$a->strings["Delete This Room"] = ""; -$a->strings["I am away right now"] = ""; -$a->strings["I am online"] = ""; -$a->strings["Bookmark this room"] = ""; -$a->strings["New Chatroom"] = ""; -$a->strings["Chatroom Name"] = ""; -$a->strings["%1\$s's Chatrooms"] = ""; -$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = ""; -$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = ""; -$a->strings["Passwords do not match."] = ""; -$a->strings["Registration successful. Please check your email for validation instructions."] = ""; -$a->strings["Your registration is pending approval by the site owner."] = ""; -$a->strings["Your registration can not be processed."] = ""; -$a->strings["Registration on this site/hub is by approval only."] = ""; -$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = ""; -$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = ""; -$a->strings["Terms of Service"] = ""; -$a->strings["I accept the %s for this website"] = ""; -$a->strings["I am over 13 years of age and accept the %s for this website"] = ""; -$a->strings["Registration"] = ""; -$a->strings["Membership on this site is by invitation only."] = ""; -$a->strings["Please enter your invitation code"] = ""; -$a->strings["Your email address"] = ""; -$a->strings["Choose a password"] = ""; -$a->strings["Please re-enter your password"] = ""; -$a->strings["Away"] = ""; -$a->strings["Online"] = ""; -$a->strings["Please login."] = ""; -$a->strings["Red Matrix - Guests: Username: {your email address}, Password: +++"] = ""; -$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = ""; -$a->strings["Remove This Channel"] = ""; -$a->strings["This will completely remove this channel from the network. Once this has been done it is not recoverable."] = ""; -$a->strings["Please enter your password for verification:"] = ""; -$a->strings["Remove this channel and all its clones from the network"] = ""; -$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = ""; -$a->strings["Remove Channel"] = ""; -$a->strings["No channel."] = ""; -$a->strings["Common connections"] = ""; -$a->strings["No connections in common."] = ""; -$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = ""; -$a->strings["The error message was:"] = ""; -$a->strings["Authentication failed."] = ""; -$a->strings["Remote Authentication"] = ""; -$a->strings["Enter your channel address (e.g. channel@example.com)"] = ""; -$a->strings["Authenticate"] = ""; -$a->strings["Continue"] = ""; -$a->strings["Premium Channel Setup"] = ""; -$a->strings["Enable premium channel connection restrictions"] = ""; -$a->strings["Please enter your restrictions or conditions, such as paypal receipt, usage guidelines, etc."] = ""; -$a->strings["This channel may require additional steps or acknowledgement of the following conditions prior to connecting:"] = ""; -$a->strings["Potential connections will then see the following text before proceeding:"] = ""; -$a->strings["By continuing, I certify that I have complied with any instructions provided on this page."] = ""; -$a->strings["(No specific instructions have been provided by the channel owner.)"] = ""; -$a->strings["Restricted or Premium Channel"] = ""; -$a->strings["No such group"] = ""; -$a->strings["Search Results For:"] = ""; -$a->strings["Collection is empty"] = ""; -$a->strings["Collection: "] = ""; -$a->strings["Connection: "] = ""; -$a->strings["Invalid connection."] = ""; -$a->strings["Could not access contact record."] = ""; -$a->strings["Could not locate selected profile."] = ""; -$a->strings["Connection updated."] = ""; -$a->strings["Failed to update connection record."] = ""; -$a->strings["Blocked"] = ""; -$a->strings["Ignored"] = ""; -$a->strings["Hidden"] = ""; -$a->strings["Archived"] = ""; -$a->strings["All"] = ""; -$a->strings["Suggest new connections"] = ""; -$a->strings["New Connections"] = ""; -$a->strings["Show pending (new) connections"] = ""; -$a->strings["Show all connections"] = ""; -$a->strings["Unblocked"] = ""; -$a->strings["Only show unblocked connections"] = ""; -$a->strings["Only show blocked connections"] = ""; -$a->strings["Only show ignored connections"] = ""; -$a->strings["Only show archived connections"] = ""; -$a->strings["Only show hidden connections"] = ""; -$a->strings["%1\$s [%2\$s]"] = ""; -$a->strings["Edit contact"] = ""; -$a->strings["Search your connections"] = ""; -$a->strings["Finding: "] = ""; +$a->strings["Location"] = ""; +$a->strings["View hub ratings"] = ""; +$a->strings["Rate"] = ""; +$a->strings["View ratings"] = ""; $a->strings["Edit post"] = ""; -$a->strings["is now connected to"] = ""; -$a->strings["Could not access address book record."] = ""; -$a->strings["Refresh failed - channel is currently unavailable."] = ""; -$a->strings["Channel has been unblocked"] = ""; -$a->strings["Channel has been blocked"] = ""; -$a->strings["Unable to set address book parameters."] = ""; -$a->strings["Channel has been unignored"] = ""; -$a->strings["Channel has been ignored"] = ""; -$a->strings["Channel has been unarchived"] = ""; -$a->strings["Channel has been archived"] = ""; -$a->strings["Channel has been unhidden"] = ""; -$a->strings["Channel has been hidden"] = ""; -$a->strings["Channel has been approved"] = ""; -$a->strings["Channel has been unapproved"] = ""; -$a->strings["Connection has been removed."] = ""; -$a->strings["View %s's profile"] = ""; -$a->strings["Refresh Permissions"] = ""; -$a->strings["Fetch updated permissions"] = ""; -$a->strings["Recent Activity"] = ""; -$a->strings["View recent posts and comments"] = ""; -$a->strings["Unblock"] = ""; -$a->strings["Block"] = ""; -$a->strings["Block or Unblock this connection"] = ""; -$a->strings["Unignore"] = ""; -$a->strings["Ignore"] = ""; -$a->strings["Ignore or Unignore this connection"] = ""; -$a->strings["Unarchive"] = ""; -$a->strings["Archive"] = ""; -$a->strings["Archive or Unarchive this connection"] = ""; -$a->strings["Unhide"] = ""; -$a->strings["Hide"] = ""; -$a->strings["Hide or Unhide this connection"] = ""; -$a->strings["Delete this connection"] = ""; -$a->strings["Approve this connection"] = ""; -$a->strings["Accept connection to allow communication"] = ""; -$a->strings["Automatic Permissions Settings"] = ""; -$a->strings["Connections: settings for %s"] = ""; -$a->strings["When receiving a channel introduction, any permissions provided here will be applied to the new connection automatically and the introduction approved. Leave this page if you do not wish to use this feature."] = ""; -$a->strings["Slide to adjust your degree of friendship"] = ""; -$a->strings["inherited"] = ""; -$a->strings["Connection has no individual permissions!"] = ""; -$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = ""; -$a->strings["Profile Visibility"] = ""; -$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = ""; -$a->strings["Contact Information / Notes"] = ""; -$a->strings["Edit contact notes"] = ""; -$a->strings["Their Settings"] = ""; -$a->strings["My Settings"] = ""; -$a->strings["Clear/Disable Automatic Permissions"] = ""; -$a->strings["Forum Members"] = ""; -$a->strings["Soapbox"] = ""; -$a->strings["Full Sharing (typical social network permissions)"] = ""; -$a->strings["Cautious Sharing "] = ""; -$a->strings["Follow Only"] = ""; -$a->strings["Individual Permissions"] = ""; -$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = ""; -$a->strings["Advanced Permissions"] = ""; -$a->strings["Simple Permissions (select one and submit)"] = ""; -$a->strings["Visit %s's profile - %s"] = ""; -$a->strings["Block/Unblock contact"] = ""; -$a->strings["Ignore contact"] = ""; -$a->strings["Repair URL settings"] = ""; -$a->strings["View conversations"] = ""; -$a->strings["Delete contact"] = ""; -$a->strings["Last update:"] = ""; -$a->strings["Update public posts"] = ""; -$a->strings["Update now"] = ""; -$a->strings["Currently blocked"] = ""; -$a->strings["Currently ignored"] = ""; -$a->strings["Currently archived"] = ""; -$a->strings["Currently pending"] = ""; -$a->strings["Hide this contact from others"] = ""; -$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = ""; -$a->strings["No potential page delegates located."] = ""; -$a->strings["Delegate Page Management"] = ""; -$a->strings["Delegates are able to manage all aspects of this account/page except for basic account settings. Please do not delegate your personal account to anybody that you do not trust completely."] = ""; -$a->strings["Existing Page Managers"] = ""; -$a->strings["Existing Page Delegates"] = ""; -$a->strings["Potential Delegates"] = ""; -$a->strings["Remove"] = ""; -$a->strings["Add"] = ""; -$a->strings["No entries."] = ""; -$a->strings["Public access denied."] = ""; -$a->strings["Gender: "] = ""; -$a->strings["Finding:"] = ""; -$a->strings["next page"] = ""; -$a->strings["previous page"] = ""; -$a->strings["No entries (some entries may be hidden)."] = ""; -$a->strings["Status: "] = ""; -$a->strings["Sexual Preference: "] = ""; -$a->strings["Homepage: "] = ""; -$a->strings["Hometown: "] = ""; -$a->strings["About: "] = ""; -$a->strings["Keywords: "] = ""; -$a->strings["This site is not a directory server"] = ""; -$a->strings["Red Matrix - "The Network""] = ""; -$a->strings["Welcome to %s"] = ""; -$a->strings["Red Matrix Server - Setup"] = ""; +$a->strings["\$Projectname channel"] = ""; +$a->strings["Collection created."] = ""; +$a->strings["Could not create collection."] = ""; +$a->strings["Collection updated."] = ""; +$a->strings["Create a collection of channels."] = ""; +$a->strings["Collection Name: "] = ""; +$a->strings["Members are visible to other channels"] = ""; +$a->strings["Collection removed."] = ""; +$a->strings["Unable to remove collection."] = ""; +$a->strings["Collection Editor"] = ""; +$a->strings["Members"] = ""; +$a->strings["All Connected Channels"] = ""; +$a->strings["Click on a channel to add or remove."] = ""; +$a->strings["Version %s"] = ""; +$a->strings["Installed plugins/addons/apps:"] = ""; +$a->strings["No installed plugins/addons/apps"] = ""; +$a->strings["This is a hub of \$Projectname - a global cooperative network of decentralized privacy enhanced websites."] = ""; +$a->strings["Tag: "] = ""; +$a->strings["Last background fetch: "] = ""; +$a->strings["Running at web location"] = ""; +$a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = ""; +$a->strings["Bug reports and issues: please visit"] = ""; +$a->strings["Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com"] = ""; +$a->strings["Site Administrators"] = ""; +$a->strings["Help:"] = ""; +$a->strings["Not Found"] = ""; +$a->strings["\$Projectname Server - Setup"] = ""; $a->strings["Could not connect to database."] = ""; $a->strings["Could not connect to specified site URL. Possible SSL certificate or DNS issue."] = ""; $a->strings["Could not create table."] = ""; $a->strings["Your site database has been installed."] = ""; -$a->strings["You may need to import the file \"install/database.sql\" manually using phpmyadmin or mysql."] = ""; +$a->strings["You may need to import the file \"install/schema_xxx.sql\" manually using a database client."] = ""; $a->strings["Please see the file \"install/INSTALL.txt\"."] = ""; $a->strings["System check"] = ""; -$a->strings["Next"] = ""; $a->strings["Check again"] = ""; $a->strings["Database connection"] = ""; -$a->strings["In order to install Red Matrix we need to know how to connect to your database."] = ""; +$a->strings["In order to install \$Projectname we need to know how to connect to your database."] = ""; $a->strings["Please contact your hosting provider or site administrator if you have questions about these settings."] = ""; $a->strings["The database you specify below should already exist. If it does not, please create it before continuing."] = ""; $a->strings["Database Server Name"] = ""; @@ -1282,6 +1222,7 @@ $a->strings["Communication port number - use 0 for default"] = ""; $a->strings["Database Login Name"] = ""; $a->strings["Database Login Password"] = ""; $a->strings["Database Name"] = ""; +$a->strings["Database Type"] = ""; $a->strings["Site administrator email address"] = ""; $a->strings["Your account email address must match this in order to use the web admin panel."] = ""; $a->strings["Website URL"] = ""; @@ -1302,7 +1243,7 @@ $a->strings["Generate encryption keys"] = ""; $a->strings["libCurl PHP module"] = ""; $a->strings["GD graphics PHP module"] = ""; $a->strings["OpenSSL PHP module"] = ""; -$a->strings["mysqli PHP module"] = ""; +$a->strings["mysqli or postgres PHP module"] = ""; $a->strings["mb_string PHP module"] = ""; $a->strings["mcrypt PHP module"] = ""; $a->strings["Apache mod_rewrite module"] = ""; @@ -1312,7 +1253,7 @@ $a->strings["Error: proc_open is required but is either not installed or has bee $a->strings["Error: libCURL PHP module required but not installed."] = ""; $a->strings["Error: GD graphics PHP module with JPEG support required but not installed."] = ""; $a->strings["Error: openssl PHP module required but not installed."] = ""; -$a->strings["Error: mysqli PHP module required but not installed."] = ""; +$a->strings["Error: mysqli or postgres PHP module required but neither are installed."] = ""; $a->strings["Error: mb_string PHP module required but not installed."] = ""; $a->strings["Error: mcrypt PHP module required but not installed."] = ""; $a->strings["The web installer needs to be able to create a file called \".htconfig.php\" in the top folder of your web server and it is unable to do so."] = ""; @@ -1334,73 +1275,189 @@ $a->strings["If your certificate is not recognized, members of other sites (who $a->strings["This can cause usability issues elsewhere (not just on your own site) so we must insist on this requirement."] = ""; $a->strings["Providers are available that issue free certificates which are browser-valid."] = ""; $a->strings["SSL certificate validation"] = ""; -$a->strings["Url rewrite in .htaccess is not working. Check your server configuration."] = ""; +$a->strings["Url rewrite in .htaccess is not working. Check your server configuration.Test: "] = ""; $a->strings["Url rewrite is working"] = ""; $a->strings["The database configuration file \".htconfig.php\" could not be written. Please use the enclosed text to create a configuration file in your web server root."] = ""; $a->strings["Errors encountered creating database tables."] = ""; $a->strings["<h1>What next</h1>"] = ""; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = ""; -$a->strings["Item not found"] = ""; -$a->strings["Edit Block"] = ""; -$a->strings["Delete block?"] = ""; -$a->strings["Insert YouTube video"] = ""; -$a->strings["Insert Vorbis [.ogg] video"] = ""; -$a->strings["Insert Vorbis [.ogg] audio"] = ""; -$a->strings["Delete Block"] = ""; -$a->strings["Layout updated."] = ""; -$a->strings["Edit System Page Description"] = ""; -$a->strings["Layout not found."] = ""; -$a->strings["Module Name:"] = ""; -$a->strings["Layout Help"] = ""; -$a->strings["Edit Layout"] = ""; -$a->strings["Delete layout?"] = ""; -$a->strings["Delete Layout"] = ""; -$a->strings["Item is not editable"] = ""; -$a->strings["Delete item?"] = ""; -$a->strings["Edit Webpage"] = ""; -$a->strings["Delete webpage?"] = ""; -$a->strings["Delete Webpage"] = ""; -$a->strings["Version %s"] = ""; -$a->strings["Installed plugins/addons/apps:"] = ""; -$a->strings["No installed plugins/addons/apps"] = ""; -$a->strings["Red"] = ""; -$a->strings["This is a hub of the Red Matrix - a global cooperative network of decentralized privacy enhanced websites."] = ""; -$a->strings["Running at web location"] = ""; -$a->strings["Please visit <a href=\"http://getzot.com\">GetZot.com</a> to learn more about the Red Matrix."] = ""; -$a->strings["Bug reports and issues: please visit"] = ""; -$a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = ""; -$a->strings["Site Administrators"] = ""; +$a->strings["No channel."] = ""; +$a->strings["Common connections"] = ""; +$a->strings["No connections in common."] = ""; +$a->strings["This site is not a directory server"] = ""; +$a->strings["Could not access contact record."] = ""; +$a->strings["Could not locate selected profile."] = ""; +$a->strings["Connection updated."] = ""; +$a->strings["Failed to update connection record."] = ""; +$a->strings["Blocked"] = ""; +$a->strings["Ignored"] = ""; +$a->strings["Hidden"] = ""; +$a->strings["Archived"] = ""; +$a->strings["Suggest new connections"] = ""; +$a->strings["New Connections"] = ""; +$a->strings["Show pending (new) connections"] = ""; +$a->strings["All Connections"] = ""; +$a->strings["Show all connections"] = ""; +$a->strings["Unblocked"] = ""; +$a->strings["Only show unblocked connections"] = ""; +$a->strings["Only show blocked connections"] = ""; +$a->strings["Only show ignored connections"] = ""; +$a->strings["Only show archived connections"] = ""; +$a->strings["Only show hidden connections"] = ""; +$a->strings["%1\$s [%2\$s]"] = ""; +$a->strings["Edit connection"] = ""; +$a->strings["Search your connections"] = ""; +$a->strings["Finding: "] = ""; +$a->strings["Block Name"] = ""; +$a->strings["Block Title"] = ""; +$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = ""; +$a->strings["\$Projectname - Guests: Username: {your email address}, Password: +++"] = ""; $a->strings["Page owner information could not be retrieved."] = ""; $a->strings["Album not found."] = ""; $a->strings["Delete Album"] = ""; $a->strings["Delete Photo"] = ""; +$a->strings["Public access denied."] = ""; $a->strings["No photos selected"] = ""; $a->strings["Access to this item is restricted."] = ""; -$a->strings["You have used %1$.2f Mbytes of %2$.2f Mbytes photo storage."] = ""; -$a->strings["You have used %1$.2f Mbytes of photo storage."] = ""; +$a->strings["%1$.2f MB of %2$.2f MB photo storage used."] = ""; +$a->strings["%1$.2f MB photo storage used."] = ""; $a->strings["Upload Photos"] = ""; -$a->strings["New album name: "] = ""; -$a->strings["or existing album name: "] = ""; -$a->strings["Do not show a status post for this upload"] = ""; +$a->strings["Enter a new album name"] = ""; +$a->strings["or select an existing one (doubleclick)"] = ""; +$a->strings["Create a status post for this upload"] = ""; +$a->strings["Album name could not be decoded"] = ""; $a->strings["Contact Photos"] = ""; -$a->strings["Edit Album"] = ""; $a->strings["Show Newest First"] = ""; $a->strings["Show Oldest First"] = ""; $a->strings["View Photo"] = ""; +$a->strings["Edit Album"] = ""; $a->strings["Permission denied. Access to this item may be restricted."] = ""; $a->strings["Photo not available"] = ""; $a->strings["Use as profile photo"] = ""; +$a->strings["Private Photo"] = ""; $a->strings["View Full Size"] = ""; $a->strings["Edit photo"] = ""; $a->strings["Rotate CW (right)"] = ""; $a->strings["Rotate CCW (left)"] = ""; -$a->strings["New album name"] = ""; $a->strings["Caption"] = ""; $a->strings["Add a Tag"] = ""; -$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"] = ""; +$a->strings["Example: @bob, @Barbara_Jensen, @jim@example.com"] = ""; +$a->strings["Flag as adult in album view"] = ""; $a->strings["In This Photo:"] = ""; +$a->strings["Map"] = ""; $a->strings["View Album"] = ""; $a->strings["Recent Photos"] = ""; +$a->strings["Profile Match"] = ""; +$a->strings["No keywords to match. Please add keywords to your default profile."] = ""; +$a->strings["is interested in:"] = ""; +$a->strings["No matches"] = ""; +$a->strings["Away"] = ""; +$a->strings["Online"] = ""; +$a->strings["Select a bookmark folder"] = ""; +$a->strings["Save Bookmark"] = ""; +$a->strings["URL of bookmark"] = ""; +$a->strings["Description"] = ""; +$a->strings["Or enter new bookmark folder name"] = ""; +$a->strings["No more system notifications."] = ""; +$a->strings["System Notifications"] = ""; +$a->strings["network"] = ""; +$a->strings["RSS"] = ""; +$a->strings["Layout updated."] = ""; +$a->strings["Edit System Page Description"] = ""; +$a->strings["Layout not found."] = ""; +$a->strings["Module Name:"] = ""; +$a->strings["Layout Help"] = ""; +$a->strings["- select -"] = ""; +$a->strings["Your service plan only allows %d channels."] = ""; +$a->strings["Nothing to import."] = ""; +$a->strings["Unable to download data from old server"] = ""; +$a->strings["Imported file is empty."] = ""; +$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = ""; +$a->strings["Unable to create a unique channel address. Import failed."] = ""; +$a->strings["Channel clone failed. Import failed."] = ""; +$a->strings["Cloned channel not found. Import failed."] = ""; +$a->strings["Import completed."] = ""; +$a->strings["You must be logged in to use this feature."] = ""; +$a->strings["Import Channel"] = ""; +$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = ""; +$a->strings["File to Upload"] = ""; +$a->strings["Or provide the old server/hub details"] = ""; +$a->strings["Your old identity address (xyz@example.com)"] = ""; +$a->strings["Your old login email address"] = ""; +$a->strings["Your old login password"] = ""; +$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = ""; +$a->strings["Make this hub my primary location"] = ""; +$a->strings["Import existing posts if possible"] = ""; +$a->strings["Item not found"] = ""; +$a->strings["Edit Layout"] = ""; +$a->strings["Delete layout?"] = ""; +$a->strings["Insert YouTube video"] = ""; +$a->strings["Insert Vorbis [.ogg] video"] = ""; +$a->strings["Insert Vorbis [.ogg] audio"] = ""; +$a->strings["Layout Description (Optional)"] = ""; +$a->strings["Layout Name"] = ""; +$a->strings["You must be logged in to see this page."] = ""; +$a->strings["Room not found"] = ""; +$a->strings["Leave Room"] = ""; +$a->strings["Delete This Room"] = ""; +$a->strings["I am away right now"] = ""; +$a->strings["I am online"] = ""; +$a->strings["Bookmark this room"] = ""; +$a->strings["New Chatroom"] = ""; +$a->strings["Chatroom Name"] = ""; +$a->strings["%1\$s's Chatrooms"] = ""; +$a->strings["Delete webpage?"] = ""; +$a->strings["Page link title"] = ""; +$a->strings["Edit Webpage"] = ""; +$a->strings["This directory server requires an access token"] = ""; +$a->strings["No valid account found."] = ""; +$a->strings["Password reset request issued. Check your email."] = ""; +$a->strings["Site Member (%s)"] = ""; +$a->strings["Password reset requested at %s"] = ""; +$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = ""; +$a->strings["Password Reset"] = ""; +$a->strings["Your password has been reset as requested."] = ""; +$a->strings["Your new password is"] = ""; +$a->strings["Save or copy your new password - and then"] = ""; +$a->strings["click here to login"] = ""; +$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = ""; +$a->strings["Your password has changed at %s"] = ""; +$a->strings["Forgot your Password?"] = ""; +$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = ""; +$a->strings["Email Address"] = ""; +$a->strings["Reset"] = ""; +$a->strings["Website:"] = ""; +$a->strings["Remote Channel [%s] (not yet known on this site)"] = ""; +$a->strings["Rating (this information is public)"] = ""; +$a->strings["Optionally explain your rating (this information is public)"] = ""; +$a->strings["Item is not editable"] = ""; +$a->strings["Delete item?"] = ""; +$a->strings["Total invitation limit exceeded."] = ""; +$a->strings["%s : Not a valid email address."] = ""; +$a->strings["Please join us on Red"] = ""; +$a->strings["Invitation limit exceeded. Please contact your site administrator."] = ""; +$a->strings["%s : Message delivery failed."] = ""; +$a->strings["%d message sent."] = array( + 0 => "", + 1 => "", +); +$a->strings["You have no more invitations available"] = ""; +$a->strings["Send invitations"] = ""; +$a->strings["Enter email addresses, one per line:"] = ""; +$a->strings["Your message:"] = ""; +$a->strings["Please join my community on \$Projectname."] = ""; +$a->strings["You will need to supply this invitation code: "] = ""; +$a->strings["1. Register at any \$Projectname location (they are all inter-connected)"] = ""; +$a->strings["2. Enter my \$Projectname network address into the site searchbar."] = ""; +$a->strings["or visit "] = ""; +$a->strings["3. Click [Connect]"] = ""; +$a->strings["Location not found."] = ""; +$a->strings["Primary location cannot be removed."] = ""; +$a->strings["No locations found."] = ""; +$a->strings["Manage Channel Locations"] = ""; +$a->strings["Location (address)"] = ""; +$a->strings["Primary Location"] = ""; +$a->strings["Drop location"] = ""; $a->strings["Failed to create source. No channel selected."] = ""; $a->strings["Source created."] = ""; $a->strings["Source updated."] = ""; @@ -1416,24 +1473,30 @@ $a->strings["Edit Source"] = ""; $a->strings["Delete Source"] = ""; $a->strings["Source removed"] = ""; $a->strings["Unable to remove source."] = ""; -$a->strings["- select -"] = ""; -$a->strings["Event title and start time are required."] = ""; -$a->strings["Event not found."] = ""; -$a->strings["l, F j"] = ""; -$a->strings["Edit event"] = ""; -$a->strings["Create New Event"] = ""; -$a->strings["Previous"] = ""; -$a->strings["hour:minute"] = ""; -$a->strings["Event details"] = ""; -$a->strings["Format is %s %s. Starting date and Title are required."] = ""; -$a->strings["Event Starts:"] = ""; -$a->strings["Required"] = ""; -$a->strings["Finish date/time is not known or not relevant"] = ""; -$a->strings["Event Finishes:"] = ""; -$a->strings["Adjust for viewer timezone"] = ""; -$a->strings["Description:"] = ""; -$a->strings["Title:"] = ""; -$a->strings["Share this event"] = ""; +$a->strings["Unable to update menu."] = ""; +$a->strings["Unable to create menu."] = ""; +$a->strings["Menu Name"] = ""; +$a->strings["Unique name (not visible on webpage) - required"] = ""; +$a->strings["Menu Title"] = ""; +$a->strings["Visible on webpage - leave empty for no title"] = ""; +$a->strings["Allow Bookmarks"] = ""; +$a->strings["Menu may be used to store saved bookmarks"] = ""; +$a->strings["Submit and proceed"] = ""; +$a->strings["Drop"] = ""; +$a->strings["Bookmarks allowed"] = ""; +$a->strings["Delete this menu"] = ""; +$a->strings["Edit menu contents"] = ""; +$a->strings["Edit this menu"] = ""; +$a->strings["Menu could not be deleted."] = ""; +$a->strings["Menu not found."] = ""; +$a->strings["Edit Menu"] = ""; +$a->strings["Add or remove entries to this menu"] = ""; +$a->strings["Menu name"] = ""; +$a->strings["Must be unique, only seen by you"] = ""; +$a->strings["Menu title"] = ""; +$a->strings["Menu title as seen by others"] = ""; +$a->strings["Allow bookmarks"] = ""; +$a->strings["Modify"] = ""; $a->strings["Permission Denied."] = ""; $a->strings["File not found."] = ""; $a->strings["Edit file permissions"] = ""; @@ -1442,56 +1505,158 @@ $a->strings["Include all files and sub folders"] = ""; $a->strings["Return to file list"] = ""; $a->strings["Copy/paste this code to attach file to a post"] = ""; $a->strings["Copy/paste this URL to link file from a web page"] = ""; -$a->strings["Channel added."] = ""; -$a->strings["%1\$s is following %2\$s's %3\$s"] = ""; +$a->strings["Share this file"] = ""; +$a->strings["Show URL to this file"] = ""; +$a->strings["Notify your contacts about this file"] = ""; $a->strings["Contact not found."] = ""; $a->strings["Friend suggestion sent."] = ""; $a->strings["Suggest Friends"] = ""; $a->strings["Suggest a friend for %s"] = ""; -$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = ""; -$a->strings["Collection created."] = ""; -$a->strings["Could not create collection."] = ""; -$a->strings["Collection updated."] = ""; -$a->strings["Create a collection of channels."] = ""; -$a->strings["Collection Name: "] = ""; -$a->strings["Members are visible to other channels"] = ""; -$a->strings["Collection removed."] = ""; -$a->strings["Unable to remove collection."] = ""; -$a->strings["Collection Editor"] = ""; -$a->strings["Members"] = ""; -$a->strings["All Connected Channels"] = ""; -$a->strings["Click on a channel to add or remove."] = ""; -$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = ""; -$a->strings["Help:"] = ""; -$a->strings["Not Found"] = ""; -$a->strings["Tag removed"] = ""; -$a->strings["Remove Item Tag"] = ""; -$a->strings["Select a tag to remove: "] = ""; +$a->strings["Hub not found."] = ""; +$a->strings["Poke/Prod"] = ""; +$a->strings["poke, prod or do other things to somebody"] = ""; +$a->strings["Recipient"] = ""; +$a->strings["Choose what you wish to do to recipient"] = ""; +$a->strings["Make this post private"] = ""; +$a->strings["Invalid profile identifier."] = ""; +$a->strings["Profile Visibility Editor"] = ""; +$a->strings["Click on a contact to add or remove."] = ""; +$a->strings["Visible To"] = ""; +$a->strings["webpage"] = ""; +$a->strings["block"] = ""; +$a->strings["layout"] = ""; +$a->strings["%s element installed"] = ""; +$a->strings["Profile not found."] = ""; +$a->strings["Profile deleted."] = ""; +$a->strings["Profile-"] = ""; +$a->strings["New profile created."] = ""; +$a->strings["Profile unavailable to clone."] = ""; +$a->strings["Profile unavailable to export."] = ""; +$a->strings["Profile Name is required."] = ""; +$a->strings["Marital Status"] = ""; +$a->strings["Romantic Partner"] = ""; +$a->strings["Likes"] = ""; +$a->strings["Dislikes"] = ""; +$a->strings["Work/Employment"] = ""; +$a->strings["Religion"] = ""; +$a->strings["Political Views"] = ""; +$a->strings["Gender"] = ""; +$a->strings["Sexual Preference"] = ""; +$a->strings["Homepage"] = ""; +$a->strings["Interests"] = ""; +$a->strings["Address"] = ""; +$a->strings["Profile updated."] = ""; +$a->strings["Hide your contact/friend list from viewers of this profile?"] = ""; +$a->strings["Edit Profile Details"] = ""; +$a->strings["View this profile"] = ""; +$a->strings["Change Profile Photo"] = ""; +$a->strings["Create a new profile using these settings"] = ""; +$a->strings["Clone this profile"] = ""; +$a->strings["Delete this profile"] = ""; +$a->strings["Import profile from file"] = ""; +$a->strings["Export profile to file"] = ""; +$a->strings["Profile Name:"] = ""; +$a->strings["Your Full Name:"] = ""; +$a->strings["Title/Description:"] = ""; +$a->strings["Your Gender:"] = ""; +$a->strings["Birthday :"] = ""; +$a->strings["Street Address:"] = ""; +$a->strings["Locality/City:"] = ""; +$a->strings["Postal/Zip Code:"] = ""; +$a->strings["Country:"] = ""; +$a->strings["Region/State:"] = ""; +$a->strings["<span class=\"heart\">♥</span> Marital Status:"] = ""; +$a->strings["Who: (if applicable)"] = ""; +$a->strings["Examples: cathy123, Cathy Williams, cathy@example.com"] = ""; +$a->strings["Since [date]:"] = ""; +$a->strings["Homepage URL:"] = ""; +$a->strings["Religious Views:"] = ""; +$a->strings["Keywords:"] = ""; +$a->strings["Example: fishing photography software"] = ""; +$a->strings["Used in directory listings"] = ""; +$a->strings["Tell us about yourself..."] = ""; +$a->strings["Hobbies/Interests"] = ""; +$a->strings["Contact information and Social Networks"] = ""; +$a->strings["My other channels"] = ""; +$a->strings["Musical interests"] = ""; +$a->strings["Books, literature"] = ""; +$a->strings["Television"] = ""; +$a->strings["Film/dance/culture/entertainment"] = ""; +$a->strings["Love/romance"] = ""; +$a->strings["Work/employment"] = ""; +$a->strings["School/education"] = ""; +$a->strings["This is your default profile."] = ""; +$a->strings["Age: "] = ""; +$a->strings["Edit/Manage Profiles"] = ""; +$a->strings["Add profile things"] = ""; +$a->strings["Include desirable objects in your profile"] = ""; +$a->strings["No ratings"] = ""; +$a->strings["Ratings"] = ""; +$a->strings["Rating: "] = ""; +$a->strings["Website: "] = ""; +$a->strings["Description: "] = ""; +$a->strings["Source of Item"] = ""; +$a->strings["OpenID protocol error. No ID returned."] = ""; +$a->strings["Welcome %s. Remote authentication successful."] = ""; +$a->strings["%d rating"] = array( + 0 => "", + 1 => "", +); +$a->strings["Gender: "] = ""; +$a->strings["Status: "] = ""; +$a->strings["Homepage: "] = ""; +$a->strings["Hometown: "] = ""; +$a->strings["About: "] = ""; +$a->strings["Public Forum:"] = ""; +$a->strings["Keywords: "] = ""; +$a->strings["Common connections: %s"] = ""; +$a->strings["Finding:"] = ""; +$a->strings["next page"] = ""; +$a->strings["previous page"] = ""; +$a->strings["No entries (some entries may be hidden)."] = ""; +$a->strings["Export Channel"] = ""; +$a->strings["Export your basic channel information to a small file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = ""; +$a->strings["Export Content"] = ""; +$a->strings["Export your channel information and all the content to a JSON backup. This backs up all of your connections, permissions, profile data and all of your content, but is generally not suitable for importing a channel to a new hub as this file may be VERY large. Please be patient - it may take several minutes for this download to begin."] = ""; +$a->strings["No connections."] = ""; +$a->strings["Visit %s's profile [%s]"] = ""; +$a->strings["invalid target signature"] = ""; $a->strings["Theme settings updated."] = ""; $a->strings["Site"] = ""; $a->strings["Accounts"] = ""; $a->strings["Channels"] = ""; $a->strings["Plugins"] = ""; $a->strings["Themes"] = ""; -$a->strings["Server"] = ""; +$a->strings["Inspect queue"] = ""; +$a->strings["Profile Config"] = ""; $a->strings["DB updates"] = ""; $a->strings["Logs"] = ""; $a->strings["Plugin Features"] = ""; $a->strings["User registrations waiting for confirmation"] = ""; +$a->strings["# Accounts"] = ""; +$a->strings["# blocked accounts"] = ""; +$a->strings["# expired accounts"] = ""; +$a->strings["# expiring accounts"] = ""; +$a->strings["# Channels"] = ""; +$a->strings["# primary"] = ""; +$a->strings["# clones"] = ""; $a->strings["Message queues"] = ""; $a->strings["Administration"] = ""; $a->strings["Summary"] = ""; -$a->strings["Registered users"] = ""; +$a->strings["Registered accounts"] = ""; $a->strings["Pending registrations"] = ""; -$a->strings["Version"] = ""; +$a->strings["Registered channels"] = ""; $a->strings["Active plugins"] = ""; +$a->strings["Version"] = ""; $a->strings["Site settings updated."] = ""; -$a->strings["No special theme for accessibility"] = ""; +$a->strings["experimental"] = ""; +$a->strings["unsupported"] = ""; $a->strings["Yes - with approval"] = ""; $a->strings["My site is not a public server"] = ""; $a->strings["My site has paid access only"] = ""; $a->strings["My site has free access only"] = ""; $a->strings["My site offers free accounts with optional paid upgrades"] = ""; +$a->strings["Registration"] = ""; $a->strings["File upload"] = ""; $a->strings["Policies"] = ""; $a->strings["Site name"] = ""; @@ -1503,10 +1668,10 @@ $a->strings["System theme"] = ""; $a->strings["Default system theme - may be over-ridden by user profiles - <a href='#' id='cnftheme'>change theme settings</a>"] = ""; $a->strings["Mobile system theme"] = ""; $a->strings["Theme for mobile devices"] = ""; -$a->strings["Accessibility system theme"] = ""; -$a->strings["Accessibility theme"] = ""; -$a->strings["Channel to use for this website's static pages"] = ""; -$a->strings["Site Channel"] = ""; +$a->strings["Enable Diaspora Protocol"] = ""; +$a->strings["Communicate with Diaspora and Friendica - experimental"] = ""; +$a->strings["Allow Feeds as Connections"] = ""; +$a->strings["(Heavy system resource usage)"] = ""; $a->strings["Maximum image size"] = ""; $a->strings["Maximum size in bytes of uploaded images. Default is 0, which means no limits."] = ""; $a->strings["Does this site allow new member registration?"] = ""; @@ -1519,8 +1684,12 @@ $a->strings["Allowed friend domains"] = ""; $a->strings["Comma separated list of domains which are allowed to establish friendships with this site. Wildcards are accepted. Empty to allow any domains"] = ""; $a->strings["Allowed email domains"] = ""; $a->strings["Comma separated list of domains which are allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains"] = ""; +$a->strings["Not allowed email domains"] = ""; +$a->strings["Comma separated list of domains which are not allowed in email addresses for registrations to this site. Wildcards are accepted. Empty to allow any domains, unless allowed domains have been defined."] = ""; $a->strings["Block public"] = ""; $a->strings["Check to block public access to all otherwise public personal pages on this site unless you are currently logged in."] = ""; +$a->strings["Verify Email Addresses"] = ""; +$a->strings["Check to verify email addresses used in account registration (recommended)."] = ""; $a->strings["Force publish"] = ""; $a->strings["Check to force all profiles on this site to be listed in the site directory."] = ""; $a->strings["Disable discovery tab"] = ""; @@ -1537,11 +1706,14 @@ $a->strings["Poll interval"] = ""; $a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = ""; $a->strings["Maximum Load Average"] = ""; $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = ""; +$a->strings["Expiration period in days for imported (matrix/network) content"] = ""; +$a->strings["0 for no expiration of imported content"] = ""; $a->strings["No server found"] = ""; $a->strings["ID"] = ""; $a->strings["for channel"] = ""; $a->strings["on server"] = ""; $a->strings["Status"] = ""; +$a->strings["Server"] = ""; $a->strings["Update has been marked successful"] = ""; $a->strings["Executing %s failed. Check system logs."] = ""; $a->strings["Update %s was successfully applied."] = ""; @@ -1551,6 +1723,13 @@ $a->strings["No failed updates."] = ""; $a->strings["Failed Updates"] = ""; $a->strings["Mark success (if update was manually applied)"] = ""; $a->strings["Attempt to execute this update step automatically"] = ""; +$a->strings["Queue Statistics"] = ""; +$a->strings["Total Entries"] = ""; +$a->strings["Priority"] = ""; +$a->strings["Destination URL"] = ""; +$a->strings["Mark hub permanently offline"] = ""; +$a->strings["Empty queue for this hub"] = ""; +$a->strings["Last known contact"] = ""; $a->strings["%s user blocked/unblocked"] = array( 0 => "", 1 => "", @@ -1560,9 +1739,8 @@ $a->strings["%s user deleted"] = array( 1 => "", ); $a->strings["Account not found"] = ""; -$a->strings["User '%s' deleted"] = ""; -$a->strings["User '%s' unblocked"] = ""; $a->strings["User '%s' blocked"] = ""; +$a->strings["User '%s' unblocked"] = ""; $a->strings["Users"] = ""; $a->strings["select all"] = ""; $a->strings["User registrations waiting for confirm"] = ""; @@ -1570,6 +1748,8 @@ $a->strings["Request date"] = ""; $a->strings["No registrations."] = ""; $a->strings["Approve"] = ""; $a->strings["Deny"] = ""; +$a->strings["Block"] = ""; +$a->strings["Unblock"] = ""; $a->strings["Register date"] = ""; $a->strings["Last login"] = ""; $a->strings["Expires"] = ""; @@ -1610,166 +1790,221 @@ $a->strings["Debugging"] = ""; $a->strings["Log file"] = ""; $a->strings["Must be writable by web server. Relative to your Red top-level directory."] = ""; $a->strings["Log level"] = ""; -$a->strings["Thing updated"] = ""; -$a->strings["Object store: failed"] = ""; -$a->strings["Thing added"] = ""; -$a->strings["OBJ: %1\$s %2\$s %3\$s"] = ""; -$a->strings["Show Thing"] = ""; -$a->strings["item not found."] = ""; -$a->strings["Edit Thing"] = ""; -$a->strings["Select a profile"] = ""; -$a->strings["Post an activity"] = ""; -$a->strings["Only sends to viewers of the applicable profile"] = ""; -$a->strings["Name of thing e.g. something"] = ""; -$a->strings["URL of thing (optional)"] = ""; -$a->strings["URL for photo of thing (optional)"] = ""; -$a->strings["Add Thing to your Profile"] = ""; -$a->strings["Nothing to import."] = ""; -$a->strings["Unable to download data from old server"] = ""; -$a->strings["Imported file is empty."] = ""; -$a->strings["Cannot create a duplicate channel identifier on this system. Import failed."] = ""; -$a->strings["Channel clone failed. Import failed."] = ""; -$a->strings["Cloned channel not found. Import failed."] = ""; -$a->strings["Import completed."] = ""; -$a->strings["You must be logged in to use this feature."] = ""; -$a->strings["Import Channel"] = ""; -$a->strings["Use this form to import an existing channel from a different server/hub. You may retrieve the channel identity from the old server/hub via the network or provide an export file. Only identity and connections/relationships will be imported. Importation of content is not yet available."] = ""; -$a->strings["File to Upload"] = ""; -$a->strings["Or provide the old server/hub details"] = ""; -$a->strings["Your old identity address (xyz@example.com)"] = ""; -$a->strings["Your old login email address"] = ""; -$a->strings["Your old login password"] = ""; -$a->strings["For either option, please choose whether to make this hub your new primary address, or whether your old location should continue this role. You will be able to post from either location, but only one can be marked as the primary location for files, photos, and media."] = ""; -$a->strings["Make this hub my primary location"] = ""; -$a->strings["Total invitation limit exceeded."] = ""; -$a->strings["%s : Not a valid email address."] = ""; -$a->strings["Please join us on Red"] = ""; -$a->strings["Invitation limit exceeded. Please contact your site administrator."] = ""; -$a->strings["%s : Message delivery failed."] = ""; -$a->strings["%d message sent."] = array( - 0 => "", - 1 => "", -); -$a->strings["You have no more invitations available"] = ""; -$a->strings["Send invitations"] = ""; -$a->strings["Enter email addresses, one per line:"] = ""; -$a->strings["Your message:"] = ""; -$a->strings["You are cordially invited to join me and some other close friends on the Red Matrix - a revolutionary new decentralized communication and information tool."] = ""; -$a->strings["You will need to supply this invitation code: \$invite_code"] = ""; -$a->strings["Please visit my channel at"] = ""; -$a->strings["Once you have registered (on ANY Red Matrix site - they are all inter-connected), please connect with my Red Matrix channel address:"] = ""; -$a->strings["Click the [Register] link on the following page to join."] = ""; -$a->strings["For more information about the Red Matrix Project and why it has the potential to change the internet as we know it, please visit http://getzot.com"] = ""; +$a->strings["New Profile Field"] = ""; +$a->strings["Field nickname"] = ""; +$a->strings["System name of field"] = ""; +$a->strings["Input type"] = ""; +$a->strings["Field Name"] = ""; +$a->strings["Label on profile pages"] = ""; +$a->strings["Help text"] = ""; +$a->strings["Additional info (optional)"] = ""; +$a->strings["Field definition not found"] = ""; +$a->strings["Edit Profile Field"] = ""; +$a->strings["Unable to find your hub."] = ""; +$a->strings["Post successful."] = ""; +$a->strings["Edit Block"] = ""; +$a->strings["Delete block?"] = ""; +$a->strings["Maximum daily site registrations exceeded. Please try again tomorrow."] = ""; +$a->strings["Please indicate acceptance of the Terms of Service. Registration failed."] = ""; +$a->strings["Passwords do not match."] = ""; +$a->strings["Registration successful. Please check your email for validation instructions."] = ""; +$a->strings["Your registration is pending approval by the site owner."] = ""; +$a->strings["Your registration can not be processed."] = ""; +$a->strings["Registration on this site/hub is by approval only."] = ""; +$a->strings["<a href=\"pubsites\">Register at another affiliated site/hub</a>"] = ""; +$a->strings["This site has exceeded the number of allowed daily account registrations. Please try again tomorrow."] = ""; +$a->strings["Terms of Service"] = ""; +$a->strings["I accept the %s for this website"] = ""; +$a->strings["I am over 13 years of age and accept the %s for this website"] = ""; +$a->strings["Membership on this site is by invitation only."] = ""; +$a->strings["Please enter your invitation code"] = ""; +$a->strings["Your email address"] = ""; +$a->strings["Choose a password"] = ""; +$a->strings["Please re-enter your password"] = ""; +$a->strings["Account removals are not allowed within 48 hours of changing the account password."] = ""; +$a->strings["Remove This Account"] = ""; +$a->strings["WARNING: "] = ""; +$a->strings["This account and all its channels will be completely removed from the network. "] = ""; +$a->strings["This action is permanent and can not be undone!"] = ""; +$a->strings["Please enter your password for verification:"] = ""; +$a->strings["Remove this account, all its channels and all its channel clones from the network"] = ""; +$a->strings["By default only the instances of the channels located on this hub will be removed from the network"] = ""; $a->strings["Unable to locate original post."] = ""; $a->strings["Empty post discarded."] = ""; $a->strings["Executable content type not permitted to this channel."] = ""; $a->strings["System error. Post not saved."] = ""; +$a->strings["Unable to obtain post information from database."] = ""; $a->strings["You have reached your limit of %1$.0f top level posts."] = ""; $a->strings["You have reached your limit of %1$.0f webpages."] = ""; $a->strings["[Embedded content - reload page to view]"] = ""; -$a->strings["Help with this feature"] = ""; -$a->strings["Layout Name"] = ""; -$a->strings["Like/Dislike"] = ""; -$a->strings["This action is restricted to members."] = ""; -$a->strings["Please <a href=\"rmagic\">login with your RedMatrix ID</a> or <a href=\"register\">register as a new RedMatrix member</a> to continue."] = ""; -$a->strings["Invalid request."] = ""; -$a->strings["thing"] = ""; -$a->strings["Channel unavailable."] = ""; -$a->strings["Previous action reversed."] = ""; -$a->strings["Action completed."] = ""; -$a->strings["Thank you."] = ""; $a->strings["Remote privacy information not available."] = ""; $a->strings["Visible to:"] = ""; -$a->strings["No connections."] = ""; -$a->strings["Visit %s's profile [%s]"] = ""; -$a->strings["View Connnections"] = ""; -$a->strings["No valid account found."] = ""; -$a->strings["Password reset request issued. Check your email."] = ""; -$a->strings["Site Member (%s)"] = ""; -$a->strings["Password reset requested at %s"] = ""; -$a->strings["Request could not be verified. (You may have previously submitted it.) Password reset failed."] = ""; -$a->strings["Password Reset"] = ""; -$a->strings["Your password has been reset as requested."] = ""; -$a->strings["Your new password is"] = ""; -$a->strings["Save or copy your new password - and then"] = ""; -$a->strings["click here to login"] = ""; -$a->strings["Your password may be changed from the <em>Settings</em> page after successful login."] = ""; -$a->strings["Your password has changed at %s"] = ""; -$a->strings["Forgot your Password?"] = ""; -$a->strings["Enter your email address and submit to have your password reset. Then check your email for further instructions."] = ""; -$a->strings["Email Address"] = ""; -$a->strings["Reset"] = ""; -$a->strings["Hub not found."] = ""; +$a->strings["Comanche page description language help"] = ""; +$a->strings["Layout Description"] = ""; +$a->strings["Download PDL file"] = ""; +$a->strings["First Name"] = ""; +$a->strings["Last Name"] = ""; +$a->strings["Nickname"] = ""; +$a->strings["Full Name"] = ""; +$a->strings["Profile Photo 16px"] = ""; +$a->strings["Profile Photo 32px"] = ""; +$a->strings["Profile Photo 48px"] = ""; +$a->strings["Profile Photo 64px"] = ""; +$a->strings["Profile Photo 80px"] = ""; +$a->strings["Profile Photo 128px"] = ""; +$a->strings["Timezone"] = ""; +$a->strings["Homepage URL"] = ""; +$a->strings["Birth Year"] = ""; +$a->strings["Birth Month"] = ""; +$a->strings["Birth Day"] = ""; +$a->strings["Birthdate"] = ""; +$a->strings["Conversation removed."] = ""; +$a->strings["No messages."] = ""; +$a->strings["Delete conversation"] = ""; +$a->strings["D, d M Y - g:i A"] = ""; +$a->strings["Unable to create element."] = ""; +$a->strings["Unable to update menu element."] = ""; +$a->strings["Unable to add menu element."] = ""; +$a->strings["Menu Item Permissions"] = ""; +$a->strings["Link Name"] = ""; +$a->strings["Link or Submenu Target"] = ""; +$a->strings["Enter URL of the link or select a menu name to create a submenu"] = ""; +$a->strings["Use magic-auth if available"] = ""; +$a->strings["Open link in new window"] = ""; +$a->strings["Order in list"] = ""; +$a->strings["Higher numbers will sink to bottom of listing"] = ""; +$a->strings["Submit and finish"] = ""; +$a->strings["Submit and continue"] = ""; +$a->strings["Menu:"] = ""; +$a->strings["Link Target"] = ""; +$a->strings["Edit menu"] = ""; +$a->strings["Edit element"] = ""; +$a->strings["Drop element"] = ""; +$a->strings["New element"] = ""; +$a->strings["Edit this menu container"] = ""; +$a->strings["Add menu element"] = ""; +$a->strings["Delete this menu item"] = ""; +$a->strings["Edit this menu item"] = ""; +$a->strings["Menu item not found."] = ""; +$a->strings["Menu item deleted."] = ""; +$a->strings["Menu item could not be deleted."] = ""; +$a->strings["Edit Menu Element"] = ""; +$a->strings["Link text"] = ""; +$a->strings["Set your current mood and tell your friends"] = ""; $a->strings["Total votes"] = ""; $a->strings["Average Rating"] = ""; +$a->strings["Channel removals are not allowed within 48 hours of changing the account password."] = ""; +$a->strings["Remove This Channel"] = ""; +$a->strings["This channel will be completely removed from the network. "] = ""; +$a->strings["Remove this channel and all its clones from the network"] = ""; +$a->strings["By default only the instance of the channel located on this hub will be removed from the network"] = ""; +$a->strings["is now connected to"] = ""; +$a->strings["Could not access address book record."] = ""; +$a->strings["Refresh failed - channel is currently unavailable."] = ""; +$a->strings["Channel has been unblocked"] = ""; +$a->strings["Channel has been blocked"] = ""; +$a->strings["Unable to set address book parameters."] = ""; +$a->strings["Channel has been unignored"] = ""; +$a->strings["Channel has been ignored"] = ""; +$a->strings["Channel has been unarchived"] = ""; +$a->strings["Channel has been archived"] = ""; +$a->strings["Channel has been unhidden"] = ""; +$a->strings["Channel has been hidden"] = ""; +$a->strings["Channel has been approved"] = ""; +$a->strings["Channel has been unapproved"] = ""; +$a->strings["Connection has been removed."] = ""; +$a->strings["View %s's profile"] = ""; +$a->strings["Refresh Permissions"] = ""; +$a->strings["Fetch updated permissions"] = ""; +$a->strings["Recent Activity"] = ""; +$a->strings["View recent posts and comments"] = ""; +$a->strings["Block (or Unblock) all communications with this connection"] = ""; +$a->strings["Unignore"] = ""; +$a->strings["Ignore"] = ""; +$a->strings["Ignore (or Unignore) all inbound communications from this connection"] = ""; +$a->strings["Unarchive"] = ""; +$a->strings["Archive"] = ""; +$a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = ""; +$a->strings["Unhide"] = ""; +$a->strings["Hide"] = ""; +$a->strings["Hide or Unhide this connection from your other connections"] = ""; +$a->strings["Delete this connection"] = ""; +$a->strings["Approve this connection"] = ""; +$a->strings["Accept connection to allow communication"] = ""; +$a->strings["Connections: settings for %s"] = ""; +$a->strings["Apply these permissions automatically"] = ""; +$a->strings["Apply the permissions indicated on this page to all new connections."] = ""; +$a->strings["Slide to adjust your degree of friendship"] = ""; +$a->strings["Default permissions for your channel type have (just) been applied. They have not yet been submitted. Please review the permissions on this page and make any desired changes at this time. This new connection may <em>not</em> be able to communicate with you until you submit this page, which will install and apply the selected permissions."] = ""; +$a->strings["inherited"] = ""; +$a->strings["Connection has no individual permissions!"] = ""; +$a->strings["This may be appropriate based on your <a href=\"settings\">privacy settings</a>, though you may wish to review the \"Advanced Permissions\"."] = ""; +$a->strings["Profile Visibility"] = ""; +$a->strings["Please choose the profile you would like to display to %s when viewing your profile securely."] = ""; +$a->strings["Contact Information / Notes"] = ""; +$a->strings["Edit contact notes"] = ""; +$a->strings["Their Settings"] = ""; +$a->strings["My Settings"] = ""; +$a->strings["Default permissions for this channel type have (just) been applied. They have <em>not</em> been saved and there are currently no stored default permissions. Please review/edit the applied settings and click [Submit] to finalize."] = ""; +$a->strings["Clear/Disable Automatic Permissions"] = ""; +$a->strings["Forum Members"] = ""; +$a->strings["Soapbox"] = ""; +$a->strings["Full Sharing (typical social network permissions)"] = ""; +$a->strings["Cautious Sharing "] = ""; +$a->strings["Follow Only"] = ""; +$a->strings["Individual Permissions"] = ""; +$a->strings["Some permissions may be inherited from your channel <a href=\"settings\">privacy settings</a>, which have higher priority than individual settings. Changing those inherited settings on this page will have no effect."] = ""; +$a->strings["Advanced Permissions"] = ""; +$a->strings["Simple Permissions (select one and submit)"] = ""; +$a->strings["Visit %s's profile - %s"] = ""; +$a->strings["Block/Unblock contact"] = ""; +$a->strings["Ignore contact"] = ""; +$a->strings["Repair URL settings"] = ""; +$a->strings["View conversations"] = ""; +$a->strings["Delete contact"] = ""; +$a->strings["Last update:"] = ""; +$a->strings["Update public posts"] = ""; +$a->strings["Update now"] = ""; +$a->strings["Currently blocked"] = ""; +$a->strings["Currently ignored"] = ""; +$a->strings["Currently archived"] = ""; +$a->strings["Currently pending"] = ""; +$a->strings["We encountered a problem while logging in with the OpenID you provided. Please check the correct spelling of the ID."] = ""; +$a->strings["The error message was:"] = ""; +$a->strings["Authentication failed."] = ""; +$a->strings["Remote Authentication"] = ""; +$a->strings["Enter your channel address (e.g. channel@example.com)"] = ""; +$a->strings["Authenticate"] = ""; $a->strings["Unable to lookup recipient."] = ""; $a->strings["Unable to communicate with requested channel."] = ""; $a->strings["Cannot verify requested channel."] = ""; $a->strings["Selected channel has private message restrictions. Send failed."] = ""; -$a->strings["Messages"] = ""; $a->strings["Message deleted."] = ""; $a->strings["Message recalled."] = ""; $a->strings["Send Private Message"] = ""; $a->strings["To:"] = ""; $a->strings["Subject:"] = ""; +$a->strings["Send"] = ""; $a->strings["Message not found."] = ""; $a->strings["Delete message"] = ""; $a->strings["Recall message"] = ""; $a->strings["Message has been recalled."] = ""; $a->strings["Private Conversation"] = ""; -$a->strings["Delete conversation"] = ""; $a->strings["No secure communications available. You <strong>may</strong> be able to respond from the sender's profile page."] = ""; $a->strings["Send Reply"] = ""; -$a->strings["You have created %1$.0f of %2$.0f allowed channels."] = ""; -$a->strings["Create a new channel"] = ""; -$a->strings["Channel Manager"] = ""; -$a->strings["Current Channel"] = ""; -$a->strings["Attach to one of your channels by selecting it."] = ""; -$a->strings["Default Channel"] = ""; -$a->strings["Make Default"] = ""; -$a->strings["Wall Photos"] = ""; -$a->strings["Profile Match"] = ""; -$a->strings["No keywords to match. Please add keywords to your default profile."] = ""; -$a->strings["is interested in:"] = ""; -$a->strings["No matches"] = ""; -$a->strings["Menu updated."] = ""; -$a->strings["Unable to update menu."] = ""; -$a->strings["Menu created."] = ""; -$a->strings["Unable to create menu."] = ""; -$a->strings["Manage Menus"] = ""; -$a->strings["Drop"] = ""; -$a->strings["Create a new menu"] = ""; -$a->strings["Delete this menu"] = ""; -$a->strings["Edit menu contents"] = ""; -$a->strings["Edit this menu"] = ""; -$a->strings["New Menu"] = ""; -$a->strings["Menu name"] = ""; -$a->strings["Must be unique, only seen by you"] = ""; -$a->strings["Menu title"] = ""; -$a->strings["Menu title as seen by others"] = ""; -$a->strings["Allow bookmarks"] = ""; -$a->strings["Menu may be used to store saved bookmarks"] = ""; -$a->strings["Menu deleted."] = ""; -$a->strings["Menu could not be deleted."] = ""; -$a->strings["Edit Menu"] = ""; -$a->strings["Add or remove entries to this menu"] = ""; -$a->strings["Conversation removed."] = ""; -$a->strings["No messages."] = ""; -$a->strings["D, d M Y - g:i A"] = ""; +$a->strings["Invalid request identifier."] = ""; +$a->strings["Discard"] = ""; +$a->strings["Please login."] = ""; +$a->strings["Remote authentication blocked. You are logged into this site locally. Please logout and retry."] = ""; $a->strings["Add a Channel"] = ""; $a->strings["A channel is your own collection of related web pages. A channel can be used to hold social network profiles, blogs, conversation groups and forums, celebrity pages, and much more. You may create as many channels as your service provider allows."] = ""; $a->strings["Examples: \"Bob Jameson\", \"Lisa and her Horses\", \"Soccer\", \"Aviation Group\" "] = ""; $a->strings["Choose a short nickname"] = ""; $a->strings["Your nickname will be used to create an easily remembered channel address (like an email address) which you can share with others."] = ""; $a->strings["Or <a href=\"import\">import an existing channel</a> from another location"] = ""; -$a->strings["Invalid request identifier."] = ""; -$a->strings["Discard"] = ""; -$a->strings["No more system notifications."] = ""; -$a->strings["System Notifications"] = ""; -$a->strings["Unable to find your hub."] = ""; -$a->strings["Post successful."] = ""; -$a->strings["invalid target signature"] = ""; -$a->strings["OpenID protocol error. No ID returned."] = ""; +$a->strings["Please choose a channel type (such as social networking or community forum) and privacy requirements so we can select the best permissions for you"] = ""; +$a->strings["Channel Type"] = ""; +$a->strings["Read more about roles"] = ""; $a->strings["App installed."] = ""; $a->strings["Malformed app."] = ""; $a->strings["Embed code"] = ""; @@ -1782,8 +2017,29 @@ $a->strings["80 x 80 pixels - optional"] = ""; $a->strings["Version ID"] = ""; $a->strings["Price of app"] = ""; $a->strings["Location (URL) to purchase app"] = ""; +$a->strings["sent you a private message"] = ""; +$a->strings["added your channel"] = ""; +$a->strings["posted an event"] = ""; +$a->strings["No such group"] = ""; +$a->strings["No such channel"] = ""; +$a->strings["Search Results For:"] = ""; +$a->strings["Collection is empty"] = ""; +$a->strings["Collection: "] = ""; +$a->strings["Connection: "] = ""; +$a->strings["Invalid connection."] = ""; +$a->strings["Ipsum Lorem"] = ""; +$a->strings["Bookmark added"] = ""; +$a->strings["My Bookmarks"] = ""; +$a->strings["My Connections Bookmarks"] = ""; +$a->strings["Insufficient permissions. Request redirected to profile page."] = ""; +$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = ""; $a->strings["Poll"] = ""; $a->strings["View Results"] = ""; +$a->strings["No service class restrictions found."] = ""; +$a->strings["Files: shared with me"] = ""; +$a->strings["NEW"] = ""; +$a->strings["Remove all files"] = ""; +$a->strings["Remove this file"] = ""; $a->strings["Schema Default"] = ""; $a->strings["Sans-Serif"] = ""; $a->strings["Monospace"] = ""; @@ -1819,10 +2075,8 @@ $a->strings["Right offset of the section element"] = ""; $a->strings["Section width"] = ""; $a->strings["Left offset of the aside"] = ""; $a->strings["Right offset of the aside element"] = ""; -$a->strings["None"] = ""; -$a->strings["Header image"] = ""; -$a->strings["Header image only on profile pages"] = ""; -$a->strings["Light (Red Matrix default)"] = ""; +$a->strings["Light (Hubzilla default)"] = ""; +$a->strings["Select scheme"] = ""; $a->strings["Narrow navbar"] = ""; $a->strings["Navigation bar background color"] = ""; $a->strings["Navigation bar gradient top color"] = ""; @@ -1843,22 +2097,24 @@ $a->strings["Set the indent for comments"] = ""; $a->strings["Set the basic color for item icons"] = ""; $a->strings["Set the hover color for item icons"] = ""; $a->strings["Set font-size for the entire application"] = ""; +$a->strings["Example: 14px"] = ""; $a->strings["Set font-color for posts and comments"] = ""; $a->strings["Set radius of corners"] = ""; $a->strings["Set shadow depth of photos"] = ""; -$a->strings["Set maximum width of conversation regions"] = ""; -$a->strings["Center conversation regions"] = ""; +$a->strings["Set maximum width of content region in pixel"] = ""; +$a->strings["Leave empty for default width"] = ""; +$a->strings["Center page content"] = ""; $a->strings["Set minimum opacity of nav bar - to hide it"] = ""; $a->strings["Set size of conversation author photo"] = ""; $a->strings["Set size of followup author photos"] = ""; -$a->strings["Sloppy photo albums"] = ""; -$a->strings["Are you a clean desk or a messy desk person?"] = ""; $a->strings["Update %s failed. See error logs."] = ""; $a->strings["Update Error at %s"] = ""; -$a->strings["Create an account to access services and applications within the Red Matrix"] = ""; +$a->strings["Create an account to access services and applications within the Hubzilla"] = ""; $a->strings["Password"] = ""; $a->strings["Remember me"] = ""; $a->strings["Forgot your password?"] = ""; -$a->strings["permission denied"] = ""; -$a->strings["Got Zot?"] = ""; $a->strings["toggle mobile"] = ""; +$a->strings["Website SSL certificate is not valid. Please correct."] = ""; +$a->strings["[red] Website SSL error for %s"] = ""; +$a->strings["Cron/Scheduled tasks not running."] = ""; +$a->strings["[red] Cron tasks not running on %s"] = ""; diff --git a/util/zotsh/README.txt b/util/zotsh/README.txt index 5d03aec2c..3f31bba7f 100644 --- a/util/zotsh/README.txt +++ b/util/zotsh/README.txt @@ -14,7 +14,7 @@ Extract somewere and launch zotsh.py Description
-----------
-ZotSH is a command line WebDAV client for RedMatrix.
+ZotSH is a command line WebDAV client for Hubzilla.
It knows how to magic-auth to remote hubs using Zot.
ZotSH uses 'easywebdav' library (0) with small modifications
|