diff options
| -rw-r--r-- | Zotlabs/Lib/ThreadItem.php | 2 | ||||
| -rw-r--r-- | include/connections.php | 3 | ||||
| -rw-r--r-- | util/hmessages.po | 1552 | ||||
| -rw-r--r-- | view/js/main.js | 12 |
4 files changed, 869 insertions, 700 deletions
diff --git a/Zotlabs/Lib/ThreadItem.php b/Zotlabs/Lib/ThreadItem.php index adf3e318d..0ee8e6680 100644 --- a/Zotlabs/Lib/ThreadItem.php +++ b/Zotlabs/Lib/ThreadItem.php @@ -409,7 +409,7 @@ class ThreadItem { 'comment' => $this->get_comment_box($indent), 'previewing' => ($conv->is_preview() ? ' preview ' : ''), 'wait' => t('Please wait'), - 'submid' => base64_encode(substr($item['mid'],0,32)), + 'submid' => str_replace(['+','='], ['',''], base64_encode(substr($item['mid'],0,32))), 'thread_level' => $thread_level ); diff --git a/include/connections.php b/include/connections.php index def80441a..f90644ec5 100644 --- a/include/connections.php +++ b/include/connections.php @@ -822,7 +822,8 @@ function get_vcard_array($vc,$id) { 'address' => $adr->getParts() ]; $last_entry = end($adrs); - array_walk($adrs[$last_entry]['address'],'array_escape_tags'); + if($adrs[$last_entry]['address']) + array_walk($adrs[$last_entry]['address'],'array_escape_tags'); } } diff --git a/util/hmessages.po b/util/hmessages.po index 4cae6091d..77e484659 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-01-13 00:05-0800\n" +"POT-Creation-Date: 2017-01-20 00:06-0800\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" @@ -95,8 +95,8 @@ msgstr "" #: ../../extend/addon/addon/cdav/cdav.php:277 #: ../../extend/addon/addon/cdav/cdav.php:284 ../../include/selectors.php:49 #: ../../include/selectors.php:66 ../../include/selectors.php:104 -#: ../../include/selectors.php:140 ../../include/connections.php:863 -#: ../../include/connections.php:870 ../../include/permissions.php:949 +#: ../../include/selectors.php:140 ../../include/connections.php:869 +#: ../../include/connections.php:876 ../../include/permissions.php:949 msgid "Other" msgstr "" @@ -197,14 +197,14 @@ msgstr "" msgid "Schedule Outbox" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:788 -#: ../../Zotlabs/Module/Photos.php:1248 +#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:784 +#: ../../Zotlabs/Module/Photos.php:1244 #: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:526 -#: ../../Zotlabs/Lib/Apps.php:603 +#: ../../Zotlabs/Lib/Apps.php:604 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:745 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:746 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:753 -#: ../../include/conversation.php:1177 ../../include/widgets.php:1684 +#: ../../include/conversation.php:1177 ../../include/widgets.php:1695 msgid "Unknown" msgstr "" @@ -234,29 +234,32 @@ msgid "Create" msgstr "" #: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:323 -#: ../../Zotlabs/Module/Photos.php:815 ../../Zotlabs/Module/Photos.php:1372 +#: ../../Zotlabs/Module/Photos.php:811 ../../Zotlabs/Module/Photos.php:1368 #: ../../Zotlabs/Module/Cover_photo.php:357 #: ../../Zotlabs/Module/Profile_photo.php:410 #: ../../Zotlabs/Module/Embedphotos.php:157 #: ../../extend/addon/addon/cdav/include/widgets.php:132 #: ../../extend/addon/addon/cdav/include/widgets.php:168 -#: ../../include/widgets.php:1697 +#: ../../include/widgets.php:1708 msgid "Upload" msgstr "" #: ../../Zotlabs/Storage/Browser.php:233 #: ../../Zotlabs/Module/Admin/Channels.php:159 #: ../../Zotlabs/Module/Connedit.php:870 -#: ../../Zotlabs/Module/Sharedwithme.php:99 ../../Zotlabs/Module/Wiki.php:151 +#: ../../Zotlabs/Module/Sharedwithme.php:99 ../../Zotlabs/Module/Wiki.php:163 #: ../../Zotlabs/Module/Settings/Oauth.php:89 #: ../../Zotlabs/Module/Settings/Oauth.php:115 #: ../../Zotlabs/Module/Chat.php:250 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136 #: ../../extend/addon/addon/rendezvous/rendezvous.php:164 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156 +#: ../../include/widgets.php:971 msgid "Name" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:152 +#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:164 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157 msgid "Type" msgstr "" @@ -278,20 +281,22 @@ msgstr "" #: ../../Zotlabs/Module/Editlayout.php:114 #: ../../Zotlabs/Module/Editwebpage.php:145 ../../Zotlabs/Module/Menu.php:112 #: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Layouts.php:192 -#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Wiki.php:144 -#: ../../Zotlabs/Module/Wiki.php:246 +#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Wiki.php:156 +#: ../../Zotlabs/Module/Wiki.php:266 #: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/Apps.php:346 -#: ../../Zotlabs/Lib/ThreadItem.php:106 +#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:106 +#: ../../Zotlabs/Lib/Apps.php:346 #: ../../extend/addon/addon/cdav/include/widgets.php:125 #: ../../extend/addon/addon/cdav/include/widgets.php:161 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:149 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251 #: ../../include/menu.php:113 ../../include/page_widgets.php:9 #: ../../include/page_widgets.php:39 ../../include/channel.php:961 #: ../../include/channel.php:965 msgid "Edit" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Photos.php:1178 +#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Photos.php:1174 #: ../../Zotlabs/Module/Editblock.php:134 #: ../../Zotlabs/Module/Connections.php:271 #: ../../Zotlabs/Module/Admin/Profs.php:155 @@ -303,8 +308,8 @@ msgstr "" #: ../../Zotlabs/Module/Group.php:177 ../../Zotlabs/Module/Blocks.php:162 #: ../../Zotlabs/Module/Webpages.php:246 #: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/Apps.php:347 -#: ../../Zotlabs/Lib/ThreadItem.php:126 +#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Lib/ThreadItem.php:126 +#: ../../Zotlabs/Lib/Apps.php:347 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:864 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153 #: ../../include/conversation.php:656 @@ -373,13 +378,13 @@ msgstr "" #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13 #: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76 #: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Mitem.php:115 -#: ../../Zotlabs/Module/Appman.php:76 ../../Zotlabs/Module/Mood.php:116 -#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:607 +#: ../../Zotlabs/Module/Appman.php:77 ../../Zotlabs/Module/Mood.php:116 +#: ../../Zotlabs/Module/Profiles.php:197 ../../Zotlabs/Module/Profiles.php:635 #: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Invite.php:17 #: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 ../../Zotlabs/Module/Setup.php:212 #: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137 -#: ../../Zotlabs/Module/Profile.php:68 ../../Zotlabs/Module/Profile.php:76 +#: ../../Zotlabs/Module/Profile.php:70 ../../Zotlabs/Module/Profile.php:87 #: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 #: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 #: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Rate.php:113 @@ -391,8 +396,8 @@ msgstr "" #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Message.php:18 #: ../../Zotlabs/Module/Service_limits.php:11 #: ../../Zotlabs/Module/Webpages.php:116 -#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Wiki.php:189 -#: ../../Zotlabs/Module/Wiki.php:286 ../../Zotlabs/Module/Sources.php:74 +#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Wiki.php:207 +#: ../../Zotlabs/Module/Wiki.php:306 ../../Zotlabs/Module/Sources.php:74 #: ../../Zotlabs/Module/Suggest.php:30 ../../Zotlabs/Module/Thing.php:274 #: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 #: ../../Zotlabs/Module/Mail.php:164 @@ -400,26 +405,28 @@ msgstr "" #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Chat.php:100 #: ../../Zotlabs/Module/Chat.php:105 ../../Zotlabs/Module/Item.php:220 -#: ../../Zotlabs/Module/Item.php:230 ../../Zotlabs/Module/Item.php:1063 +#: ../../Zotlabs/Module/Item.php:230 ../../Zotlabs/Module/Item.php:1067 #: ../../Zotlabs/Lib/Chatroom.php:137 #: ../../extend/addon/addon/friendica/dfrn_confirm.php:55 #: ../../extend/addon/addon/keepout/keepout.php:36 #: ../../extend/addon/addon/pumpio/pumpio.php:40 #: ../../extend/addon/addon/openid/Mod_Id.php:53 #: ../../extend/addon/addon/diaspora_reconnect/diaspora_reconnect.php:58 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:194 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:291 #: ../../include/attach.php:142 ../../include/attach.php:189 #: ../../include/attach.php:253 ../../include/attach.php:267 #: ../../include/attach.php:274 ../../include/attach.php:341 #: ../../include/attach.php:355 ../../include/attach.php:362 #: ../../include/attach.php:439 ../../include/attach.php:906 #: ../../include/attach.php:977 ../../include/attach.php:1135 -#: ../../include/items.php:3422 ../../include/photos.php:27 +#: ../../include/items.php:3429 ../../include/photos.php:27 msgid "Permission denied." msgstr "" -#: ../../Zotlabs/Web/Router.php:157 ../../Zotlabs/Module/Display.php:120 +#: ../../Zotlabs/Web/Router.php:157 ../../Zotlabs/Module/Display.php:124 #: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79 -#: ../../include/help.php:66 +#: ../../Zotlabs/Lib/NativeWikiPage.php:496 ../../include/help.php:66 msgid "Page not found." msgstr "" @@ -451,7 +458,7 @@ msgstr "" msgid "Some blurb about what to do when you're new here" msgstr "" -#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Photos.php:509 +#: ../../Zotlabs/Module/Display.php:17 ../../Zotlabs/Module/Photos.php:508 #: ../../Zotlabs/Module/Search.php:17 ../../Zotlabs/Module/Ratings.php:83 #: ../../Zotlabs/Module/Directory.php:64 #: ../../Zotlabs/Module/Viewconnections.php:23 @@ -459,11 +466,11 @@ msgstr "" msgid "Public access denied." msgstr "" -#: ../../Zotlabs/Module/Display.php:40 ../../Zotlabs/Module/Admin.php:60 +#: ../../Zotlabs/Module/Display.php:38 ../../Zotlabs/Module/Admin.php:60 #: ../../Zotlabs/Module/Admin/Plugins.php:254 #: ../../Zotlabs/Module/Admin/Themes.php:69 #: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Thing.php:89 -#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3343 +#: ../../Zotlabs/Module/Viewsrc.php:24 ../../include/items.php:3350 msgid "Item not found." msgstr "" @@ -599,7 +606,7 @@ msgid "Membership on this site is by invitation only." msgstr "" #: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:150 -#: ../../boot.php:1703 +#: ../../boot.php:1704 msgid "Register" msgstr "" @@ -618,11 +625,10 @@ msgstr "" msgid "Page owner information could not be retrieved." msgstr "" -#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:733 +#: ../../Zotlabs/Module/Photos.php:97 ../../Zotlabs/Module/Photos.php:729 #: ../../Zotlabs/Module/Profile_photo.php:115 #: ../../Zotlabs/Module/Profile_photo.php:219 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:225 -#: ../../include/photo/photo_driver.php:728 +#: ../../include/photo/photo_driver.php:730 msgid "Profile Photos" msgstr "" @@ -641,54 +647,54 @@ msgid "" "manager" msgstr "" -#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1058 +#: ../../Zotlabs/Module/Photos.php:190 ../../Zotlabs/Module/Photos.php:1054 msgid "Delete Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:520 +#: ../../Zotlabs/Module/Photos.php:519 msgid "No photos selected" msgstr "" -#: ../../Zotlabs/Module/Photos.php:569 +#: ../../Zotlabs/Module/Photos.php:568 msgid "Access to this item is restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:608 +#: ../../Zotlabs/Module/Photos.php:607 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:611 +#: ../../Zotlabs/Module/Photos.php:610 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../Zotlabs/Module/Photos.php:647 +#: ../../Zotlabs/Module/Photos.php:646 msgid "Upload Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:651 +#: ../../Zotlabs/Module/Photos.php:650 msgid "Enter an album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:652 +#: ../../Zotlabs/Module/Photos.php:651 msgid "or select an existing album (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:653 +#: ../../Zotlabs/Module/Photos.php:652 msgid "Create a status post for this upload" msgstr "" -#: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Admin/Site.php:218 +#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Admin/Site.php:218 #: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 #: ../../Zotlabs/Module/Connedit.php:417 ../../Zotlabs/Module/Connedit.php:755 #: ../../Zotlabs/Module/Filestorage.php:160 #: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:653 +#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Events.php:470 #: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Wiki.php:159 +#: ../../Zotlabs/Module/Wiki.php:171 #: ../../Zotlabs/Module/Settings/Channel.php:289 #: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../extend/addon/addon/dwpost/dwpost.php:73 @@ -735,23 +741,24 @@ msgstr "" #: ../../extend/addon/addon/wppost/wppost.php:105 #: ../../extend/addon/addon/wppost/wppost.php:109 #: ../../extend/addon/addon/xmpp/xmpp.php:53 -#: ../../extend/addon/addon/cdav/cdav.php:234 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../view/theme/redbasic/php/config.php:111 -#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1725 +#: ../../extend/addon/addon/cdav/cdav.php:234 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1726 msgid "No" msgstr "" -#: ../../Zotlabs/Module/Photos.php:653 ../../Zotlabs/Module/Admin/Site.php:220 +#: ../../Zotlabs/Module/Photos.php:652 ../../Zotlabs/Module/Admin/Site.php:220 #: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 #: ../../Zotlabs/Module/Connedit.php:417 #: ../../Zotlabs/Module/Filestorage.php:160 #: ../../Zotlabs/Module/Filestorage.php:168 ../../Zotlabs/Module/Mitem.php:162 #: ../../Zotlabs/Module/Mitem.php:163 ../../Zotlabs/Module/Mitem.php:240 -#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:653 +#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Profiles.php:681 #: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Events.php:470 #: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Wiki.php:159 +#: ../../Zotlabs/Module/Wiki.php:171 #: ../../Zotlabs/Module/Settings/Channel.php:289 #: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../extend/addon/addon/dwpost/dwpost.php:73 @@ -798,22 +805,23 @@ msgstr "" #: ../../extend/addon/addon/wppost/wppost.php:105 #: ../../extend/addon/addon/wppost/wppost.php:109 #: ../../extend/addon/addon/xmpp/xmpp.php:53 -#: ../../extend/addon/addon/cdav/cdav.php:234 ../../include/dir_fns.php:143 -#: ../../include/dir_fns.php:144 ../../include/dir_fns.php:145 -#: ../../view/theme/redbasic/php/config.php:111 -#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1725 +#: ../../extend/addon/addon/cdav/cdav.php:234 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 +#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 +#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:136 ../../boot.php:1726 msgid "Yes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:654 +#: ../../Zotlabs/Module/Photos.php:653 msgid "Caption (optional):" msgstr "" -#: ../../Zotlabs/Module/Photos.php:655 +#: ../../Zotlabs/Module/Photos.php:654 msgid "Description (optional):" msgstr "" -#: ../../Zotlabs/Module/Photos.php:658 ../../Zotlabs/Module/Photos.php:1046 +#: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1042 #: ../../Zotlabs/Module/Connedit.php:652 #: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Thing.php:313 #: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Chat.php:234 @@ -821,8 +829,8 @@ msgstr "" msgid "Permissions" msgstr "" -#: ../../Zotlabs/Module/Photos.php:668 ../../Zotlabs/Module/Photos.php:1057 -#: ../../Zotlabs/Module/Photos.php:1097 ../../Zotlabs/Module/Photos.php:1215 +#: ../../Zotlabs/Module/Photos.php:667 ../../Zotlabs/Module/Photos.php:1053 +#: ../../Zotlabs/Module/Photos.php:1093 ../../Zotlabs/Module/Photos.php:1211 #: ../../Zotlabs/Module/Connect.php:98 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Logs.php:84 @@ -838,12 +846,12 @@ msgstr "" #: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Cal.php:342 #: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Import_items.php:122 #: ../../Zotlabs/Module/Import.php:546 ../../Zotlabs/Module/Mitem.php:243 -#: ../../Zotlabs/Module/Appman.php:127 ../../Zotlabs/Module/Mood.php:139 -#: ../../Zotlabs/Module/Profiles.php:693 ../../Zotlabs/Module/Invite.php:149 +#: ../../Zotlabs/Module/Appman.php:129 ../../Zotlabs/Module/Mood.php:139 +#: ../../Zotlabs/Module/Profiles.php:721 ../../Zotlabs/Module/Invite.php:149 #: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:357 #: ../../Zotlabs/Module/Poke.php:186 ../../Zotlabs/Module/Pconfig.php:107 #: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Wiki.php:148 +#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Wiki.php:160 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 #: ../../Zotlabs/Module/Settings/Features.php:47 #: ../../Zotlabs/Module/Settings/Oauth.php:87 @@ -873,7 +881,7 @@ msgstr "" #: ../../extend/addon/addon/nofed/nofed.php:80 #: ../../extend/addon/addon/nsabait/nsabait.php:161 #: ../../extend/addon/addon/nsfw/nsfw.php:92 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:52 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:53 #: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168 #: ../../extend/addon/addon/pageheader/pageheader.php:48 #: ../../extend/addon/addon/piwik/piwik.php:95 @@ -900,205 +908,206 @@ msgstr "" #: ../../extend/addon/addon/cdav/cdav.php:246 #: ../../extend/addon/addon/likebanner/likebanner.php:57 #: ../../extend/addon/addon/mailtest/mailtest.php:100 -#: ../../include/js_strings.php:22 ../../include/widgets.php:796 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153 +#: ../../include/js_strings.php:22 ../../include/widgets.php:799 #: ../../view/theme/redbasic/php/config.php:106 msgid "Submit" msgstr "" -#: ../../Zotlabs/Module/Photos.php:686 +#: ../../Zotlabs/Module/Photos.php:685 msgid "Album name could not be decoded" msgstr "" -#: ../../Zotlabs/Module/Photos.php:733 +#: ../../Zotlabs/Module/Photos.php:729 msgid "Contact Photos" msgstr "" -#: ../../Zotlabs/Module/Photos.php:756 +#: ../../Zotlabs/Module/Photos.php:752 msgid "Show Newest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:758 +#: ../../Zotlabs/Module/Photos.php:754 msgid "Show Oldest First" msgstr "" -#: ../../Zotlabs/Module/Photos.php:782 ../../Zotlabs/Module/Photos.php:1339 -#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1678 +#: ../../Zotlabs/Module/Photos.php:778 ../../Zotlabs/Module/Photos.php:1335 +#: ../../Zotlabs/Module/Embedphotos.php:139 ../../include/widgets.php:1689 msgid "View Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:813 -#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1695 +#: ../../Zotlabs/Module/Photos.php:809 +#: ../../Zotlabs/Module/Embedphotos.php:155 ../../include/widgets.php:1706 msgid "Edit Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:860 +#: ../../Zotlabs/Module/Photos.php:856 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../Zotlabs/Module/Photos.php:862 +#: ../../Zotlabs/Module/Photos.php:858 msgid "Photo not available" msgstr "" -#: ../../Zotlabs/Module/Photos.php:920 +#: ../../Zotlabs/Module/Photos.php:916 msgid "Use as profile photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:921 +#: ../../Zotlabs/Module/Photos.php:917 msgid "Use as cover photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:928 +#: ../../Zotlabs/Module/Photos.php:924 msgid "Private Photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:939 ../../Zotlabs/Module/Cal.php:336 +#: ../../Zotlabs/Module/Photos.php:935 ../../Zotlabs/Module/Cal.php:336 #: ../../Zotlabs/Module/Cal.php:343 ../../Zotlabs/Module/Events.php:689 #: ../../Zotlabs/Module/Events.php:698 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:846 msgid "Previous" msgstr "" -#: ../../Zotlabs/Module/Photos.php:943 +#: ../../Zotlabs/Module/Photos.php:939 msgid "View Full Size" msgstr "" -#: ../../Zotlabs/Module/Photos.php:948 ../../Zotlabs/Module/Cal.php:337 +#: ../../Zotlabs/Module/Photos.php:944 ../../Zotlabs/Module/Cal.php:337 #: ../../Zotlabs/Module/Cal.php:344 ../../Zotlabs/Module/Setup.php:264 #: ../../Zotlabs/Module/Events.php:690 ../../Zotlabs/Module/Events.php:699 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:847 msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Photos.php:988 +#: ../../Zotlabs/Module/Photos.php:984 #: ../../Zotlabs/Module/Admin/Plugins.php:445 #: ../../Zotlabs/Module/Tagrm.php:137 #: ../../extend/addon/addon/superblock/superblock.php:114 msgid "Remove" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1032 +#: ../../Zotlabs/Module/Photos.php:1028 msgid "Edit photo" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1034 +#: ../../Zotlabs/Module/Photos.php:1030 msgid "Rotate CW (right)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1035 +#: ../../Zotlabs/Module/Photos.php:1031 msgid "Rotate CCW (left)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1038 +#: ../../Zotlabs/Module/Photos.php:1034 msgid "Move photo to album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1039 +#: ../../Zotlabs/Module/Photos.php:1035 msgid "Enter a new album name" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1040 +#: ../../Zotlabs/Module/Photos.php:1036 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1043 +#: ../../Zotlabs/Module/Photos.php:1039 msgid "Caption" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1045 +#: ../../Zotlabs/Module/Photos.php:1041 msgid "Add a Tag" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1053 +#: ../../Zotlabs/Module/Photos.php:1049 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1056 +#: ../../Zotlabs/Module/Photos.php:1052 msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1075 ../../Zotlabs/Lib/ThreadItem.php:268 +#: ../../Zotlabs/Module/Photos.php:1071 ../../Zotlabs/Lib/ThreadItem.php:268 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1076 ../../Zotlabs/Lib/ThreadItem.php:269 +#: ../../Zotlabs/Module/Photos.php:1072 ../../Zotlabs/Lib/ThreadItem.php:269 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1077 ../../Zotlabs/Module/Blocks.php:161 +#: ../../Zotlabs/Module/Photos.php:1073 ../../Zotlabs/Module/Blocks.php:161 #: ../../Zotlabs/Module/Layouts.php:193 ../../Zotlabs/Module/Webpages.php:245 #: ../../extend/addon/addon/cdav/include/widgets.php:123 #: ../../include/conversation.php:1378 msgid "Share" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1078 ../../Zotlabs/Lib/ThreadItem.php:411 +#: ../../Zotlabs/Module/Photos.php:1074 ../../Zotlabs/Lib/ThreadItem.php:411 #: ../../include/conversation.php:738 msgid "Please wait" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Photos.php:1212 +#: ../../Zotlabs/Module/Photos.php:1090 ../../Zotlabs/Module/Photos.php:1208 #: ../../Zotlabs/Lib/ThreadItem.php:728 msgid "This is you" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1096 ../../Zotlabs/Module/Photos.php:1214 +#: ../../Zotlabs/Module/Photos.php:1092 ../../Zotlabs/Module/Photos.php:1210 #: ../../Zotlabs/Lib/ThreadItem.php:730 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1098 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Photos.php:1094 ../../Zotlabs/Module/Events.php:478 #: ../../Zotlabs/Module/Webpages.php:251 ../../Zotlabs/Lib/ThreadItem.php:740 #: ../../include/page_widgets.php:43 ../../include/conversation.php:1347 msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1112 ../../include/conversation.php:577 +#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1112 ../../include/conversation.php:577 +#: ../../Zotlabs/Module/Photos.php:1108 ../../include/conversation.php:577 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:578 +#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578 msgctxt "title" msgid "Agree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:578 +#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1113 ../../include/conversation.php:578 +#: ../../Zotlabs/Module/Photos.php:1109 ../../include/conversation.php:578 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:579 +#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:579 +#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1114 ../../include/conversation.php:579 +#: ../../Zotlabs/Module/Photos.php:1110 ../../include/conversation.php:579 msgctxt "title" msgid "Might attend" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Module/Photos.php:1143 +#: ../../Zotlabs/Module/Photos.php:1127 ../../Zotlabs/Module/Photos.php:1139 #: ../../Zotlabs/Lib/ThreadItem.php:186 ../../Zotlabs/Lib/ThreadItem.php:198 #: ../../include/conversation.php:1928 msgid "View all" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1135 ../../Zotlabs/Lib/ThreadItem.php:190 +#: ../../Zotlabs/Module/Photos.php:1131 ../../Zotlabs/Lib/ThreadItem.php:190 #: ../../include/taxonomy.php:403 ../../include/channel.php:1190 #: ../../include/conversation.php:1952 msgctxt "noun" @@ -1107,7 +1116,7 @@ msgid_plural "Likes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1140 ../../Zotlabs/Lib/ThreadItem.php:195 +#: ../../Zotlabs/Module/Photos.php:1136 ../../Zotlabs/Lib/ThreadItem.php:195 #: ../../include/conversation.php:1955 msgctxt "noun" msgid "Dislike" @@ -1115,39 +1124,39 @@ msgid_plural "Dislikes" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Module/Photos.php:1240 +#: ../../Zotlabs/Module/Photos.php:1236 msgid "Photo Tools" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1249 +#: ../../Zotlabs/Module/Photos.php:1245 msgid "In This Photo:" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1254 +#: ../../Zotlabs/Module/Photos.php:1250 msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1262 ../../Zotlabs/Lib/ThreadItem.php:400 +#: ../../Zotlabs/Module/Photos.php:1258 ../../Zotlabs/Lib/ThreadItem.php:400 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1263 ../../Zotlabs/Lib/ThreadItem.php:401 +#: ../../Zotlabs/Module/Photos.php:1259 ../../Zotlabs/Lib/ThreadItem.php:401 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1268 ../../Zotlabs/Lib/ThreadItem.php:406 +#: ../../Zotlabs/Module/Photos.php:1264 ../../Zotlabs/Lib/ThreadItem.php:406 #: ../../include/acl_selectors.php:210 msgid "Close" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1345 +#: ../../Zotlabs/Module/Photos.php:1341 msgid "View Album" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1356 ../../Zotlabs/Module/Photos.php:1369 -#: ../../Zotlabs/Module/Photos.php:1370 +#: ../../Zotlabs/Module/Photos.php:1352 ../../Zotlabs/Module/Photos.php:1365 +#: ../../Zotlabs/Module/Photos.php:1366 msgid "Recent Photos" msgstr "" @@ -1392,7 +1401,7 @@ msgstr "" #: ../../Zotlabs/Module/Filer.php:53 ../../Zotlabs/Module/Admin/Profs.php:74 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Rbmark.php:32 #: ../../Zotlabs/Module/Rbmark.php:104 ../../include/text.php:1003 -#: ../../include/text.php:1015 ../../include/widgets.php:201 +#: ../../include/text.php:1015 ../../include/widgets.php:202 msgid "Save" msgstr "" @@ -1448,7 +1457,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:92 #: ../../Zotlabs/Module/Connections.php:107 -#: ../../Zotlabs/Module/Connedit.php:689 ../../include/widgets.php:533 +#: ../../Zotlabs/Module/Connedit.php:689 ../../include/widgets.php:536 msgid "All" msgstr "" @@ -1552,7 +1561,7 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Search.php:44 #: ../../Zotlabs/Lib/Apps.php:232 ../../include/acl_selectors.php:203 #: ../../include/nav.php:168 ../../include/text.php:1002 -#: ../../include/text.php:1014 ../../include/widgets.php:315 +#: ../../include/text.php:1014 ../../include/widgets.php:316 msgid "Search" msgstr "" @@ -1600,30 +1609,30 @@ msgstr "" msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4253 +#: ../../Zotlabs/Module/Cover_photo.php:233 ../../include/items.php:4260 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4254 +#: ../../Zotlabs/Module/Cover_photo.php:234 ../../include/items.php:4261 #, php-format msgid "%1$s updated her %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4255 +#: ../../Zotlabs/Module/Cover_photo.php:235 ../../include/items.php:4262 msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4256 +#: ../../Zotlabs/Module/Cover_photo.php:236 ../../include/items.php:4263 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4258 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4265 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1677 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/channel.php:1681 msgid "cover photo" msgstr "" @@ -1704,8 +1713,8 @@ msgstr "" msgid "Log settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1588 -#: ../../include/widgets.php:1598 +#: ../../Zotlabs/Module/Admin/Logs.php:83 ../../include/widgets.php:1599 +#: ../../include/widgets.php:1609 msgid "Logs" msgstr "" @@ -1752,7 +1761,7 @@ msgid "Enable" msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:337 -#: ../../Zotlabs/Module/Admin/Plugins.php:428 ../../include/widgets.php:1566 +#: ../../Zotlabs/Module/Admin/Plugins.php:428 ../../include/widgets.php:1577 msgid "Plugins" msgstr "" @@ -1763,7 +1772,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:339 #: ../../Zotlabs/Module/Admin/Themes.php:123 ../../Zotlabs/Lib/Apps.php:218 -#: ../../include/nav.php:211 ../../include/widgets.php:680 +#: ../../include/nav.php:211 ../../include/widgets.php:683 msgid "Settings" msgstr "" @@ -1832,8 +1841,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:414 #: ../../Zotlabs/Module/Connedit.php:888 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Wiki.php:238 -#: ../../Zotlabs/Module/Wiki.php:261 +#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Wiki.php:256 +#: ../../Zotlabs/Module/Wiki.php:281 #: ../../Zotlabs/Module/Settings/Oauth.php:88 #: ../../Zotlabs/Module/Settings/Oauth.php:114 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 @@ -1841,6 +1850,8 @@ msgstr "" #: ../../extend/addon/addon/js_upload/js_upload.php:46 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:866 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1154 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266 #: ../../include/conversation.php:1394 ../../include/conversation.php:1443 msgid "Cancel" msgstr "" @@ -1916,7 +1927,7 @@ msgstr "" msgid "Edit Profile Field" msgstr "" -#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1569 +#: ../../Zotlabs/Module/Admin/Profs.php:147 ../../include/widgets.php:1580 msgid "Profile Fields" msgstr "" @@ -1996,7 +2007,7 @@ msgid "" "embedded content from that site is explicitly blocked." msgstr "" -#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1564 +#: ../../Zotlabs/Module/Admin/Security.php:87 ../../include/widgets.php:1575 msgid "Security" msgstr "" @@ -2096,7 +2107,7 @@ msgid "Screenshot" msgstr "" #: ../../Zotlabs/Module/Admin/Themes.php:121 -#: ../../Zotlabs/Module/Admin/Themes.php:155 ../../include/widgets.php:1567 +#: ../../Zotlabs/Module/Admin/Themes.php:155 ../../include/widgets.php:1578 msgid "Themes" msgstr "" @@ -2179,7 +2190,7 @@ msgid "Account '%s' unblocked" msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:165 -#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1562 +#: ../../Zotlabs/Module/Admin/Accounts.php:178 ../../include/widgets.php:1573 msgid "Accounts" msgstr "" @@ -2204,7 +2215,7 @@ msgstr "" #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1140 #: ../../extend/addon/addon/openid/MysqlProvider.php:56 #: ../../extend/addon/addon/openid/MysqlProvider.php:57 -#: ../../include/network.php:2237 +#: ../../include/network.php:2241 msgid "Email" msgstr "" @@ -2312,7 +2323,7 @@ msgstr "" msgid "Channel '%s' code disallowed" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1563 +#: ../../Zotlabs/Module/Admin/Channels.php:146 ../../include/widgets.php:1574 msgid "Channels" msgstr "" @@ -2343,7 +2354,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:160 #: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:877 -#: ../../Zotlabs/Module/Profiles.php:474 +#: ../../Zotlabs/Module/Profiles.php:502 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143 msgid "Address" msgstr "" @@ -2477,7 +2488,7 @@ msgstr "" msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:259 ../../include/widgets.php:1561 +#: ../../Zotlabs/Module/Admin/Site.php:259 ../../include/widgets.php:1572 msgid "Site" msgstr "" @@ -3083,7 +3094,7 @@ msgid "Manage Channel Locations" msgstr "" #: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51 -#: ../../Zotlabs/Module/Profiles.php:481 ../../Zotlabs/Module/Profiles.php:704 +#: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:732 #: ../../Zotlabs/Module/Events.php:475 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:839 #: ../../include/js_strings.php:25 @@ -3112,7 +3123,7 @@ msgstr "" msgid "Use this form to drop the location if the hub is no longer operating." msgstr "" -#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1385 +#: ../../Zotlabs/Module/Pubsites.php:24 ../../include/widgets.php:1396 msgid "Public Hubs" msgstr "" @@ -3156,7 +3167,8 @@ msgstr "" #: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Blocks.php:166 #: ../../Zotlabs/Module/Layouts.php:197 ../../Zotlabs/Module/Events.php:694 -#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Wiki.php:146 +#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Wiki.php:158 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151 #: ../../include/page_widgets.php:42 msgid "View" msgstr "" @@ -3208,7 +3220,7 @@ msgid "Connection has been removed." msgstr "" #: ../../Zotlabs/Module/Connedit.php:588 ../../Zotlabs/Lib/Apps.php:223 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:57 #: ../../include/nav.php:89 ../../include/conversation.php:936 #: ../../include/conversation.php:1049 msgid "View Profile" @@ -3304,11 +3316,11 @@ msgstr "" msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:685 ../../include/widgets.php:529 +#: ../../Zotlabs/Module/Connedit.php:685 ../../include/widgets.php:532 msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:686 ../../include/widgets.php:530 +#: ../../Zotlabs/Module/Connedit.php:686 ../../include/widgets.php:533 msgid "Family" msgstr "" @@ -3320,11 +3332,11 @@ msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:80 #: ../../include/selectors.php:123 ../../include/channel.php:402 #: ../../include/channel.php:403 ../../include/channel.php:410 -#: ../../include/widgets.php:531 +#: ../../include/widgets.php:534 msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:688 ../../include/widgets.php:532 +#: ../../Zotlabs/Module/Connedit.php:688 ../../include/widgets.php:535 msgid "Acquaintances" msgstr "" @@ -3360,11 +3372,11 @@ msgstr "" msgid "none" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:818 ../../include/widgets.php:656 +#: ../../Zotlabs/Module/Connedit.php:818 ../../include/widgets.php:659 msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:818 ../../include/items.php:3909 +#: ../../Zotlabs/Module/Connedit.php:818 ../../include/items.php:3916 #, php-format msgid "Connection: %s" msgstr "" @@ -3523,21 +3535,21 @@ msgstr "" #: ../../Zotlabs/Module/Connedit.php:879 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145 #: ../../extend/addon/addon/cdav/cdav.php:270 -#: ../../include/connections.php:856 +#: ../../include/connections.php:862 msgid "Mobile" msgstr "" #: ../../Zotlabs/Module/Connedit.php:880 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146 #: ../../extend/addon/addon/cdav/cdav.php:271 ../../include/nav.php:88 -#: ../../include/connections.php:857 +#: ../../include/connections.php:863 msgid "Home" msgstr "" #: ../../Zotlabs/Module/Connedit.php:881 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147 #: ../../extend/addon/addon/cdav/cdav.php:274 -#: ../../include/connections.php:860 +#: ../../include/connections.php:866 msgid "Work" msgstr "" @@ -3582,7 +3594,7 @@ msgstr "" msgid "ZIP Code" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:895 ../../Zotlabs/Module/Profiles.php:727 +#: ../../Zotlabs/Module/Connedit.php:895 ../../Zotlabs/Module/Profiles.php:755 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161 msgid "Country" msgstr "" @@ -3660,8 +3672,8 @@ msgstr "" #: ../../Zotlabs/Module/Match.php:68 ../../Zotlabs/Module/Directory.php:329 #: ../../Zotlabs/Module/Suggest.php:56 ../../include/connections.php:78 #: ../../include/channel.php:1036 ../../include/conversation.php:938 -#: ../../include/conversation.php:1069 ../../include/widgets.php:147 -#: ../../include/widgets.php:184 +#: ../../include/conversation.php:1069 ../../include/widgets.php:148 +#: ../../include/widgets.php:185 msgid "Connect" msgstr "" @@ -3691,6 +3703,7 @@ msgid "Create Event" msgstr "" #: ../../Zotlabs/Module/Cal.php:338 ../../Zotlabs/Module/Events.php:691 +#: ../../include/channel.php:1287 msgid "Export" msgstr "" @@ -3712,7 +3725,7 @@ msgid "Could not create privacy group." msgstr "" #: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3876 +#: ../../include/items.php:3883 msgid "Privacy group not found." msgstr "" @@ -3890,8 +3903,9 @@ msgstr "" msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:784 -#: ../../Zotlabs/Module/Wiki.php:147 ../../Zotlabs/Module/Chat.php:255 +#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Profiles.php:812 +#: ../../Zotlabs/Module/Wiki.php:159 ../../Zotlabs/Module/Chat.php:255 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152 msgid "Create New" msgstr "" @@ -4135,69 +4149,69 @@ msgstr "" msgid "Link text" msgstr "" -#: ../../Zotlabs/Module/Appman.php:37 ../../Zotlabs/Module/Appman.php:53 +#: ../../Zotlabs/Module/Appman.php:38 ../../Zotlabs/Module/Appman.php:54 msgid "App installed." msgstr "" -#: ../../Zotlabs/Module/Appman.php:46 +#: ../../Zotlabs/Module/Appman.php:47 msgid "Malformed app." msgstr "" -#: ../../Zotlabs/Module/Appman.php:105 +#: ../../Zotlabs/Module/Appman.php:106 msgid "Embed code" msgstr "" -#: ../../Zotlabs/Module/Appman.php:111 ../../include/widgets.php:107 +#: ../../Zotlabs/Module/Appman.php:112 msgid "Edit App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:111 +#: ../../Zotlabs/Module/Appman.php:112 msgid "Create App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:116 +#: ../../Zotlabs/Module/Appman.php:117 msgid "Name of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:116 ../../Zotlabs/Module/Appman.php:117 -#: ../../Zotlabs/Module/Profiles.php:715 ../../Zotlabs/Module/Profiles.php:719 +#: ../../Zotlabs/Module/Appman.php:117 ../../Zotlabs/Module/Appman.php:118 +#: ../../Zotlabs/Module/Profiles.php:743 ../../Zotlabs/Module/Profiles.php:747 #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 #: ../../include/datetime.php:259 msgid "Required" msgstr "" -#: ../../Zotlabs/Module/Appman.php:117 +#: ../../Zotlabs/Module/Appman.php:118 msgid "Location (URL) of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:118 ../../Zotlabs/Module/Events.php:473 +#: ../../Zotlabs/Module/Appman.php:119 ../../Zotlabs/Module/Events.php:473 #: ../../Zotlabs/Module/Rbmark.php:101 #: ../../extend/addon/addon/cdav/Mod_Cdav.php:838 #: ../../extend/addon/addon/rendezvous/rendezvous.php:165 msgid "Description" msgstr "" -#: ../../Zotlabs/Module/Appman.php:119 +#: ../../Zotlabs/Module/Appman.php:120 msgid "Photo icon URL" msgstr "" -#: ../../Zotlabs/Module/Appman.php:119 +#: ../../Zotlabs/Module/Appman.php:120 msgid "80 x 80 pixels - optional" msgstr "" -#: ../../Zotlabs/Module/Appman.php:120 +#: ../../Zotlabs/Module/Appman.php:121 msgid "Categories (optional, comma separated list)" msgstr "" -#: ../../Zotlabs/Module/Appman.php:121 +#: ../../Zotlabs/Module/Appman.php:122 msgid "Version ID" msgstr "" -#: ../../Zotlabs/Module/Appman.php:122 +#: ../../Zotlabs/Module/Appman.php:123 msgid "Price of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:123 +#: ../../Zotlabs/Module/Appman.php:124 msgid "Location (URL) to purchase app" msgstr "" @@ -4246,7 +4260,7 @@ msgid "System Notifications" msgstr "" #: ../../Zotlabs/Module/Profiles.php:24 ../../Zotlabs/Module/Profiles.php:183 -#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:631 +#: ../../Zotlabs/Module/Profiles.php:240 ../../Zotlabs/Module/Profiles.php:659 #: ../../extend/addon/addon/friendica/dfrn_confirm.php:62 msgid "Profile not found." msgstr "" @@ -4275,247 +4289,247 @@ msgstr "" msgid "Profile Name is required." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:431 +#: ../../Zotlabs/Module/Profiles.php:459 msgid "Marital Status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:435 +#: ../../Zotlabs/Module/Profiles.php:463 msgid "Romantic Partner" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:439 ../../Zotlabs/Module/Profiles.php:742 +#: ../../Zotlabs/Module/Profiles.php:467 ../../Zotlabs/Module/Profiles.php:770 msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:443 ../../Zotlabs/Module/Profiles.php:743 +#: ../../Zotlabs/Module/Profiles.php:471 ../../Zotlabs/Module/Profiles.php:771 msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:447 ../../Zotlabs/Module/Profiles.php:750 +#: ../../Zotlabs/Module/Profiles.php:475 ../../Zotlabs/Module/Profiles.php:778 msgid "Work/Employment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:450 +#: ../../Zotlabs/Module/Profiles.php:478 msgid "Religion" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:454 +#: ../../Zotlabs/Module/Profiles.php:482 msgid "Political Views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:458 +#: ../../Zotlabs/Module/Profiles.php:486 #: ../../extend/addon/addon/openid/MysqlProvider.php:74 msgid "Gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:462 +#: ../../Zotlabs/Module/Profiles.php:490 msgid "Sexual Preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:466 +#: ../../Zotlabs/Module/Profiles.php:494 msgid "Homepage" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:470 +#: ../../Zotlabs/Module/Profiles.php:498 msgid "Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:566 +#: ../../Zotlabs/Module/Profiles.php:594 msgid "Profile updated." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:650 +#: ../../Zotlabs/Module/Profiles.php:678 msgid "Hide your connections list from viewers of this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:692 +#: ../../Zotlabs/Module/Profiles.php:720 msgid "Edit Profile Details" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:694 +#: ../../Zotlabs/Module/Profiles.php:722 msgid "View this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:695 ../../Zotlabs/Module/Profiles.php:777 +#: ../../Zotlabs/Module/Profiles.php:723 ../../Zotlabs/Module/Profiles.php:805 #: ../../include/channel.php:983 msgid "Edit visibility" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:696 +#: ../../Zotlabs/Module/Profiles.php:724 msgid "Profile Tools" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:697 +#: ../../Zotlabs/Module/Profiles.php:725 msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:698 ../../include/channel.php:954 +#: ../../Zotlabs/Module/Profiles.php:726 ../../include/channel.php:954 msgid "Change profile photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:699 +#: ../../Zotlabs/Module/Profiles.php:727 msgid "Create a new profile using these settings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:700 +#: ../../Zotlabs/Module/Profiles.php:728 msgid "Clone this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:701 +#: ../../Zotlabs/Module/Profiles.php:729 msgid "Delete this profile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:702 +#: ../../Zotlabs/Module/Profiles.php:730 msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:703 ../../include/conversation.php:1715 +#: ../../Zotlabs/Module/Profiles.php:731 ../../include/conversation.php:1715 #: ../../include/widgets.php:105 msgid "Personal" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:705 +#: ../../Zotlabs/Module/Profiles.php:733 msgid "Relation" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:706 ../../include/datetime.php:55 +#: ../../Zotlabs/Module/Profiles.php:734 ../../include/datetime.php:55 msgid "Miscellaneous" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:708 +#: ../../Zotlabs/Module/Profiles.php:736 msgid "Import profile from file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:709 +#: ../../Zotlabs/Module/Profiles.php:737 msgid "Export profile to file" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:710 +#: ../../Zotlabs/Module/Profiles.php:738 msgid "Your gender" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:711 +#: ../../Zotlabs/Module/Profiles.php:739 msgid "Marital status" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:712 +#: ../../Zotlabs/Module/Profiles.php:740 msgid "Sexual preference" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:715 +#: ../../Zotlabs/Module/Profiles.php:743 msgid "Profile name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:717 +#: ../../Zotlabs/Module/Profiles.php:745 msgid "This is your default profile." msgstr "" -#: ../../Zotlabs/Module/Profiles.php:719 +#: ../../Zotlabs/Module/Profiles.php:747 msgid "Your full name" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:720 +#: ../../Zotlabs/Module/Profiles.php:748 msgid "Title/Description" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:723 +#: ../../Zotlabs/Module/Profiles.php:751 msgid "Street address" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:724 +#: ../../Zotlabs/Module/Profiles.php:752 msgid "Locality/City" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:725 +#: ../../Zotlabs/Module/Profiles.php:753 msgid "Region/State" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:726 +#: ../../Zotlabs/Module/Profiles.php:754 msgid "Postal/Zip code" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:760 msgid "Who (if applicable)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:732 +#: ../../Zotlabs/Module/Profiles.php:760 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:733 +#: ../../Zotlabs/Module/Profiles.php:761 msgid "Since (date)" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 +#: ../../Zotlabs/Module/Profiles.php:764 msgid "Tell us about yourself" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:737 +#: ../../Zotlabs/Module/Profiles.php:765 #: ../../extend/addon/addon/openid/MysqlProvider.php:68 msgid "Homepage URL" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:738 +#: ../../Zotlabs/Module/Profiles.php:766 msgid "Hometown" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:739 +#: ../../Zotlabs/Module/Profiles.php:767 msgid "Political views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:740 +#: ../../Zotlabs/Module/Profiles.php:768 msgid "Religious views" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Keywords used in directory listings" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:741 +#: ../../Zotlabs/Module/Profiles.php:769 msgid "Example: fishing photography software" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:744 +#: ../../Zotlabs/Module/Profiles.php:772 msgid "Musical interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:745 +#: ../../Zotlabs/Module/Profiles.php:773 msgid "Books, literature" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:746 +#: ../../Zotlabs/Module/Profiles.php:774 msgid "Television" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:747 +#: ../../Zotlabs/Module/Profiles.php:775 msgid "Film/Dance/Culture/Entertainment" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:748 +#: ../../Zotlabs/Module/Profiles.php:776 msgid "Hobbies/Interests" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:749 +#: ../../Zotlabs/Module/Profiles.php:777 msgid "Love/Romance" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:751 +#: ../../Zotlabs/Module/Profiles.php:779 msgid "School/Education" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:752 +#: ../../Zotlabs/Module/Profiles.php:780 msgid "Contact information and social networks" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:753 +#: ../../Zotlabs/Module/Profiles.php:781 msgid "My other channels" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:773 ../../include/channel.php:979 +#: ../../Zotlabs/Module/Profiles.php:801 ../../include/channel.php:979 msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:783 ../../include/nav.php:91 +#: ../../Zotlabs/Module/Profiles.php:811 ../../include/nav.php:91 #: ../../include/channel.php:961 msgid "Edit Profiles" msgstr "" @@ -4615,7 +4629,7 @@ msgstr "" msgid "Site Name" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1962 +#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1966 msgid "Administrator" msgstr "" @@ -5150,6 +5164,10 @@ msgid "" "to correctly use this feature." msgstr "" +#: ../../Zotlabs/Module/Profile.php:78 +msgid "vcard" +msgstr "" + #: ../../Zotlabs/Module/Apps.php:46 ../../include/nav.php:166 #: ../../include/widgets.php:102 msgid "Apps" @@ -5203,7 +5221,7 @@ msgid "Optionally explain your rating (this information is public)" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:186 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:293 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:296 msgid "" "Shift-reload the page or clear browser cache if the new photo does not " "display immediately." @@ -5218,8 +5236,8 @@ msgid "Upload Profile Photo" msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:410 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:181 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:193 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:182 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:194 msgid "Use" msgstr "" @@ -5379,7 +5397,7 @@ msgstr "" msgid "Profile Visibility Editor" msgstr "" -#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1282 +#: ../../Zotlabs/Module/Profperm.php:117 ../../include/channel.php:1284 msgid "Profile" msgstr "" @@ -5391,9 +5409,9 @@ msgstr "" msgid "Visible To" msgstr "" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Wiki.php:20 -#: ../../Zotlabs/Module/Chat.php:25 +#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25 #: ../../extend/addon/addon/chess/chess.php:400 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:26 msgid "You must be logged in to see this page." msgstr "" @@ -5433,7 +5451,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1729 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1730 msgid "Password Reset" msgstr "" @@ -5868,128 +5886,197 @@ msgstr "" msgid "Remove this file" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:34 +#: ../../Zotlabs/Module/Wiki.php:24 +msgid "Profile Unavailable." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:38 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:40 msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:55 +#: ../../Zotlabs/Module/Wiki.php:60 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:60 msgid "Invalid channel" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:100 +#: ../../Zotlabs/Module/Wiki.php:112 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:105 msgid "Error retrieving wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:107 +#: ../../Zotlabs/Module/Wiki.php:119 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:112 msgid "Error creating zip file export folder" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:125 +#: ../../Zotlabs/Module/Wiki.php:137 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:130 msgid "Error downloading wiki: " msgstr "" -#: ../../Zotlabs/Module/Wiki.php:139 ../../include/nav.php:111 -#: ../../include/conversation.php:1900 +#: ../../Zotlabs/Module/Wiki.php:151 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:144 +#: ../../include/nav.php:111 ../../include/conversation.php:1900 msgid "Wikis" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:145 +#: ../../Zotlabs/Module/Wiki.php:157 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:150 msgid "Download" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:149 +#: ../../Zotlabs/Module/Wiki.php:161 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154 msgid "Wiki name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:150 +#: ../../Zotlabs/Module/Wiki.php:162 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155 msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:159 +#: ../../Zotlabs/Module/Wiki.php:171 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:164 msgid "Create a status post for this wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:178 +#: ../../Zotlabs/Module/Wiki.php:196 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:183 msgid "Wiki not found" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:203 +#: ../../Zotlabs/Module/Wiki.php:220 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:208 msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:207 +#: ../../Zotlabs/Module/Wiki.php:224 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:212 msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:236 +#: ../../Zotlabs/Module/Wiki.php:254 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:241 msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:237 +#: ../../Zotlabs/Module/Wiki.php:255 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242 msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:246 +#: ../../Zotlabs/Module/Wiki.php:259 +msgid "Short description of your changes (optional)" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:266 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:251 msgid "Source" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:254 +#: ../../Zotlabs/Module/Wiki.php:274 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:259 msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:259 ../../include/conversation.php:1299 +#: ../../Zotlabs/Module/Wiki.php:279 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:264 +#: ../../include/conversation.php:1299 msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:260 ../../include/conversation.php:1393 +#: ../../Zotlabs/Module/Wiki.php:280 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265 +#: ../../include/conversation.php:1393 msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:262 ../../include/conversation.php:1395 -#: ../../include/conversation.php:1442 +#: ../../Zotlabs/Module/Wiki.php:282 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267 +#: ../../include/conversation.php:1395 ../../include/conversation.php:1442 msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:263 ../../include/conversation.php:1335 +#: ../../Zotlabs/Module/Wiki.php:283 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268 +#: ../../include/conversation.php:1335 msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:264 ../../include/conversation.php:1336 +#: ../../Zotlabs/Module/Wiki.php:284 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269 +#: ../../include/conversation.php:1336 msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:265 +#: ../../Zotlabs/Module/Wiki.php:285 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270 msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:266 ../../include/conversation.php:1338 +#: ../../Zotlabs/Module/Wiki.php:286 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271 +#: ../../include/conversation.php:1338 msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:267 ../../include/conversation.php:1339 +#: ../../Zotlabs/Module/Wiki.php:287 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272 +#: ../../include/conversation.php:1339 msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:268 ../../include/conversation.php:1340 +#: ../../Zotlabs/Module/Wiki.php:288 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273 +#: ../../include/conversation.php:1340 msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:332 +#: ../../Zotlabs/Module/Wiki.php:353 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337 msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:343 +#: ../../Zotlabs/Module/Wiki.php:364 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348 msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:348 +#: ../../Zotlabs/Module/Wiki.php:370 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353 msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:394 +#: ../../Zotlabs/Module/Wiki.php:382 +msgid "Wiki delete permission denied." +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:391 +msgid "Error deleting wiki" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:418 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400 msgid "New page created" msgstr "" +#: ../../Zotlabs/Module/Wiki.php:530 +msgid "Cannot delete Home" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:600 +msgid "Current Revision" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:600 +msgid "Selected Revision" +msgstr "" + +#: ../../Zotlabs/Module/Wiki.php:650 +msgid "You must be authenticated." +msgstr "" + #: ../../Zotlabs/Module/Sources.php:37 msgid "Failed to create source. No channel selected." msgstr "" @@ -6007,7 +6094,7 @@ msgid "*" msgstr "" #: ../../Zotlabs/Module/Sources.php:96 ../../include/features.php:204 -#: ../../include/widgets.php:672 +#: ../../include/widgets.php:675 msgid "Channel Sources" msgstr "" @@ -6084,7 +6171,7 @@ msgid "" "hours." msgstr "" -#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:149 +#: ../../Zotlabs/Module/Suggest.php:58 ../../include/widgets.php:150 msgid "Ignore/Hide" msgstr "" @@ -6097,7 +6184,7 @@ msgstr "" msgid "comment" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:100 +#: ../../Zotlabs/Module/Tagger.php:95 #, php-format msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" @@ -6772,7 +6859,7 @@ msgid "" "Examples:" msgstr "" -#: ../../Zotlabs/Module/Settings/Tokens.php:150 ../../include/widgets.php:647 +#: ../../Zotlabs/Module/Settings/Tokens.php:150 ../../include/widgets.php:650 msgid "Guest Access Tokens" msgstr "" @@ -7047,32 +7134,32 @@ msgstr "" msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Item.php:448 +#: ../../Zotlabs/Module/Item.php:450 msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Item.php:490 +#: ../../Zotlabs/Module/Item.php:492 msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../Zotlabs/Module/Item.php:838 +#: ../../Zotlabs/Module/Item.php:842 msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Item.php:980 +#: ../../Zotlabs/Module/Item.php:984 msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Item.php:1110 +#: ../../Zotlabs/Module/Item.php:1114 msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Item.php:1117 +#: ../../Zotlabs/Module/Item.php:1121 #, php-format msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Item.php:1124 +#: ../../Zotlabs/Module/Item.php:1128 #, php-format msgid "You have reached your limit of %1$.0f webpages." msgstr "" @@ -7097,22 +7184,22 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1914 +#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1918 msgid "$Projectname Notification" msgstr "" #: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46 #: ../../extend/addon/addon/diaspora/util.php:218 #: ../../extend/addon/addon/diaspora/util.php:231 -#: ../../include/network.php:1915 +#: ../../include/network.php:1919 msgid "$projectname" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1917 +#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1921 msgid "Thank You," msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1919 +#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1923 #, php-format msgid "%s Administrator" msgstr "" @@ -7382,114 +7469,6 @@ msgstr "" msgid "This is your default setting for the audience of your webpages" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:207 -msgid "Site Admin" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:208 -#: ../../extend/addon/addon/buglink/buglink.php:16 -msgid "Report Bug" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:209 -msgid "View Bookmarks" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:210 -msgid "My Chatrooms" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:212 -msgid "Firefox Share" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:213 -msgid "Remote Diagnostics" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:214 ../../include/features.php:328 -msgid "Suggest Channels" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:115 -#: ../../boot.php:1721 -msgid "Login" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:182 -msgid "Grid" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:221 ../../include/features.php:99 -#: ../../include/conversation.php:1903 -msgid "Wiki" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:185 -msgid "Channel Home" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:204 -#: ../../include/conversation.php:1853 ../../include/conversation.php:1856 -msgid "Events" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:170 -msgid "Directory" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:196 -msgid "Mail" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:99 -msgid "Chat" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:233 -msgid "Probe" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:234 -msgid "Suggest" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:235 -msgid "Random Channel" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:236 -msgid "Invite" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:237 ../../include/widgets.php:1565 -msgid "Features" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:238 -#: ../../extend/addon/addon/openid/MysqlProvider.php:69 -msgid "Language" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:239 -msgid "Post" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:240 -#: ../../extend/addon/addon/openid/MysqlProvider.php:58 -#: ../../extend/addon/addon/openid/MysqlProvider.php:59 -#: ../../extend/addon/addon/openid/MysqlProvider.php:60 -msgid "Profile Photo" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:344 -msgid "Purchase" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:348 -msgid "Undelete" -msgstr "" - #: ../../Zotlabs/Lib/ThreadItem.php:95 ../../include/conversation.php:663 msgid "Private Message" msgstr "" @@ -7683,11 +7662,177 @@ msgstr "" msgid "Video" msgstr "" -#: ../../Zotlabs/Lib/NativeWiki.php:575 ../../include/bbcode.php:576 -#: ../../include/bbcode.php:719 ../../include/wiki.php:572 +#: ../../Zotlabs/Lib/NativeWikiPage.php:31 +#: ../../Zotlabs/Lib/NativeWikiPage.php:62 +msgid "(No Title)" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:85 +msgid "Wiki not found." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:96 +msgid "Destination name already exists" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:122 +#: ../../Zotlabs/Lib/NativeWikiPage.php:337 +msgid "Page not found" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:151 +msgid "Error reading page content" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:330 +#: ../../Zotlabs/Lib/NativeWikiPage.php:375 +#: ../../Zotlabs/Lib/NativeWikiPage.php:444 +#: ../../Zotlabs/Lib/NativeWikiPage.php:486 +msgid "Error reading wiki" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:363 +msgid "Page update failed." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:399 +msgid "Nothing deleted" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:465 +msgid "Compare: object not found." +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:471 +msgid "Page updated" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:474 +msgid "Untitled" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:480 +msgid "Wiki resource_id required for git commit" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:546 +#: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579 +#: ../../include/bbcode.php:576 ../../include/bbcode.php:719 msgid "Different viewers will see this text differently" msgstr "" +#: ../../Zotlabs/Lib/NativeWiki.php:116 +msgid "Wiki files deleted successfully" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:207 +msgid "Site Admin" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:208 +#: ../../extend/addon/addon/buglink/buglink.php:16 +msgid "Report Bug" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:209 +msgid "View Bookmarks" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:210 +msgid "My Chatrooms" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:212 +msgid "Firefox Share" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:213 +msgid "Remote Diagnostics" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:214 ../../include/features.php:328 +msgid "Suggest Channels" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:215 ../../include/nav.php:115 +#: ../../boot.php:1722 +msgid "Login" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:217 ../../include/nav.php:182 +msgid "Grid" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:221 ../../include/features.php:99 +#: ../../include/conversation.php:1903 +msgid "Wiki" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:222 ../../include/nav.php:185 +msgid "Channel Home" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:204 +#: ../../include/conversation.php:1853 ../../include/conversation.php:1856 +msgid "Events" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:226 ../../include/nav.php:170 +msgid "Directory" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:196 +msgid "Mail" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:99 +msgid "Chat" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:233 +msgid "Probe" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:234 +msgid "Suggest" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:235 +msgid "Random Channel" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:236 +msgid "Invite" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:237 ../../include/widgets.php:1576 +msgid "Features" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:238 +#: ../../extend/addon/addon/openid/MysqlProvider.php:69 +msgid "Language" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:239 +msgid "Post" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:240 +#: ../../extend/addon/addon/openid/MysqlProvider.php:58 +#: ../../extend/addon/addon/openid/MysqlProvider.php:59 +#: ../../extend/addon/addon/openid/MysqlProvider.php:60 +msgid "Profile Photo" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:344 +msgid "Purchase" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:348 +msgid "Undelete" +msgstr "" + #: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24 msgid "Flag Adult Photos" msgstr "" @@ -8245,7 +8390,7 @@ msgid "Add a personal note:" msgstr "" #: ../../extend/addon/addon/friendica/dfrn_request.php:871 -#: ../../include/network.php:2232 ../../include/network.php:2233 +#: ../../include/network.php:2236 ../../include/network.php:2237 msgid "Friendica" msgstr "" @@ -8254,7 +8399,7 @@ msgid "StatusNet/Federated Social Web" msgstr "" #: ../../extend/addon/addon/friendica/dfrn_request.php:873 -#: ../../include/network.php:2238 +#: ../../include/network.php:2242 msgid "Diaspora" msgstr "" @@ -8919,106 +9064,106 @@ msgstr "" msgid "%s - click to open/close" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:49 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:127 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:50 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:128 msgid "System defaults:" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:53 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:54 msgid "Preferred Clipart IDs" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:53 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:54 msgid "List of preferred clipart ids. These will be shown first." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:54 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:55 msgid "Default Search Term" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:54 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:55 msgid "The default search term. These will be shown second." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:55 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 msgid "Return After" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:55 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:56 msgid "Page to load after image selection." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:57 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:58 #: ../../include/nav.php:93 ../../include/channel.php:965 msgid "Edit Profile" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:58 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:59 msgid "Profile List" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:60 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:61 msgid "Order of Preferred" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:60 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:61 msgid "Sort order of preferred clipart ids." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:61 -#: ../../extend/addon/addon/openclipatar/openclipatar.php:67 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:62 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:68 msgid "Newest first" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:64 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:65 msgid "As entered" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:66 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:67 msgid "Order of other" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:66 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:67 msgid "Sort order of other clipart ids." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:68 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:69 msgid "Most downloaded first" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:69 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:70 msgid "Most liked first" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:71 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:72 msgid "Preferred IDs Message" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:71 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:72 msgid "Message to display above preferred results." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:77 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:78 msgid "Uploaded by: " msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:77 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:78 msgid "Drawn by: " msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:191 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:192 msgid "Or select from a free OpenClipart.org image:" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:194 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:195 msgid "Search Term" msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:216 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:232 msgid "Unknown error. Please try again later." msgstr "" -#: ../../extend/addon/addon/openclipatar/openclipatar.php:303 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:306 msgid "Profile photo updated successfully." msgstr "" @@ -10182,22 +10327,22 @@ msgid "CalDAV/CardDAV Settings" msgstr "" #: ../../extend/addon/addon/cdav/cdav.php:272 -#: ../../include/connections.php:858 +#: ../../include/connections.php:864 msgid "Home, Voice" msgstr "" #: ../../extend/addon/addon/cdav/cdav.php:273 -#: ../../include/connections.php:859 +#: ../../include/connections.php:865 msgid "Home, Fax" msgstr "" #: ../../extend/addon/addon/cdav/cdav.php:275 -#: ../../include/connections.php:861 +#: ../../include/connections.php:867 msgid "Work, Voice" msgstr "" #: ../../extend/addon/addon/cdav/cdav.php:276 -#: ../../include/connections.php:862 +#: ../../include/connections.php:868 msgid "Work, Fax" msgstr "" @@ -10501,6 +10646,26 @@ msgid "" "share their own locations with the group." msgstr "" +#: ../../extend/addon/addon/gitwiki/gitwiki.php:76 +#: ../../include/widgets.php:952 +msgid "Wiki Pages" +msgstr "" + +#: ../../extend/addon/addon/gitwiki/gitwiki.php:81 +#: ../../include/widgets.php:957 +msgid "Add new page" +msgstr "" + +#: ../../extend/addon/addon/gitwiki/gitwiki.php:82 +#: ../../include/widgets.php:958 +msgid "Page name" +msgstr "" + +#: ../../extend/addon/addon/gitwiki/gitwiki.php:95 +#: ../../include/widgets.php:911 +msgid "Wiki List" +msgstr "" + #: ../../include/Import/import_diaspora.php:16 msgid "No username found in import file." msgstr "" @@ -10660,7 +10825,7 @@ msgstr "" #: ../../include/taxonomy.php:188 ../../include/taxonomy.php:270 #: ../../include/contact_widgets.php:91 ../../include/widgets.php:46 -#: ../../include/widgets.php:465 +#: ../../include/widgets.php:468 msgid "Categories" msgstr "" @@ -10708,7 +10873,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:286 ../../boot.php:2565 +#: ../../include/datetime.php:286 ../../boot.php:2566 msgid "never" msgstr "" @@ -11053,7 +11218,7 @@ msgstr "" msgid "%1$s's bookmarks" msgstr "" -#: ../../include/nav.php:85 ../../include/nav.php:118 ../../boot.php:1720 +#: ../../include/nav.php:85 ../../include/nav.php:118 ../../boot.php:1721 msgid "Logout" msgstr "" @@ -11185,15 +11350,15 @@ msgstr "" msgid "Mark all private messages seen" msgstr "" -#: ../../include/nav.php:199 ../../include/widgets.php:700 +#: ../../include/nav.php:199 ../../include/widgets.php:703 msgid "Inbox" msgstr "" -#: ../../include/nav.php:200 ../../include/widgets.php:705 +#: ../../include/nav.php:200 ../../include/widgets.php:708 msgid "Outbox" msgstr "" -#: ../../include/nav.php:201 ../../include/widgets.php:710 +#: ../../include/nav.php:201 ../../include/widgets.php:713 msgid "New Message" msgstr "" @@ -11217,7 +11382,7 @@ msgstr "" msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:219 ../../include/widgets.php:1595 +#: ../../include/nav.php:219 ../../include/widgets.php:1606 msgid "Admin" msgstr "" @@ -11225,15 +11390,19 @@ msgstr "" msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:250 ../../include/conversation.php:836 +#: ../../include/nav.php:247 +msgid "Documentation" +msgstr "" + +#: ../../include/nav.php:251 ../../include/conversation.php:836 msgid "Loading..." msgstr "" -#: ../../include/nav.php:255 +#: ../../include/nav.php:256 msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:256 +#: ../../include/nav.php:257 msgid "Please wait..." msgstr "" @@ -11432,7 +11601,7 @@ msgstr "" msgid "Enable management and selection of privacy groups" msgstr "" -#: ../../include/features.php:292 ../../include/widgets.php:283 +#: ../../include/features.php:292 ../../include/widgets.php:284 msgid "Saved Searches" msgstr "" @@ -11505,7 +11674,7 @@ msgid "Add emoji reaction ability to posts" msgstr "" #: ../../include/features.php:381 ../../include/contact_widgets.php:53 -#: ../../include/widgets.php:346 +#: ../../include/widgets.php:347 msgid "Saved Folders" msgstr "" @@ -11603,7 +11772,7 @@ msgid "Advanced example: name=fred and country=iceland" msgstr "" #: ../../include/contact_widgets.php:56 ../../include/contact_widgets.php:94 -#: ../../include/widgets.php:349 ../../include/widgets.php:468 +#: ../../include/widgets.php:350 ../../include/widgets.php:471 msgid "Everything" msgstr "" @@ -12175,7 +12344,7 @@ msgstr "" msgid "School/education:" msgstr "" -#: ../../include/channel.php:1284 +#: ../../include/channel.php:1286 msgid "Like this thing" msgstr "" @@ -12308,46 +12477,6 @@ msgstr "" msgid "Cannot connect to yourself." msgstr "" -#: ../../include/network.php:729 -msgid "view full size" -msgstr "" - -#: ../../include/network.php:1978 -msgid "No Subject" -msgstr "" - -#: ../../include/network.php:2234 -msgid "OStatus" -msgstr "" - -#: ../../include/network.php:2235 -msgid "GNU-Social" -msgstr "" - -#: ../../include/network.php:2236 -msgid "RSS/Atom" -msgstr "" - -#: ../../include/network.php:2239 -msgid "Facebook" -msgstr "" - -#: ../../include/network.php:2240 -msgid "Zot" -msgstr "" - -#: ../../include/network.php:2241 -msgid "LinkedIn" -msgstr "" - -#: ../../include/network.php:2242 -msgid "XMPP/IM" -msgstr "" - -#: ../../include/network.php:2243 -msgid "MySpace" -msgstr "" - #: ../../include/conversation.php:204 #, php-format msgid "%1$s is now connected with %2$s" @@ -12573,7 +12702,7 @@ msgstr "" msgid "Profile Details" msgstr "" -#: ../../include/conversation.php:1839 ../../include/photos.php:508 +#: ../../include/conversation.php:1839 ../../include/photos.php:515 msgid "Photo Albums" msgstr "" @@ -12582,7 +12711,7 @@ msgid "Files and Storage" msgstr "" #: ../../include/conversation.php:1866 ../../include/conversation.php:1869 -#: ../../include/widgets.php:883 +#: ../../include/widgets.php:886 msgid "Chatrooms" msgstr "" @@ -12928,370 +13057,403 @@ msgstr "" msgid "Channels not in any privacy group" msgstr "" -#: ../../include/group.php:316 ../../include/widgets.php:284 +#: ../../include/group.php:316 ../../include/widgets.php:285 msgid "add" msgstr "" -#: ../../include/widgets.php:103 -msgid "System" +#: ../../include/permissions.php:35 +msgid "Can view my normal stream and posts" msgstr "" -#: ../../include/widgets.php:106 -msgid "New App" +#: ../../include/permissions.php:39 +msgid "Can view my webpages" msgstr "" -#: ../../include/widgets.php:154 -msgid "Suggestions" +#: ../../include/permissions.php:43 +msgid "Can post on my channel page (\"wall\")" msgstr "" -#: ../../include/widgets.php:155 -msgid "See more..." +#: ../../include/permissions.php:46 +msgid "Can like/dislike stuff" msgstr "" -#: ../../include/widgets.php:175 -#, php-format -msgid "You have %1$.0f of %2$.0f allowed connections." +#: ../../include/permissions.php:46 +msgid "Profiles and things other than posts/comments" msgstr "" -#: ../../include/widgets.php:181 -msgid "Add New Connection" +#: ../../include/permissions.php:48 +msgid "Can forward to all my channel contacts via post @mentions" msgstr "" -#: ../../include/widgets.php:182 -msgid "Enter channel address" +#: ../../include/permissions.php:48 +msgid "Advanced - useful for creating group forum channels" msgstr "" -#: ../../include/widgets.php:183 -msgid "Examples: bob@example.com, https://example.com/barbara" +#: ../../include/permissions.php:49 +msgid "Can chat with me (when available)" msgstr "" -#: ../../include/widgets.php:199 -msgid "Notes" +#: ../../include/permissions.php:50 +msgid "Can write to my file storage and photos" msgstr "" -#: ../../include/widgets.php:275 -msgid "Remove term" +#: ../../include/permissions.php:51 +msgid "Can edit my webpages" msgstr "" -#: ../../include/widgets.php:390 -msgid "Archives" +#: ../../include/permissions.php:53 +msgid "Somewhat advanced - very useful in open communities" msgstr "" -#: ../../include/widgets.php:552 -msgid "Refresh" +#: ../../include/permissions.php:55 +msgid "Can administer my channel resources" msgstr "" -#: ../../include/widgets.php:592 -msgid "Account settings" +#: ../../include/permissions.php:55 +msgid "Extremely advanced. Leave this alone unless you know what you are doing" msgstr "" -#: ../../include/widgets.php:598 -msgid "Channel settings" +#: ../../include/import.php:30 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../include/widgets.php:607 -msgid "Additional features" +#: ../../include/import.php:90 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../include/widgets.php:614 -msgid "Feature/Addon settings" +#: ../../include/import.php:1367 +msgid "Unable to import element \"" msgstr "" -#: ../../include/widgets.php:620 -msgid "Display settings" +#: ../../include/items.php:837 ../../include/items.php:882 +msgid "(Unknown)" msgstr "" -#: ../../include/widgets.php:627 -msgid "Manage locations" +#: ../../include/items.php:1080 +msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/widgets.php:634 -msgid "Export channel" +#: ../../include/items.php:1082 +msgid "Visible to you only." msgstr "" -#: ../../include/widgets.php:640 -msgid "Connected apps" +#: ../../include/items.php:1084 +msgid "Visible to anybody in this network." msgstr "" -#: ../../include/widgets.php:664 -msgid "Premium Channel Settings" +#: ../../include/items.php:1086 +msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/widgets.php:693 -msgid "Private Mail Menu" +#: ../../include/items.php:1088 +#, php-format +msgid "Visible to anybody on %s." msgstr "" -#: ../../include/widgets.php:695 -msgid "Combined View" +#: ../../include/items.php:1090 +msgid "Visible to all connections." msgstr "" -#: ../../include/widgets.php:727 ../../include/widgets.php:739 -msgid "Conversations" +#: ../../include/items.php:1092 +msgid "Visible to approved connections." msgstr "" -#: ../../include/widgets.php:731 -msgid "Received Messages" +#: ../../include/items.php:1094 +msgid "Visible to specific connections." msgstr "" -#: ../../include/widgets.php:735 -msgid "Sent Messages" +#: ../../include/items.php:3899 +msgid "Privacy group is empty." msgstr "" -#: ../../include/widgets.php:749 -msgid "No messages." +#: ../../include/items.php:3906 +#, php-format +msgid "Privacy group: %s" msgstr "" -#: ../../include/widgets.php:767 -msgid "Delete conversation" +#: ../../include/items.php:3918 +msgid "Connection not found." msgstr "" -#: ../../include/widgets.php:793 -msgid "Events Tools" +#: ../../include/items.php:4267 +msgid "profile photo" msgstr "" -#: ../../include/widgets.php:794 -msgid "Export Calendar" +#: ../../include/items.php:4463 +#, php-format +msgid "[Edited %s]" msgstr "" -#: ../../include/widgets.php:795 -msgid "Import Calendar" +#: ../../include/items.php:4463 +msgctxt "edit_activity" +msgid "Post" msgstr "" -#: ../../include/widgets.php:887 -msgid "Overview" +#: ../../include/items.php:4463 +msgctxt "edit_activity" +msgid "Comment" msgstr "" -#: ../../include/widgets.php:894 -msgid "Chat Members" +#: ../../include/photos.php:115 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/widgets.php:906 -msgid "Wiki List" +#: ../../include/photos.php:122 +msgid "Image file is empty." msgstr "" -#: ../../include/widgets.php:944 -msgid "Wiki Pages" +#: ../../include/photos.php:260 +msgid "Photo storage failed." msgstr "" -#: ../../include/widgets.php:949 -msgid "Add new page" +#: ../../include/photos.php:300 +msgid "a new photo" msgstr "" -#: ../../include/widgets.php:950 -msgid "Page name" +#: ../../include/photos.php:304 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/widgets.php:983 -msgid "Bookmarked Chatrooms" +#: ../../include/photos.php:519 +msgid "Upload New Photos" msgstr "" -#: ../../include/widgets.php:1014 -msgid "Suggested Chatrooms" +#: ../../include/network.php:733 +msgid "view full size" msgstr "" -#: ../../include/widgets.php:1159 ../../include/widgets.php:1271 -msgid "photo/image" +#: ../../include/network.php:1982 +msgid "No Subject" msgstr "" -#: ../../include/widgets.php:1214 -msgid "Click to show more" +#: ../../include/network.php:2238 +msgid "OStatus" msgstr "" -#: ../../include/widgets.php:1365 -msgid "Rating Tools" +#: ../../include/network.php:2239 +msgid "GNU-Social" msgstr "" -#: ../../include/widgets.php:1369 ../../include/widgets.php:1371 -msgid "Rate Me" +#: ../../include/network.php:2240 +msgid "RSS/Atom" msgstr "" -#: ../../include/widgets.php:1374 -msgid "View Ratings" +#: ../../include/network.php:2243 +msgid "Facebook" msgstr "" -#: ../../include/widgets.php:1467 -msgid "Forums" +#: ../../include/network.php:2244 +msgid "Zot" msgstr "" -#: ../../include/widgets.php:1496 -msgid "Tasks" +#: ../../include/network.php:2245 +msgid "LinkedIn" msgstr "" -#: ../../include/widgets.php:1562 ../../include/widgets.php:1600 -msgid "Member registrations waiting for confirmation" +#: ../../include/network.php:2246 +msgid "XMPP/IM" msgstr "" -#: ../../include/widgets.php:1568 -msgid "Inspect queue" +#: ../../include/network.php:2247 +msgid "MySpace" msgstr "" -#: ../../include/widgets.php:1570 -msgid "DB updates" +#: ../../include/widgets.php:103 +msgid "System" msgstr "" -#: ../../include/widgets.php:1596 -msgid "Plugin Features" +#: ../../include/widgets.php:106 +msgid "New App" msgstr "" -#: ../../include/permissions.php:35 -msgid "Can view my normal stream and posts" +#: ../../include/widgets.php:107 +msgid "Edit Apps" msgstr "" -#: ../../include/permissions.php:39 -msgid "Can view my webpages" +#: ../../include/widgets.php:155 +msgid "Suggestions" msgstr "" -#: ../../include/permissions.php:43 -msgid "Can post on my channel page (\"wall\")" +#: ../../include/widgets.php:156 +msgid "See more..." msgstr "" -#: ../../include/permissions.php:46 -msgid "Can like/dislike stuff" +#: ../../include/widgets.php:176 +#, php-format +msgid "You have %1$.0f of %2$.0f allowed connections." msgstr "" -#: ../../include/permissions.php:46 -msgid "Profiles and things other than posts/comments" +#: ../../include/widgets.php:182 +msgid "Add New Connection" msgstr "" -#: ../../include/permissions.php:48 -msgid "Can forward to all my channel contacts via post @mentions" +#: ../../include/widgets.php:183 +msgid "Enter channel address" msgstr "" -#: ../../include/permissions.php:48 -msgid "Advanced - useful for creating group forum channels" +#: ../../include/widgets.php:184 +msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: ../../include/permissions.php:49 -msgid "Can chat with me (when available)" +#: ../../include/widgets.php:200 +msgid "Notes" msgstr "" -#: ../../include/permissions.php:50 -msgid "Can write to my file storage and photos" +#: ../../include/widgets.php:276 +msgid "Remove term" msgstr "" -#: ../../include/permissions.php:51 -msgid "Can edit my webpages" +#: ../../include/widgets.php:391 +msgid "Archives" msgstr "" -#: ../../include/permissions.php:53 -msgid "Somewhat advanced - very useful in open communities" +#: ../../include/widgets.php:555 +msgid "Refresh" msgstr "" -#: ../../include/permissions.php:55 -msgid "Can administer my channel resources" +#: ../../include/widgets.php:595 +msgid "Account settings" msgstr "" -#: ../../include/permissions.php:55 -msgid "Extremely advanced. Leave this alone unless you know what you are doing" +#: ../../include/widgets.php:601 +msgid "Channel settings" msgstr "" -#: ../../include/import.php:30 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../include/widgets.php:610 +msgid "Additional features" msgstr "" -#: ../../include/import.php:90 -msgid "Channel clone failed. Import failed." +#: ../../include/widgets.php:617 +msgid "Feature/Addon settings" msgstr "" -#: ../../include/import.php:1367 -msgid "Unable to import element \"" +#: ../../include/widgets.php:623 +msgid "Display settings" msgstr "" -#: ../../include/items.php:837 ../../include/items.php:882 -msgid "(Unknown)" +#: ../../include/widgets.php:630 +msgid "Manage locations" msgstr "" -#: ../../include/items.php:1080 -msgid "Visible to anybody on the internet." +#: ../../include/widgets.php:637 +msgid "Export channel" msgstr "" -#: ../../include/items.php:1082 -msgid "Visible to you only." +#: ../../include/widgets.php:643 +msgid "Connected apps" msgstr "" -#: ../../include/items.php:1084 -msgid "Visible to anybody in this network." +#: ../../include/widgets.php:667 +msgid "Premium Channel Settings" msgstr "" -#: ../../include/items.php:1086 -msgid "Visible to anybody authenticated." +#: ../../include/widgets.php:696 +msgid "Private Mail Menu" msgstr "" -#: ../../include/items.php:1088 -#, php-format -msgid "Visible to anybody on %s." +#: ../../include/widgets.php:698 +msgid "Combined View" msgstr "" -#: ../../include/items.php:1090 -msgid "Visible to all connections." +#: ../../include/widgets.php:730 ../../include/widgets.php:742 +msgid "Conversations" msgstr "" -#: ../../include/items.php:1092 -msgid "Visible to approved connections." +#: ../../include/widgets.php:734 +msgid "Received Messages" msgstr "" -#: ../../include/items.php:1094 -msgid "Visible to specific connections." +#: ../../include/widgets.php:738 +msgid "Sent Messages" msgstr "" -#: ../../include/items.php:3892 -msgid "Privacy group is empty." +#: ../../include/widgets.php:752 +msgid "No messages." msgstr "" -#: ../../include/items.php:3899 -#, php-format -msgid "Privacy group: %s" +#: ../../include/widgets.php:770 +msgid "Delete conversation" msgstr "" -#: ../../include/items.php:3911 -msgid "Connection not found." +#: ../../include/widgets.php:796 +msgid "Events Tools" msgstr "" -#: ../../include/items.php:4260 -msgid "profile photo" +#: ../../include/widgets.php:797 +msgid "Export Calendar" msgstr "" -#: ../../include/items.php:4456 -#, php-format -msgid "[Edited %s]" +#: ../../include/widgets.php:798 +msgid "Import Calendar" msgstr "" -#: ../../include/items.php:4456 -msgctxt "edit_activity" -msgid "Post" +#: ../../include/widgets.php:890 +msgid "Overview" msgstr "" -#: ../../include/items.php:4456 -msgctxt "edit_activity" -msgid "Comment" +#: ../../include/widgets.php:897 +msgid "Chat Members" msgstr "" -#: ../../include/photos.php:115 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../include/widgets.php:972 +msgctxt "wiki_history" +msgid "Message" msgstr "" -#: ../../include/photos.php:122 -msgid "Image file is empty." +#: ../../include/widgets.php:994 +msgid "Bookmarked Chatrooms" msgstr "" -#: ../../include/photos.php:260 -msgid "Photo storage failed." +#: ../../include/widgets.php:1025 +msgid "Suggested Chatrooms" msgstr "" -#: ../../include/photos.php:300 -msgid "a new photo" +#: ../../include/widgets.php:1170 ../../include/widgets.php:1282 +msgid "photo/image" msgstr "" -#: ../../include/photos.php:304 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +#: ../../include/widgets.php:1225 +msgid "Click to show more" msgstr "" -#: ../../include/photos.php:512 -msgid "Upload New Photos" +#: ../../include/widgets.php:1376 +msgid "Rating Tools" +msgstr "" + +#: ../../include/widgets.php:1380 ../../include/widgets.php:1382 +msgid "Rate Me" +msgstr "" + +#: ../../include/widgets.php:1385 +msgid "View Ratings" +msgstr "" + +#: ../../include/widgets.php:1478 +msgid "Forums" +msgstr "" + +#: ../../include/widgets.php:1507 +msgid "Tasks" +msgstr "" + +#: ../../include/widgets.php:1573 ../../include/widgets.php:1611 +msgid "Member registrations waiting for confirmation" +msgstr "" + +#: ../../include/widgets.php:1579 +msgid "Inspect queue" +msgstr "" + +#: ../../include/widgets.php:1581 +msgid "DB updates" +msgstr "" + +#: ../../include/widgets.php:1607 +msgid "Plugin Features" msgstr "" #: ../../util/nconfig.php:34 @@ -13430,66 +13592,66 @@ msgstr "" msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1177 +#: ../../boot.php:1178 #, php-format msgctxt "opensearch" msgid "Search %1$s (%2$s)" msgstr "" -#: ../../boot.php:1177 +#: ../../boot.php:1178 msgctxt "opensearch" msgid "$Projectname" msgstr "" -#: ../../boot.php:1495 +#: ../../boot.php:1496 #, php-format msgid "Update %s failed. See error logs." msgstr "" -#: ../../boot.php:1498 +#: ../../boot.php:1499 #, php-format msgid "Update Error at %s" msgstr "" -#: ../../boot.php:1702 +#: ../../boot.php:1703 msgid "" "Create an account to access services and applications within the Hubzilla" msgstr "" -#: ../../boot.php:1723 +#: ../../boot.php:1724 msgid "Login/Email" msgstr "" -#: ../../boot.php:1724 +#: ../../boot.php:1725 msgid "Password" msgstr "" -#: ../../boot.php:1725 +#: ../../boot.php:1726 msgid "Remember me" msgstr "" -#: ../../boot.php:1728 +#: ../../boot.php:1729 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2289 +#: ../../boot.php:2290 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2444 +#: ../../boot.php:2445 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2447 +#: ../../boot.php:2448 #, php-format msgid "[hubzilla] Website SSL error for %s" msgstr "" -#: ../../boot.php:2564 +#: ../../boot.php:2565 msgid "Cron/Scheduled tasks not running." msgstr "" -#: ../../boot.php:2568 +#: ../../boot.php:2569 #, php-format msgid "[hubzilla] Cron tasks not running on %s" msgstr "" diff --git a/view/js/main.js b/view/js/main.js index c67f1c167..2fc912093 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -662,7 +662,13 @@ function updateConvItems(mode,data) { } // auto-scroll to a particular comment in a thread (designated by mid) when in single-thread mode - if($('.item_' + bParam_mid.substring(0,32)).length && !$('.item_' + bParam_mid.substring(0,32)).hasClass('toplevel_item') && mode == 'replace') { + // use the same method to generate the submid as we use in ThreadItem, + // substr(0,32) + base64_encode + replace(['+','='],['','']); + var submid = bParam_mid; + var submid_encoded = ((submid.length) ? submid.substring(0,32) : 'abcdefg'); + submid_encoded = window.btoa(submid_encoded); + submid_encoded = submid_encoded.replace(/[\+\=]/g,''); + if($('.item_' + submid_encoded).length && !$('.item_' + submid_encoded).hasClass('toplevel_item') && mode == 'replace') { if($('.collapsed-comments').length) { var scrolltoid = $('.collapsed-comments').attr('id').substring(19); $('#collapsed-comments-' + scrolltoid + ' .autotime').timeago(); @@ -670,8 +676,8 @@ function updateConvItems(mode,data) { $('#hide-comments-' + scrolltoid).html(aStr.showfewer); $('#hide-comments-total-' + scrolltoid).hide(); } - $('html, body').animate({ scrollTop: $('.item_' + bParam_mid.substring(0,32)).offset().top - $('nav').outerHeight() }, 'slow'); - $('.item_' + bParam_mid.substring(0,32)).addClass('item-highlight'); + $('html, body').animate({ scrollTop: $('.item_' + submid_encoded).offset().top - $('nav').outerHeight() }, 'slow'); + $('.item_' + submid_encoded).addClass('item-highlight'); } $(document.body).trigger("sticky_kit:recalc"); |