diff options
Diffstat (limited to 'util/messages.po')
| -rw-r--r-- | util/messages.po | 4673 |
1 files changed, 2575 insertions, 2098 deletions
diff --git a/util/messages.po b/util/messages.po index d645321f7..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-07-31.1110\n" +<<<<<<< HEAD +"Project-Id-Version: 2015-05-29.1047\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-07-31 00:03-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:227 -#: ../../mod/connections.php:382 ../../mod/connections.php:395 -#: ../../mod/connections.php:414 ../../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:1553 -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/Import/import_diaspora.php:17 -msgid "No username found in import file." +#: ../../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/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: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,7 +626,7 @@ 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 "" @@ -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:635 ../../mod/connedit.php:663 -#: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1555 -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:1555 -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:1155 ../../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,13 +753,13 @@ 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 "" @@ -420,17 +767,81 @@ msgstr "" 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:671 msgid "Rating" msgstr "" @@ -496,26 +906,48 @@ msgid "Describe (optional)" msgstr "" #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668 +<<<<<<< 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: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:534 ../../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:692 ../../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 +#: ../../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:395 -msgid "prev" -msgstr "" - -#: ../../include/text.php:397 -msgid "first" -msgstr "" - -#: ../../include/text.php:426 -msgid "last" -msgstr "" - -#: ../../include/text.php:429 -msgid "next" -msgstr "" - -#: ../../include/text.php:439 -msgid "older" -msgstr "" - -#: ../../include/text.php:441 -msgid "newer" -msgstr "" - -#: ../../include/text.php:834 -msgid "No connections" -msgstr "" - -#: ../../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/text.php:918 ../../include/text.php:930 -#: ../../include/nav.php:165 ../../include/apps.php:147 -#: ../../mod/search.php:38 -msgid "Search" -msgstr "" - -#: ../../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:1457 -#: ../../mod/admin.php:1477 -msgid "Save" -msgstr "" - -#: ../../include/text.php:994 -msgid "poke" -msgstr "" - -#: ../../include/text.php:994 ../../include/conversation.php:243 -msgid "poked" -msgstr "" - -#: ../../include/text.php:995 -msgid "ping" -msgstr "" - -#: ../../include/text.php:995 -msgid "pinged" -msgstr "" - -#: ../../include/text.php:996 -msgid "prod" -msgstr "" - -#: ../../include/text.php:996 -msgid "prodded" -msgstr "" - -#: ../../include/text.php:997 -msgid "slap" -msgstr "" - -#: ../../include/text.php:997 -msgid "slapped" -msgstr "" - -#: ../../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 -msgid "Click to open/close" -msgstr "" - -#: ../../include/text.php:1665 ../../mod/events.php:457 -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 "" - -#: ../../include/text.php:1888 ../../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:1891 ../../include/conversation.php:123 -#: ../../mod/like.php:348 ../../mod/tagger.php:47 -msgid "event" -msgstr "" - -#: ../../include/text.php:1894 ../../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: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/RedDAV/RedBrowser.php:107 -#: ../../include/RedDAV/RedBrowser.php:265 +#: ../../include/RedDAV/RedBrowser.php:268 msgid "parent" msgstr "" @@ -982,7 +1059,7 @@ msgstr "" #: ../../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 "" @@ -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/events.php:493 ../../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/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:551 +#: ../../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 "" @@ -1374,8 +1454,13 @@ msgstr "" #: ../../include/widgets.php:136 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../include/conversation.php:945 -#: ../../include/identity.php:857 ../../mod/directory.php:316 +<<<<<<< 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 "" @@ -1425,141 +1510,147 @@ msgstr "" msgid "Archives" msgstr "" -#: ../../include/widgets.php:429 ../../mod/connedit.php:571 +#: ../../include/widgets.php:427 ../../mod/connedit.php:578 msgid "Me" msgstr "" -#: ../../include/widgets.php:430 ../../mod/connedit.php:572 +#: ../../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:573 +#: ../../mod/connedit.php:580 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Friends" msgstr "" -#: ../../include/widgets.php:432 ../../mod/connedit.php:574 +#: ../../include/widgets.php:430 ../../mod/connedit.php:581 msgid "Acquaintances" msgstr "" -#: ../../include/widgets.php:433 ../../mod/connections.php:231 -#: ../../mod/connections.php:246 ../../mod/connedit.php:575 +#: ../../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:662 +#: ../../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:908 ../../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,23 +1927,19 @@ 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 "" @@ -1849,14 +1980,14 @@ msgid "I abstain" msgstr "" #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 -#: ../../include/conversation.php:1677 ../../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:1701 ../../include/identity.php:1167 -#: ../../mod/photos.php:1019 +#: ../../include/conversation.php:1701 ../../include/identity.php:1134 +#: ../../mod/photos.php:1007 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -1864,7 +1995,7 @@ msgstr[0] "" msgstr[1] "" #: ../../include/ItemObject.php:184 ../../include/conversation.php:1704 -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1012 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -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 "" @@ -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:737 -#: ../../include/conversation.php:1209 ../../mod/editpost.php:123 -#: ../../mod/photos.php:962 ../../mod/editlayout.php:147 -#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149 +#: ../../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:1181 -#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134 -#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135 +#: ../../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:1182 -#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135 -#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136 +#: ../../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:1183 -#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136 -#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137 +#: ../../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:1184 -#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137 -#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138 +#: ../../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:1185 -#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138 -#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139 +#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183 +#: ../../mod/editpost.php:118 ../../mod/editblock.php:145 msgid "Code" msgstr "" @@ -2049,7 +2180,7 @@ msgid "Video" msgstr "" #: ../../include/ItemObject.php:680 ../../include/conversation.php:1236 -#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361 +#: ../../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:215 ../../mod/admin.php:739 +#: ../../include/Contact.php:215 ../../mod/admin.php:730 #, php-format msgid "User '%s' deleted" msgstr "" @@ -2070,11 +2201,11 @@ msgstr "" msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:461 +#: ../../include/bb2diaspora.php:453 msgid "$Projectname event notification:" msgstr "" -#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1550 +#: ../../include/nav.php:87 ../../include/nav.php:120 ../../boot.php:1549 msgid "Logout" msgstr "" @@ -2091,7 +2222,7 @@ msgid "Your posts and conversations" msgstr "" #: ../../include/nav.php:91 ../../include/conversation.php:942 -#: ../../mod/connedit.php:498 +#: ../../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:880 +#: ../../include/nav.php:95 ../../include/identity.php:847 msgid "Edit Profile" msgstr "" @@ -2146,7 +2277,7 @@ msgid "Your bookmarks" msgstr "" #: ../../include/nav.php:113 ../../include/conversation.php:1645 -#: ../../include/apps.php:136 ../../mod/webpages.php:178 +#: ../../include/apps.php:136 ../../mod/webpages.php:177 msgid "Webpages" msgstr "" @@ -2154,7 +2285,7 @@ msgstr "" msgid "Your webpages" msgstr "" -#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1551 +#: ../../include/nav.php:117 ../../include/apps.php:131 ../../boot.php:1550 msgid "Login" msgstr "" @@ -2179,7 +2310,7 @@ msgstr "" msgid "Home Page" msgstr "" -#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1527 +#: ../../include/nav.php:155 ../../mod/register.php:224 ../../boot.php:1526 msgid "Register" 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 "" @@ -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 "" @@ -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,42 +2691,42 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:996 +#: ../../include/conversation.php:572 ../../mod/photos.php:984 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:996 +#: ../../include/conversation.php:572 ../../mod/photos.php:984 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Might attend" msgstr "" @@ -2724,13 +2862,13 @@ msgstr "" msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1147 ../../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:1174 ../../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 "" @@ -2742,9 +2880,9 @@ msgstr "" msgid "Post as" msgstr "" -#: ../../include/conversation.php:1186 ../../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 "" @@ -2752,9 +2890,9 @@ msgstr "" msgid "upload photo" msgstr "" -#: ../../include/conversation.php:1188 ../../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 "" @@ -2762,9 +2900,9 @@ msgstr "" msgid "attach file" msgstr "" -#: ../../include/conversation.php:1190 ../../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 "" @@ -2788,9 +2926,9 @@ msgstr "" msgid "audio link" msgstr "" -#: ../../include/conversation.php:1196 ../../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 "" @@ -2798,13 +2936,13 @@ msgstr "" msgid "set location" msgstr "" -#: ../../include/conversation.php:1198 ../../mod/editpost.php:120 +#: ../../include/conversation.php:1198 ../../mod/editpost.php:127 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1201 ../../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 "" @@ -2812,20 +2950,20 @@ msgstr "" msgid "clear location" msgstr "" -#: ../../include/conversation.php:1204 ../../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:1208 ../../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:1210 ../../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 "" @@ -2833,33 +2971,33 @@ msgstr "" msgid "permissions" msgstr "" -#: ../../include/conversation.php:1219 ../../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:1221 ../../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:1234 ../../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:1238 ../../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:1239 ../../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 "" @@ -2892,7 +3030,7 @@ msgid "Posts that mention or involve you" msgstr "" #: ../../include/conversation.php:1513 ../../mod/connections.php:212 -#: ../../mod/connections.php:225 ../../mod/menu.php:107 +#: ../../mod/connections.php:225 ../../mod/menu.php:105 msgid "New" msgstr "" @@ -2916,7 +3054,7 @@ msgstr "" msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1579 ../../mod/admin.php:993 +#: ../../include/conversation.php:1579 ../../mod/admin.php:984 msgid "Channel" msgstr "" @@ -2994,87 +3132,149 @@ 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:1035 ../../include/items.php:1081 +#: ../../include/items.php:1020 ../../include/items.php:1066 msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1307 +<<<<<<< HEAD +#: ../../include/items.php:1234 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1236 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1238 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1240 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1242 +======= +#: ../../include/items.php:1304 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1309 +#: ../../include/items.php:1306 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1311 +#: ../../include/items.php:1308 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1313 +#: ../../include/items.php:1310 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1315 +#: ../../include/items.php:1312 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1317 +<<<<<<< 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:1319 +#: ../../include/items.php:1316 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1321 +#: ../../include/items.php:1318 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4209 ../../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:4282 ../../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: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: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:169 -#: ../../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:336 +<<<<<<< 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:4684 ../../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:4700 +<<<<<<< HEAD +#: ../../include/items.php:4551 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4707 +#: ../../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:4717 ../../mod/connedit.php:662 +<<<<<<< HEAD +#: ../../include/items.php:4568 +======= +#: ../../include/items.php:4703 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4719 +<<<<<<< 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:2132 +#: ../../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:413 +#: ../../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:383 +#: ../../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: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:660 +#: ../../include/identity.php:631 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:707 ../../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:870 ../../mod/profiles.php:774 +#: ../../include/identity.php:837 ../../mod/profiles.php:774 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:876 +#: ../../include/identity.php:843 msgid "Profiles" msgstr "" -#: ../../include/identity.php:876 +#: ../../include/identity.php:843 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:877 ../../mod/profiles.php:775 +#: ../../include/identity.php:844 ../../mod/profiles.php:775 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:892 ../../mod/profiles.php:786 +#: ../../include/identity.php:859 ../../mod/profiles.php:786 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:895 +#: ../../include/identity.php:862 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:896 ../../mod/profiles.php:669 +#: ../../include/identity.php:863 ../../mod/profiles.php:669 #: ../../mod/profiles.php:790 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:912 ../../include/identity.php:1151 +#: ../../include/identity.php:879 ../../include/identity.php:1118 msgid "Gender:" msgstr "" -#: ../../include/identity.php:913 ../../include/identity.php:1195 +#: ../../include/identity.php:880 ../../include/identity.php:1162 msgid "Status:" msgstr "" -#: ../../include/identity.php:914 ../../include/identity.php:1206 +#: ../../include/identity.php:881 ../../include/identity.php:1173 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:915 +#: ../../include/identity.php:882 msgid "Online Now" msgstr "" -#: ../../include/identity.php:998 ../../include/identity.php:1076 +#: ../../include/identity.php:965 ../../include/identity.php:1043 #: ../../mod/ping.php:324 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:999 ../../include/identity.php:1077 +#: ../../include/identity.php:966 ../../include/identity.php:1044 msgid "F d" msgstr "" -#: ../../include/identity.php:1044 ../../include/identity.php:1116 +#: ../../include/identity.php:1011 ../../include/identity.php:1083 #: ../../mod/ping.php:346 msgid "[today]" msgstr "" -#: ../../include/identity.php:1055 +#: ../../include/identity.php:1022 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1056 +#: ../../include/identity.php:1023 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1109 +#: ../../include/identity.php:1076 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1127 +#: ../../include/identity.php:1094 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1128 +#: ../../include/identity.php:1095 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1141 ../../include/identity.php:1258 +#: ../../include/identity.php:1108 ../../include/identity.php:1225 #: ../../include/apps.php:138 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/identity.php:1149 ../../mod/settings.php:1056 +#: ../../include/identity.php:1116 ../../mod/settings.php:1050 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1156 +#: ../../include/identity.php:1123 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1180 +#: ../../include/identity.php:1147 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1181 +#: ../../include/identity.php:1148 msgid "j F" msgstr "" -#: ../../include/identity.php:1188 +#: ../../include/identity.php:1155 msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1192 ../../mod/directory.php:297 +<<<<<<< HEAD +#: ../../include/identity.php:1159 +======= +#: ../../include/identity.php:1163 ../../mod/directory.php:290 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Age:" msgstr "" -#: ../../include/identity.php:1201 +#: ../../include/identity.php:1168 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1204 ../../mod/profiles.php:691 +#: ../../include/identity.php:1171 ../../mod/profiles.php:691 msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1208 ../../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:1210 +#: ../../include/identity.php:1177 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1212 ../../mod/profiles.php:694 +#: ../../include/identity.php:1179 ../../mod/profiles.php:694 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1214 +#: ../../include/identity.php:1181 msgid "Religion:" msgstr "" -#: ../../include/identity.php:1216 ../../mod/directory.php:315 +<<<<<<< HEAD +#: ../../include/identity.php:1183 +======= +#: ../../include/identity.php:1187 ../../mod/directory.php:308 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "About:" msgstr "" -#: ../../include/identity.php:1218 +#: ../../include/identity.php:1185 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1220 ../../mod/profiles.php:697 +#: ../../include/identity.php:1187 ../../mod/profiles.php:697 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1222 ../../mod/profiles.php:698 +#: ../../include/identity.php:1189 ../../mod/profiles.php:698 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1224 +#: ../../include/identity.php:1191 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1226 +#: ../../include/identity.php:1193 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1228 +#: ../../include/identity.php:1195 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1230 +#: ../../include/identity.php:1197 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1232 +#: ../../include/identity.php:1199 msgid "Television:" msgstr "" -#: ../../include/identity.php:1234 +#: ../../include/identity.php:1201 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1236 +#: ../../include/identity.php:1203 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1238 +#: ../../include/identity.php:1205 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1240 +#: ../../include/identity.php:1207 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1260 +#: ../../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/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/directory.php:308 ../../mod/events.php:659 +#: ../../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/directory.php:386 -msgid "Sort options" +#: ../../mod/settings.php:1110 +msgid "Unseen private messages" msgstr "" -#: ../../mod/directory.php:387 -msgid "Alphabetic" +#: ../../mod/settings.php:1110 ../../mod/settings.php:1115 +#: ../../mod/settings.php:1116 ../../mod/settings.php:1117 +msgid "Recommended" msgstr "" -#: ../../mod/directory.php:388 -msgid "Reverse Alphabetic" +#: ../../mod/settings.php:1111 +msgid "Upcoming events" msgstr "" -#: ../../mod/directory.php:389 -msgid "Newest to Oldest" +#: ../../mod/settings.php:1112 +msgid "Events today" msgstr "" -#: ../../mod/directory.php:390 -msgid "Oldest to Newest" +#: ../../mod/settings.php:1113 +msgid "Upcoming birthdays" msgstr "" -#: ../../mod/directory.php:407 -msgid "No entries (some entries may be hidden)." +#: ../../mod/settings.php:1113 +msgid "Not available in all themes" +msgstr "" + +#: ../../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 "" @@ -4187,12 +4954,21 @@ msgstr "" msgid "Post an activity" msgstr "" +<<<<<<< HEAD #: ../../mod/thing.php:267 ../../mod/thing.php:313 msgid "Only sends to viewers of the applicable profile" msgstr "" #: ../../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:271 ../../mod/thing.php:316 @@ -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 "" @@ -4373,109 +5220,101 @@ msgstr "" 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: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 "" @@ -4529,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 "" @@ -4557,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 "" @@ -4598,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 " @@ -4621,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 @@ -4725,11 +5584,11 @@ msgstr "" msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:94 ../../mod/connedit.php:219 +#: ../../mod/connections.php:94 ../../mod/connedit.php:214 msgid "Connection updated." msgstr "" -#: ../../mod/connections.php:96 ../../mod/connedit.php:221 +#: ../../mod/connections.php:96 ../../mod/connedit.php:216 msgid "Failed to update connection record." msgstr "" @@ -4818,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 "" @@ -5089,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:516 +#: ../../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:521 +#: ../../mod/import.php:492 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:522 +#: ../../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:523 +#: ../../mod/import.php:494 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:524 +#: ../../mod/import.php:495 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:525 +#: ../../mod/import.php:496 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:526 +#: ../../mod/import.php:497 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:527 +#: ../../mod/import.php:498 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:528 +#: ../../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 " @@ -5166,38 +6017,52 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:529 +#: ../../mod/import.php:500 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/import.php:530 -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:531 -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 "" @@ -5239,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 "" @@ -5399,7 +6144,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1559 +#: ../../mod/lostpass.php:85 ../../boot.php:1558 msgid "Password Reset" msgstr "" @@ -5457,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 @@ -5661,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 "" @@ -5673,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 "" @@ -5822,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 "" @@ -5905,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 "" @@ -5961,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 @@ -6073,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 "" @@ -6528,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/uexport.php:41 ../../mod/uexport.php:42 +#: ../../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/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:43 +#: ../../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:44 +#: ../../mod/uexport.php:36 msgid "Export Content" msgstr "" -#: ../../mod/uexport.php:45 +#: ../../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 " @@ -6574,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 "" @@ -6582,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 "" @@ -6606,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 "" @@ -6650,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 "" @@ -6665,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 "" @@ -6673,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 "" @@ -6681,675 +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 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 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:747 +#: ../../mod/admin.php:738 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:755 +#: ../../mod/admin.php:746 #, php-format 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:687 +#: ../../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:519 +#: ../../mod/admin.php:818 ../../mod/connedit.php:517 +#: ../../mod/connedit.php:720 msgid "Block" msgstr "" -#: ../../mod/admin.php:828 ../../mod/connedit.php:519 +#: ../../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 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 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 "" @@ -7361,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 "" @@ -7475,25 +8291,39 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720 -msgid "Remove Account" +#: ../../mod/item.php:174 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 -msgid "Help:" +#: ../../mod/item.php:440 +msgid "Empty post discarded." msgstr "" -#: ../../mod/help.php:76 ../../index.php:238 -msgid "Not Found" +#: ../../mod/item.php:480 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/help.php:100 -msgid "$Projectname Documentation" +#: ../../mod/item.php:897 +msgid "System error. Post not saved." +msgstr "" + +#: ../../mod/item.php:1115 +msgid "Unable to obtain post information from database." +msgstr "" + +#: ../../mod/item.php:1122 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." +msgstr "" + +#: ../../mod/item.php:1129 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." 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 +#: ../../mod/update_home.php:21 msgid "[Embedded content - reload page to view]" msgstr "" @@ -7505,929 +8335,565 @@ msgstr "" 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" +#: ../../mod/layouts.php:176 +msgid "Comanche page description language help" msgstr "" -#: ../../mod/settings.php:719 ../../mod/settings.php:1057 -msgid "Email Address:" +#: ../../mod/layouts.php:180 +msgid "Layout Description" msgstr "" -#: ../../mod/settings.php:721 -msgid "Remove this account including all its channels" +#: ../../mod/layouts.php:185 +msgid "Download PDL file" msgstr "" -#: ../../mod/settings.php:737 -msgid "Off" +#: ../../mod/id.php:11 +msgid "First Name" msgstr "" -#: ../../mod/settings.php:737 -msgid "On" +#: ../../mod/id.php:12 +msgid "Last Name" msgstr "" -#: ../../mod/settings.php:744 -msgid "Additional Features" +#: ../../mod/id.php:13 +msgid "Nickname" msgstr "" -#: ../../mod/settings.php:768 -msgid "Connector Settings" +#: ../../mod/id.php:14 +msgid "Full Name" msgstr "" -#: ../../mod/settings.php:807 -msgid "No special theme for mobile devices" +#: ../../mod/id.php:20 +msgid "Profile Photo 16px" msgstr "" -#: ../../mod/settings.php:810 -#, php-format -msgid "%s - (Experimental)" +#: ../../mod/id.php:21 +msgid "Profile Photo 32px" msgstr "" -#: ../../mod/settings.php:849 -msgid "Display Settings" +#: ../../mod/id.php:22 +msgid "Profile Photo 48px" msgstr "" -#: ../../mod/settings.php:850 -msgid "Theme Settings" +#: ../../mod/id.php:23 +msgid "Profile Photo 64px" msgstr "" -#: ../../mod/settings.php:851 -msgid "Custom Theme Settings" +#: ../../mod/id.php:24 +msgid "Profile Photo 80px" msgstr "" -#: ../../mod/settings.php:852 -msgid "Content Settings" +#: ../../mod/id.php:25 +msgid "Profile Photo 128px" msgstr "" -#: ../../mod/settings.php:858 -msgid "Display Theme:" +#: ../../mod/id.php:26 +msgid "Timezone" msgstr "" -#: ../../mod/settings.php:859 -msgid "Mobile Theme:" +#: ../../mod/id.php:27 +msgid "Homepage URL" msgstr "" -#: ../../mod/settings.php:860 -msgid "Enable user zoom on mobile devices" +#: ../../mod/id.php:29 +msgid "Birth Year" msgstr "" -#: ../../mod/settings.php:861 -msgid "Update browser every xx seconds" +#: ../../mod/id.php:30 +msgid "Birth Month" msgstr "" -#: ../../mod/settings.php:861 -msgid "Minimum of 10 seconds, no maximum" +#: ../../mod/id.php:31 +msgid "Birth Day" msgstr "" -#: ../../mod/settings.php:862 -msgid "Maximum number of conversations to load at any time:" +#: ../../mod/id.php:32 +msgid "Birthdate" msgstr "" -#: ../../mod/settings.php:862 -msgid "Maximum of 100 items" +#: ../../mod/message.php:41 +msgid "Conversation removed." msgstr "" -#: ../../mod/settings.php:863 -msgid "Show emoticons (smilies) as images" +#: ../../mod/message.php:56 +msgid "No messages." msgstr "" -#: ../../mod/settings.php:864 -msgid "Link post titles to source" +#: ../../mod/message.php:72 ../../mod/mail.php:336 +msgid "Delete conversation" msgstr "" -#: ../../mod/settings.php:865 -msgid "System Page Layout Editor - (advanced)" +#: ../../mod/message.php:74 +msgid "D, d M Y - g:i A" msgstr "" -#: ../../mod/settings.php:868 -msgid "Use blog/list mode on channel page" +#: ../../mod/mitem.php:51 +msgid "Unable to create element." msgstr "" -#: ../../mod/settings.php:868 ../../mod/settings.php:869 -msgid "(comments displayed separately)" +#: ../../mod/mitem.php:74 +msgid "Unable to update menu element." msgstr "" -#: ../../mod/settings.php:869 -msgid "Use blog/list mode on matrix page" +#: ../../mod/mitem.php:89 +msgid "Unable to add menu element." msgstr "" -#: ../../mod/settings.php:870 -msgid "Channel page max height of content (in pixels)" +#: ../../mod/mitem.php:158 ../../mod/mitem.php:228 +msgid "Menu Item Permissions" msgstr "" -#: ../../mod/settings.php:870 ../../mod/settings.php:871 -msgid "click to expand content exceeding this height" +#: ../../mod/mitem.php:161 ../../mod/mitem.php:176 +msgid "Link Name" msgstr "" -#: ../../mod/settings.php:871 -msgid "Matrix page max height of content (in pixels)" +#: ../../mod/mitem.php:162 ../../mod/mitem.php:233 +msgid "Link or Submenu Target" msgstr "" -#: ../../mod/settings.php:905 -msgid "Nobody except yourself" +#: ../../mod/mitem.php:162 +msgid "Enter URL of the link or select a menu name to create a submenu" msgstr "" -#: ../../mod/settings.php:906 -msgid "Only those you specifically allow" +#: ../../mod/mitem.php:163 ../../mod/mitem.php:234 +msgid "Use magic-auth if available" msgstr "" -#: ../../mod/settings.php:907 -msgid "Approved connections" +#: ../../mod/mitem.php:164 ../../mod/mitem.php:235 +msgid "Open link in new window" msgstr "" -#: ../../mod/settings.php:908 -msgid "Any connections" +#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 +msgid "Order in list" msgstr "" -#: ../../mod/settings.php:909 -msgid "Anybody on this website" +#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 +msgid "Higher numbers will sink to bottom of listing" msgstr "" -#: ../../mod/settings.php:910 -msgid "Anybody in this network" +#: ../../mod/mitem.php:166 +msgid "Submit and finish" msgstr "" -#: ../../mod/settings.php:911 -msgid "Anybody authenticated" +#: ../../mod/mitem.php:167 +msgid "Submit and continue" msgstr "" -#: ../../mod/settings.php:912 -msgid "Anybody on the internet" +#: ../../mod/mitem.php:174 +msgid "Menu:" msgstr "" -#: ../../mod/settings.php:986 -msgid "Publish your default profile in the network directory" +#: ../../mod/mitem.php:177 +msgid "Link Target" msgstr "" -#: ../../mod/settings.php:991 -msgid "Allow us to suggest you as a potential friend to new members?" +#: ../../mod/mitem.php:180 +msgid "Edit menu" msgstr "" -#: ../../mod/settings.php:1000 -msgid "Your channel address is" +#: ../../mod/mitem.php:183 +msgid "Edit element" msgstr "" -#: ../../mod/settings.php:1048 -msgid "Channel Settings" +#: ../../mod/mitem.php:184 +msgid "Drop element" msgstr "" -#: ../../mod/settings.php:1055 -msgid "Basic Settings" +#: ../../mod/mitem.php:185 +msgid "New element" msgstr "" -#: ../../mod/settings.php:1058 -msgid "Your Timezone:" +#: ../../mod/mitem.php:186 +msgid "Edit this menu container" msgstr "" -#: ../../mod/settings.php:1059 -msgid "Default Post Location:" +#: ../../mod/mitem.php:187 +msgid "Add menu element" msgstr "" -#: ../../mod/settings.php:1059 -msgid "Geographical location to display on your posts" +#: ../../mod/mitem.php:188 +msgid "Delete this menu item" msgstr "" -#: ../../mod/settings.php:1060 -msgid "Use Browser Location:" +#: ../../mod/mitem.php:189 +msgid "Edit this menu item" msgstr "" -#: ../../mod/settings.php:1062 -msgid "Adult Content" +#: ../../mod/mitem.php:206 +msgid "Menu item not found." msgstr "" -#: ../../mod/settings.php:1062 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" +#: ../../mod/mitem.php:217 +msgid "Menu item deleted." msgstr "" -#: ../../mod/settings.php:1064 -msgid "Security and Privacy Settings" +#: ../../mod/mitem.php:219 +msgid "Menu item could not be deleted." msgstr "" -#: ../../mod/settings.php:1066 -msgid "Your permissions are already configured. Click to view/adjust" +#: ../../mod/mitem.php:226 +msgid "Edit Menu Element" msgstr "" -#: ../../mod/settings.php:1068 -msgid "Hide my online presence" +#: ../../mod/mitem.php:232 +msgid "Link text" msgstr "" -#: ../../mod/settings.php:1068 -msgid "Prevents displaying in your profile that you are online" +#: ../../mod/mood.php:131 +msgid "Set your current mood and tell your friends" msgstr "" -#: ../../mod/settings.php:1070 -msgid "Simple Privacy Settings:" +#: ../../mod/vote.php:97 +msgid "Total votes" msgstr "" -#: ../../mod/settings.php:1071 -msgid "" -"Very Public - <em>extremely permissive (should be used with caution)</em>" +#: ../../mod/vote.php:98 +msgid "Average Rating" msgstr "" -#: ../../mod/settings.php:1072 +#: ../../mod/removeme.php:29 msgid "" -"Typical - <em>default public, privacy when desired (similar to social " -"network permissions but with improved privacy)</em>" +"Channel removals are not allowed within 48 hours of changing the account " +"password." msgstr "" -#: ../../mod/settings.php:1073 -msgid "Private - <em>default private, never open or public</em>" +#: ../../mod/removeme.php:57 +msgid "Remove This Channel" msgstr "" -#: ../../mod/settings.php:1074 -msgid "Blocked - <em>default blocked to/from everybody</em>" +#: ../../mod/removeme.php:58 +msgid "This channel will be completely removed from the network. " msgstr "" -#: ../../mod/settings.php:1076 -msgid "Allow others to tag your posts" +#: ../../mod/removeme.php:60 +msgid "Remove this channel and all its clones from the network" msgstr "" -#: ../../mod/settings.php:1076 +#: ../../mod/removeme.php:60 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" -msgstr "" - -#: ../../mod/settings.php:1099 -msgid "joining a forum/community" -msgstr "" - -#: ../../mod/settings.php:1100 -msgid "making an <em>interesting</em> profile change" -msgstr "" - -#: ../../mod/settings.php:1101 -msgid "Send a notification email when:" +"By default only the instance of the channel located on this hub will be " +"removed from the network" msgstr "" -#: ../../mod/settings.php:1102 -msgid "You receive a connection request" +#: ../../mod/connedit.php:268 +msgid "is now connected to" msgstr "" -#: ../../mod/settings.php:1103 -msgid "Your connections are confirmed" +#: ../../mod/connedit.php:381 +msgid "Could not access address book record." msgstr "" -#: ../../mod/settings.php:1104 -msgid "Someone writes on your profile wall" +#: ../../mod/connedit.php:395 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/settings.php:1105 -msgid "Someone writes a followup comment" +#: ../../mod/connedit.php:402 +msgid "Channel has been unblocked" msgstr "" -#: ../../mod/settings.php:1106 -msgid "You receive a private message" +#: ../../mod/connedit.php:403 +msgid "Channel has been blocked" msgstr "" -#: ../../mod/settings.php:1107 -msgid "You receive a friend suggestion" +#: ../../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/settings.php:1108 -msgid "You are tagged in a post" +#: ../../mod/connedit.php:414 +msgid "Channel has been unignored" msgstr "" -#: ../../mod/settings.php:1109 -msgid "You are poked/prodded/etc. in a post" +#: ../../mod/connedit.php:415 +msgid "Channel has been ignored" msgstr "" -#: ../../mod/settings.php:1112 -msgid "Show visual notifications including:" +#: ../../mod/connedit.php:426 +msgid "Channel has been unarchived" msgstr "" -#: ../../mod/settings.php:1114 -msgid "Unseen matrix activity" +#: ../../mod/connedit.php:427 +msgid "Channel has been archived" msgstr "" -#: ../../mod/settings.php:1115 -msgid "Unseen channel activity" +#: ../../mod/connedit.php:438 +msgid "Channel has been unhidden" msgstr "" -#: ../../mod/settings.php:1116 -msgid "Unseen private messages" +#: ../../mod/connedit.php:439 +msgid "Channel has been hidden" msgstr "" -#: ../../mod/settings.php:1116 ../../mod/settings.php:1121 -#: ../../mod/settings.php:1122 ../../mod/settings.php:1123 -msgid "Recommended" +#: ../../mod/connedit.php:454 +msgid "Channel has been approved" msgstr "" -#: ../../mod/settings.php:1117 -msgid "Upcoming events" +#: ../../mod/connedit.php:455 +msgid "Channel has been unapproved" msgstr "" -#: ../../mod/settings.php:1118 -msgid "Events today" -msgstr "" - -#: ../../mod/settings.php:1119 -msgid "Upcoming birthdays" +#: ../../mod/connedit.php:483 +msgid "Connection has been removed." msgstr "" -#: ../../mod/settings.php:1119 -msgid "Not available in all themes" +#: ../../mod/connedit.php:503 +#, php-format +msgid "View %s's profile" msgstr "" -#: ../../mod/settings.php:1120 -msgid "System (personal) notifications" +#: ../../mod/connedit.php:507 +msgid "Refresh Permissions" msgstr "" -#: ../../mod/settings.php:1121 -msgid "System info messages" +#: ../../mod/connedit.php:510 +msgid "Fetch updated permissions" msgstr "" -#: ../../mod/settings.php:1122 -msgid "System critical alerts" +#: ../../mod/connedit.php:514 +msgid "Recent Activity" msgstr "" -#: ../../mod/settings.php:1123 -msgid "New connections" +#: ../../mod/connedit.php:517 +msgid "View recent posts and comments" msgstr "" -#: ../../mod/settings.php:1124 -msgid "System Registrations" +#: ../../mod/connedit.php:526 +msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../mod/settings.php:1125 -msgid "" -"Also show new wall posts, private messages and connections under Notices" +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 +msgid "Unignore" msgstr "" -#: ../../mod/settings.php:1127 -msgid "Notify me of events this many days in advance" +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 +#: ../../mod/notifications.php:51 +msgid "Ignore" msgstr "" -#: ../../mod/settings.php:1127 -msgid "Must be greater than 0" +#: ../../mod/connedit.php:533 +msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../mod/settings.php:1129 -msgid "Advanced Account/Page Type Settings" +#: ../../mod/connedit.php:536 +msgid "Unarchive" msgstr "" -#: ../../mod/settings.php:1130 -msgid "Change the behaviour of this account for special situations" +#: ../../mod/connedit.php:536 +msgid "Archive" msgstr "" -#: ../../mod/settings.php:1133 +#: ../../mod/connedit.php:539 msgid "" -"Please enable expert mode (in <a href=\"settings/features\">Settings > " -"Additional features</a>) to adjust!" -msgstr "" - -#: ../../mod/settings.php:1134 -msgid "Miscellaneous Settings" -msgstr "" - -#: ../../mod/settings.php:1136 -msgid "Personal menu to display in your channel pages" -msgstr "" - -#: ../../mod/settings.php:1137 ../../mod/removeme.php:61 -msgid "Remove Channel" -msgstr "" - -#: ../../mod/settings.php:1138 -msgid "Remove this channel." -msgstr "" - -#: ../../mod/id.php:11 -msgid "First Name" -msgstr "" - -#: ../../mod/id.php:12 -msgid "Last Name" -msgstr "" - -#: ../../mod/id.php:13 -msgid "Nickname" -msgstr "" - -#: ../../mod/id.php:14 -msgid "Full Name" -msgstr "" - -#: ../../mod/id.php:20 -msgid "Profile Photo 16px" -msgstr "" - -#: ../../mod/id.php:21 -msgid "Profile Photo 32px" -msgstr "" - -#: ../../mod/id.php:22 -msgid "Profile Photo 48px" -msgstr "" - -#: ../../mod/id.php:23 -msgid "Profile Photo 64px" -msgstr "" - -#: ../../mod/id.php:24 -msgid "Profile Photo 80px" -msgstr "" - -#: ../../mod/id.php:25 -msgid "Profile Photo 128px" -msgstr "" - -#: ../../mod/id.php:26 -msgid "Timezone" -msgstr "" - -#: ../../mod/id.php:27 -msgid "Homepage URL" +"Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../mod/id.php:29 -msgid "Birth Year" +#: ../../mod/connedit.php:542 +msgid "Unhide" msgstr "" -#: ../../mod/id.php:30 -msgid "Birth Month" +#: ../../mod/connedit.php:542 +msgid "Hide" msgstr "" -#: ../../mod/id.php:31 -msgid "Birth Day" +#: ../../mod/connedit.php:545 +msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../mod/id.php:32 -msgid "Birthdate" +#: ../../mod/connedit.php:552 +msgid "Delete this connection" msgstr "" -#: ../../mod/message.php:41 -msgid "Conversation removed." +#: ../../mod/connedit.php:643 ../../mod/connedit.php:684 +msgid "Approve this connection" msgstr "" -#: ../../mod/message.php:56 -msgid "No messages." +#: ../../mod/connedit.php:643 +msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/message.php:72 ../../mod/mail.php:336 -msgid "Delete conversation" +#: ../../mod/connedit.php:659 +#, php-format +msgid "Connections: settings for %s" msgstr "" -#: ../../mod/message.php:74 -msgid "D, d M Y - g:i A" +#: ../../mod/connedit.php:660 +msgid "Apply these permissions automatically" msgstr "" -#: ../../mod/mood.php:131 -msgid "Set your current mood and tell your friends" +#: ../../mod/connedit.php:664 +msgid "Apply the permissions indicated on this page to all new connections." msgstr "" -#: ../../mod/vote.php:97 -msgid "Total votes" +#: ../../mod/connedit.php:668 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/vote.php:98 -msgid "Average Rating" +#: ../../mod/connedit.php:672 +msgid "Only import posts with this text" msgstr "" -#: ../../mod/removeme.php:29 +#: ../../mod/connedit.php:672 ../../mod/connedit.php:673 msgid "" -"Channel removals are not allowed within 48 hours of changing the account " -"password." -msgstr "" - -#: ../../mod/removeme.php:57 -msgid "Remove This Channel" -msgstr "" - -#: ../../mod/removeme.php:58 -msgid "This channel will be completely removed from the network. " +"words one per line or #tags or /patterns/, leave blank to import all posts" msgstr "" -#: ../../mod/removeme.php:60 -msgid "Remove this channel and all its clones from the network" +#: ../../mod/connedit.php:673 +msgid "Do not import posts with this text" msgstr "" -#: ../../mod/removeme.php:60 +#: ../../mod/connedit.php:680 msgid "" -"By default only the instance of the channel located on this hub will be " -"removed from the network" -msgstr "" - -#: ../../mod/connedit.php:267 -msgid "is now connected to" +"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:380 -msgid "Could not access address book record." +#: ../../mod/connedit.php:683 +msgid "inherited" msgstr "" -#: ../../mod/connedit.php:394 -msgid "Refresh failed - channel is currently unavailable." +#: ../../mod/connedit.php:686 +msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connedit.php:406 ../../mod/connedit.php:418 -#: ../../mod/connedit.php:430 ../../mod/connedit.php:442 -#: ../../mod/connedit.php:458 -msgid "Unable to set address book parameters." +#: ../../mod/connedit.php:687 +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:482 -msgid "Connection has been removed." +#: ../../mod/connedit.php:689 +msgid "Profile Visibility" msgstr "" -#: ../../mod/connedit.php:501 +#: ../../mod/connedit.php:690 #, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../mod/connedit.php:505 -msgid "Refresh Permissions" -msgstr "" - -#: ../../mod/connedit.php:508 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../mod/connedit.php:512 -msgid "Recent Activity" -msgstr "" - -#: ../../mod/connedit.php:515 -msgid "View recent posts and comments" -msgstr "" - -#: ../../mod/connedit.php:522 -msgid "Block (or Unblock) all communications with this connection" -msgstr "" - -#: ../../mod/connedit.php:523 -msgid "This connection is blocked!" -msgstr "" - -#: ../../mod/connedit.php:527 -msgid "Unignore" -msgstr "" - -#: ../../mod/connedit.php:527 ../../mod/notifications.php:51 -msgid "Ignore" -msgstr "" - -#: ../../mod/connedit.php:530 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "" - -#: ../../mod/connedit.php:531 -msgid "This connection is ignored!" -msgstr "" - -#: ../../mod/connedit.php:535 -msgid "Unarchive" -msgstr "" - -#: ../../mod/connedit.php:535 -msgid "Archive" -msgstr "" - -#: ../../mod/connedit.php:538 msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "" - -#: ../../mod/connedit.php:539 -msgid "This connection is archived!" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../mod/connedit.php:543 -msgid "Unhide" +#: ../../mod/connedit.php:691 +msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connedit.php:543 -msgid "Hide" +#: ../../mod/connedit.php:692 +msgid "Edit contact notes" msgstr "" -#: ../../mod/connedit.php:546 -msgid "Hide or Unhide this connection from your other connections" +#: ../../mod/connedit.php:694 +msgid "Their Settings" msgstr "" -#: ../../mod/connedit.php:547 -msgid "This connection is hidden!" +#: ../../mod/connedit.php:695 +msgid "My Settings" msgstr "" -#: ../../mod/connedit.php:554 -msgid "Delete this connection" +#: ../../mod/connedit.php:697 +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:635 -msgid "Approve this connection" +#: ../../mod/connedit.php:698 +msgid "Clear/Disable Automatic Permissions" msgstr "" -#: ../../mod/connedit.php:635 -msgid "Accept connection to allow communication" +#: ../../mod/connedit.php:699 +msgid "Forum Members" msgstr "" -#: ../../mod/connedit.php:640 -msgid "Set Affinity" +#: ../../mod/connedit.php:700 +msgid "Soapbox" msgstr "" -#: ../../mod/connedit.php:643 -msgid "Set Profile" +#: ../../mod/connedit.php:701 +msgid "Full Sharing (typical social network permissions)" msgstr "" -#: ../../mod/connedit.php:646 -msgid "Set Affinity & Profile" +#: ../../mod/connedit.php:702 +msgid "Cautious Sharing " msgstr "" -#: ../../mod/connedit.php:663 -msgid "Apply these permissions automatically" +#: ../../mod/connedit.php:703 +msgid "Follow Only" msgstr "" -#: ../../mod/connedit.php:665 -msgid "This connection's address is" +#: ../../mod/connedit.php:704 +msgid "Individual Permissions" msgstr "" -#: ../../mod/connedit.php:668 +#: ../../mod/connedit.php:705 msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." +"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:670 -msgid "Slide to adjust your degree of friendship" +#: ../../mod/connedit.php:706 +msgid "Advanced Permissions" msgstr "" -#: ../../mod/connedit.php:672 -msgid "Slide to adjust your rating" -msgstr "" - -#: ../../mod/connedit.php:673 ../../mod/connedit.php:678 -msgid "Optionally explain your rating" -msgstr "" - -#: ../../mod/connedit.php:675 -msgid "Custom Filter" -msgstr "" - -#: ../../mod/connedit.php:676 -msgid "Only import posts with this text" -msgstr "" - -#: ../../mod/connedit.php:676 ../../mod/connedit.php:677 -msgid "" -"words one per line or #tags or /patterns/, leave blank to import all posts" +#: ../../mod/connedit.php:707 +msgid "Simple Permissions (select one and submit)" msgstr "" -#: ../../mod/connedit.php:677 -msgid "Do not import posts with this text" +#: ../../mod/connedit.php:711 +#, php-format +msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connedit.php:679 -msgid "This information is public!" +#: ../../mod/connedit.php:712 +msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connedit.php:684 -msgid "Connection Pending Approval" +#: ../../mod/connedit.php:713 +msgid "Ignore contact" msgstr "" -#: ../../mod/connedit.php:685 -msgid "Connection Request" +#: ../../mod/connedit.php:714 +msgid "Repair URL settings" msgstr "" -#: ../../mod/connedit.php:686 -#, php-format -msgid "" -"(%s) would like to connect with you. Please approve this connection to allow " -"communication." +#: ../../mod/connedit.php:715 +msgid "View conversations" msgstr "" -#: ../../mod/connedit.php:688 -msgid "Approve Later" +#: ../../mod/connedit.php:717 +msgid "Delete contact" msgstr "" -#: ../../mod/connedit.php:691 -msgid "inherited" -msgstr "" - -#: ../../mod/connedit.php:693 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." +#: ../../mod/connedit.php:721 +msgid "Last update:" msgstr "" -#: ../../mod/connedit.php:695 -msgid "Their Settings" +#: ../../mod/connedit.php:723 +msgid "Update public posts" msgstr "" -#: ../../mod/connedit.php:696 -msgid "My Settings" +#: ../../mod/connedit.php:725 +msgid "Update now" msgstr "" -#: ../../mod/connedit.php:698 -msgid "Individual Permissions" +#: ../../mod/connedit.php:731 +msgid "Currently blocked" msgstr "" -#: ../../mod/connedit.php:699 -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." +#: ../../mod/connedit.php:732 +msgid "Currently ignored" msgstr "" -#: ../../mod/connedit.php:700 -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." +#: ../../mod/connedit.php:733 +msgid "Currently archived" msgstr "" -#: ../../mod/connedit.php:701 -msgid "Last update:" +#: ../../mod/connedit.php:734 +msgid "Currently pending" msgstr "" #: ../../mod/rmagic.php:40 @@ -8651,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/network.php:207 +msgid "Collection: " +msgstr "" + +#: ../../mod/network.php:226 +msgid "Connection: " +msgstr "" + +#: ../../mod/network.php:233 +msgid "Invalid connection." msgstr "" -#: ../../mod/page.php:126 -msgid "Lorem Ipsum" +#: ../../mod/page.php:122 +msgid "Ipsum Lorem" msgstr "" #: ../../mod/bookmarks.php:38 @@ -8751,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 "" @@ -8760,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 "" @@ -8881,157 +9358,157 @@ 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 "" -#: ../../boot.php:1356 +#: ../../boot.php:1355 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1359 +#: ../../boot.php:1358 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1526 +#: ../../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:1554 +#: ../../boot.php:1553 msgid "Password" msgstr "" -#: ../../boot.php:1555 +#: ../../boot.php:1554 msgid "Remember me" msgstr "" -#: ../../boot.php:1558 +#: ../../boot.php:1557 msgid "Forgot your password?" msgstr "" |