diff options
| -rw-r--r-- | include/zot.php | 18 | ||||
| -rw-r--r-- | util/messages.po | 5048 | ||||
| -rw-r--r-- | version.inc | 2 | ||||
| -rw-r--r-- | view/es/messages.po | 36 | ||||
| -rw-r--r-- | view/es/strings.php | 26 |
5 files changed, 2335 insertions, 2795 deletions
diff --git a/include/zot.php b/include/zot.php index ee3f603cd..4d4877eba 100644 --- a/include/zot.php +++ b/include/zot.php @@ -398,11 +398,6 @@ function zot_refresh($them, $channel = null, $force = false) { } } - $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", - dbesc($x['hash']), - intval($channel['channel_id']) - ); - if(array_key_exists('profile',$j) && array_key_exists('next_birthday',$j['profile'])) { $next_birthday = datetime_convert('UTC','UTC',$j['profile']['next_birthday']); } @@ -410,8 +405,15 @@ function zot_refresh($them, $channel = null, $force = false) { $next_birthday = NULL_DATE; } + $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and abook_self = 0 limit 1", + dbesc($x['hash']), + intval($channel['channel_id']) + ); + if($r) { + // connection exists + // if the dob is the same as what we have stored (disregarding the year), keep the one // we have as we may have updated the year after sending a notification; and resetting // to the one we just received would cause us to create duplicated events. @@ -453,6 +455,9 @@ function zot_refresh($them, $channel = null, $force = false) { } } else { + + // new connection + $role = get_pconfig($channel['channel_id'],'system','permissions_role'); if($role) { $xx = get_role_perms($role); @@ -2816,6 +2821,9 @@ function build_sync_packet($uid = 0, $packet = null, $groups_changed = false) { $channel = $r[0]; + if(intval($channel['channel_removed'])) + return; + $h = q("select * from hubloc where hubloc_hash = '%s' and hubloc_deleted = 0", dbesc($channel['channel_hash']) ); diff --git a/util/messages.po b/util/messages.po index 692012537..341c042bb 100644 --- a/util/messages.po +++ b/util/messages.po @@ -1,20 +1,14 @@ -# Hubzilla Project -# Copyright (C) 2012-2014 the Hubzilla Project +# Red Matrix Project +# Copyright (C) 2012-2014 the Red Matrix Project # This file is distributed under the same license as the Red package. # Mike Macgirvin, 2012 # #, fuzzy msgid "" msgstr "" -<<<<<<< HEAD -"Project-Id-Version: 2015-05-29.1047\n" +"Project-Id-Version: 2015-09-25.1166\n" "Report-Msgid-Bugs-To: \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 +"POT-Creation-Date: 2015-09-25 00:05-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -30,461 +24,88 @@ 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:91 ../../mod/photos.php:625 +#: ../../mod/photos.php:92 ../../mod/photos.php:637 msgid "Profile Photos" 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:1448 -#: ../../mod/admin.php:1468 -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 -#: ../../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" +#: ../../include/menu.php:107 ../../include/page_widgets.php:8 +#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266 +#: ../../include/ItemObject.php:100 ../../include/apps.php:254 +#: ../../mod/webpages.php:181 ../../mod/thing.php:255 +#: ../../mod/connections.php:242 ../../mod/connections.php:255 +#: ../../mod/connections.php:274 ../../mod/blocks.php:153 +#: ../../mod/editpost.php:106 ../../mod/editlayout.php:133 +#: ../../mod/editwebpage.php:178 ../../mod/editblock.php:134 +#: ../../mod/menu.php:106 ../../mod/settings.php:650 ../../mod/layouts.php:183 +msgid "Edit" 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" +#: ../../include/contact_selectors.php:56 +msgid "Frequently" msgstr "" -<<<<<<< HEAD -#: ../../include/bbcode.php:161 ../../include/bbcode.php:811 -msgid "Encrypted content" +#: ../../include/contact_selectors.php:57 +msgid "Hourly" msgstr "" -#: ../../include/bbcode.php:178 -======= -#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 -#: ../../mod/like.php:394 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 -#, php-format -msgid "Install %s element: " +#: ../../include/contact_selectors.php:58 +msgid "Twice daily" msgstr "" -<<<<<<< HEAD -#: ../../include/bbcode.php:188 ../../mod/impel.php:37 -msgid "webpage" +#: ../../include/contact_selectors.php:59 +msgid "Daily" msgstr "" -#: ../../include/bbcode.php:191 ../../mod/impel.php:47 -msgid "layout" +#: ../../include/contact_selectors.php:60 +msgid "Weekly" msgstr "" -#: ../../include/bbcode.php:194 ../../mod/impel.php:42 -msgid "block" +#: ../../include/contact_selectors.php:61 +msgid "Monthly" msgstr "" -#: ../../include/bbcode.php:208 -msgid "QR code" +#: ../../include/contact_selectors.php:76 +msgid "Friendica" msgstr "" -#: ../../include/bbcode.php:259 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -======= -#: ../../include/diaspora.php:2490 -msgid "Please choose" +#: ../../include/contact_selectors.php:77 +msgid "OStatus" msgstr "" -#: ../../include/diaspora.php:2492 -msgid "Agree" +#: ../../include/contact_selectors.php:78 +msgid "RSS/Atom" msgstr "" -#: ../../include/diaspora.php:2494 -msgid "Disagree" +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822 +#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16 +#: ../../boot.php:1552 +msgid "Email" msgstr "" -#: ../../include/diaspora.php:2496 -msgid "Abstain" +#: ../../include/contact_selectors.php:80 +msgid "Diaspora" msgstr "" -#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 -#: ../../include/network.php:1586 ../../include/enotify.php:59 -#: ../../mod/p.php:46 -msgid "$projectname" ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/contact_selectors.php:81 +msgid "Facebook" msgstr "" -#: ../../include/bbcode.php:261 -msgid "post" +#: ../../include/contact_selectors.php:82 +msgid "Zot!" msgstr "" -#: ../../include/bbcode.php:511 -msgid "Different viewers will see this text differently" +#: ../../include/contact_selectors.php:83 +msgid "LinkedIn" msgstr "" -#: ../../include/bbcode.php:722 -msgid "$1 spoiler" +#: ../../include/contact_selectors.php:84 +msgid "XMPP/IM" msgstr "" -#: ../../include/bbcode.php:749 -msgid "$1 wrote:" +#: ../../include/contact_selectors.php:85 +msgid "MySpace" msgstr "" -<<<<<<< HEAD #: ../../include/notify.php:23 msgid "created a new post" msgstr "" @@ -492,14 +113,18 @@ msgstr "" #: ../../include/notify.php:24 #, php-format msgid "commented on %s's post" -======= +msgstr "" + +#: ../../include/Import/import_diaspora.php:17 +msgid "No username found in import file." +msgstr "" + #: ../../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 +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:562 msgid "Import completed." ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../include/group.php:26 @@ -513,7 +138,7 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:254 ../../mod/admin.php:822 +#: ../../include/group.php:254 ../../mod/admin.php:831 msgid "All Channels" msgstr "" @@ -626,12 +251,12 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:235 ../../mod/events.php:635 +#: ../../include/datetime.php:235 ../../mod/events.php:672 #: ../../mod/appman.php:91 ../../mod/appman.php:92 msgid "Required" msgstr "" -#: ../../include/datetime.php:262 ../../boot.php:2354 +#: ../../include/datetime.php:262 ../../boot.php:2353 msgid "never" msgstr "" @@ -711,41 +336,69 @@ msgstr "" msgid "Happy Birthday %1$s" msgstr "" -#: ../../include/page_widgets.php:6 -msgid "New Page" +#: ../../include/dir_fns.php:126 +msgid "Directory Options" msgstr "" -#: ../../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" +#: ../../include/dir_fns.php:128 +msgid "Safe Mode" msgstr "" -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:186 +#: ../../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:159 ../../mod/mitem.php:160 +#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94 +#: ../../mod/menu.php:151 ../../mod/filestorage.php:151 +#: ../../mod/filestorage.php:159 ../../mod/admin.php:428 +#: ../../mod/settings.php:579 ../../mod/removeme.php:60 +#: ../../mod/connedit.php:647 ../../mod/connedit.php:675 +#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 +msgid "No" +msgstr "" + +#: ../../include/dir_fns.php:128 ../../include/dir_fns.php:129 +#: ../../include/dir_fns.php:130 ../../mod/api.php:105 +#: ../../mod/photos.php:568 ../../mod/mitem.php:159 ../../mod/mitem.php:160 +#: ../../mod/mitem.php:232 ../../mod/mitem.php:233 ../../mod/menu.php:94 +#: ../../mod/menu.php:151 ../../mod/filestorage.php:151 +#: ../../mod/filestorage.php:159 ../../mod/admin.php:430 +#: ../../mod/settings.php:579 ../../mod/removeme.php:60 +#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 +msgid "Yes" +msgstr "" + +#: ../../include/dir_fns.php:129 +msgid "Public Forums Only" +msgstr "" + +#: ../../include/dir_fns.php:130 +msgid "This Website Only" +msgstr "" + +#: ../../include/page_widgets.php:6 +msgid "New Page" +msgstr "" + +#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187 #: ../../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:187 -#: ../../mod/events.php:653 ../../mod/photos.php:970 -#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150 -#: ../../mod/editblock.php:176 +#: ../../include/conversation.php:1166 ../../mod/webpages.php:188 +#: ../../mod/events.php:690 ../../mod/editpost.php:143 +#: ../../mod/photos.php:982 ../../mod/editwebpage.php:214 +#: ../../mod/editblock.php:170 msgid "Preview" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:188 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189 msgid "Actions" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:189 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190 msgid "Page Link" msgstr "" @@ -753,95 +406,31 @@ msgstr "" msgid "Title" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:191 -#: ../../mod/blocks.php:150 ../../mod/layouts.php:181 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192 +#: ../../mod/blocks.php:150 ../../mod/menu.php:108 ../../mod/layouts.php:181 msgid "Created" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:192 -#: ../../mod/blocks.php:151 ../../mod/layouts.php:182 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193 +#: ../../mod/blocks.php:151 ../../mod/menu.php:109 ../../mod/layouts.php:182 msgid "Edited" msgstr "" -#: ../../include/api.php:1193 +#: ../../include/api.php:1234 msgid "Public Timeline" msgstr "" -#: ../../include/comanche.php:34 ../../mod/admin.php:386 +#: ../../include/comanche.php:34 ../../mod/admin.php:390 #: ../../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:968 ../../mod/photos.php:1086 +#: ../../mod/photos.php:980 ../../mod/photos.php:1098 msgid "Comment" msgstr "" @@ -869,7 +458,7 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: ../../include/js_strings.php:13 ../../mod/photos.php:39 +#: ../../include/js_strings.php:13 ../../mod/photos.php:40 msgid "everybody" msgstr "" @@ -898,6 +487,7 @@ msgid "Rate This Channel (this is public)" msgstr "" #: ../../include/js_strings.php:20 ../../mod/rate.php:156 +#: ../../mod/connedit.php:683 msgid "Rating" msgstr "" @@ -906,48 +496,26 @@ 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: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 +#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:303 +#: ../../mod/thing.php:346 ../../mod/events.php:511 ../../mod/events.php:693 +#: ../../mod/group.php:81 ../../mod/photos.php:577 ../../mod/photos.php:654 +#: ../../mod/photos.php:941 ../../mod/photos.php:981 ../../mod/photos.php:1099 +#: ../../mod/pdledit.php:58 ../../mod/import.php:592 ../../mod/chat.php:177 +#: ../../mod/chat.php:211 ../../mod/mitem.php:235 ../../mod/rate.php:167 +#: ../../mod/invite.php:142 ../../mod/locs.php:105 ../../mod/sources.php:104 +#: ../../mod/sources.php:138 ../../mod/filestorage.php:156 +#: ../../mod/fsuggest.php:108 ../../mod/poke.php:166 +#: ../../mod/profiles.php:667 ../../mod/setup.php:327 ../../mod/setup.php:367 +#: ../../mod/admin.php:453 ../../mod/admin.php:819 ../../mod/admin.php:986 +#: ../../mod/admin.php:1118 ../../mod/admin.php:1312 ../../mod/admin.php:1397 +#: ../../mod/settings.php:588 ../../mod/settings.php:692 +#: ../../mod/settings.php:718 ../../mod/settings.php:746 +#: ../../mod/settings.php:769 ../../mod/settings.php:854 +#: ../../mod/settings.php:1050 ../../mod/mood.php:134 +#: ../../mod/connedit.php:704 ../../mod/mail.php:355 ../../mod/appman.php:99 +#: ../../mod/pconfig.php:108 ../../mod/poll.php:68 +#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256 #: ../../view/theme/redbasic/php/config.php:99 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Submit" msgstr "" @@ -1032,8 +600,363 @@ msgstr "" msgid "timeago.numbers" msgstr "" +#: ../../include/text.php:391 +msgid "prev" +msgstr "" + +#: ../../include/text.php:393 +msgid "first" +msgstr "" + +#: ../../include/text.php:422 +msgid "last" +msgstr "" + +#: ../../include/text.php:425 +msgid "next" +msgstr "" + +#: ../../include/text.php:435 +msgid "older" +msgstr "" + +#: ../../include/text.php:437 +msgid "newer" +msgstr "" + +#: ../../include/text.php:830 +msgid "No connections" +msgstr "" + +#: ../../include/text.php:844 +#, php-format +msgid "%d Connection" +msgid_plural "%d Connections" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/text.php:857 ../../mod/viewconnections.php:104 +msgid "View Connections" +msgstr "" + +#: ../../include/text.php:914 ../../include/text.php:926 +#: ../../include/nav.php:165 ../../include/apps.php:147 +#: ../../mod/search.php:38 +msgid "Search" +msgstr "" + +#: ../../include/text.php:915 ../../include/text.php:927 +#: ../../include/widgets.php:192 ../../mod/rbmark.php:28 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457 +#: ../../mod/admin.php:1477 +msgid "Save" +msgstr "" + +#: ../../include/text.php:990 +msgid "poke" +msgstr "" + +#: ../../include/text.php:990 ../../include/conversation.php:243 +msgid "poked" +msgstr "" + +#: ../../include/text.php:991 +msgid "ping" +msgstr "" + +#: ../../include/text.php:991 +msgid "pinged" +msgstr "" + +#: ../../include/text.php:992 +msgid "prod" +msgstr "" + +#: ../../include/text.php:992 +msgid "prodded" +msgstr "" + +#: ../../include/text.php:993 +msgid "slap" +msgstr "" + +#: ../../include/text.php:993 +msgid "slapped" +msgstr "" + +#: ../../include/text.php:994 +msgid "finger" +msgstr "" + +#: ../../include/text.php:994 +msgid "fingered" +msgstr "" + +#: ../../include/text.php:995 +msgid "rebuff" +msgstr "" + +#: ../../include/text.php:995 +msgid "rebuffed" +msgstr "" + +#: ../../include/text.php:1005 +msgid "happy" +msgstr "" + +#: ../../include/text.php:1006 +msgid "sad" +msgstr "" + +#: ../../include/text.php:1007 +msgid "mellow" +msgstr "" + +#: ../../include/text.php:1008 +msgid "tired" +msgstr "" + +#: ../../include/text.php:1009 +msgid "perky" +msgstr "" + +#: ../../include/text.php:1010 +msgid "angry" +msgstr "" + +#: ../../include/text.php:1011 +msgid "stupified" +msgstr "" + +#: ../../include/text.php:1012 +msgid "puzzled" +msgstr "" + +#: ../../include/text.php:1013 +msgid "interested" +msgstr "" + +#: ../../include/text.php:1014 +msgid "bitter" +msgstr "" + +#: ../../include/text.php:1015 +msgid "cheerful" +msgstr "" + +#: ../../include/text.php:1016 +msgid "alive" +msgstr "" + +#: ../../include/text.php:1017 +msgid "annoyed" +msgstr "" + +#: ../../include/text.php:1018 +msgid "anxious" +msgstr "" + +#: ../../include/text.php:1019 +msgid "cranky" +msgstr "" + +#: ../../include/text.php:1020 +msgid "disturbed" +msgstr "" + +#: ../../include/text.php:1021 +msgid "frustrated" +msgstr "" + +#: ../../include/text.php:1022 +msgid "depressed" +msgstr "" + +#: ../../include/text.php:1023 +msgid "motivated" +msgstr "" + +#: ../../include/text.php:1024 +msgid "relaxed" +msgstr "" + +#: ../../include/text.php:1025 +msgid "surprised" +msgstr "" + +#: ../../include/text.php:1197 +msgid "Monday" +msgstr "" + +#: ../../include/text.php:1197 +msgid "Tuesday" +msgstr "" + +#: ../../include/text.php:1197 +msgid "Wednesday" +msgstr "" + +#: ../../include/text.php:1197 +msgid "Thursday" +msgstr "" + +#: ../../include/text.php:1197 +msgid "Friday" +msgstr "" + +#: ../../include/text.php:1197 +msgid "Saturday" +msgstr "" + +#: ../../include/text.php:1197 +msgid "Sunday" +msgstr "" + +#: ../../include/text.php:1201 +msgid "January" +msgstr "" + +#: ../../include/text.php:1201 +msgid "February" +msgstr "" + +#: ../../include/text.php:1201 +msgid "March" +msgstr "" + +#: ../../include/text.php:1201 +msgid "April" +msgstr "" + +#: ../../include/text.php:1201 +msgid "May" +msgstr "" + +#: ../../include/text.php:1201 +msgid "June" +msgstr "" + +#: ../../include/text.php:1201 +msgid "July" +msgstr "" + +#: ../../include/text.php:1201 +msgid "August" +msgstr "" + +#: ../../include/text.php:1201 +msgid "September" +msgstr "" + +#: ../../include/text.php:1201 +msgid "October" +msgstr "" + +#: ../../include/text.php:1201 +msgid "November" +msgstr "" + +#: ../../include/text.php:1201 +msgid "December" +msgstr "" + +#: ../../include/text.php:1306 +msgid "unknown.???" +msgstr "" + +#: ../../include/text.php:1307 +msgid "bytes" +msgstr "" + +#: ../../include/text.php:1343 +msgid "remove category" +msgstr "" + +#: ../../include/text.php:1418 +msgid "remove from file" +msgstr "" + +#: ../../include/text.php:1494 ../../include/text.php:1505 +msgid "Click to open/close" +msgstr "" + +#: ../../include/text.php:1661 ../../mod/events.php:474 +msgid "Link to Source" +msgstr "" + +#: ../../include/text.php:1682 ../../include/text.php:1753 +msgid "default" +msgstr "" + +#: ../../include/text.php:1690 +msgid "Page layout" +msgstr "" + +#: ../../include/text.php:1690 +msgid "You can create your own with the layouts tool" +msgstr "" + +#: ../../include/text.php:1731 +msgid "Page content type" +msgstr "" + +#: ../../include/text.php:1765 +msgid "Select an alternate language" +msgstr "" + +#: ../../include/text.php:1884 ../../include/diaspora.php:2119 +#: ../../include/conversation.php:120 ../../mod/like.php:349 +#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 +#: ../../mod/tagger.php:43 +msgid "photo" +msgstr "" + +#: ../../include/text.php:1887 ../../include/conversation.php:123 +#: ../../mod/like.php:351 ../../mod/tagger.php:47 +msgid "event" +msgstr "" + +#: ../../include/text.php:1890 ../../include/diaspora.php:2119 +#: ../../include/conversation.php:148 ../../mod/like.php:349 +#: ../../mod/subthread.php:72 ../../mod/subthread.php:174 +msgid "status" +msgstr "" + +#: ../../include/text.php:1892 ../../include/conversation.php:150 +#: ../../mod/tagger.php:53 +msgid "comment" +msgstr "" + +#: ../../include/text.php:1897 +msgid "activity" +msgstr "" + +#: ../../include/text.php:2192 +msgid "Design Tools" +msgstr "" + +#: ../../include/text.php:2195 ../../mod/blocks.php:147 +msgid "Blocks" +msgstr "" + +#: ../../include/text.php:2196 ../../mod/menu.php:101 +msgid "Menus" +msgstr "" + +#: ../../include/text.php:2197 ../../mod/layouts.php:174 +msgid "Layouts" +msgstr "" + +#: ../../include/text.php:2198 +msgid "Pages" +msgstr "" + +#: ../../include/text.php:2549 ../../include/RedDAV/RedBrowser.php:131 +msgid "Collection" +msgstr "" + #: ../../include/RedDAV/RedBrowser.php:107 -#: ../../include/RedDAV/RedBrowser.php:268 +#: ../../include/RedDAV/RedBrowser.php:265 msgid "parent" msgstr "" @@ -1057,9 +980,9 @@ msgstr "" msgid "Schedule Outbox" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019 +#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1030 #: ../../include/apps.php:336 ../../include/apps.php:387 -#: ../../mod/photos.php:681 ../../mod/photos.php:1119 +#: ../../mod/photos.php:693 ../../mod/photos.php:1131 msgid "Unknown" msgstr "" @@ -1074,7 +997,7 @@ msgid "%1$s used of %2$s (%3$s%)" msgstr "" #: ../../include/RedDAV/RedBrowser.php:251 ../../include/nav.php:98 -#: ../../include/conversation.php:1609 ../../include/apps.php:135 +#: ../../include/conversation.php:1620 ../../include/apps.php:135 #: ../../mod/fbrowser.php:114 msgid "Files" msgstr "" @@ -1088,60 +1011,51 @@ msgid "Shared" msgstr "" #: ../../include/RedDAV/RedBrowser.php:256 -#: ../../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 +#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180 +#: ../../mod/blocks.php:152 ../../mod/menu.php:112 +#: ../../mod/new_channel.php:121 ../../mod/layouts.php:175 msgid "Create" msgstr "" #: ../../include/RedDAV/RedBrowser.php:257 -#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362 -#: ../../mod/photos.php:706 ../../mod/photos.php:1236 +#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362 +#: ../../mod/photos.php:718 ../../mod/photos.php:1248 msgid "Upload" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:589 -#: ../../mod/settings.php:615 ../../mod/admin.php:985 +#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:994 +#: ../../mod/settings.php:590 ../../mod/settings.php:616 #: ../../mod/sharedwithme.php:95 msgid "Name" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:265 +#: ../../include/RedDAV/RedBrowser.php:262 msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97 +#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97 msgid "Size" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98 +#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98 msgid "Last Modified" msgstr "" -#: ../../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 +#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120 +#: ../../include/conversation.php:671 ../../include/apps.php:255 +#: ../../mod/webpages.php:183 ../../mod/thing.php:256 ../../mod/group.php:176 #: ../../mod/blocks.php:155 ../../mod/photos.php:1062 -#: ../../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 +#: ../../mod/editlayout.php:178 ../../mod/editwebpage.php:225 +#: ../../mod/editblock.php:180 ../../mod/admin.php:826 ../../mod/admin.php:988 +#: ../../mod/settings.php:651 ../../mod/connedit.php:563 msgid "Delete" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:305 +#: ../../include/RedDAV/RedBrowser.php:302 msgid "Create new folder" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:307 +#: ../../include/RedDAV/RedBrowser.php:304 msgid "Upload file" msgstr "" @@ -1158,6 +1072,12 @@ 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 "" @@ -1279,7 +1199,7 @@ msgid "" "(320px) photo thumbnails" msgstr "" -#: ../../include/features.php:59 ../../include/widgets.php:546 +#: ../../include/features.php:59 ../../include/widgets.php:548 #: ../../mod/sources.php:88 msgid "Channel Sources" msgstr "" @@ -1432,7 +1352,7 @@ msgid "Categories" msgstr "" #: ../../include/widgets.php:91 ../../include/nav.php:163 -#: ../../mod/apps.php:34 +#: ../../mod/apps.php:36 msgid "Apps" msgstr "" @@ -1440,7 +1360,7 @@ msgstr "" msgid "System" msgstr "" -#: ../../include/widgets.php:94 ../../include/conversation.php:1504 +#: ../../include/widgets.php:94 ../../include/conversation.php:1515 msgid "Personal" msgstr "" @@ -1453,14 +1373,9 @@ msgid "Edit Personal App" msgstr "" #: ../../include/widgets.php:136 ../../include/widgets.php:175 -#: ../../include/Contact.php:107 ../../include/conversation.php:945 -<<<<<<< HEAD -#: ../../include/identity.php:824 ../../mod/match.php:64 -#: ../../mod/directory.php:302 ../../mod/suggest.php:52 -======= -#: ../../include/identity.php:828 ../../mod/directory.php:309 +#: ../../include/Contact.php:107 ../../include/conversation.php:956 +#: ../../include/identity.php:933 ../../mod/directory.php:316 #: ../../mod/match.php:64 ../../mod/suggest.php:52 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Connect" msgstr "" @@ -1468,7 +1383,7 @@ msgstr "" msgid "Ignore/Hide" msgstr "" -#: ../../include/widgets.php:143 ../../mod/connections.php:268 +#: ../../include/widgets.php:143 ../../mod/connections.php:128 msgid "Suggestions" msgstr "" @@ -1510,147 +1425,141 @@ msgstr "" msgid "Archives" msgstr "" -#: ../../include/widgets.php:427 ../../mod/connedit.php:578 +#: ../../include/widgets.php:429 ../../mod/connedit.php:583 msgid "Me" msgstr "" -#: ../../include/widgets.php:428 ../../mod/connedit.php:579 +#: ../../include/widgets.php:430 ../../mod/connedit.php:584 msgid "Family" msgstr "" -#: ../../include/widgets.php:429 ../../include/identity.php:394 +#: ../../include/widgets.php:431 ../../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:580 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../mod/connedit.php:585 msgid "Friends" msgstr "" -#: ../../include/widgets.php:430 ../../mod/connedit.php:581 +#: ../../include/widgets.php:432 ../../mod/connedit.php:586 msgid "Acquaintances" msgstr "" -#: ../../include/widgets.php:431 ../../mod/connections.php:231 -#: ../../mod/connections.php:246 ../../mod/connedit.php:582 +#: ../../include/widgets.php:433 ../../mod/connections.php:91 +#: ../../mod/connections.php:106 ../../mod/connedit.php:587 msgid "All" msgstr "" -#: ../../include/widgets.php:450 +#: ../../include/widgets.php:452 msgid "Refresh" msgstr "" -#: ../../include/widgets.php:485 +#: ../../include/widgets.php:487 msgid "Account settings" msgstr "" -#: ../../include/widgets.php:491 +#: ../../include/widgets.php:493 msgid "Channel settings" msgstr "" -#: ../../include/widgets.php:497 +#: ../../include/widgets.php:499 msgid "Additional features" msgstr "" -#: ../../include/widgets.php:503 +#: ../../include/widgets.php:505 msgid "Feature/Addon settings" msgstr "" -#: ../../include/widgets.php:509 +#: ../../include/widgets.php:511 msgid "Display settings" msgstr "" -#: ../../include/widgets.php:515 +#: ../../include/widgets.php:517 msgid "Connected apps" msgstr "" -#: ../../include/widgets.php:521 +#: ../../include/widgets.php:523 msgid "Export channel" msgstr "" -#: ../../include/widgets.php:530 ../../mod/connedit.php:659 +#: ../../include/widgets.php:532 ../../mod/connedit.php:674 msgid "Connection Default Permissions" msgstr "" -#: ../../include/widgets.php:538 +#: ../../include/widgets.php:540 msgid "Premium Channel Settings" msgstr "" -#: ../../include/widgets.php:554 ../../include/nav.php:208 -#: ../../include/apps.php:134 ../../mod/admin.php:1070 -#: ../../mod/admin.php:1270 +#: ../../include/widgets.php:556 ../../include/nav.php:208 +#: ../../include/apps.php:134 ../../mod/admin.php:1079 +#: ../../mod/admin.php:1279 msgid "Settings" msgstr "" -#: ../../include/widgets.php:567 ../../mod/message.php:31 +#: ../../include/widgets.php:569 ../../mod/message.php:31 #: ../../mod/mail.php:128 msgid "Messages" msgstr "" -#: ../../include/widgets.php:570 +#: ../../include/widgets.php:572 msgid "Check Mail" msgstr "" -#: ../../include/widgets.php:575 ../../include/nav.php:199 +#: ../../include/widgets.php:577 ../../include/nav.php:199 msgid "New Message" msgstr "" -#: ../../include/widgets.php:650 +#: ../../include/widgets.php:652 msgid "Chat Rooms" msgstr "" -#: ../../include/widgets.php:670 +#: ../../include/widgets.php:672 msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/widgets.php:690 +#: ../../include/widgets.php:692 msgid "Suggested Chatrooms" msgstr "" -#: ../../include/widgets.php:817 ../../include/widgets.php:875 +#: ../../include/widgets.php:819 ../../include/widgets.php:877 msgid "photo/image" msgstr "" -#: ../../include/widgets.php:970 ../../include/widgets.php:972 +#: ../../include/widgets.php:972 ../../include/widgets.php:974 msgid "Rate Me" msgstr "" -#: ../../include/widgets.php:976 +#: ../../include/widgets.php:978 msgid "View Ratings" msgstr "" -#: ../../include/widgets.php:987 +#: ../../include/widgets.php:989 msgid "Public Hubs" msgstr "" -<<<<<<< HEAD -#: ../../include/enotify.php:58 -msgid "$Projectname Notification" +#: ../../include/event.php:22 ../../include/bb2diaspora.php:459 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/enotify.php:59 ../../include/diaspora.php:2467 -#: ../../include/diaspora.php:2478 ../../mod/p.php:46 -msgid "$projectname" +#: ../../include/event.php:30 ../../include/bb2diaspora.php:465 +msgid "Starts:" msgstr "" -#: ../../include/enotify.php:61 -msgid "Thank You," +#: ../../include/event.php:40 ../../include/bb2diaspora.php:473 +msgid "Finishes:" msgstr "" -#: ../../include/enotify.php:63 -#, php-format -msgid "%s Administrator" +#: ../../include/event.php:50 ../../include/bb2diaspora.php:481 +#: ../../include/identity.php:984 ../../mod/directory.php:302 +#: ../../mod/events.php:684 +msgid "Location:" +msgstr "" + +#: ../../include/event.php:549 +msgid "This event has been added to your calendar." msgstr "" -======= ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -1829,86 +1738,42 @@ msgstr "" msgid "[Red:Notify]" msgstr "" -#: ../../include/contact_selectors.php:56 -msgid "Frequently" -msgstr "" - -#: ../../include/contact_selectors.php:57 -msgid "Hourly" -msgstr "" - -#: ../../include/contact_selectors.php:58 -msgid "Twice daily" -msgstr "" - -#: ../../include/contact_selectors.php:59 -msgid "Daily" -msgstr "" - -#: ../../include/contact_selectors.php:60 -msgid "Weekly" -msgstr "" - -#: ../../include/contact_selectors.php:61 -msgid "Monthly" -msgstr "" - -#: ../../include/contact_selectors.php:76 -msgid "Friendica" -msgstr "" - -#: ../../include/contact_selectors.php:77 -msgid "OStatus" -msgstr "" - -#: ../../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" +#: ../../include/message.php:18 +msgid "No recipient provided." msgstr "" -#: ../../include/contact_selectors.php:82 -msgid "Zot!" +#: ../../include/message.php:23 +msgid "[no subject]" msgstr "" -#: ../../include/contact_selectors.php:83 -msgid "LinkedIn" +#: ../../include/message.php:45 +msgid "Unable to determine sender." msgstr "" -#: ../../include/contact_selectors.php:84 -msgid "XMPP/IM" +#: ../../include/message.php:200 +msgid "Stored post could not be verified." msgstr "" -#: ../../include/contact_selectors.php:85 -msgid "MySpace" +#: ../../include/diaspora.php:2148 ../../include/conversation.php:164 +#: ../../mod/like.php:397 +#, php-format +msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/message.php:18 -msgid "No recipient provided." +#: ../../include/diaspora.php:2494 +msgid "Please choose" msgstr "" -#: ../../include/message.php:23 -msgid "[no subject]" +#: ../../include/diaspora.php:2496 +msgid "Agree" msgstr "" -#: ../../include/message.php:45 -msgid "Unable to determine sender." +#: ../../include/diaspora.php:2498 +msgid "Disagree" msgstr "" -#: ../../include/message.php:200 -msgid "Stored post could not be verified." +#: ../../include/diaspora.php:2500 +msgid "Abstain" msgstr "" #: ../../include/follow.php:28 @@ -1927,27 +1792,31 @@ msgstr "" msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:135 ../../include/follow.php:197 +#: ../../include/follow.php:135 ../../include/follow.php:206 msgid "Protocol disabled." msgstr "" -#: ../../include/follow.php:170 +#: ../../include/follow.php:144 +msgid "Protocol blocked for this channel." +msgstr "" + +#: ../../include/follow.php:179 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:186 +#: ../../include/follow.php:195 msgid "local account not found." msgstr "" -#: ../../include/follow.php:215 +#: ../../include/follow.php:224 msgid "Cannot connect to yourself." msgstr "" -#: ../../include/ItemObject.php:89 ../../include/conversation.php:667 +#: ../../include/ItemObject.php:89 ../../include/conversation.php:678 msgid "Private Message" msgstr "" -#: ../../include/ItemObject.php:126 ../../include/conversation.php:659 +#: ../../include/ItemObject.php:126 ../../include/conversation.php:670 msgid "Select" msgstr "" @@ -1980,22 +1849,22 @@ msgid "I abstain" msgstr "" #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 -#: ../../include/conversation.php:1677 ../../mod/photos.php:1003 -#: ../../mod/photos.php:1015 +#: ../../include/conversation.php:1688 ../../mod/photos.php:1015 +#: ../../mod/photos.php:1027 msgid "View all" msgstr "" #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396 -#: ../../include/conversation.php:1701 ../../include/identity.php:1134 -#: ../../mod/photos.php:1007 +#: ../../include/conversation.php:1712 ../../include/identity.php:1243 +#: ../../mod/photos.php:1019 msgctxt "noun" msgid "Like" msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704 -#: ../../mod/photos.php:1012 +#: ../../include/ItemObject.php:184 ../../include/conversation.php:1715 +#: ../../mod/photos.php:1024 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -2018,11 +1887,11 @@ msgstr "" msgid "starred" msgstr "" -#: ../../include/ItemObject.php:227 ../../include/conversation.php:674 +#: ../../include/ItemObject.php:227 ../../include/conversation.php:685 msgid "Message signature validated" msgstr "" -#: ../../include/ItemObject.php:228 ../../include/conversation.php:675 +#: ../../include/ItemObject.php:228 ../../include/conversation.php:686 msgid "Message signature incorrect" msgstr "" @@ -2030,7 +1899,7 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:254 ../../mod/photos.php:947 +#: ../../include/ItemObject.php:254 ../../mod/photos.php:959 msgid "I like this (toggle)" msgstr "" @@ -2038,7 +1907,7 @@ msgstr "" msgid "like" msgstr "" -#: ../../include/ItemObject.php:255 ../../mod/photos.php:948 +#: ../../include/ItemObject.php:255 ../../mod/photos.php:960 msgid "I don't like this (toggle)" msgstr "" @@ -2082,17 +1951,17 @@ msgstr "" msgid "via Wall-To-Wall:" msgstr "" -#: ../../include/ItemObject.php:312 ../../include/conversation.php:716 +#: ../../include/ItemObject.php:312 ../../include/conversation.php:727 #, php-format msgid "from %s" msgstr "" -#: ../../include/ItemObject.php:315 ../../include/conversation.php:719 +#: ../../include/ItemObject.php:315 ../../include/conversation.php:730 #, php-format msgid "last edited: %s" msgstr "" -#: ../../include/ItemObject.php:316 ../../include/conversation.php:720 +#: ../../include/ItemObject.php:316 ../../include/conversation.php:731 #, php-format msgid "Expires: %s" msgstr "" @@ -2109,61 +1978,61 @@ msgstr "" msgid "Mark all seen" msgstr "" -#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133 +#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134 +#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146 msgctxt "noun" msgid "Dislikes" msgstr "" #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249 -#: ../../mod/photos.php:1139 +#: ../../mod/photos.php:1151 msgid "Close" msgstr "" -#: ../../include/ItemObject.php:364 ../../include/conversation.php:737 -#: ../../include/conversation.php:1209 ../../mod/photos.php:950 -#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192 -#: ../../mod/editpost.php:130 ../../mod/editblock.php:155 +#: ../../include/ItemObject.php:364 ../../include/conversation.php:748 +#: ../../include/conversation.php:1220 ../../mod/editpost.php:123 +#: ../../mod/photos.php:962 ../../mod/editlayout.php:147 +#: ../../mod/editwebpage.php:192 ../../mod/editblock.php:149 #: ../../mod/mail.php:241 ../../mod/mail.php:356 msgid "Please wait" msgstr "" -#: ../../include/ItemObject.php:665 ../../mod/photos.php:966 -#: ../../mod/photos.php:1084 +#: ../../include/ItemObject.php:665 ../../mod/photos.php:978 +#: ../../mod/photos.php:1096 msgid "This is you" msgstr "" -#: ../../include/ItemObject.php:669 ../../include/conversation.php:1181 -#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:179 -#: ../../mod/editpost.php:114 ../../mod/editblock.php:141 +#: ../../include/ItemObject.php:669 ../../include/conversation.php:1192 +#: ../../mod/editpost.php:107 ../../mod/editlayout.php:134 +#: ../../mod/editwebpage.php:179 ../../mod/editblock.php:135 msgid "Bold" msgstr "" -#: ../../include/ItemObject.php:670 ../../include/conversation.php:1182 -#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:180 -#: ../../mod/editpost.php:115 ../../mod/editblock.php:142 +#: ../../include/ItemObject.php:670 ../../include/conversation.php:1193 +#: ../../mod/editpost.php:108 ../../mod/editlayout.php:135 +#: ../../mod/editwebpage.php:180 ../../mod/editblock.php:136 msgid "Italic" msgstr "" -#: ../../include/ItemObject.php:671 ../../include/conversation.php:1183 -#: ../../mod/editlayout.php:142 ../../mod/editwebpage.php:181 -#: ../../mod/editpost.php:116 ../../mod/editblock.php:143 +#: ../../include/ItemObject.php:671 ../../include/conversation.php:1194 +#: ../../mod/editpost.php:109 ../../mod/editlayout.php:136 +#: ../../mod/editwebpage.php:181 ../../mod/editblock.php:137 msgid "Underline" msgstr "" -#: ../../include/ItemObject.php:672 ../../include/conversation.php:1184 -#: ../../mod/editlayout.php:143 ../../mod/editwebpage.php:182 -#: ../../mod/editpost.php:117 ../../mod/editblock.php:144 +#: ../../include/ItemObject.php:672 ../../include/conversation.php:1195 +#: ../../mod/editpost.php:110 ../../mod/editlayout.php:137 +#: ../../mod/editwebpage.php:182 ../../mod/editblock.php:138 msgid "Quote" msgstr "" -#: ../../include/ItemObject.php:673 ../../include/conversation.php:1185 -#: ../../mod/editlayout.php:144 ../../mod/editwebpage.php:183 -#: ../../mod/editpost.php:118 ../../mod/editblock.php:145 +#: ../../include/ItemObject.php:673 ../../include/conversation.php:1196 +#: ../../mod/editpost.php:111 ../../mod/editlayout.php:138 +#: ../../mod/editwebpage.php:183 ../../mod/editblock.php:139 msgid "Code" msgstr "" @@ -2179,8 +2048,8 @@ msgstr "" msgid "Video" msgstr "" -#: ../../include/ItemObject.php:680 ../../include/conversation.php:1236 -#: ../../mod/editpost.php:158 ../../mod/mail.php:247 ../../mod/mail.php:361 +#: ../../include/ItemObject.php:680 ../../include/conversation.php:1247 +#: ../../mod/editpost.php:151 ../../mod/mail.php:247 ../../mod/mail.php:361 msgid "Encrypt text" msgstr "" @@ -2192,7 +2061,7 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:215 ../../mod/admin.php:730 +#: ../../include/Contact.php:212 #, php-format msgid "User '%s' deleted" msgstr "" @@ -2201,7 +2070,7 @@ msgstr "" msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:453 +#: ../../include/bb2diaspora.php:461 msgid "$Projectname event notification:" msgstr "" @@ -2221,8 +2090,8 @@ msgstr "" msgid "Your posts and conversations" msgstr "" -#: ../../include/nav.php:91 ../../include/conversation.php:942 -#: ../../mod/connedit.php:500 ../../mod/connedit.php:666 +#: ../../include/nav.php:91 ../../include/conversation.php:953 +#: ../../mod/connedit.php:510 msgid "View Profile" msgstr "" @@ -2238,7 +2107,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:95 ../../include/identity.php:847 +#: ../../include/nav.php:95 ../../include/identity.php:956 msgid "Edit Profile" msgstr "" @@ -2246,7 +2115,7 @@ msgstr "" msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:97 ../../include/conversation.php:1600 +#: ../../include/nav.php:97 ../../include/conversation.php:1611 #: ../../include/apps.php:139 ../../mod/fbrowser.php:25 msgid "Photos" msgstr "" @@ -2267,7 +2136,7 @@ msgstr "" msgid "Your chatrooms" msgstr "" -#: ../../include/nav.php:109 ../../include/conversation.php:1635 +#: ../../include/nav.php:109 ../../include/conversation.php:1646 #: ../../include/apps.php:129 msgid "Bookmarks" msgstr "" @@ -2276,8 +2145,8 @@ msgstr "" msgid "Your bookmarks" msgstr "" -#: ../../include/nav.php:113 ../../include/conversation.php:1645 -#: ../../include/apps.php:136 ../../mod/webpages.php:177 +#: ../../include/nav.php:113 ../../include/conversation.php:1656 +#: ../../include/apps.php:136 ../../mod/webpages.php:178 msgid "Webpages" msgstr "" @@ -2336,7 +2205,6 @@ msgid "Search site content" msgstr "" #: ../../include/nav.php:168 ../../include/apps.php:141 -#: ../../mod/directory.php:366 msgid "Directory" msgstr "" @@ -2368,7 +2236,7 @@ msgstr "" msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:187 ../../mod/connections.php:407 +#: ../../include/nav.php:187 ../../mod/connections.php:267 msgid "Connections" msgstr "" @@ -2413,7 +2281,7 @@ msgid "Outbox" msgstr "" #: ../../include/nav.php:202 ../../include/apps.php:140 -#: ../../mod/events.php:472 +#: ../../mod/events.php:503 msgid "Events" msgstr "" @@ -2450,7 +2318,7 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:247 ../../include/conversation.php:850 +#: ../../include/nav.php:247 ../../include/conversation.php:861 msgid "Loading..." msgstr "" @@ -2664,13 +2532,7 @@ 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 +#: ../../include/conversation.php:167 ../../mod/like.php:399 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" @@ -2691,590 +2553,528 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:984 +#: ../../include/conversation.php:583 ../../mod/photos.php:996 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:984 +#: ../../include/conversation.php:583 ../../mod/photos.php:996 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:584 ../../mod/photos.php:997 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:584 ../../mod/photos.php:997 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:985 +#: ../../include/conversation.php:584 ../../mod/photos.php:997 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:585 ../../mod/photos.php:998 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:585 ../../mod/photos.php:998 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:986 +#: ../../include/conversation.php:585 ../../mod/photos.php:998 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../include/conversation.php:692 +#: ../../include/conversation.php:703 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:707 +#: ../../include/conversation.php:718 msgid "Categories:" msgstr "" -#: ../../include/conversation.php:708 +#: ../../include/conversation.php:719 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:735 +#: ../../include/conversation.php:746 msgid "View in context" msgstr "" -#: ../../include/conversation.php:846 +#: ../../include/conversation.php:857 msgid "remove" msgstr "" -#: ../../include/conversation.php:851 +#: ../../include/conversation.php:862 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:939 +#: ../../include/conversation.php:950 msgid "View Source" msgstr "" -#: ../../include/conversation.php:940 +#: ../../include/conversation.php:951 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:941 +#: ../../include/conversation.php:952 msgid "View Status" msgstr "" -#: ../../include/conversation.php:943 +#: ../../include/conversation.php:954 msgid "View Photos" msgstr "" -#: ../../include/conversation.php:944 +#: ../../include/conversation.php:955 msgid "Matrix Activity" msgstr "" -#: ../../include/conversation.php:946 +#: ../../include/conversation.php:957 msgid "Edit Contact" msgstr "" -#: ../../include/conversation.php:947 +#: ../../include/conversation.php:958 msgid "Send PM" msgstr "" -#: ../../include/conversation.php:948 ../../include/apps.php:145 +#: ../../include/conversation.php:959 ../../include/apps.php:145 msgid "Poke" msgstr "" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1073 #, php-format msgid "%s likes this." msgstr "" -#: ../../include/conversation.php:1062 +#: ../../include/conversation.php:1073 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1066 +#: ../../include/conversation.php:1077 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1068 +#: ../../include/conversation.php:1079 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1074 +#: ../../include/conversation.php:1085 msgid "and" msgstr "" -#: ../../include/conversation.php:1077 +#: ../../include/conversation.php:1088 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1078 +#: ../../include/conversation.php:1089 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1078 +#: ../../include/conversation.php:1089 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1140 +#: ../../include/conversation.php:1151 msgid "Visible to <strong>everybody</strong>" msgstr "" -#: ../../include/conversation.php:1141 ../../mod/mail.php:174 +#: ../../include/conversation.php:1152 ../../mod/mail.php:174 #: ../../mod/mail.php:289 msgid "Please enter a link URL:" msgstr "" -#: ../../include/conversation.php:1142 +#: ../../include/conversation.php:1153 msgid "Please enter a video link/URL:" msgstr "" -#: ../../include/conversation.php:1143 +#: ../../include/conversation.php:1154 msgid "Please enter an audio link/URL:" msgstr "" -#: ../../include/conversation.php:1144 +#: ../../include/conversation.php:1155 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1145 ../../mod/filer.php:49 +#: ../../include/conversation.php:1156 ../../mod/filer.php:49 msgid "Save to Folder:" msgstr "" -#: ../../include/conversation.php:1146 +#: ../../include/conversation.php:1157 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1147 ../../mod/editpost.php:52 +#: ../../include/conversation.php:1158 ../../mod/editpost.php:47 #: ../../mod/mail.php:175 ../../mod/mail.php:290 msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1174 ../../mod/webpages.php:181 -#: ../../mod/blocks.php:154 ../../mod/photos.php:949 ../../mod/layouts.php:184 +#: ../../include/conversation.php:1185 ../../mod/webpages.php:182 +#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184 msgid "Share" msgstr "" -#: ../../include/conversation.php:1176 +#: ../../include/conversation.php:1187 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1179 +#: ../../include/conversation.php:1190 msgid "Post as" msgstr "" -#: ../../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 +#: ../../include/conversation.php:1197 ../../mod/editpost.php:112 +#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:184 +#: ../../mod/editblock.php:141 ../../mod/mail.php:238 ../../mod/mail.php:352 msgid "Upload photo" msgstr "" -#: ../../include/conversation.php:1187 +#: ../../include/conversation.php:1198 msgid "upload photo" msgstr "" -#: ../../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 +#: ../../include/conversation.php:1199 ../../mod/editpost.php:113 +#: ../../mod/editlayout.php:140 ../../mod/editwebpage.php:185 +#: ../../mod/editblock.php:142 ../../mod/mail.php:239 ../../mod/mail.php:353 msgid "Attach file" msgstr "" -#: ../../include/conversation.php:1189 +#: ../../include/conversation.php:1200 msgid "attach file" msgstr "" -#: ../../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 +#: ../../include/conversation.php:1201 ../../mod/editpost.php:114 +#: ../../mod/editlayout.php:141 ../../mod/editwebpage.php:186 +#: ../../mod/editblock.php:143 ../../mod/mail.php:240 ../../mod/mail.php:354 msgid "Insert web link" msgstr "" -#: ../../include/conversation.php:1191 +#: ../../include/conversation.php:1202 msgid "web link" msgstr "" -#: ../../include/conversation.php:1192 +#: ../../include/conversation.php:1203 msgid "Insert video link" msgstr "" -#: ../../include/conversation.php:1193 +#: ../../include/conversation.php:1204 msgid "video link" msgstr "" -#: ../../include/conversation.php:1194 +#: ../../include/conversation.php:1205 msgid "Insert audio link" msgstr "" -#: ../../include/conversation.php:1195 +#: ../../include/conversation.php:1206 msgid "audio link" msgstr "" -#: ../../include/conversation.php:1196 ../../mod/editlayout.php:151 -#: ../../mod/editwebpage.php:190 ../../mod/editpost.php:125 -#: ../../mod/editblock.php:153 +#: ../../include/conversation.php:1207 ../../mod/editpost.php:118 +#: ../../mod/editlayout.php:145 ../../mod/editwebpage.php:190 +#: ../../mod/editblock.php:147 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1197 +#: ../../include/conversation.php:1208 msgid "set location" msgstr "" -#: ../../include/conversation.php:1198 ../../mod/editpost.php:127 +#: ../../include/conversation.php:1209 ../../mod/editpost.php:120 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1201 ../../mod/editlayout.php:152 -#: ../../mod/editwebpage.php:191 ../../mod/editpost.php:126 -#: ../../mod/editblock.php:154 +#: ../../include/conversation.php:1212 ../../mod/editpost.php:119 +#: ../../mod/editlayout.php:146 ../../mod/editwebpage.php:191 +#: ../../mod/editblock.php:148 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1202 +#: ../../include/conversation.php:1213 msgid "clear location" msgstr "" -#: ../../include/conversation.php:1204 ../../mod/editwebpage.php:207 -#: ../../mod/editpost.php:142 ../../mod/editblock.php:167 +#: ../../include/conversation.php:1215 ../../mod/editpost.php:135 +#: ../../mod/editwebpage.php:207 ../../mod/editblock.php:161 msgid "Title (optional)" msgstr "" -#: ../../include/conversation.php:1208 ../../mod/editlayout.php:168 -#: ../../mod/editwebpage.php:209 ../../mod/editpost.php:144 -#: ../../mod/editblock.php:170 +#: ../../include/conversation.php:1219 ../../mod/editpost.php:137 +#: ../../mod/editlayout.php:162 ../../mod/editwebpage.php:209 +#: ../../mod/editblock.php:164 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1210 ../../mod/editlayout.php:154 -#: ../../mod/editwebpage.php:193 ../../mod/editpost.php:131 -#: ../../mod/editblock.php:156 +#: ../../include/conversation.php:1221 ../../mod/editpost.php:124 +#: ../../mod/editlayout.php:148 ../../mod/editwebpage.php:193 +#: ../../mod/editblock.php:150 msgid "Permission settings" msgstr "" -#: ../../include/conversation.php:1211 +#: ../../include/conversation.php:1222 msgid "permissions" msgstr "" -#: ../../include/conversation.php:1219 ../../mod/editlayout.php:161 -#: ../../mod/editwebpage.php:202 ../../mod/editpost.php:139 -#: ../../mod/editblock.php:164 +#: ../../include/conversation.php:1230 ../../mod/editpost.php:132 +#: ../../mod/editlayout.php:155 ../../mod/editwebpage.php:202 +#: ../../mod/editblock.php:158 msgid "Public post" msgstr "" -#: ../../include/conversation.php:1221 ../../mod/editlayout.php:169 -#: ../../mod/editwebpage.php:210 ../../mod/editpost.php:145 -#: ../../mod/editblock.php:171 +#: ../../include/conversation.php:1232 ../../mod/editpost.php:138 +#: ../../mod/editlayout.php:163 ../../mod/editwebpage.php:210 +#: ../../mod/editblock.php:165 msgid "Example: bob@example.com, mary@example.com" msgstr "" -#: ../../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 +#: ../../include/conversation.php:1245 ../../mod/editpost.php:149 +#: ../../mod/editlayout.php:172 ../../mod/editwebpage.php:219 +#: ../../mod/editblock.php:175 ../../mod/mail.php:245 ../../mod/mail.php:359 msgid "Set expiration date" msgstr "" -#: ../../include/conversation.php:1238 ../../mod/events.php:637 -#: ../../mod/editpost.php:160 +#: ../../include/conversation.php:1249 ../../mod/events.php:674 +#: ../../mod/editpost.php:153 msgid "OK" msgstr "" -#: ../../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 +#: ../../include/conversation.php:1250 ../../mod/tagrm.php:11 +#: ../../mod/tagrm.php:134 ../../mod/events.php:673 ../../mod/fbrowser.php:82 +#: ../../mod/fbrowser.php:117 ../../mod/editpost.php:154 +#: ../../mod/settings.php:589 ../../mod/settings.php:615 msgid "Cancel" msgstr "" -#: ../../include/conversation.php:1481 +#: ../../include/conversation.php:1492 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1484 +#: ../../include/conversation.php:1495 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1489 +#: ../../include/conversation.php:1500 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1492 +#: ../../include/conversation.php:1503 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1496 +#: ../../include/conversation.php:1507 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1499 +#: ../../include/conversation.php:1510 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1507 +#: ../../include/conversation.php:1518 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1513 ../../mod/connections.php:212 -#: ../../mod/connections.php:225 ../../mod/menu.php:105 +#: ../../include/conversation.php:1524 ../../mod/connections.php:72 +#: ../../mod/connections.php:85 ../../mod/menu.php:110 msgid "New" msgstr "" -#: ../../include/conversation.php:1516 +#: ../../include/conversation.php:1527 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1522 +#: ../../include/conversation.php:1533 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1525 +#: ../../include/conversation.php:1536 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1532 +#: ../../include/conversation.php:1543 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1535 +#: ../../include/conversation.php:1546 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1579 ../../mod/admin.php:984 +#: ../../include/conversation.php:1590 ../../mod/admin.php:993 msgid "Channel" msgstr "" -#: ../../include/conversation.php:1582 +#: ../../include/conversation.php:1593 msgid "Status Messages and Posts" msgstr "" -#: ../../include/conversation.php:1591 +#: ../../include/conversation.php:1602 msgid "About" msgstr "" -#: ../../include/conversation.php:1594 +#: ../../include/conversation.php:1605 msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1603 ../../include/photos.php:359 +#: ../../include/conversation.php:1614 ../../include/photos.php:359 msgid "Photo Albums" msgstr "" -#: ../../include/conversation.php:1612 +#: ../../include/conversation.php:1623 msgid "Files and Storage" msgstr "" -#: ../../include/conversation.php:1622 ../../include/conversation.php:1625 +#: ../../include/conversation.php:1633 ../../include/conversation.php:1636 msgid "Chatrooms" msgstr "" -#: ../../include/conversation.php:1638 +#: ../../include/conversation.php:1649 msgid "Saved Bookmarks" msgstr "" -#: ../../include/conversation.php:1648 +#: ../../include/conversation.php:1659 msgid "Manage Webpages" msgstr "" -#: ../../include/conversation.php:1707 +#: ../../include/conversation.php:1718 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1710 +#: ../../include/conversation.php:1721 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1713 +#: ../../include/conversation.php:1724 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1716 +#: ../../include/conversation.php:1727 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1719 +#: ../../include/conversation.php:1730 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1722 +#: ../../include/conversation.php:1733 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" msgstr[0] "" msgstr[1] "" -#: ../../include/items.php:399 ../../mod/like.php:270 +#: ../../include/items.php:413 ../../mod/like.php:273 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23 -#: ../../mod/bulksetclose.php:11 ../../index.php:381 +#: ../../mod/bulksetclose.php:11 ../../index.php:392 msgid "Permission denied" msgstr "" -#: ../../include/items.php:1020 ../../include/items.php:1066 +#: ../../include/items.php:1101 ../../include/items.php:1147 msgid "(Unknown)" msgstr "" -<<<<<<< HEAD -#: ../../include/items.php:1234 +#: ../../include/items.php:1373 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1236 +#: ../../include/items.php:1375 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1238 +#: ../../include/items.php:1377 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1240 +#: ../../include/items.php:1379 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:1306 -msgid "Visible to you only." -msgstr "" - -#: ../../include/items.php:1308 -msgid "Visible to anybody in this network." -msgstr "" - -#: ../../include/items.php:1310 -msgid "Visible to anybody authenticated." -msgstr "" - -#: ../../include/items.php:1312 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/items.php:1381 #, php-format msgid "Visible to anybody on %s." msgstr "" -<<<<<<< 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 +#: ../../include/items.php:1383 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1316 +#: ../../include/items.php:1385 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1318 +#: ../../include/items.php:1387 msgid "Visible to specific connections." msgstr "" -#: ../../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 +#: ../../include/items.php:4286 ../../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 msgid "Item not found." msgstr "" -<<<<<<< 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/items.php:4359 ../../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/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/achievements.php:30 ../../mod/manage.php:6 ../../mod/api.php:26 +#: ../../mod/api.php:31 ../../mod/webpages.php:69 ../../mod/thing.php:269 +#: ../../mod/thing.php:284 ../../mod/thing.php:318 +#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277 +#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178 +#: ../../mod/events.php:249 ../../mod/group.php:9 ../../mod/item.php:206 +#: ../../mod/item.php:214 ../../mod/item.php:1005 ../../mod/network.php:12 +#: ../../mod/common.php:35 ../../mod/connections.php:29 +#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/editpost.php:13 +#: ../../mod/photos.php:69 ../../mod/pdledit.php:21 ../../mod/authtest.php:13 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 -#: ../../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/chat.php:90 ../../mod/chat.php:95 ../../mod/mitem.php:111 +#: ../../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:72 ../../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 -<<<<<<< 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/register.php:72 ../../mod/settings.php:570 ../../mod/id.php:71 +#: ../../mod/message.php:16 ../../mod/mood.php:111 ../../mod/connedit.php:348 #: ../../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 @@ -3283,80 +3083,42 @@ 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:382 +#: ../../index.php:182 ../../index.php:393 msgid "Permission denied." msgstr "" -#: ../../include/items.php:4670 ../../mod/group.php:38 ../../mod/group.php:140 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/items.php:4763 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -<<<<<<< HEAD -#: ../../include/items.php:4551 +#: ../../include/items.php:4779 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4558 -======= -#: ../../include/items.php:4686 -msgid "Collection is empty." -msgstr "" - -#: ../../include/items.php:4693 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/items.php:4786 #, php-format msgid "Collection: %s" msgstr "" -<<<<<<< HEAD -#: ../../include/items.php:4568 -======= -#: ../../include/items.php:4703 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/items.php:4796 ../../mod/connedit.php:674 #, php-format msgid "Connection: %s" msgstr "" -<<<<<<< HEAD -#: ../../include/items.php:4570 -======= -#: ../../include/items.php:4705 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/items.php:4798 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 +#: ../../include/zot.php:678 msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:682 +#: ../../include/zot.php:694 msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2126 +#: ../../include/zot.php:2184 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -3388,7 +3150,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:450 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:457 msgid "Advanced" msgstr "" @@ -3408,20 +3170,12 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413 -<<<<<<< HEAD -#: ../../mod/directory.php:362 ../../mod/directory.php:367 -msgid "Find" -msgstr "" - -#: ../../include/contact_widgets.php:27 ../../mod/directory.php:366 -======= -#: ../../mod/directory.php:372 ../../mod/directory.php:377 +#: ../../include/contact_widgets.php:26 ../../mod/directory.php:379 +#: ../../mod/directory.php:384 ../../mod/connections.php:273 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:27 ../../mod/directory.php:376 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:383 #: ../../mod/suggest.php:60 msgid "Channel Suggestions" msgstr "" @@ -3461,8 +3215,8 @@ msgstr "" msgid "Don't show" msgstr "" -#: ../../include/acl_selectors.php:248 ../../mod/events.php:654 -#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209 +#: ../../include/acl_selectors.php:248 ../../mod/events.php:691 +#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209 #: ../../mod/filestorage.php:147 msgid "Permissions" msgstr "" @@ -3562,218 +3316,206 @@ msgstr "" msgid "Default Profile" msgstr "" -#: ../../include/identity.php:631 +#: ../../include/identity.php:736 msgid "Requested channel is not available." msgstr "" -#: ../../include/identity.php:678 ../../mod/profile.php:16 +#: ../../include/identity.php:783 ../../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/filestorage.php:54 ../../mod/editblock.php:29 +#: ../../mod/editblock.php:29 ../../mod/filestorage.php:54 #: ../../mod/layouts.php:29 msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:837 ../../mod/profiles.php:774 +#: ../../include/identity.php:946 ../../mod/profiles.php:774 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:843 +#: ../../include/identity.php:952 msgid "Profiles" msgstr "" -#: ../../include/identity.php:843 +#: ../../include/identity.php:952 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:844 ../../mod/profiles.php:775 +#: ../../include/identity.php:953 ../../mod/profiles.php:775 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:859 ../../mod/profiles.php:786 +#: ../../include/identity.php:968 ../../mod/profiles.php:786 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:862 +#: ../../include/identity.php:971 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:863 ../../mod/profiles.php:669 +#: ../../include/identity.php:972 ../../mod/profiles.php:669 #: ../../mod/profiles.php:790 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:879 ../../include/identity.php:1118 +#: ../../include/identity.php:988 ../../include/identity.php:1227 msgid "Gender:" msgstr "" -#: ../../include/identity.php:880 ../../include/identity.php:1162 +#: ../../include/identity.php:989 ../../include/identity.php:1271 msgid "Status:" msgstr "" -#: ../../include/identity.php:881 ../../include/identity.php:1173 +#: ../../include/identity.php:990 ../../include/identity.php:1282 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:882 +#: ../../include/identity.php:991 msgid "Online Now" msgstr "" -#: ../../include/identity.php:965 ../../include/identity.php:1043 +#: ../../include/identity.php:1074 ../../include/identity.php:1152 #: ../../mod/ping.php:324 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:966 ../../include/identity.php:1044 +#: ../../include/identity.php:1075 ../../include/identity.php:1153 msgid "F d" msgstr "" -#: ../../include/identity.php:1011 ../../include/identity.php:1083 +#: ../../include/identity.php:1120 ../../include/identity.php:1192 #: ../../mod/ping.php:346 msgid "[today]" msgstr "" -#: ../../include/identity.php:1022 +#: ../../include/identity.php:1131 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1023 +#: ../../include/identity.php:1132 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1076 +#: ../../include/identity.php:1185 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1094 +#: ../../include/identity.php:1203 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1095 +#: ../../include/identity.php:1204 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1108 ../../include/identity.php:1225 +#: ../../include/identity.php:1217 ../../include/identity.php:1334 #: ../../include/apps.php:138 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/identity.php:1116 ../../mod/settings.php:1050 +#: ../../include/identity.php:1225 ../../mod/settings.php:1056 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1123 +#: ../../include/identity.php:1232 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1147 +#: ../../include/identity.php:1256 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1148 +#: ../../include/identity.php:1257 msgid "j F" msgstr "" -#: ../../include/identity.php:1155 +#: ../../include/identity.php:1264 msgid "Birthday:" msgstr "" -<<<<<<< HEAD -#: ../../include/identity.php:1159 -======= -#: ../../include/identity.php:1163 ../../mod/directory.php:290 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/identity.php:1268 ../../mod/directory.php:297 msgid "Age:" msgstr "" -#: ../../include/identity.php:1168 +#: ../../include/identity.php:1277 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1171 ../../mod/profiles.php:691 +#: ../../include/identity.php:1280 ../../mod/profiles.php:691 msgid "Sexual Preference:" msgstr "" -<<<<<<< HEAD -#: ../../include/identity.php:1175 ../../mod/profiles.php:693 -======= -#: ../../include/identity.php:1179 ../../mod/directory.php:306 +#: ../../include/identity.php:1284 ../../mod/directory.php:313 #: ../../mod/profiles.php:693 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1177 +#: ../../include/identity.php:1286 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/profiles.php:694 +#: ../../include/identity.php:1288 ../../mod/profiles.php:694 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1181 +#: ../../include/identity.php:1290 msgid "Religion:" msgstr "" -<<<<<<< HEAD -#: ../../include/identity.php:1183 -======= -#: ../../include/identity.php:1187 ../../mod/directory.php:308 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +#: ../../include/identity.php:1292 ../../mod/directory.php:315 msgid "About:" msgstr "" -#: ../../include/identity.php:1185 +#: ../../include/identity.php:1294 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1187 ../../mod/profiles.php:697 +#: ../../include/identity.php:1296 ../../mod/profiles.php:697 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1189 ../../mod/profiles.php:698 +#: ../../include/identity.php:1298 ../../mod/profiles.php:698 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1191 +#: ../../include/identity.php:1300 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1193 +#: ../../include/identity.php:1302 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1195 +#: ../../include/identity.php:1304 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1197 +#: ../../include/identity.php:1306 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1199 +#: ../../include/identity.php:1308 msgid "Television:" msgstr "" -#: ../../include/identity.php:1201 +#: ../../include/identity.php:1310 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1203 +#: ../../include/identity.php:1312 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1205 +#: ../../include/identity.php:1314 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1207 +#: ../../include/identity.php:1316 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1227 +#: ../../include/identity.php:1336 msgid "Like this thing" msgstr "" @@ -4059,7 +3801,7 @@ msgid "Profile Photo" msgstr "" #: ../../include/apps.php:247 ../../mod/settings.php:84 -#: ../../mod/settings.php:613 +#: ../../mod/settings.php:614 msgid "Update" msgstr "" @@ -4071,19 +3813,17 @@ msgstr "" msgid "Purchase" msgstr "" -<<<<<<< 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 +#: ../../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 msgid "Image/photo" msgstr "" -#: ../../include/bbcode.php:161 ../../include/bbcode.php:814 +#: ../../include/bbcode.php:161 ../../include/bbcode.php:818 msgid "Encrypted content" msgstr "" @@ -4092,48 +3832,54 @@ msgstr "" msgid "Install %s element: " msgstr "" -#: ../../include/bbcode.php:188 ../../mod/impel.php:37 +#: ../../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 msgid "webpage" msgstr "" -#: ../../include/bbcode.php:191 ../../mod/impel.php:47 +#: ../../include/bbcode.php:195 ../../mod/impel.php:47 msgid "layout" msgstr "" -#: ../../include/bbcode.php:194 ../../mod/impel.php:42 +#: ../../include/bbcode.php:198 ../../mod/impel.php:42 msgid "block" msgstr "" -#: ../../include/bbcode.php:197 ../../mod/impel.php:54 +#: ../../include/bbcode.php:201 ../../mod/impel.php:54 msgid "menu" msgstr "" -#: ../../include/bbcode.php:211 +#: ../../include/bbcode.php:215 msgid "QR code" msgstr "" -#: ../../include/bbcode.php:262 +#: ../../include/bbcode.php:266 #, php-format msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:264 ../../mod/tagger.php:51 +#: ../../include/bbcode.php:268 ../../mod/tagger.php:51 msgid "post" msgstr "" -#: ../../include/bbcode.php:514 +#: ../../include/bbcode.php:518 msgid "Different viewers will see this text differently" msgstr "" -#: ../../include/bbcode.php:725 +#: ../../include/bbcode.php:729 msgid "$1 spoiler" msgstr "" -#: ../../include/bbcode.php:752 +#: ../../include/bbcode.php:756 msgid "$1 wrote:" msgstr "" ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../include/chat.php:23 msgid "Missing room name" msgstr "" @@ -4154,20 +3900,25 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../include/diaspora.php:2439 -msgid "Please choose" +#: ../../include/photos.php:94 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/diaspora.php:2441 -msgid "Agree" +#: ../../include/photos.php:101 +msgid "Image file is empty." msgstr "" -#: ../../include/diaspora.php:2443 -msgid "Disagree" +#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 +msgid "Unable to process image" msgstr "" -#: ../../include/diaspora.php:2445 -msgid "Abstain" +#: ../../include/photos.php:199 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:363 +msgid "Upload New Photos" msgstr "" #: ../../mod/achievements.php:34 @@ -4213,611 +3964,93 @@ msgstr "" msgid "Delegated Channels" msgstr "" -<<<<<<< HEAD -#: ../../mod/settings.php:76 -msgid "Name is required" -msgstr "" - -#: ../../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" +#: ../../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." msgstr "" -#: ../../mod/settings.php:807 +#: ../../mod/directory.php:234 #, php-format -msgid "%s - (Experimental)" -msgstr "" - -#: ../../mod/settings.php:810 ../../mod/admin.php:396 -msgid "mobile" -msgstr "" - -#: ../../mod/settings.php:846 -msgid "Display Settings" -msgstr "" - -#: ../../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 "" +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" -#: ../../mod/settings.php:1095 -msgid "Send a notification email when:" +#: ../../mod/directory.php:245 +msgid "Gender: " msgstr "" -#: ../../mod/settings.php:1096 -msgid "You receive a connection request" +#: ../../mod/directory.php:247 +msgid "Status: " msgstr "" -#: ../../mod/settings.php:1097 -msgid "Your connections are confirmed" +#: ../../mod/directory.php:249 +msgid "Homepage: " msgstr "" -<<<<<<< HEAD -#: ../../mod/settings.php:1098 -msgid "Someone writes on your profile wall" -======= -#: ../../mod/events.php:645 ../../mod/directory.php:301 +#: ../../mod/directory.php:308 ../../mod/events.php:682 msgid "Description:" msgstr "" -#: ../../mod/events.php:649 -msgid "Title:" ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 -msgstr "" - -#: ../../mod/settings.php:1099 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../mod/settings.php:1100 -msgid "You receive a private message" -msgstr "" - -#: ../../mod/settings.php:1101 -msgid "You receive a friend suggestion" -msgstr "" - -#: ../../mod/settings.php:1102 -msgid "You are tagged in a post" -msgstr "" - -#: ../../mod/settings.php:1103 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: ../../mod/settings.php:1106 -msgid "Show visual notifications including:" -msgstr "" - -#: ../../mod/settings.php:1108 -msgid "Unseen matrix activity" -msgstr "" - -#: ../../mod/settings.php:1109 -msgid "Unseen channel activity" -msgstr "" - -#: ../../mod/settings.php:1110 -msgid "Unseen private messages" -msgstr "" - -#: ../../mod/settings.php:1110 ../../mod/settings.php:1115 -#: ../../mod/settings.php:1116 ../../mod/settings.php:1117 -msgid "Recommended" -msgstr "" - -#: ../../mod/settings.php:1111 -msgid "Upcoming events" -msgstr "" - -#: ../../mod/settings.php:1112 -msgid "Events today" -msgstr "" - -#: ../../mod/settings.php:1113 -msgid "Upcoming birthdays" -msgstr "" - -#: ../../mod/settings.php:1113 -msgid "Not available in all themes" -msgstr "" - -#: ../../mod/settings.php:1114 -msgid "System (personal) notifications" +#: ../../mod/directory.php:317 +msgid "Public Forum:" msgstr "" -#: ../../mod/settings.php:1115 -msgid "System info messages" +#: ../../mod/directory.php:320 +msgid "Keywords: " msgstr "" -#: ../../mod/settings.php:1116 -msgid "System critical alerts" +#: ../../mod/directory.php:323 +msgid "Don't suggest" msgstr "" -#: ../../mod/settings.php:1117 -msgid "New connections" +#: ../../mod/directory.php:325 +msgid "Common connections:" msgstr "" -#: ../../mod/settings.php:1118 -msgid "System Registrations" +#: ../../mod/directory.php:374 +msgid "Global Directory" msgstr "" -#: ../../mod/settings.php:1119 -msgid "" -"Also show new wall posts, private messages and connections under Notices" +#: ../../mod/directory.php:374 +msgid "Local Directory" msgstr "" -#: ../../mod/settings.php:1121 -msgid "Notify me of events this many days in advance" +#: ../../mod/directory.php:380 +msgid "Finding:" msgstr "" -#: ../../mod/settings.php:1121 -msgid "Must be greater than 0" +#: ../../mod/directory.php:385 +msgid "next page" msgstr "" -#: ../../mod/settings.php:1123 -msgid "Advanced Account/Page Type Settings" +#: ../../mod/directory.php:385 +msgid "previous page" msgstr "" -#: ../../mod/settings.php:1124 -msgid "Change the behaviour of this account for special situations" +#: ../../mod/directory.php:386 +msgid "Sort options" msgstr "" -#: ../../mod/settings.php:1127 -msgid "" -"Please enable expert mode (in <a href=\"settings/features\">Settings > " -"Additional features</a>) to adjust!" +#: ../../mod/directory.php:387 +msgid "Alphabetic" msgstr "" -#: ../../mod/settings.php:1128 -msgid "Miscellaneous Settings" +#: ../../mod/directory.php:388 +msgid "Reverse Alphabetic" msgstr "" -#: ../../mod/settings.php:1130 -msgid "Personal menu to display in your channel pages" +#: ../../mod/directory.php:389 +msgid "Newest to Oldest" msgstr "" -#: ../../mod/settings.php:1131 ../../mod/removeme.php:61 -msgid "Remove Channel" +#: ../../mod/directory.php:390 +msgid "Oldest to Newest" msgstr "" -#: ../../mod/settings.php:1132 -msgid "Remove this channel." +#: ../../mod/directory.php:407 +msgid "No entries (some entries may be hidden)." msgstr "" #: ../../mod/xchan.php:6 @@ -4828,7 +4061,7 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../mod/xchan.php:37 ../../mod/menu.php:152 ../../mod/mitem.php:120 +#: ../../mod/xchan.php:37 ../../mod/mitem.php:116 ../../mod/menu.php:160 msgid "Not found." msgstr "" @@ -4850,7 +4083,7 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/webpages.php:190 +#: ../../mod/webpages.php:191 msgid "Page Title" msgstr "" @@ -4870,7 +4103,7 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../mod/tagrm.php:133 ../../mod/photos.php:875 +#: ../../mod/tagrm.php:133 ../../mod/photos.php:887 msgid "Remove" msgstr "" @@ -4921,65 +4154,56 @@ msgstr "" msgid "Thing updated" msgstr "" -#: ../../mod/thing.php:153 +#: ../../mod/thing.php:167 msgid "Object store: failed" msgstr "" -#: ../../mod/thing.php:157 +#: ../../mod/thing.php:171 msgid "Thing added" msgstr "" -#: ../../mod/thing.php:175 +#: ../../mod/thing.php:203 #, php-format msgid "OBJ: %1$s %2$s %3$s" msgstr "" -#: ../../mod/thing.php:226 +#: ../../mod/thing.php:254 msgid "Show Thing" msgstr "" -#: ../../mod/thing.php:233 +#: ../../mod/thing.php:261 msgid "item not found." msgstr "" -#: ../../mod/thing.php:261 +#: ../../mod/thing.php:289 msgid "Edit Thing" msgstr "" -#: ../../mod/thing.php:263 ../../mod/thing.php:310 +#: ../../mod/thing.php:291 ../../mod/thing.php:338 msgid "Select a profile" msgstr "" -#: ../../mod/thing.php:267 ../../mod/thing.php:313 +#: ../../mod/thing.php:295 ../../mod/thing.php:341 msgid "Post an activity" msgstr "" -<<<<<<< HEAD -#: ../../mod/thing.php:267 ../../mod/thing.php:313 +#: ../../mod/thing.php:295 ../../mod/thing.php:341 msgid "Only sends to viewers of the applicable profile" msgstr "" -#: ../../mod/thing.php:269 ../../mod/thing.php:315 +#: ../../mod/thing.php:297 ../../mod/thing.php:343 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 +#: ../../mod/thing.php:299 ../../mod/thing.php:344 msgid "URL of thing (optional)" msgstr "" -#: ../../mod/thing.php:273 ../../mod/thing.php:317 +#: ../../mod/thing.php:301 ../../mod/thing.php:345 msgid "URL for photo of thing (optional)" msgstr "" -#: ../../mod/thing.php:308 +#: ../../mod/thing.php:336 msgid "Add Thing to your Profile" msgstr "" @@ -4992,15 +4216,6 @@ 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 "" @@ -5040,6 +4255,10 @@ 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 "" @@ -5060,74 +4279,8 @@ 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 @@ -5139,16 +4292,16 @@ msgstr "" msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/block.php:27 ../../mod/page.php:33 +#: ../../mod/block.php:27 ../../mod/page.php:36 msgid "Invalid item." msgstr "" -#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:49 +#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:52 msgid "Channel not found." msgstr "" -#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106 -#: ../../mod/page.php:85 ../../index.php:230 +#: ../../mod/block.php:75 ../../mod/display.php:110 ../../mod/help.php:79 +#: ../../mod/page.php:89 ../../index.php:241 msgid "Page not found." msgstr "" @@ -5178,143 +4331,155 @@ msgstr "" msgid "Channel unavailable." msgstr "" -#: ../../mod/like.php:228 +#: ../../mod/like.php:231 msgid "Previous action reversed." msgstr "" -#: ../../mod/like.php:398 +#: ../../mod/like.php:401 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../mod/like.php:400 +#: ../../mod/like.php:403 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../mod/like.php:402 +#: ../../mod/like.php:405 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -#: ../../mod/like.php:404 +#: ../../mod/like.php:407 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../mod/like.php:406 +#: ../../mod/like.php:409 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../mod/like.php:408 +#: ../../mod/like.php:411 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../mod/like.php:492 +#: ../../mod/like.php:507 msgid "Action completed." msgstr "" -#: ../../mod/like.php:493 +#: ../../mod/like.php:508 msgid "Thank you." msgstr "" -#: ../../mod/events.php:87 +#: ../../mod/events.php:21 +msgid "Calendar entries imported." +msgstr "" + +#: ../../mod/events.php:23 +msgid "No calendar entries found." +msgstr "" + +#: ../../mod/events.php:101 msgid "Event can not end before it has started." msgstr "" -#: ../../mod/events.php:89 ../../mod/events.php:98 ../../mod/events.php:116 +#: ../../mod/events.php:103 ../../mod/events.php:112 ../../mod/events.php:130 msgid "Unable to generate preview." msgstr "" -#: ../../mod/events.php:96 +#: ../../mod/events.php:110 msgid "Event title and start time are required." msgstr "" -#: ../../mod/events.php:114 +#: ../../mod/events.php:128 msgid "Event not found." msgstr "" -#: ../../mod/events.php:396 +#: ../../mod/events.php:426 msgid "l, F j" msgstr "" -#: ../../mod/events.php:418 +#: ../../mod/events.php:448 msgid "Edit event" msgstr "" -#: ../../mod/events.php:419 +#: ../../mod/events.php:449 msgid "Delete event" msgstr "" -#: ../../mod/events.php:473 +#: ../../mod/events.php:483 +msgid "calendar" +msgstr "" + +#: ../../mod/events.php:504 msgid "Create New Event" msgstr "" -#: ../../mod/events.php:474 ../../mod/photos.php:827 +#: ../../mod/events.php:505 ../../mod/photos.php:839 msgid "Previous" msgstr "" -#: ../../mod/events.php:475 ../../mod/photos.php:836 ../../mod/setup.php:281 +#: ../../mod/events.php:506 ../../mod/photos.php:848 ../../mod/setup.php:281 msgid "Next" msgstr "" -#: ../../mod/events.php:476 +#: ../../mod/events.php:507 msgid "Export" msgstr "" -#: ../../mod/events.php:504 +#: ../../mod/events.php:510 +msgid "Import" +msgstr "" + +#: ../../mod/events.php:541 msgid "Event removed" msgstr "" -#: ../../mod/events.php:507 +#: ../../mod/events.php:544 msgid "Failed to remove event" msgstr "" -#: ../../mod/events.php:627 +#: ../../mod/events.php:664 msgid "Event details" msgstr "" -#: ../../mod/events.php:628 +#: ../../mod/events.php:665 msgid "Starting date and Title are required." msgstr "" -#: ../../mod/events.php:630 +#: ../../mod/events.php:667 msgid "Categories (comma-separated list)" msgstr "" -#: ../../mod/events.php:632 +#: ../../mod/events.php:669 msgid "Event Starts:" msgstr "" -#: ../../mod/events.php:639 +#: ../../mod/events.php:676 msgid "Finish date/time is not known or not relevant" msgstr "" -#: ../../mod/events.php:641 +#: ../../mod/events.php:678 msgid "Event Finishes:" msgstr "" -#: ../../mod/events.php:643 ../../mod/events.php:644 +#: ../../mod/events.php:680 ../../mod/events.php:681 msgid "Adjust for viewer timezone" msgstr "" -#: ../../mod/events.php:643 +#: ../../mod/events.php:680 msgid "" "Important for events that happen in a particular place. Not practical for " "global holidays." msgstr "" -#: ../../mod/events.php:645 -msgid "Description:" -msgstr "" - -#: ../../mod/events.php:649 +#: ../../mod/events.php:686 msgid "Title:" msgstr "" -#: ../../mod/events.php:651 +#: ../../mod/events.php:688 msgid "Share this event" msgstr "" @@ -5368,7 +4533,7 @@ msgstr "" msgid "View ratings" msgstr "" -#: ../../mod/rpost.php:131 ../../mod/editpost.php:42 +#: ../../mod/rpost.php:131 ../../mod/editpost.php:158 msgid "Edit post" msgstr "" @@ -5396,7 +4561,6 @@ msgstr "" msgid "Collection Name: " msgstr "" -<<<<<<< HEAD #: ../../mod/group.php:89 ../../mod/group.php:186 msgid "Members are visible to other channels" msgstr "" @@ -5438,6 +4602,10 @@ 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 " @@ -5457,107 +4625,84 @@ 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 "" -"Cannot create a duplicate channel identifier on this system. Import failed." -msgstr "" - -#: ../../mod/import.php:176 -msgid "Channel clone failed. Import failed." +"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " +"about $Projectname." msgstr "" -#: ../../mod/import.php:186 -msgid "Cloned channel not found. Import failed." +#: ../../mod/siteinfo.php:165 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/import.php:516 -msgid "You must be logged in to use this feature." +#: ../../mod/siteinfo.php:167 +msgid "$projectname issues" msgstr "" -#: ../../mod/import.php:521 -msgid "Import Channel" +#: ../../mod/siteinfo.php:168 +msgid "" +"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" msgstr "" -#: ../../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." +#: ../../mod/siteinfo.php:170 +msgid "Site Administrators" msgstr "" -#: ../../mod/import.php:523 -msgid "File to Upload" +#: ../../mod/item.php:174 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/import.php:524 -msgid "Or provide the old server/hub details" +#: ../../mod/item.php:440 +msgid "Empty post discarded." msgstr "" -#: ../../mod/import.php:525 -msgid "Your old identity address (xyz@example.com)" +#: ../../mod/item.php:480 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/import.php:526 -msgid "Your old login email address" +#: ../../mod/item.php:914 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/import.php:527 -msgid "Your old login password" +#: ../../mod/item.php:1146 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../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." +#: ../../mod/item.php:1153 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/import.php:529 -msgid "Make this hub my primary location" +#: ../../mod/item.php:1160 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/import.php:530 -msgid "" -"Import existing posts if possible (experimental - limited by available memory" +#: ../../mod/network.php:91 +msgid "No such group" msgstr "" -#: ../../mod/import.php:531 ->>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 -msgid "" -"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " -"about $Projectname." +#: ../../mod/network.php:129 +msgid "No such channel" msgstr "" -#: ../../mod/siteinfo.php:165 -msgid "Bug reports and issues: please visit" +#: ../../mod/network.php:143 +msgid "Search Results For:" msgstr "" -#: ../../mod/siteinfo.php:168 -msgid "" -"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com" +#: ../../mod/network.php:198 +msgid "Collection is empty" msgstr "" -#: ../../mod/siteinfo.php:170 -msgid "Site Administrators" +#: ../../mod/network.php:207 +msgid "Collection: " msgstr "" -#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 -msgid "Help:" +#: ../../mod/network.php:226 +msgid "Connection: " msgstr "" -#: ../../mod/help.php:76 ../../index.php:227 -msgid "Not Found" +#: ../../mod/network.php:233 +msgid "Invalid connection." msgstr "" #: ../../mod/common.php:10 @@ -5576,96 +4721,80 @@ msgstr "" msgid "This site is not a directory server" msgstr "" -#: ../../mod/connections.php:37 ../../mod/connedit.php:75 -msgid "Could not access contact record." -msgstr "" - -#: ../../mod/connections.php:51 ../../mod/connedit.php:99 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../mod/connections.php:94 ../../mod/connedit.php:214 -msgid "Connection updated." -msgstr "" - -#: ../../mod/connections.php:96 ../../mod/connedit.php:216 -msgid "Failed to update connection record." -msgstr "" - -#: ../../mod/connections.php:192 ../../mod/connections.php:293 +#: ../../mod/connections.php:52 ../../mod/connections.php:153 msgid "Blocked" msgstr "" -#: ../../mod/connections.php:197 ../../mod/connections.php:300 +#: ../../mod/connections.php:57 ../../mod/connections.php:160 msgid "Ignored" msgstr "" -#: ../../mod/connections.php:202 ../../mod/connections.php:314 +#: ../../mod/connections.php:62 ../../mod/connections.php:174 msgid "Hidden" msgstr "" -#: ../../mod/connections.php:207 ../../mod/connections.php:307 +#: ../../mod/connections.php:67 ../../mod/connections.php:167 msgid "Archived" msgstr "" -#: ../../mod/connections.php:271 +#: ../../mod/connections.php:131 msgid "Suggest new connections" msgstr "" -#: ../../mod/connections.php:274 +#: ../../mod/connections.php:134 msgid "New Connections" msgstr "" -#: ../../mod/connections.php:277 +#: ../../mod/connections.php:137 msgid "Show pending (new) connections" msgstr "" -#: ../../mod/connections.php:280 ../../mod/profperm.php:139 +#: ../../mod/connections.php:140 ../../mod/profperm.php:139 msgid "All Connections" msgstr "" -#: ../../mod/connections.php:283 +#: ../../mod/connections.php:143 msgid "Show all connections" msgstr "" -#: ../../mod/connections.php:286 +#: ../../mod/connections.php:146 msgid "Unblocked" msgstr "" -#: ../../mod/connections.php:289 +#: ../../mod/connections.php:149 msgid "Only show unblocked connections" msgstr "" -#: ../../mod/connections.php:296 +#: ../../mod/connections.php:156 msgid "Only show blocked connections" msgstr "" -#: ../../mod/connections.php:303 +#: ../../mod/connections.php:163 msgid "Only show ignored connections" msgstr "" -#: ../../mod/connections.php:310 +#: ../../mod/connections.php:170 msgid "Only show archived connections" msgstr "" -#: ../../mod/connections.php:317 +#: ../../mod/connections.php:177 msgid "Only show hidden connections" msgstr "" -#: ../../mod/connections.php:372 +#: ../../mod/connections.php:232 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../mod/connections.php:373 +#: ../../mod/connections.php:233 msgid "Edit connection" msgstr "" -#: ../../mod/connections.php:411 +#: ../../mod/connections.php:271 msgid "Search your connections" msgstr "" -#: ../../mod/connections.php:412 +#: ../../mod/connections.php:272 msgid "Finding: " msgstr "" @@ -5677,167 +4806,175 @@ msgstr "" msgid "Block Title" msgstr "" -#: ../../mod/tagger.php:96 -#, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" +#: ../../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" msgstr "" #: ../../mod/cloud.php:120 msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" -#: ../../mod/photos.php:77 +#: ../../mod/photos.php:78 msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/photos.php:97 +#: ../../mod/photos.php:98 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:119 ../../mod/photos.php:643 +#: ../../mod/photos.php:120 ../../mod/photos.php:655 msgid "Delete Album" msgstr "" -<<<<<<< HEAD -#: ../../mod/photos.php:159 ../../mod/photos.php:930 +#: ../../mod/photos.php:160 ../../mod/photos.php:942 msgid "Delete Photo" msgstr "" -#: ../../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 +#: ../../mod/photos.php:452 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:484 +#: ../../mod/photos.php:496 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:523 +#: ../../mod/photos.php:535 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:526 +#: ../../mod/photos.php:538 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:550 +#: ../../mod/photos.php:562 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915 +#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927 msgid "Enter a new album name" msgstr "" -#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916 +#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../mod/photos.php:556 +#: ../../mod/photos.php:568 msgid "Create a status post for this upload" msgstr "" -#: ../../mod/photos.php:584 +#: ../../mod/photos.php:596 msgid "Album name could not be decoded" msgstr "" -#: ../../mod/photos.php:625 ../../mod/photos.php:1157 -#: ../../mod/photos.php:1173 +#: ../../mod/photos.php:637 ../../mod/photos.php:1169 +#: ../../mod/photos.php:1185 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:649 +#: ../../mod/photos.php:661 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:651 +#: ../../mod/photos.php:663 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:675 ../../mod/photos.php:1205 +#: ../../mod/photos.php:687 ../../mod/photos.php:1217 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:704 +#: ../../mod/photos.php:716 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:749 +#: ../../mod/photos.php:761 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:751 +#: ../../mod/photos.php:763 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:809 +#: ../../mod/photos.php:821 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:816 +#: ../../mod/photos.php:828 msgid "Private Photo" msgstr "" -#: ../../mod/photos.php:831 +#: ../../mod/photos.php:843 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:909 +#: ../../mod/photos.php:921 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:911 +#: ../../mod/photos.php:923 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:912 +#: ../../mod/photos.php:924 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:919 +#: ../../mod/photos.php:931 msgid "Caption" msgstr "" -#: ../../mod/photos.php:921 +#: ../../mod/photos.php:933 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:925 +#: ../../mod/photos.php:937 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../mod/photos.php:928 +#: ../../mod/photos.php:940 msgid "Flag as adult in album view" msgstr "" -#: ../../mod/photos.php:1120 +#: ../../mod/photos.php:1132 msgid "In This Photo:" msgstr "" -#: ../../mod/photos.php:1125 +#: ../../mod/photos.php:1137 msgid "Map" msgstr "" -#: ../../mod/photos.php:1211 +#: ../../mod/photos.php:1223 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1234 +#: ../../mod/photos.php:1246 msgid "Recent Photos" msgstr "" @@ -5940,76 +5077,76 @@ msgstr "" msgid "Your service plan only allows %d channels." msgstr "" -#: ../../mod/import.php:51 +#: ../../mod/import.php:60 msgid "Nothing to import." msgstr "" -#: ../../mod/import.php:75 +#: ../../mod/import.php:84 msgid "Unable to download data from old server" msgstr "" -#: ../../mod/import.php:81 +#: ../../mod/import.php:90 msgid "Imported file is empty." msgstr "" -#: ../../mod/import.php:106 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../mod/import.php:110 +msgid "The data provided is not compatible with this project." msgstr "" -#: ../../mod/import.php:127 -msgid "Unable to create a unique channel address. Import failed." +#: ../../mod/import.php:115 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." msgstr "" -#: ../../mod/import.php:147 -msgid "Channel clone failed. Import failed." +#: ../../mod/import.php:135 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/import.php:157 -msgid "Cloned channel not found. Import failed." +#: ../../mod/import.php:176 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/import.php:475 -msgid "Import completed." +#: ../../mod/import.php:186 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:487 +#: ../../mod/import.php:574 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:492 +#: ../../mod/import.php:579 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:493 +#: ../../mod/import.php:580 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. Only identity and connections/relationships will be " -"imported. Importation of content is not yet available." +"provide an export file." msgstr "" -#: ../../mod/import.php:494 +#: ../../mod/import.php:581 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:495 +#: ../../mod/import.php:582 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:496 +#: ../../mod/import.php:583 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:497 +#: ../../mod/import.php:584 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:498 +#: ../../mod/import.php:585 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:499 +#: ../../mod/import.php:586 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 " @@ -6017,52 +5154,38 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:500 +#: ../../mod/import.php:587 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/import.php:501 -msgid "Import existing posts if possible" -msgstr "" - -#: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77 -#: ../../mod/editpost.php:20 ../../mod/editblock.php:78 -#: ../../mod/editblock.php:94 -msgid "Item not found" +#: ../../mod/import.php:588 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../mod/editlayout.php:106 -msgid "Edit Layout" +#: ../../mod/import.php:589 +msgid "" +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." msgstr "" -#: ../../mod/editlayout.php:117 +#: ../../mod/editlayout.php:111 msgid "Delete layout?" msgstr "" -#: ../../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 +#: ../../mod/editlayout.php:158 ../../mod/layouts.php:124 msgid "Layout Description (Optional)" msgstr "" -#: ../../mod/editlayout.php:166 ../../mod/layouts.php:121 +#: ../../mod/editlayout.php:160 ../../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 "" @@ -6104,6 +5227,126 @@ msgstr "" msgid "%1$s's Chatrooms" msgstr "" +#: ../../mod/mitem.php:24 ../../mod/menu.php:138 +msgid "Menu not found." +msgstr "" + +#: ../../mod/mitem.php:48 +msgid "Unable to create element." +msgstr "" + +#: ../../mod/mitem.php:72 +msgid "Unable to update menu element." +msgstr "" + +#: ../../mod/mitem.php:88 +msgid "Unable to add menu element." +msgstr "" + +#: ../../mod/mitem.php:154 ../../mod/mitem.php:226 +msgid "Menu Item Permissions" +msgstr "" + +#: ../../mod/mitem.php:155 ../../mod/mitem.php:227 ../../mod/settings.php:1083 +msgid "(click to open/close)" +msgstr "" + +#: ../../mod/mitem.php:157 ../../mod/mitem.php:173 +msgid "Link Name" +msgstr "" + +#: ../../mod/mitem.php:158 ../../mod/mitem.php:231 +msgid "Link or Submenu Target" +msgstr "" + +#: ../../mod/mitem.php:158 +msgid "Enter URL of the link or select a menu name to create a submenu" +msgstr "" + +#: ../../mod/mitem.php:159 ../../mod/mitem.php:232 +msgid "Use magic-auth if available" +msgstr "" + +#: ../../mod/mitem.php:160 ../../mod/mitem.php:233 +msgid "Open link in new window" +msgstr "" + +#: ../../mod/mitem.php:161 ../../mod/mitem.php:234 +msgid "Order in list" +msgstr "" + +#: ../../mod/mitem.php:161 ../../mod/mitem.php:234 +msgid "Higher numbers will sink to bottom of listing" +msgstr "" + +#: ../../mod/mitem.php:162 +msgid "Submit and finish" +msgstr "" + +#: ../../mod/mitem.php:163 +msgid "Submit and continue" +msgstr "" + +#: ../../mod/mitem.php:171 +msgid "Menu:" +msgstr "" + +#: ../../mod/mitem.php:174 +msgid "Link Target" +msgstr "" + +#: ../../mod/mitem.php:177 +msgid "Edit menu" +msgstr "" + +#: ../../mod/mitem.php:180 +msgid "Edit element" +msgstr "" + +#: ../../mod/mitem.php:181 +msgid "Drop element" +msgstr "" + +#: ../../mod/mitem.php:182 +msgid "New element" +msgstr "" + +#: ../../mod/mitem.php:183 +msgid "Edit this menu container" +msgstr "" + +#: ../../mod/mitem.php:184 +msgid "Add menu element" +msgstr "" + +#: ../../mod/mitem.php:185 +msgid "Delete this menu item" +msgstr "" + +#: ../../mod/mitem.php:186 +msgid "Edit this menu item" +msgstr "" + +#: ../../mod/mitem.php:203 +msgid "Menu item not found." +msgstr "" + +#: ../../mod/mitem.php:215 +msgid "Menu item deleted." +msgstr "" + +#: ../../mod/mitem.php:217 +msgid "Menu item could not be deleted." +msgstr "" + +#: ../../mod/mitem.php:224 +msgid "Edit Menu Element" +msgstr "" + +#: ../../mod/mitem.php:230 +msgid "Link text" +msgstr "" + #: ../../mod/editwebpage.php:152 msgid "Delete webpage?" msgstr "" @@ -6128,7 +5371,7 @@ msgstr "" msgid "Password reset request issued. Check your email." msgstr "" -#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:102 +#: ../../mod/lostpass.php:35 ../../mod/lostpass.php:103 #, php-format msgid "Site Member (%s)" msgstr "" @@ -6144,52 +5387,52 @@ msgid "" "Password reset failed." msgstr "" -#: ../../mod/lostpass.php:85 ../../boot.php:1558 +#: ../../mod/lostpass.php:86 ../../boot.php:1558 msgid "Password Reset" msgstr "" -#: ../../mod/lostpass.php:86 +#: ../../mod/lostpass.php:87 msgid "Your password has been reset as requested." msgstr "" -#: ../../mod/lostpass.php:87 +#: ../../mod/lostpass.php:88 msgid "Your new password is" msgstr "" -#: ../../mod/lostpass.php:88 +#: ../../mod/lostpass.php:89 msgid "Save or copy your new password - and then" msgstr "" -#: ../../mod/lostpass.php:89 +#: ../../mod/lostpass.php:90 msgid "click here to login" msgstr "" -#: ../../mod/lostpass.php:90 +#: ../../mod/lostpass.php:91 msgid "" "Your password may be changed from the <em>Settings</em> page after " "successful login." msgstr "" -#: ../../mod/lostpass.php:107 +#: ../../mod/lostpass.php:108 #, php-format msgid "Your password has changed at %s" msgstr "" -#: ../../mod/lostpass.php:122 +#: ../../mod/lostpass.php:123 msgid "Forgot your Password?" msgstr "" -#: ../../mod/lostpass.php:123 +#: ../../mod/lostpass.php:124 msgid "" "Enter your email address and submit to have your password reset. Then check " "your email for further instructions." msgstr "" -#: ../../mod/lostpass.php:124 +#: ../../mod/lostpass.php:125 msgid "Email Address" msgstr "" -#: ../../mod/lostpass.php:125 +#: ../../mod/lostpass.php:126 msgid "Reset" msgstr "" @@ -6202,20 +5445,20 @@ msgstr "" msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../mod/rate.php:161 ../../mod/connedit.php:663 +#: ../../mod/rate.php:161 msgid "Rating (this information is public)" msgstr "" -#: ../../mod/rate.php:162 ../../mod/connedit.php:664 +#: ../../mod/rate.php:162 msgid "Optionally explain your rating (this information is public)" msgstr "" -#: ../../mod/editpost.php:31 -msgid "Item is not editable" +#: ../../mod/editblock.php:117 +msgid "Delete block?" msgstr "" -#: ../../mod/editpost.php:53 -msgid "Delete item?" +#: ../../mod/editblock.php:179 +msgid "Edit Block" msgstr "" #: ../../mod/invite.php:25 @@ -6378,102 +5621,94 @@ msgstr "" msgid "Unable to remove source." msgstr "" -#: ../../mod/menu.php:44 +#: ../../mod/menu.php:45 msgid "Unable to update menu." msgstr "" -#: ../../mod/menu.php:53 +#: ../../mod/menu.php:56 msgid "Unable to create menu." msgstr "" -#: ../../mod/menu.php:89 ../../mod/menu.php:101 +#: ../../mod/menu.php:92 ../../mod/menu.php:104 msgid "Menu Name" msgstr "" -#: ../../mod/menu.php:89 +#: ../../mod/menu.php:92 msgid "Unique name (not visible on webpage) - required" msgstr "" -#: ../../mod/menu.php:90 ../../mod/menu.php:102 +#: ../../mod/menu.php:93 ../../mod/menu.php:105 msgid "Menu Title" msgstr "" -#: ../../mod/menu.php:90 +#: ../../mod/menu.php:93 msgid "Visible on webpage - leave empty for no title" msgstr "" -#: ../../mod/menu.php:91 +#: ../../mod/menu.php:94 msgid "Allow Bookmarks" msgstr "" -#: ../../mod/menu.php:91 ../../mod/menu.php:143 +#: ../../mod/menu.php:94 ../../mod/menu.php:151 msgid "Menu may be used to store saved bookmarks" msgstr "" -#: ../../mod/menu.php:92 +#: ../../mod/menu.php:95 ../../mod/menu.php:153 msgid "Submit and proceed" msgstr "" -#: ../../mod/menu.php:104 +#: ../../mod/menu.php:107 msgid "Drop" msgstr "" -#: ../../mod/menu.php:106 +#: ../../mod/menu.php:111 msgid "Bookmarks allowed" msgstr "" -#: ../../mod/menu.php:108 +#: ../../mod/menu.php:113 msgid "Delete this menu" msgstr "" -#: ../../mod/menu.php:109 ../../mod/menu.php:140 +#: ../../mod/menu.php:114 ../../mod/menu.php:148 msgid "Edit menu contents" msgstr "" -#: ../../mod/menu.php:110 +#: ../../mod/menu.php:115 msgid "Edit this menu" msgstr "" -#: ../../mod/menu.php:124 +#: ../../mod/menu.php:130 msgid "Menu could not be deleted." msgstr "" -#: ../../mod/menu.php:132 ../../mod/mitem.php:24 -msgid "Menu not found." -msgstr "" - -#: ../../mod/menu.php:137 +#: ../../mod/menu.php:143 msgid "Edit Menu" msgstr "" -#: ../../mod/menu.php:139 +#: ../../mod/menu.php:147 msgid "Add or remove entries to this menu" msgstr "" -#: ../../mod/menu.php:141 +#: ../../mod/menu.php:149 msgid "Menu name" msgstr "" -#: ../../mod/menu.php:141 +#: ../../mod/menu.php:149 msgid "Must be unique, only seen by you" msgstr "" -#: ../../mod/menu.php:142 +#: ../../mod/menu.php:150 msgid "Menu title" msgstr "" -#: ../../mod/menu.php:142 +#: ../../mod/menu.php:150 msgid "Menu title as seen by others" msgstr "" -#: ../../mod/menu.php:143 +#: ../../mod/menu.php:151 msgid "Allow bookmarks" msgstr "" -#: ../../mod/menu.php:145 -msgid "Modify" -msgstr "" - #: ../../mod/filestorage.php:82 msgid "Permission Denied." msgstr "" @@ -6575,16 +5810,12 @@ msgstr "" msgid "Visible To" msgstr "" -#: ../../mod/impel.php:54 -msgid "menu" -msgstr "" - -#: ../../mod/impel.php:186 +#: ../../mod/impel.php:191 #, php-format msgid "%s element installed" msgstr "" -#: ../../mod/impel.php:189 +#: ../../mod/impel.php:194 #, php-format msgid "%s element installation failed" msgstr "" @@ -6662,7 +5893,7 @@ msgstr "" msgid "Interests" msgstr "" -#: ../../mod/profiles.php:447 ../../mod/admin.php:985 +#: ../../mod/profiles.php:447 ../../mod/admin.php:994 msgid "Address" msgstr "" @@ -6718,18 +5949,8 @@ 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 @@ -6840,7 +6061,7 @@ msgstr "" msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:728 ../../mod/directory.php:218 +#: ../../mod/profiles.php:728 msgid "Age: " msgstr "" @@ -7290,94 +6511,32 @@ msgstr "" msgid "OpenID protocol error. No ID returned." msgstr "" -#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:286 +#: ../../mod/openid.php:72 ../../mod/openid.php:180 ../../mod/post.php:287 #, php-format msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../mod/directory.php:224 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/directory.php:236 -msgid "Gender: " -msgstr "" - -#: ../../mod/directory.php:238 -msgid "Status: " -msgstr "" - -#: ../../mod/directory.php:240 -msgid "Homepage: " -msgstr "" - -#: ../../mod/directory.php:243 -msgid "Hometown: " -msgstr "" - -#: ../../mod/directory.php:245 -msgid "About: " -msgstr "" - -#: ../../mod/directory.php:303 -msgid "Public Forum:" -msgstr "" - -<<<<<<< HEAD -#: ../../mod/directory.php:306 -msgid "Keywords: " -msgstr "" - -#: ../../mod/directory.php:311 +#: ../../mod/tagger.php:96 #, 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)." +msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" -#: ../../mod/uexport.php:33 ../../mod/uexport.php:34 +#: ../../mod/uexport.php:45 ../../mod/uexport.php:46 msgid "Export Channel" msgstr "" -#: ../../mod/uexport.php:35 +#: ../../mod/uexport.php:47 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:36 +#: ../../mod/uexport.php:48 msgid "Export Content" msgstr "" -#: ../../mod/uexport.php:37 +#: ../../mod/uexport.php:49 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 " @@ -7403,7 +6562,7 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:93 ../../mod/admin.php:445 +#: ../../mod/admin.php:93 ../../mod/admin.php:452 msgid "Site" msgstr "" @@ -7411,15 +6570,15 @@ msgstr "" msgid "Accounts" msgstr "" -#: ../../mod/admin.php:95 ../../mod/admin.php:976 +#: ../../mod/admin.php:95 ../../mod/admin.php:985 msgid "Channels" msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:1068 ../../mod/admin.php:1108 +#: ../../mod/admin.php:96 ../../mod/admin.php:1077 ../../mod/admin.php:1117 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:1268 ../../mod/admin.php:1302 +#: ../../mod/admin.php:97 ../../mod/admin.php:1277 ../../mod/admin.php:1311 msgid "Themes" msgstr "" @@ -7435,7 +6594,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1387 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1396 msgid "Logs" msgstr "" @@ -7479,10 +6638,10 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../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 +#: ../../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 msgid "Administration" msgstr "" @@ -7494,7 +6653,7 @@ msgstr "" msgid "Registered accounts" msgstr "" -#: ../../mod/admin.php:245 ../../mod/admin.php:543 +#: ../../mod/admin.php:245 ../../mod/admin.php:552 msgid "Pending registrations" msgstr "" @@ -7502,7 +6661,7 @@ msgstr "" msgid "Registered channels" msgstr "" -#: ../../mod/admin.php:247 ../../mod/admin.php:544 +#: ../../mod/admin.php:247 ../../mod/admin.php:553 msgid "Active plugins" msgstr "" @@ -7510,654 +6669,680 @@ msgstr "" msgid "Version" msgstr "" -#: ../../mod/admin.php:359 +#: ../../mod/admin.php:363 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:398 +#: ../../mod/admin.php:400 ../../mod/settings.php:813 +msgid "mobile" +msgstr "" + +#: ../../mod/admin.php:402 msgid "experimental" msgstr "" -#: ../../mod/admin.php:400 +#: ../../mod/admin.php:404 msgid "unsupported" msgstr "" -#: ../../mod/admin.php:425 +#: ../../mod/admin.php:429 msgid "Yes - with approval" msgstr "" -#: ../../mod/admin.php:431 +#: ../../mod/admin.php:435 msgid "My site is not a public server" msgstr "" -#: ../../mod/admin.php:432 +#: ../../mod/admin.php:436 msgid "My site has paid access only" msgstr "" -#: ../../mod/admin.php:433 +#: ../../mod/admin.php:437 msgid "My site has free access only" msgstr "" -#: ../../mod/admin.php:434 +#: ../../mod/admin.php:438 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../mod/admin.php:447 ../../mod/register.php:207 +#: ../../mod/admin.php:454 ../../mod/register.php:207 msgid "Registration" msgstr "" -#: ../../mod/admin.php:448 +#: ../../mod/admin.php:455 msgid "File upload" msgstr "" -#: ../../mod/admin.php:449 +#: ../../mod/admin.php:456 msgid "Policies" msgstr "" -#: ../../mod/admin.php:454 +#: ../../mod/admin.php:461 msgid "Site name" msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:462 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:463 msgid "Administrator Information" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:463 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../mod/admin.php:457 +#: ../../mod/admin.php:464 msgid "System language" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:465 msgid "System theme" msgstr "" -#: ../../mod/admin.php:458 +#: ../../mod/admin.php:465 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:466 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:459 +#: ../../mod/admin.php:466 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:468 msgid "Enable Diaspora Protocol" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:468 msgid "Communicate with Diaspora and Friendica - experimental" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:469 msgid "Allow Feeds as Connections" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:469 msgid "(Heavy system resource usage)" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:470 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:470 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:471 msgid "Does this site allow new member registration?" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:472 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:473 msgid "Register text" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:473 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:467 +#: ../../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 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:467 +#: ../../mod/admin.php:476 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:477 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:477 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:469 +#: ../../mod/admin.php:478 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:478 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:470 +#: ../../mod/admin.php:479 msgid "Not allowed email domains" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:479 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:471 +#: ../../mod/admin.php:480 msgid "Block public" msgstr "" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:480 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:472 +#: ../../mod/admin.php:481 msgid "Verify Email Addresses" msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:481 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:482 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:482 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:483 msgid "Disable discovery tab" msgstr "" -#: ../../mod/admin.php:474 +#: ../../mod/admin.php:483 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "" -#: ../../mod/admin.php:475 -msgid "No login on Homepage" +#: ../../mod/admin.php:484 +msgid "login on Homepage" msgstr "" -#: ../../mod/admin.php:475 +#: ../../mod/admin.php:484 msgid "" -"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)." +"Present a login box to visitors on the home page if no other content has " +"been configured." msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:486 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:487 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:488 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:488 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:489 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:489 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:481 +#: ../../mod/admin.php:490 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:490 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:491 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:491 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:492 msgid "Expiration period in days for imported (matrix/network) content" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:492 msgid "0 for no expiration of imported content" msgstr "" -#: ../../mod/admin.php:531 +#: ../../mod/admin.php:540 msgid "No server found" msgstr "" -#: ../../mod/admin.php:538 ../../mod/admin.php:822 +#: ../../mod/admin.php:547 ../../mod/admin.php:831 msgid "ID" msgstr "" -#: ../../mod/admin.php:538 +#: ../../mod/admin.php:547 msgid "for channel" msgstr "" -#: ../../mod/admin.php:538 +#: ../../mod/admin.php:547 msgid "on server" msgstr "" -#: ../../mod/admin.php:538 +#: ../../mod/admin.php:547 msgid "Status" msgstr "" -#: ../../mod/admin.php:540 +#: ../../mod/admin.php:549 msgid "Server" msgstr "" -#: ../../mod/admin.php:557 +#: ../../mod/admin.php:566 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:567 +#: ../../mod/admin.php:576 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:570 +#: ../../mod/admin.php:579 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:574 +#: ../../mod/admin.php:583 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:577 +#: ../../mod/admin.php:586 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:593 +#: ../../mod/admin.php:602 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:597 +#: ../../mod/admin.php:606 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:599 +#: ../../mod/admin.php:608 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:600 +#: ../../mod/admin.php:609 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:632 +#: ../../mod/admin.php:641 msgid "Queue Statistics" msgstr "" -#: ../../mod/admin.php:633 +#: ../../mod/admin.php:642 msgid "Total Entries" msgstr "" -#: ../../mod/admin.php:634 +#: ../../mod/admin.php:643 msgid "Priority" msgstr "" -#: ../../mod/admin.php:635 +#: ../../mod/admin.php:644 msgid "Destination URL" msgstr "" -#: ../../mod/admin.php:636 +#: ../../mod/admin.php:645 msgid "Mark hub permanently offline" msgstr "" -#: ../../mod/admin.php:637 +#: ../../mod/admin.php:646 msgid "Empty queue for this hub" msgstr "" -#: ../../mod/admin.php:638 +#: ../../mod/admin.php:647 msgid "Last known contact" msgstr "" -#: ../../mod/admin.php:674 +#: ../../mod/admin.php:683 #, php-format -msgid "%s user blocked/unblocked" -msgid_plural "%s users blocked/unblocked" +msgid "%s account blocked/unblocked" +msgid_plural "%s account blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:682 +#: ../../mod/admin.php:691 #, php-format -msgid "%s user deleted" -msgid_plural "%s users deleted" +msgid "%s account deleted" +msgid_plural "%s accounts deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:718 +#: ../../mod/admin.php:727 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:738 +#: ../../mod/admin.php:739 #, php-format -msgid "User '%s' blocked" +msgid "Account '%s' deleted" msgstr "" -#: ../../mod/admin.php:746 +#: ../../mod/admin.php:747 #, php-format -msgid "User '%s' unblocked" +msgid "Account '%s' blocked" msgstr "" -#: ../../mod/admin.php:809 ../../mod/admin.php:821 +#: ../../mod/admin.php:755 +#, php-format +msgid "Account '%s' unblocked" +msgstr "" + +#: ../../mod/admin.php:818 ../../mod/admin.php:830 msgid "Users" msgstr "" -#: ../../mod/admin.php:811 ../../mod/admin.php:978 +#: ../../mod/admin.php:820 ../../mod/admin.php:987 msgid "select all" msgstr "" -#: ../../mod/admin.php:812 +#: ../../mod/admin.php:821 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:813 +#: ../../mod/admin.php:822 msgid "Request date" msgstr "" -#: ../../mod/admin.php:814 +#: ../../mod/admin.php:823 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:815 +#: ../../mod/admin.php:824 ../../mod/connedit.php:699 msgid "Approve" msgstr "" -#: ../../mod/admin.php:816 +#: ../../mod/admin.php:825 msgid "Deny" msgstr "" -#: ../../mod/admin.php:818 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 +#: ../../mod/admin.php:827 ../../mod/connedit.php:531 msgid "Block" msgstr "" -#: ../../mod/admin.php:819 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 +#: ../../mod/admin.php:828 ../../mod/connedit.php:531 msgid "Unblock" msgstr "" -#: ../../mod/admin.php:822 +#: ../../mod/admin.php:831 msgid "Register date" msgstr "" -#: ../../mod/admin.php:822 +#: ../../mod/admin.php:831 msgid "Last login" msgstr "" -#: ../../mod/admin.php:822 +#: ../../mod/admin.php:831 msgid "Expires" msgstr "" -#: ../../mod/admin.php:822 +#: ../../mod/admin.php:831 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:824 +#: ../../mod/admin.php:833 msgid "" -"Selected users will be deleted!\\n\\nEverything these users had posted on " -"this site will be permanently deleted!\\n\\nAre you sure?" +"Selected accounts will be deleted!\\n\\nEverything these accounts had posted " +"on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:825 +#: ../../mod/admin.php:834 msgid "" -"The user {0} will be deleted!\\n\\nEverything this user has posted on this " -"site will be permanently deleted!\\n\\nAre you sure?" +"The account {0} will be deleted!\\n\\nEverything this account has posted on " +"this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:861 +#: ../../mod/admin.php:870 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channels censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:870 +#: ../../mod/admin.php:879 #, php-format msgid "%s channel code allowed/disallowed" msgid_plural "%s channels code allowed/disallowed" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:877 +#: ../../mod/admin.php:886 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:897 +#: ../../mod/admin.php:906 msgid "Channel not found" msgstr "" -#: ../../mod/admin.php:908 +#: ../../mod/admin.php:917 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:920 +#: ../../mod/admin.php:929 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:920 +#: ../../mod/admin.php:929 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:931 +#: ../../mod/admin.php:940 #, php-format msgid "Channel '%s' code allowed" msgstr "" -#: ../../mod/admin.php:931 +#: ../../mod/admin.php:940 #, php-format msgid "Channel '%s' code disallowed" msgstr "" -#: ../../mod/admin.php:980 +#: ../../mod/admin.php:989 msgid "Censor" msgstr "" -#: ../../mod/admin.php:981 +#: ../../mod/admin.php:990 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:982 +#: ../../mod/admin.php:991 msgid "Allow Code" msgstr "" -#: ../../mod/admin.php:983 +#: ../../mod/admin.php:992 msgid "Disallow Code" msgstr "" -#: ../../mod/admin.php:985 +#: ../../mod/admin.php:994 msgid "UID" msgstr "" -#: ../../mod/admin.php:987 +#: ../../mod/admin.php:996 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:988 +#: ../../mod/admin.php:997 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:1028 +#: ../../mod/admin.php:1037 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:1032 +#: ../../mod/admin.php:1041 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:1042 ../../mod/admin.php:1240 +#: ../../mod/admin.php:1051 ../../mod/admin.php:1249 msgid "Disable" msgstr "" -#: ../../mod/admin.php:1045 ../../mod/admin.php:1242 +#: ../../mod/admin.php:1054 ../../mod/admin.php:1251 msgid "Enable" msgstr "" -#: ../../mod/admin.php:1069 ../../mod/admin.php:1269 +#: ../../mod/admin.php:1078 ../../mod/admin.php:1278 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:1077 ../../mod/admin.php:1279 +#: ../../mod/admin.php:1086 ../../mod/admin.php:1288 msgid "Author: " msgstr "" -#: ../../mod/admin.php:1078 ../../mod/admin.php:1280 +#: ../../mod/admin.php:1087 ../../mod/admin.php:1289 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1205 +#: ../../mod/admin.php:1214 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1261 +#: ../../mod/admin.php:1270 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1307 +#: ../../mod/admin.php:1316 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1308 +#: ../../mod/admin.php:1317 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1332 +#: ../../mod/admin.php:1341 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1389 +#: ../../mod/admin.php:1398 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1395 +#: ../../mod/admin.php:1404 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1396 +#: ../../mod/admin.php:1405 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1396 +#: ../../mod/admin.php:1405 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1397 +#: ../../mod/admin.php:1406 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1443 +#: ../../mod/admin.php:1452 msgid "New Profile Field" msgstr "" -#: ../../mod/admin.php:1444 ../../mod/admin.php:1464 +#: ../../mod/admin.php:1453 ../../mod/admin.php:1473 msgid "Field nickname" msgstr "" -#: ../../mod/admin.php:1444 ../../mod/admin.php:1464 +#: ../../mod/admin.php:1453 ../../mod/admin.php:1473 msgid "System name of field" msgstr "" -#: ../../mod/admin.php:1445 ../../mod/admin.php:1465 +#: ../../mod/admin.php:1454 ../../mod/admin.php:1474 msgid "Input type" msgstr "" -#: ../../mod/admin.php:1446 ../../mod/admin.php:1466 +#: ../../mod/admin.php:1455 ../../mod/admin.php:1475 msgid "Field Name" msgstr "" -#: ../../mod/admin.php:1446 ../../mod/admin.php:1466 +#: ../../mod/admin.php:1455 ../../mod/admin.php:1475 msgid "Label on profile pages" msgstr "" -#: ../../mod/admin.php:1447 ../../mod/admin.php:1467 +#: ../../mod/admin.php:1456 ../../mod/admin.php:1476 msgid "Help text" msgstr "" -#: ../../mod/admin.php:1447 ../../mod/admin.php:1467 +#: ../../mod/admin.php:1456 ../../mod/admin.php:1476 msgid "Additional info (optional)" msgstr "" -#: ../../mod/admin.php:1457 +#: ../../mod/admin.php:1466 msgid "Field definition not found" msgstr "" -#: ../../mod/admin.php:1463 +#: ../../mod/admin.php:1472 msgid "Edit Profile Field" msgstr "" @@ -8169,14 +7354,6 @@ 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 "" @@ -8291,39 +7468,25 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/item.php:174 -msgid "Unable to locate original post." -msgstr "" - -#: ../../mod/item.php:440 -msgid "Empty post discarded." -msgstr "" - -#: ../../mod/item.php:480 -msgid "Executable content type not permitted to this channel." -msgstr "" - -#: ../../mod/item.php:897 -msgid "System error. Post not saved." +#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720 +msgid "Remove Account" msgstr "" -#: ../../mod/item.php:1115 -msgid "Unable to obtain post information from database." +#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 +msgid "Help:" msgstr "" -#: ../../mod/item.php:1122 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../mod/help.php:76 ../../index.php:238 +msgid "Not Found" msgstr "" -#: ../../mod/item.php:1129 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." +#: ../../mod/help.php:100 +msgid "$Projectname Documentation" msgstr "" #: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 #: ../../mod/update_network.php:23 ../../mod/update_search.php:46 -#: ../../mod/update_home.php:21 +#: ../../mod/update_home.php:21 ../../mod/update_public.php:21 msgid "[Embedded content - reload page to view]" msgstr "" @@ -8335,208 +7498,661 @@ msgstr "" msgid "Visible to:" msgstr "" -#: ../../mod/layouts.php:176 -msgid "Comanche page description language help" +#: ../../mod/settings.php:76 +msgid "Name is required" msgstr "" -#: ../../mod/layouts.php:180 -msgid "Layout Description" +#: ../../mod/settings.php:80 +msgid "Key and Secret are required" msgstr "" -#: ../../mod/layouts.php:185 -msgid "Download PDL file" +#: ../../mod/settings.php:130 +msgid "Diaspora Policy Settings updated." msgstr "" -#: ../../mod/id.php:11 -msgid "First Name" +#: ../../mod/settings.php:238 +msgid "Passwords do not match. Password unchanged." msgstr "" -#: ../../mod/id.php:12 -msgid "Last Name" +#: ../../mod/settings.php:242 +msgid "Empty passwords are not allowed. Password unchanged." msgstr "" -#: ../../mod/id.php:13 -msgid "Nickname" +#: ../../mod/settings.php:256 +msgid "Password changed." msgstr "" -#: ../../mod/id.php:14 -msgid "Full Name" +#: ../../mod/settings.php:258 +msgid "Password update failed. Please try again." msgstr "" -#: ../../mod/id.php:20 -msgid "Profile Photo 16px" +#: ../../mod/settings.php:272 +msgid "Not valid email." msgstr "" -#: ../../mod/id.php:21 -msgid "Profile Photo 32px" +#: ../../mod/settings.php:275 +msgid "Protected email address. Cannot change to that email." msgstr "" -#: ../../mod/id.php:22 -msgid "Profile Photo 48px" +#: ../../mod/settings.php:284 +msgid "System failure storing new email. Please try again." msgstr "" -#: ../../mod/id.php:23 -msgid "Profile Photo 64px" +#: ../../mod/settings.php:523 +msgid "Settings updated." msgstr "" -#: ../../mod/id.php:24 -msgid "Profile Photo 80px" +#: ../../mod/settings.php:587 ../../mod/settings.php:613 +#: ../../mod/settings.php:649 +msgid "Add application" msgstr "" -#: ../../mod/id.php:25 -msgid "Profile Photo 128px" +#: ../../mod/settings.php:590 +msgid "Name of application" msgstr "" -#: ../../mod/id.php:26 -msgid "Timezone" +#: ../../mod/settings.php:591 ../../mod/settings.php:617 +msgid "Consumer Key" msgstr "" -#: ../../mod/id.php:27 -msgid "Homepage URL" +#: ../../mod/settings.php:591 ../../mod/settings.php:592 +msgid "Automatically generated - change if desired. Max length 20" msgstr "" -#: ../../mod/id.php:29 -msgid "Birth Year" +#: ../../mod/settings.php:592 ../../mod/settings.php:618 +msgid "Consumer Secret" msgstr "" -#: ../../mod/id.php:30 -msgid "Birth Month" +#: ../../mod/settings.php:593 ../../mod/settings.php:619 +msgid "Redirect" msgstr "" -#: ../../mod/id.php:31 -msgid "Birth Day" +#: ../../mod/settings.php:593 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" msgstr "" -#: ../../mod/id.php:32 -msgid "Birthdate" +#: ../../mod/settings.php:594 ../../mod/settings.php:620 +msgid "Icon url" msgstr "" -#: ../../mod/message.php:41 -msgid "Conversation removed." +#: ../../mod/settings.php:594 +msgid "Optional" msgstr "" -#: ../../mod/message.php:56 -msgid "No messages." +#: ../../mod/settings.php:605 +msgid "You can't edit this application." msgstr "" -#: ../../mod/message.php:72 ../../mod/mail.php:336 -msgid "Delete conversation" +#: ../../mod/settings.php:648 +msgid "Connected Apps" msgstr "" -#: ../../mod/message.php:74 -msgid "D, d M Y - g:i A" +#: ../../mod/settings.php:652 +msgid "Client key starts with" msgstr "" -#: ../../mod/mitem.php:51 -msgid "Unable to create element." +#: ../../mod/settings.php:653 +msgid "No name" msgstr "" -#: ../../mod/mitem.php:74 -msgid "Unable to update menu element." +#: ../../mod/settings.php:654 +msgid "Remove authorization" msgstr "" -#: ../../mod/mitem.php:89 -msgid "Unable to add menu element." +#: ../../mod/settings.php:668 +msgid "No feature settings configured" msgstr "" -#: ../../mod/mitem.php:158 ../../mod/mitem.php:228 -msgid "Menu Item Permissions" +#: ../../mod/settings.php:685 +msgid "Feature/Addon Settings" msgstr "" -#: ../../mod/mitem.php:161 ../../mod/mitem.php:176 -msgid "Link Name" +#: ../../mod/settings.php:687 +msgid "Settings for the built-in Diaspora emulator" msgstr "" -#: ../../mod/mitem.php:162 ../../mod/mitem.php:233 -msgid "Link or Submenu Target" +#: ../../mod/settings.php:688 +msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../mod/mitem.php:162 -msgid "Enter URL of the link or select a menu name to create a submenu" +#: ../../mod/settings.php:689 +msgid "Enable the Diaspora protocol for this channel" msgstr "" -#: ../../mod/mitem.php:163 ../../mod/mitem.php:234 -msgid "Use magic-auth if available" +#: ../../mod/settings.php:690 +msgid "Diaspora Policy Settings" msgstr "" -#: ../../mod/mitem.php:164 ../../mod/mitem.php:235 -msgid "Open link in new window" +#: ../../mod/settings.php:691 +msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 -msgid "Order in list" +#: ../../mod/settings.php:715 +msgid "Account Settings" msgstr "" -#: ../../mod/mitem.php:165 ../../mod/mitem.php:236 -msgid "Higher numbers will sink to bottom of listing" +#: ../../mod/settings.php:716 +msgid "Enter New Password:" msgstr "" -#: ../../mod/mitem.php:166 -msgid "Submit and finish" +#: ../../mod/settings.php:717 +msgid "Confirm New Password:" msgstr "" -#: ../../mod/mitem.php:167 -msgid "Submit and continue" +#: ../../mod/settings.php:717 +msgid "Leave password fields blank unless changing" msgstr "" -#: ../../mod/mitem.php:174 -msgid "Menu:" +#: ../../mod/settings.php:719 ../../mod/settings.php:1057 +msgid "Email Address:" msgstr "" -#: ../../mod/mitem.php:177 -msgid "Link Target" +#: ../../mod/settings.php:721 +msgid "Remove this account including all its channels" msgstr "" -#: ../../mod/mitem.php:180 -msgid "Edit menu" +#: ../../mod/settings.php:737 +msgid "Off" msgstr "" -#: ../../mod/mitem.php:183 -msgid "Edit element" +#: ../../mod/settings.php:737 +msgid "On" msgstr "" -#: ../../mod/mitem.php:184 -msgid "Drop element" +#: ../../mod/settings.php:744 +msgid "Additional Features" msgstr "" -#: ../../mod/mitem.php:185 -msgid "New element" +#: ../../mod/settings.php:768 +msgid "Connector Settings" msgstr "" -#: ../../mod/mitem.php:186 -msgid "Edit this menu container" +#: ../../mod/settings.php:807 +msgid "No special theme for mobile devices" msgstr "" -#: ../../mod/mitem.php:187 -msgid "Add menu element" +#: ../../mod/settings.php:810 +#, php-format +msgid "%s - (Experimental)" msgstr "" -#: ../../mod/mitem.php:188 -msgid "Delete this menu item" +#: ../../mod/settings.php:849 +msgid "Display Settings" msgstr "" -#: ../../mod/mitem.php:189 -msgid "Edit this menu item" +#: ../../mod/settings.php:850 +msgid "Theme Settings" msgstr "" -#: ../../mod/mitem.php:206 -msgid "Menu item not found." +#: ../../mod/settings.php:851 +msgid "Custom Theme Settings" msgstr "" -#: ../../mod/mitem.php:217 -msgid "Menu item deleted." +#: ../../mod/settings.php:852 +msgid "Content Settings" msgstr "" -#: ../../mod/mitem.php:219 -msgid "Menu item could not be deleted." +#: ../../mod/settings.php:858 +msgid "Display Theme:" msgstr "" -#: ../../mod/mitem.php:226 -msgid "Edit Menu Element" +#: ../../mod/settings.php:859 +msgid "Mobile Theme:" msgstr "" -#: ../../mod/mitem.php:232 -msgid "Link text" +#: ../../mod/settings.php:860 +msgid "Enable user zoom on mobile devices" +msgstr "" + +#: ../../mod/settings.php:861 +msgid "Update browser every xx seconds" +msgstr "" + +#: ../../mod/settings.php:861 +msgid "Minimum of 10 seconds, no maximum" +msgstr "" + +#: ../../mod/settings.php:862 +msgid "Maximum number of conversations to load at any time:" +msgstr "" + +#: ../../mod/settings.php:862 +msgid "Maximum of 100 items" +msgstr "" + +#: ../../mod/settings.php:863 +msgid "Show emoticons (smilies) as images" +msgstr "" + +#: ../../mod/settings.php:864 +msgid "Link post titles to source" +msgstr "" + +#: ../../mod/settings.php:865 +msgid "System Page Layout Editor - (advanced)" +msgstr "" + +#: ../../mod/settings.php:868 +msgid "Use blog/list mode on channel page" +msgstr "" + +#: ../../mod/settings.php:868 ../../mod/settings.php:869 +msgid "(comments displayed separately)" +msgstr "" + +#: ../../mod/settings.php:869 +msgid "Use blog/list mode on matrix page" +msgstr "" + +#: ../../mod/settings.php:870 +msgid "Channel page max height of content (in pixels)" +msgstr "" + +#: ../../mod/settings.php:870 ../../mod/settings.php:871 +msgid "click to expand content exceeding this height" +msgstr "" + +#: ../../mod/settings.php:871 +msgid "Matrix page max height of content (in pixels)" +msgstr "" + +#: ../../mod/settings.php:905 +msgid "Nobody except yourself" +msgstr "" + +#: ../../mod/settings.php:906 +msgid "Only those you specifically allow" +msgstr "" + +#: ../../mod/settings.php:907 +msgid "Approved connections" +msgstr "" + +#: ../../mod/settings.php:908 +msgid "Any connections" +msgstr "" + +#: ../../mod/settings.php:909 +msgid "Anybody on this website" +msgstr "" + +#: ../../mod/settings.php:910 +msgid "Anybody in this network" +msgstr "" + +#: ../../mod/settings.php:911 +msgid "Anybody authenticated" +msgstr "" + +#: ../../mod/settings.php:912 +msgid "Anybody on the internet" +msgstr "" + +#: ../../mod/settings.php:986 +msgid "Publish your default profile in the network directory" +msgstr "" + +#: ../../mod/settings.php:991 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: ../../mod/settings.php:1000 +msgid "Your channel address is" +msgstr "" + +#: ../../mod/settings.php:1048 +msgid "Channel Settings" +msgstr "" + +#: ../../mod/settings.php:1055 +msgid "Basic Settings" +msgstr "" + +#: ../../mod/settings.php:1058 +msgid "Your Timezone:" +msgstr "" + +#: ../../mod/settings.php:1059 +msgid "Default Post Location:" +msgstr "" + +#: ../../mod/settings.php:1059 +msgid "Geographical location to display on your posts" +msgstr "" + +#: ../../mod/settings.php:1060 +msgid "Use Browser Location:" +msgstr "" + +#: ../../mod/settings.php:1062 +msgid "Adult Content" +msgstr "" + +#: ../../mod/settings.php:1062 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" +msgstr "" + +#: ../../mod/settings.php:1064 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:1066 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "" + +#: ../../mod/settings.php:1068 +msgid "Hide my online presence" +msgstr "" + +#: ../../mod/settings.php:1068 +msgid "Prevents displaying in your profile that you are online" +msgstr "" + +#: ../../mod/settings.php:1070 +msgid "Simple Privacy Settings:" +msgstr "" + +#: ../../mod/settings.php:1071 +msgid "" +"Very Public - <em>extremely permissive (should be used with caution)</em>" +msgstr "" + +#: ../../mod/settings.php:1072 +msgid "" +"Typical - <em>default public, privacy when desired (similar to social " +"network permissions but with improved privacy)</em>" +msgstr "" + +#: ../../mod/settings.php:1073 +msgid "Private - <em>default private, never open or public</em>" +msgstr "" + +#: ../../mod/settings.php:1074 +msgid "Blocked - <em>default blocked to/from everybody</em>" +msgstr "" + +#: ../../mod/settings.php:1076 +msgid "Allow others to tag your posts" +msgstr "" + +#: ../../mod/settings.php:1076 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" +msgstr "" + +#: ../../mod/settings.php:1078 +msgid "Advanced Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:1080 +msgid "Expire other channel content after this many days" +msgstr "" + +#: ../../mod/settings.php:1080 +msgid "0 or blank prevents expiration" +msgstr "" + +#: ../../mod/settings.php:1081 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../mod/settings.php:1081 +msgid "May reduce spam activity" +msgstr "" + +#: ../../mod/settings.php:1082 +msgid "Default Post Permissions" +msgstr "" + +#: ../../mod/settings.php:1087 +msgid "Channel permissions category:" +msgstr "" + +#: ../../mod/settings.php:1093 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: ../../mod/settings.php:1093 +msgid "Useful to reduce spamming" +msgstr "" + +#: ../../mod/settings.php:1096 +msgid "Notification Settings" +msgstr "" + +#: ../../mod/settings.php:1097 +msgid "By default post a status message when:" +msgstr "" + +#: ../../mod/settings.php:1098 +msgid "accepting a friend request" +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:" +msgstr "" + +#: ../../mod/settings.php:1102 +msgid "You receive a connection request" +msgstr "" + +#: ../../mod/settings.php:1103 +msgid "Your connections are confirmed" +msgstr "" + +#: ../../mod/settings.php:1104 +msgid "Someone writes on your profile wall" +msgstr "" + +#: ../../mod/settings.php:1105 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../mod/settings.php:1106 +msgid "You receive a private message" +msgstr "" + +#: ../../mod/settings.php:1107 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../mod/settings.php:1108 +msgid "You are tagged in a post" +msgstr "" + +#: ../../mod/settings.php:1109 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: ../../mod/settings.php:1112 +msgid "Show visual notifications including:" +msgstr "" + +#: ../../mod/settings.php:1114 +msgid "Unseen matrix activity" +msgstr "" + +#: ../../mod/settings.php:1115 +msgid "Unseen channel activity" +msgstr "" + +#: ../../mod/settings.php:1116 +msgid "Unseen private messages" +msgstr "" + +#: ../../mod/settings.php:1116 ../../mod/settings.php:1121 +#: ../../mod/settings.php:1122 ../../mod/settings.php:1123 +msgid "Recommended" +msgstr "" + +#: ../../mod/settings.php:1117 +msgid "Upcoming events" +msgstr "" + +#: ../../mod/settings.php:1118 +msgid "Events today" +msgstr "" + +#: ../../mod/settings.php:1119 +msgid "Upcoming birthdays" +msgstr "" + +#: ../../mod/settings.php:1119 +msgid "Not available in all themes" +msgstr "" + +#: ../../mod/settings.php:1120 +msgid "System (personal) notifications" +msgstr "" + +#: ../../mod/settings.php:1121 +msgid "System info messages" +msgstr "" + +#: ../../mod/settings.php:1122 +msgid "System critical alerts" +msgstr "" + +#: ../../mod/settings.php:1123 +msgid "New connections" +msgstr "" + +#: ../../mod/settings.php:1124 +msgid "System Registrations" +msgstr "" + +#: ../../mod/settings.php:1125 +msgid "" +"Also show new wall posts, private messages and connections under Notices" +msgstr "" + +#: ../../mod/settings.php:1127 +msgid "Notify me of events this many days in advance" +msgstr "" + +#: ../../mod/settings.php:1127 +msgid "Must be greater than 0" +msgstr "" + +#: ../../mod/settings.php:1129 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: ../../mod/settings.php:1130 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: ../../mod/settings.php:1133 +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" +msgstr "" + +#: ../../mod/id.php:29 +msgid "Birth Year" +msgstr "" + +#: ../../mod/id.php:30 +msgid "Birth Month" +msgstr "" + +#: ../../mod/id.php:31 +msgid "Birth Day" +msgstr "" + +#: ../../mod/id.php:32 +msgid "Birthdate" +msgstr "" + +#: ../../mod/message.php:41 +msgid "Conversation removed." +msgstr "" + +#: ../../mod/message.php:56 +msgid "No messages." +msgstr "" + +#: ../../mod/message.php:72 ../../mod/mail.php:336 +msgid "Delete conversation" +msgstr "" + +#: ../../mod/message.php:74 +msgid "D, d M Y - g:i A" msgstr "" #: ../../mod/mood.php:131 @@ -8575,327 +8191,254 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/connedit.php:268 -msgid "is now connected to" -msgstr "" - -#: ../../mod/connedit.php:381 -msgid "Could not access address book record." -msgstr "" - -#: ../../mod/connedit.php:395 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../mod/connedit.php:402 -msgid "Channel has been unblocked" -msgstr "" - -#: ../../mod/connedit.php:403 -msgid "Channel has been blocked" -msgstr "" - -#: ../../mod/connedit.php:407 ../../mod/connedit.php:419 -#: ../../mod/connedit.php:431 ../../mod/connedit.php:443 -#: ../../mod/connedit.php:459 -msgid "Unable to set address book parameters." -msgstr "" - -#: ../../mod/connedit.php:414 -msgid "Channel has been unignored" +#: ../../mod/connedit.php:75 +msgid "Could not access contact record." msgstr "" -#: ../../mod/connedit.php:415 -msgid "Channel has been ignored" +#: ../../mod/connedit.php:99 +msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connedit.php:426 -msgid "Channel has been unarchived" +#: ../../mod/connedit.php:219 +msgid "Connection updated." msgstr "" -#: ../../mod/connedit.php:427 -msgid "Channel has been archived" +#: ../../mod/connedit.php:221 +msgid "Failed to update connection record." msgstr "" -#: ../../mod/connedit.php:438 -msgid "Channel has been unhidden" +#: ../../mod/connedit.php:267 +msgid "is now connected to" msgstr "" -#: ../../mod/connedit.php:439 -msgid "Channel has been hidden" +#: ../../mod/connedit.php:392 +msgid "Could not access address book record." msgstr "" -#: ../../mod/connedit.php:454 -msgid "Channel has been approved" +#: ../../mod/connedit.php:406 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connedit.php:455 -msgid "Channel has been unapproved" +#: ../../mod/connedit.php:418 ../../mod/connedit.php:430 +#: ../../mod/connedit.php:442 ../../mod/connedit.php:454 +#: ../../mod/connedit.php:470 +msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connedit.php:483 +#: ../../mod/connedit.php:494 msgid "Connection has been removed." msgstr "" -#: ../../mod/connedit.php:503 +#: ../../mod/connedit.php:513 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connedit.php:507 +#: ../../mod/connedit.php:517 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connedit.php:510 +#: ../../mod/connedit.php:520 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connedit.php:514 +#: ../../mod/connedit.php:524 msgid "Recent Activity" msgstr "" -#: ../../mod/connedit.php:517 +#: ../../mod/connedit.php:527 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connedit.php:526 +#: ../../mod/connedit.php:534 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 +#: ../../mod/connedit.php:535 +msgid "This connection is blocked!" +msgstr "" + +#: ../../mod/connedit.php:539 msgid "Unignore" msgstr "" -#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 -#: ../../mod/notifications.php:51 +#: ../../mod/connedit.php:539 ../../mod/notifications.php:51 msgid "Ignore" msgstr "" -#: ../../mod/connedit.php:533 +#: ../../mod/connedit.php:542 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:543 +msgid "This connection is ignored!" +msgstr "" + +#: ../../mod/connedit.php:547 msgid "Unarchive" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:547 msgid "Archive" msgstr "" -#: ../../mod/connedit.php:539 +#: ../../mod/connedit.php:550 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:551 +msgid "This connection is archived!" +msgstr "" + +#: ../../mod/connedit.php:555 msgid "Unhide" msgstr "" -#: ../../mod/connedit.php:542 +#: ../../mod/connedit.php:555 msgid "Hide" msgstr "" -#: ../../mod/connedit.php:545 +#: ../../mod/connedit.php:558 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../mod/connedit.php:552 +#: ../../mod/connedit.php:559 +msgid "This connection is hidden!" +msgstr "" + +#: ../../mod/connedit.php:566 msgid "Delete this connection" msgstr "" -#: ../../mod/connedit.php:643 ../../mod/connedit.php:684 +#: ../../mod/connedit.php:647 msgid "Approve this connection" msgstr "" -#: ../../mod/connedit.php:643 +#: ../../mod/connedit.php:647 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connedit.php:659 -#, php-format -msgid "Connections: settings for %s" +#: ../../mod/connedit.php:652 +msgid "Set Affinity" msgstr "" -#: ../../mod/connedit.php:660 -msgid "Apply these permissions automatically" +#: ../../mod/connedit.php:655 +msgid "Set Profile" msgstr "" -#: ../../mod/connedit.php:664 -msgid "Apply the permissions indicated on this page to all new connections." +#: ../../mod/connedit.php:658 +msgid "Set Affinity & Profile" msgstr "" -#: ../../mod/connedit.php:668 -msgid "Slide to adjust your degree of friendship" +#: ../../mod/connedit.php:675 +msgid "Apply these permissions automatically" msgstr "" -#: ../../mod/connedit.php:672 -msgid "Only import posts with this text" +#: ../../mod/connedit.php:677 +msgid "This connection's address is" msgstr "" -#: ../../mod/connedit.php:672 ../../mod/connedit.php:673 +#: ../../mod/connedit.php:680 msgid "" -"words one per line or #tags or /patterns/, leave blank to import all posts" -msgstr "" - -#: ../../mod/connedit.php:673 -msgid "Do not import posts with this text" +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../mod/connedit.php:680 -msgid "" -"Default permissions for your channel type have (just) been applied. They " -"have not yet been submitted. Please review the permissions on this page and " -"make any desired changes at this time. This new connection may <em>not</em> " -"be able to communicate with you until you submit this page, which will " -"install and apply the selected permissions." +#: ../../mod/connedit.php:682 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connedit.php:683 -msgid "inherited" +#: ../../mod/connedit.php:684 +msgid "Slide to adjust your rating" msgstr "" -#: ../../mod/connedit.php:686 -msgid "Connection has no individual permissions!" +#: ../../mod/connedit.php:685 ../../mod/connedit.php:690 +msgid "Optionally explain your rating" msgstr "" #: ../../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\"." +msgid "Custom Filter" msgstr "" -#: ../../mod/connedit.php:689 -msgid "Profile Visibility" +#: ../../mod/connedit.php:688 +msgid "Only import posts with this text" msgstr "" -#: ../../mod/connedit.php:690 -#, php-format +#: ../../mod/connedit.php:688 ../../mod/connedit.php:689 msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -#: ../../mod/connedit.php:691 -msgid "Contact Information / Notes" +"words one per line or #tags or /patterns/, leave blank to import all posts" msgstr "" -#: ../../mod/connedit.php:692 -msgid "Edit contact notes" +#: ../../mod/connedit.php:689 +msgid "Do not import posts with this text" msgstr "" -#: ../../mod/connedit.php:694 -msgid "Their Settings" +#: ../../mod/connedit.php:691 +msgid "This information is public!" msgstr "" -#: ../../mod/connedit.php:695 -msgid "My Settings" +#: ../../mod/connedit.php:696 +msgid "Connection Pending Approval" msgstr "" #: ../../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." +msgid "Connection Request" msgstr "" #: ../../mod/connedit.php:698 -msgid "Clear/Disable Automatic Permissions" -msgstr "" - -#: ../../mod/connedit.php:699 -msgid "Forum Members" +#, php-format +msgid "" +"(%s) would like to connect with you. Please approve this connection to allow " +"communication." msgstr "" #: ../../mod/connedit.php:700 -msgid "Soapbox" -msgstr "" - -#: ../../mod/connedit.php:701 -msgid "Full Sharing (typical social network permissions)" -msgstr "" - -#: ../../mod/connedit.php:702 -msgid "Cautious Sharing " +msgid "Approve Later" msgstr "" #: ../../mod/connedit.php:703 -msgid "Follow Only" -msgstr "" - -#: ../../mod/connedit.php:704 -msgid "Individual Permissions" +msgid "inherited" msgstr "" #: ../../mod/connedit.php:705 +#, php-format msgid "" -"Some permissions may be inherited from your channel <a href=\"settings" -"\">privacy settings</a>, which have higher priority than individual " -"settings. Changing those inherited settings on this page will have no effect." -msgstr "" - -#: ../../mod/connedit.php:706 -msgid "Advanced Permissions" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" #: ../../mod/connedit.php:707 -msgid "Simple Permissions (select one and submit)" -msgstr "" - -#: ../../mod/connedit.php:711 -#, php-format -msgid "Visit %s's profile - %s" -msgstr "" - -#: ../../mod/connedit.php:712 -msgid "Block/Unblock contact" +msgid "Their Settings" msgstr "" -#: ../../mod/connedit.php:713 -msgid "Ignore contact" +#: ../../mod/connedit.php:708 +msgid "My Settings" msgstr "" -#: ../../mod/connedit.php:714 -msgid "Repair URL settings" +#: ../../mod/connedit.php:710 +msgid "Individual Permissions" msgstr "" -#: ../../mod/connedit.php:715 -msgid "View conversations" +#: ../../mod/connedit.php:711 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../mod/connedit.php:717 -msgid "Delete contact" +#: ../../mod/connedit.php:712 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can change those settings here but they wont have " +"any impact unless the inherited setting changes." msgstr "" -#: ../../mod/connedit.php:721 +#: ../../mod/connedit.php:713 msgid "Last update:" msgstr "" -#: ../../mod/connedit.php:723 -msgid "Update public posts" -msgstr "" - -#: ../../mod/connedit.php:725 -msgid "Update now" -msgstr "" - -#: ../../mod/connedit.php:731 -msgid "Currently blocked" -msgstr "" - -#: ../../mod/connedit.php:732 -msgid "Currently ignored" -msgstr "" - -#: ../../mod/connedit.php:733 -msgid "Currently archived" -msgstr "" - -#: ../../mod/connedit.php:734 -msgid "Currently pending" -msgstr "" - #: ../../mod/rmagic.php:40 msgid "" "We encountered a problem while logging in with the OpenID you provided. " @@ -9004,7 +8547,7 @@ msgstr "" msgid "Please login." msgstr "" -#: ../../mod/post.php:235 +#: ../../mod/post.php:236 msgid "" "Remote authentication blocked. You are logged into this site locally. Please " "logout and retry." @@ -9117,36 +8660,25 @@ msgstr "" msgid "posted an event" msgstr "" -#: ../../mod/network.php:91 -msgid "No such group" -msgstr "" - -#: ../../mod/network.php:129 -msgid "No such channel" -msgstr "" - -#: ../../mod/network.php:143 -msgid "Search Results For:" -msgstr "" - -#: ../../mod/network.php:198 -msgid "Collection is empty" +#: ../../mod/layouts.php:176 +msgid "Comanche page description language help" msgstr "" -#: ../../mod/network.php:207 -msgid "Collection: " +#: ../../mod/layouts.php:180 +msgid "Layout Description" msgstr "" -#: ../../mod/network.php:226 -msgid "Connection: " +#: ../../mod/layouts.php:185 +msgid "Download PDL file" msgstr "" -#: ../../mod/network.php:233 -msgid "Invalid connection." +#: ../../mod/home.php:73 +#, php-format +msgid "Welcome to %s" msgstr "" -#: ../../mod/page.php:122 -msgid "Ipsum Lorem" +#: ../../mod/page.php:126 +msgid "Lorem Ipsum" msgstr "" #: ../../mod/bookmarks.php:38 @@ -9228,7 +8760,7 @@ msgid "Monospace" msgstr "" #: ../../view/theme/apw/php/config.php:259 -#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Theme settings" msgstr "" @@ -9237,7 +8769,7 @@ msgid "Set scheme" msgstr "" #: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set font-size for posts and comments" msgstr "" @@ -9358,130 +8890,130 @@ msgid "Right offset of the aside element" msgstr "" #: ../../view/theme/redbasic/php/config.php:82 -msgid "Light (Hubzilla default)" +msgid "Light (Red Matrix default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Select scheme" msgstr "" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:113 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Example: 14px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:125 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set maximum width of content region in pixel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Leave empty for default width" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Center page content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:131 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:132 msgid "Set size of followup author photos" msgstr "" @@ -9497,7 +9029,7 @@ msgstr "" #: ../../boot.php:1525 msgid "" -"Create an account to access services and applications within the Hubzilla" +"Create an account to access services and applications within the Red Matrix" msgstr "" #: ../../boot.php:1553 @@ -9512,24 +9044,24 @@ msgstr "" msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2178 +#: ../../boot.php:2177 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2313 +#: ../../boot.php:2312 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2316 +#: ../../boot.php:2315 #, php-format msgid "[red] Website SSL error for %s" msgstr "" -#: ../../boot.php:2353 +#: ../../boot.php:2352 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2357 +#: ../../boot.php:2356 #, php-format msgid "[red] Cron tasks not running on %s" msgstr "" diff --git a/version.inc b/version.inc index e621e16cb..0384d000f 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-09-23.1164 +2015-09-27.1168 diff --git a/view/es/messages.po b/view/es/messages.po index bb0ba9839..cc6d56196 100644 --- a/view/es/messages.po +++ b/view/es/messages.po @@ -13,8 +13,8 @@ msgid "" msgstr "" "Project-Id-Version: Redmatrix\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-09-11 00:05-0700\n" -"PO-Revision-Date: 2015-09-14 18:21+0000\n" +"POT-Creation-Date: 2015-09-18 00:04-0700\n" +"PO-Revision-Date: 2015-09-22 14:10+0000\n" "Last-Translator: Manuel Jiménez Friaza <mjfriaza@openmailbox.org>\n" "Language-Team: Spanish (http://www.transifex.com/Friendica/red-matrix/language/es/)\n" "MIME-Version: 1.0\n" @@ -1598,17 +1598,17 @@ msgstr "Por favor visite %s para ver y/o responder a su mensaje privado." #: ../../include/enotify.php:158 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" -msgstr "%1$s, %2$s comentó en [zrl=%3$s]a %4$s[/zrl]" +msgstr "%1$s, %2$s ha comentado sobre [zrl=%3$s]%4$s[/zrl]" #: ../../include/enotify.php:166 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" -msgstr "%1$s, %2$s comentó en [zrl=%3$s]%4$s de %5$s[/zrl]" +msgstr "%1$s, %2$s ha comentado sobre el [zrl=%3$s]%5$s de %4$s[/zrl]" #: ../../include/enotify.php:175 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" -msgstr "%1$s, %2$s comentó en [zrl=%3$s]su %4$s[/zrl]" +msgstr "%1$s, %2$s ha comentado [zrl=%3$s]su %4$s[/zrl]" #: ../../include/enotify.php:186 #, php-format @@ -1665,7 +1665,7 @@ msgstr "[Red:Aviso] %1$s le ha dado un toque" #: ../../include/enotify.php:239 #, php-format msgid "%1$s, %2$s poked you at %3$s" -msgstr "%1$s, %2$s le dio un toque en %3$s" +msgstr "%1$s, %2$s le dio un toque sobre %3$s" #: ../../include/enotify.php:240 #, php-format @@ -1680,12 +1680,12 @@ msgstr "[Red:Aviso] %s etiquetó su entrada" #: ../../include/enotify.php:257 #, php-format msgid "%1$s, %2$s tagged your post at %3$s" -msgstr "%1$s, %2$s etiquetó su publicación en %3$s" +msgstr "%1$s, %2$s ha etiquetado su publicación sobre %3$s" #: ../../include/enotify.php:258 #, php-format msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" -msgstr "%1$s, %2$s etiquetó [zrl=%3$s]su publicación[/zrl]" +msgstr "%1$s, %2$s ha etiquetado [zrl=%3$s]su publicación[/zrl]" #: ../../include/enotify.php:270 msgid "[Red:Notify] Introduction received" @@ -3118,15 +3118,15 @@ msgstr "Conexión: %s" msgid "Connection not found." msgstr "Conexión no encontrada" -#: ../../include/zot.php:675 +#: ../../include/zot.php:677 msgid "Invalid data packet" msgstr "Paquete de datos no válido" -#: ../../include/zot.php:691 +#: ../../include/zot.php:693 msgid "Unable to verify channel signature" msgstr "No ha sido posible de verificar la signatura del canal" -#: ../../include/zot.php:2142 +#: ../../include/zot.php:2161 #, php-format msgid "Unable to verify site signature for %s" msgstr "No ha sido posible de verificar la signatura del sitio para %s" @@ -4640,7 +4640,7 @@ msgstr "Por favor, visite <a href=\"https://redmatrix.me\">redmatrix.me </a> par #: ../../mod/siteinfo.php:165 msgid "Bug reports and issues: please visit" -msgstr "Informes de errores e incidencias: por, favor visite" +msgstr "Informes de errores e incidencias: por favor visite" #: ../../mod/siteinfo.php:167 msgid "$projectname issues" @@ -5275,7 +5275,7 @@ msgstr "Introduzca la dirección del enlace o seleccione el nombre de un submenà #: ../../mod/mitem.php:159 ../../mod/mitem.php:232 msgid "Use magic-auth if available" -msgstr "Use la autenticación mágica si está disponible" +msgstr "Usar la autenticación mágica si está disponible" #: ../../mod/mitem.php:160 ../../mod/mitem.php:233 msgid "Open link in new window" @@ -6188,7 +6188,7 @@ msgstr "Puerto de la base de datos" #: ../../mod/setup.php:312 msgid "Communication port number - use 0 for default" -msgstr "Número del puerto de comunicaciones - use 0 como valor por defecto" +msgstr "Número del puerto de comunicaciones - usar 0 como valor por defecto" #: ../../mod/setup.php:313 msgid "Database Login Name" @@ -6532,7 +6532,7 @@ msgstr "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo #: ../../mod/tagger.php:96 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" -msgstr "%1$s ha etiquetado el %3$s de %2$s con %4$s" +msgstr "%1$s ha etiquetado la %3$s de %2$s con %4$s" #: ../../mod/uexport.php:45 ../../mod/uexport.php:46 msgid "Export Channel" @@ -6958,7 +6958,7 @@ msgstr "Intervalo de sondeo" msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." -msgstr "Retrasar el sondeo en segundo plano en esta cantidad de segundo para reducir la carga del sistema. Si es 0, use el intervalo de entrega." +msgstr "Retrasar el sondeo en segundo plano en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, se usará el intervalo de entrega." #: ../../mod/admin.php:491 msgid "Maximum Load Average" @@ -7985,7 +7985,7 @@ msgstr "Reciba una sugerencia de amistad" #: ../../mod/settings.php:1108 msgid "You are tagged in a post" -msgstr "Usted sea etiquetado en una publicación" +msgstr "Usted ha sido etiquetado en una publicación" #: ../../mod/settings.php:1109 msgid "You are poked/prodded/etc. in a post" @@ -8305,7 +8305,7 @@ msgstr "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunqu #: ../../mod/connedit.php:551 msgid "This connection is archived!" -msgstr "¡Esta conexión esta archivada!" +msgstr "¡Esta conexión está archivada!" #: ../../mod/connedit.php:555 msgid "Unhide" diff --git a/view/es/strings.php b/view/es/strings.php index 1d91ed820..f1821ad49 100644 --- a/view/es/strings.php +++ b/view/es/strings.php @@ -364,9 +364,9 @@ $a->strings["%1\$s, %2\$s sent you a new private message at %3\$s."] = "%1\$s, % $a->strings["%1\$s sent you %2\$s."] = "%1\$s le envió %2\$s."; $a->strings["a private message"] = "un mensaje privado"; $a->strings["Please visit %s to view and/or reply to your private messages."] = "Por favor visite %s para ver y/o responder a su mensaje privado."; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]a %4\$s[/zrl]"; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]%4\$s de %5\$s[/zrl]"; -$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s comentó en [zrl=%3\$s]su %4\$s[/zrl]"; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]a %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado sobre [zrl=%3\$s]%4\$s[/zrl]"; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]%4\$s's %5\$s[/zrl]"] = "%1\$s, %2\$s ha comentado sobre el [zrl=%3\$s]%5\$s de %4\$s[/zrl]"; +$a->strings["%1\$s, %2\$s commented on [zrl=%3\$s]your %4\$s[/zrl]"] = "%1\$s, %2\$s ha comentado [zrl=%3\$s]su %4\$s[/zrl]"; $a->strings["[Red:Notify] Comment to conversation #%1\$d by %2\$s"] = "[Red:Aviso] Nuevo comentario de %2\$s en la conversación #%1\$d"; $a->strings["%1\$s, %2\$s commented on an item/conversation you have been following."] = "%1\$s, %2\$s comentó un elemento/conversación que ha estado siguiendo."; $a->strings["Please visit %s to view and/or reply to the conversation."] = "Para ver o comentar la conversación, visite %s"; @@ -377,11 +377,11 @@ $a->strings["[Red:Notify] %s tagged you"] = "[Red:Aviso] %s le etiquetó"; $a->strings["%1\$s, %2\$s tagged you at %3\$s"] = "%1\$s, %2\$s le etiquetó en %3\$s"; $a->strings["%1\$s, %2\$s [zrl=%3\$s]tagged you[/zrl]."] = "%1\$s, %2\$s [zrl=%3\$s]le etiquetó[/zrl]."; $a->strings["[Red:Notify] %1\$s poked you"] = "[Red:Aviso] %1\$s le ha dado un toque"; -$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque en %3\$s"; +$a->strings["%1\$s, %2\$s poked you at %3\$s"] = "%1\$s, %2\$s le dio un toque sobre %3\$s"; $a->strings["%1\$s, %2\$s [zrl=%2\$s]poked you[/zrl]."] = "%1\$s, %2\$s [zrl=%2\$s]le dio un toque[/zrl]."; $a->strings["[Red:Notify] %s tagged your post"] = "[Red:Aviso] %s etiquetó su entrada"; -$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s etiquetó su publicación en %3\$s"; -$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s etiquetó [zrl=%3\$s]su publicación[/zrl]"; +$a->strings["%1\$s, %2\$s tagged your post at %3\$s"] = "%1\$s, %2\$s ha etiquetado su publicación sobre %3\$s"; +$a->strings["%1\$s, %2\$s tagged [zrl=%3\$s]your post[/zrl]"] = "%1\$s, %2\$s ha etiquetado [zrl=%3\$s]su publicación[/zrl]"; $a->strings["[Red:Notify] Introduction received"] = "[Red:Aviso] Solicitud de conexión recibida"; $a->strings["%1\$s, you've received an new connection request from '%2\$s' at %3\$s"] = "%1\$s, ha recibido una nueva solicitud de conexión de '%2\$s' en %3\$s"; $a->strings["%1\$s, you've received [zrl=%2\$s]a new connection request[/zrl] from %3\$s."] = "%1\$s, ha recibido [zrl=%2\$s]una nueva solicitud de conexión[/zrl] de %3\$s."; @@ -1093,7 +1093,7 @@ $a->strings["Tag: "] = "Etiqueta:"; $a->strings["Last background fetch: "] = "Última actualización en segundo plano:"; $a->strings["Running at web location"] = "Corriendo en el sitio web"; $a->strings["Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more about \$Projectname."] = "Por favor, visite <a href=\"https://redmatrix.me\">redmatrix.me </a> para aprender más sobre \$Projectname."; -$a->strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por, favor visite"; +$a->strings["Bug reports and issues: please visit"] = "Informes de errores e incidencias: por favor visite"; $a->strings["\$projectname issues"] = "Problemas en \$projectname"; $a->strings["Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"] = "Sugerencias, elogios, etc - por favor, un correo electrónico a \"redmatrix\" en librelist - punto com"; $a->strings["Site Administrators"] = "Administradores del sitio"; @@ -1244,7 +1244,7 @@ $a->strings["(click to open/close)"] = "(pulse para abrir/cerrar)"; $a->strings["Link Name"] = "Nombre del enlace"; $a->strings["Link or Submenu Target"] = "Destino del enlace o submenú"; $a->strings["Enter URL of the link or select a menu name to create a submenu"] = "Introduzca la dirección del enlace o seleccione el nombre de un submenú"; -$a->strings["Use magic-auth if available"] = "Use la autenticación mágica si está disponible"; +$a->strings["Use magic-auth if available"] = "Usar la autenticación mágica si está disponible"; $a->strings["Open link in new window"] = "Abrir el enlace en una nueva ventana"; $a->strings["Order in list"] = "Orden en la lista"; $a->strings["Higher numbers will sink to bottom of listing"] = "Los números más altos irán al final de la lista"; @@ -1467,7 +1467,7 @@ $a->strings["The database you specify below should already exist. If it does not $a->strings["Database Server Name"] = "Nombre del servidor de base de datos"; $a->strings["Default is localhost"] = "Por defecto es localhost"; $a->strings["Database Port"] = "Puerto de la base de datos"; -$a->strings["Communication port number - use 0 for default"] = "Número del puerto de comunicaciones - use 0 como valor por defecto"; +$a->strings["Communication port number - use 0 for default"] = "Número del puerto de comunicaciones - usar 0 como valor por defecto"; $a->strings["Database Login Name"] = "Nombre de acceso a la base de datos"; $a->strings["Database Login Password"] = "Contraseña de acceso a la base de datos"; $a->strings["Database Name"] = "Nombre de la base de datos"; @@ -1537,7 +1537,7 @@ $a->strings["<h1>What next</h1>"] = "<h1>Siguiente paso</h1>"; $a->strings["IMPORTANT: You will need to [manually] setup a scheduled task for the poller."] = "IMPORTANTE: Debe crear [manualmente] una tarea programada para las actualizaciones."; $a->strings["OpenID protocol error. No ID returned."] = "Error del protocolo OpenID. Ningún ID recibido como respuesta."; $a->strings["Welcome %s. Remote authentication successful."] = "Bienvenido %s. La identificación desde su servidor se ha llevado a cabo correctamente."; -$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado el %3\$s de %2\$s con %4\$s"; +$a->strings["%1\$s tagged %2\$s's %3\$s with %4\$s"] = "%1\$s ha etiquetado la %3\$s de %2\$s con %4\$s"; $a->strings["Export Channel"] = "Exportar el canal"; $a->strings["Export your basic channel information to a small file. This acts as a backup of your connections, permissions, profile and basic data, which can be used to import your data to a new hub, but\tdoes not contain your content."] = "Exportar la base de datos de su canal a un pequeño fichero. Este podrá servir como una copia de seguridad de sus conexiones, permisos, perfil y datos básicos, que podrá importar a un nuevo canal, pero sin sus contenidos."; $a->strings["Export Content"] = "Exportar contenidos"; @@ -1632,7 +1632,7 @@ $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = $a->strings["Delivery interval"] = "Intervalo de entrega"; $a->strings["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."] = "Retrasar los procesos de entrega en segundo plano por esta cantidad de segundos para reducir la carga del sistema. Recomendado: 4-5 para hosts compartidos, 2-3 para servidores virtuales privados, 0-1 para grandes servidores dedicados."; $a->strings["Poll interval"] = "Intervalo de sondeo"; -$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el sondeo en segundo plano en esta cantidad de segundo para reducir la carga del sistema. Si es 0, use el intervalo de entrega."; +$a->strings["Delay background polling processes by this many seconds to reduce system load. If 0, use delivery interval."] = "Retrasar el sondeo en segundo plano en esta cantidad de segundos, para reducir la carga del sistema. Si es 0, se usará el intervalo de entrega."; $a->strings["Maximum Load Average"] = "Carga media máxima"; $a->strings["Maximum system load before delivery and poll processes are deferred - default 50."] = "Carga máxima del sistema antes de que los procesos de entrega y sondeo se hayan retardado - por defecto, 50."; $a->strings["Expiration period in days for imported (matrix/network) content"] = "Periodo de caducidad en dÃas para el contenido importado (red)"; @@ -1887,7 +1887,7 @@ $a->strings["Someone writes on your profile wall"] = "Alguien escriba en la pág $a->strings["Someone writes a followup comment"] = "Alguien escriba un comentario sobre sus publicaciones"; $a->strings["You receive a private message"] = "Reciba un mensaje privado"; $a->strings["You receive a friend suggestion"] = "Reciba una sugerencia de amistad"; -$a->strings["You are tagged in a post"] = "Usted sea etiquetado en una publicación"; +$a->strings["You are tagged in a post"] = "Usted ha sido etiquetado en una publicación"; $a->strings["You are poked/prodded/etc. in a post"] = "Recibir un toque o incitación en una publicación"; $a->strings["Show visual notifications including:"] = "Mostrar notificaciones visuales que incluyan:"; $a->strings["Unseen matrix activity"] = "Actividad no vista en la red"; @@ -1964,7 +1964,7 @@ $a->strings["This connection is ignored!"] = "¡Esta conexión es ignorada!"; $a->strings["Unarchive"] = "Desarchivar"; $a->strings["Archive"] = "Archivar"; $a->strings["Archive (or Unarchive) this connection - mark channel dead but keep content"] = "Archiva (o desarchiva) esta conexión - marca el canal como muerto aunque mantiene sus contenidos"; -$a->strings["This connection is archived!"] = "¡Esta conexión esta archivada!"; +$a->strings["This connection is archived!"] = "¡Esta conexión está archivada!"; $a->strings["Unhide"] = "Mostrar"; $a->strings["Hide"] = "Ocultar"; $a->strings["Hide or Unhide this connection from your other connections"] = "Ocultar o mostrar esta conexión a sus otras conexiones"; |