diff options
| author | zotlabs <mike@macgirvin.com> | 2017-07-05 20:52:33 -0700 |
|---|---|---|
| committer | zotlabs <mike@macgirvin.com> | 2017-07-05 20:52:33 -0700 |
| commit | 024d2737d001fe1bbae3b4310c7e205d2c014c6f (patch) | |
| tree | a14628c687b021a2414271fa7f607308a2682d49 | |
| parent | b2e5b6c977c8f8af9bfd49dac3ce41a2183025da (diff) | |
| download | volse-hubzilla-024d2737d001fe1bbae3b4310c7e205d2c014c6f.tar.gz volse-hubzilla-024d2737d001fe1bbae3b4310c7e205d2c014c6f.tar.bz2 volse-hubzilla-024d2737d001fe1bbae3b4310c7e205d2c014c6f.zip | |
there was a merge conflict in hmessages.po
| -rw-r--r-- | util/hmessages.po | 8697 |
1 files changed, 3246 insertions, 5451 deletions
diff --git a/util/hmessages.po b/util/hmessages.po index 43ce90835..a11fbec7d 100644 --- a/util/hmessages.po +++ b/util/hmessages.po @@ -6,15 +6,9 @@ #, fuzzy msgid "" msgstr "" -<<<<<<< HEAD -"Project-Id-Version: 5.3\n" +"Project-Id-Version: 5.3.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-07 00:05-0700\n" -======= -"Project-Id-Version: 2.3.5\n" -"Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-05-01 15:36+0200\n" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +"POT-Creation-Date: 2017-07-05 20:52-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -24,622 +18,326 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: ../../Zotlabs/Access/PermissionRoles.php:248 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:946 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Social Networking" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:249 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:946 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Social - Mostly Public" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:250 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:946 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Social - Restricted" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:251 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:946 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Social - Private" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:254 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:947 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Community Forum" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:255 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:947 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Forum - Mostly Public" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:256 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:947 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Forum - Restricted" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:257 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:947 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Forum - Private" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:260 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:948 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Feed Republish" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:261 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:948 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Feed - Mostly Public" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:262 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:948 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Feed - Restricted" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:265 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:949 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Special Purpose" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:266 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:949 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Special - Celebrity/Soapbox" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:267 -<<<<<<< HEAD -======= -#: ../../include/permissions.php:949 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgid "Special - Group Repository" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:270 #: ../../Zotlabs/Module/Register.php:213 ../../Zotlabs/Module/Profiles.php:798 +#: ../../Zotlabs/Module/Connedit.php:931 #: ../../Zotlabs/Module/New_channel.php:132 -#: ../../Zotlabs/Module/Connedit.php:914 #: ../../Zotlabs/Module/Settings/Channel.php:463 -<<<<<<< HEAD -#: ../../extend/addon/addon/cdav/cdav.php:277 -#: ../../extend/addon/addon/cdav/cdav.php:284 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1148 -#: ../../include/connections.php:675 ../../include/connections.php:682 -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -#: ../../include/selectors.php:104 ../../include/selectors.php:140 -======= -#: ../../Zotlabs/Module/Connedit.php:914 ../../Zotlabs/Module/Profiles.php:798 -#: ../../Zotlabs/Module/Register.php:213 ../../addon/cdav/Mod_Cdav.php:1148 -#: ../../addon/cdav/cdav.php:277 ../../addon/cdav/cdav.php:284 -#: ../../include/selectors.php:49 ../../include/selectors.php:66 -#: ../../include/selectors.php:104 ../../include/selectors.php:140 -#: ../../include/permissions.php:950 ../../include/connections.php:675 -#: ../../include/connections.php:682 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../Zotlabs/Module/Cdav.php:1121 ../../include/connections.php:681 +#: ../../include/connections.php:688 ../../include/selectors.php:49 +#: ../../include/selectors.php:66 ../../include/selectors.php:104 +#: ../../include/selectors.php:140 ../../include/event.php:1297 +#: ../../include/event.php:1304 msgid "Other" msgstr "" #: ../../Zotlabs/Access/PermissionRoles.php:271 -<<<<<<< HEAD msgid "Custom/Expert Mode" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:46 +#: ../../Zotlabs/Access/Permissions.php:53 msgid "Can view my channel stream and posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:47 +#: ../../Zotlabs/Access/Permissions.php:54 msgid "Can send me their channel stream and posts" -======= -#: ../../include/permissions.php:950 -msgid "Custom/Expert Mode" -msgstr "" - -#: ../../Zotlabs/Module/Blocks.php:33 ../../Zotlabs/Module/Editlayout.php:31 -#: ../../Zotlabs/Module/Connect.php:17 ../../Zotlabs/Module/Achievements.php:15 -#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Editblock.php:31 -#: ../../Zotlabs/Module/Profile.php:20 ../../Zotlabs/Module/Layouts.php:31 -#: ../../Zotlabs/Module/Editwebpage.php:32 ../../Zotlabs/Module/Webpages.php:33 -#: ../../Zotlabs/Module/Filestorage.php:59 ../../include/channel.php:945 -msgid "Requested profile is not available." -msgstr "" - -#: ../../Zotlabs/Module/Blocks.php:73 ../../Zotlabs/Module/Blocks.php:80 -#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 -#: ../../Zotlabs/Module/Editlayout.php:67 -#: ../../Zotlabs/Module/Editlayout.php:90 ../../Zotlabs/Module/Channel.php:115 -#: ../../Zotlabs/Module/Channel.php:245 ../../Zotlabs/Module/Channel.php:285 -#: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Events.php:271 -#: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Regmod.php:21 -#: ../../Zotlabs/Module/New_channel.php:77 -#: ../../Zotlabs/Module/New_channel.php:104 -#: ../../Zotlabs/Module/Sharedwithme.php:11 ../../Zotlabs/Module/Setup.php:212 -#: ../../Zotlabs/Module/Achievements.php:34 ../../Zotlabs/Module/Thing.php:274 -#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 -#: ../../Zotlabs/Module/Api.php:24 ../../Zotlabs/Module/Editblock.php:67 -#: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100 -#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Connections.php:29 -#: ../../Zotlabs/Module/Viewsrc.php:19 ../../Zotlabs/Module/Bookmarks.php:61 -#: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Wiki.php:50 -#: ../../Zotlabs/Module/Wiki.php:216 ../../Zotlabs/Module/Wiki.php:315 -#: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Poke.php:137 -#: ../../Zotlabs/Module/Profile_photo.php:280 -#: ../../Zotlabs/Module/Profile_photo.php:293 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:221 -#: ../../Zotlabs/Module/Item.php:231 ../../Zotlabs/Module/Item.php:1038 -#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91 -#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Chat.php:98 -#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Menu.php:78 -#: ../../Zotlabs/Module/Layouts.php:71 ../../Zotlabs/Module/Layouts.php:78 -#: ../../Zotlabs/Module/Layouts.php:89 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 -#: ../../Zotlabs/Module/Editwebpage.php:68 -#: ../../Zotlabs/Module/Editwebpage.php:89 -#: ../../Zotlabs/Module/Editwebpage.php:107 -#: ../../Zotlabs/Module/Editwebpage.php:121 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Webpages.php:116 ../../Zotlabs/Module/Block.php:26 -#: ../../Zotlabs/Module/Block.php:76 ../../Zotlabs/Module/Editpost.php:17 -#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Like.php:181 -#: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Message.php:18 -#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Register.php:77 -#: ../../Zotlabs/Module/Cover_photo.php:281 -#: ../../Zotlabs/Module/Cover_photo.php:294 ../../Zotlabs/Module/Network.php:15 -#: ../../Zotlabs/Module/Filestorage.php:23 -#: ../../Zotlabs/Module/Filestorage.php:78 -#: ../../Zotlabs/Module/Filestorage.php:93 -#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Common.php:39 -#: ../../Zotlabs/Module/Viewconnections.php:28 -#: ../../Zotlabs/Module/Viewconnections.php:33 -#: ../../Zotlabs/Module/Service_limits.php:11 ../../Zotlabs/Module/Rate.php:113 -#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Lib/Chatroom.php:137 -#: ../../Zotlabs/Web/WebServer.php:131 ../../addon/keepout/keepout.php:36 -#: ../../addon/openid/Mod_Id.php:53 ../../addon/gitwiki/Mod_Gitwiki.php:196 -#: ../../addon/gitwiki/Mod_Gitwiki.php:292 -#: ../../addon/diaspora_reconnect/diaspora_reconnect.php:58 -#: ../../addon/pumpio/pumpio.php:40 ../../include/attach.php:144 -#: ../../include/attach.php:191 ../../include/attach.php:255 -#: ../../include/attach.php:269 ../../include/attach.php:276 -#: ../../include/attach.php:344 ../../include/attach.php:358 -#: ../../include/attach.php:365 ../../include/attach.php:442 -#: ../../include/attach.php:909 ../../include/attach.php:983 -#: ../../include/attach.php:1148 ../../include/items.php:3470 -#: ../../include/photos.php:27 -msgid "Permission denied." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Access/Permissions.php:48 +#: ../../Zotlabs/Access/Permissions.php:55 msgid "Can view my default channel profile" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Access/Permissions.php:49 +#: ../../Zotlabs/Access/Permissions.php:56 msgid "Can view my connections" -======= -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2267 -msgid "Blocks" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Access/Permissions.php:50 +#: ../../Zotlabs/Access/Permissions.php:57 msgid "Can view my file storage and photos" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:51 +#: ../../Zotlabs/Access/Permissions.php:58 msgid "Can upload/modify my file storage and photos" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:52 +#: ../../Zotlabs/Access/Permissions.php:59 msgid "Can view my channel webpages" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Access/Permissions.php:53 +#: ../../Zotlabs/Access/Permissions.php:60 msgid "Can view my wiki pages" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:54 +#: ../../Zotlabs/Access/Permissions.php:61 msgid "Can create/edit my channel webpages" -======= -#: ../../Zotlabs/Module/Blocks.php:159 ../../Zotlabs/Module/New_channel.php:147 -#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Menu.php:118 -#: ../../Zotlabs/Module/Layouts.php:185 ../../Zotlabs/Module/Profiles.php:801 -#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Storage/Browser.php:228 -#: ../../Zotlabs/Storage/Browser.php:332 ../../addon/cdav/Mod_Cdav.php:1151 -#: ../../addon/cdav/include/widgets.php:127 -#: ../../addon/cdav/include/widgets.php:164 -msgid "Create" msgstr "" -#: ../../Zotlabs/Module/Blocks.php:160 ../../Zotlabs/Module/Editlayout.php:114 -#: ../../Zotlabs/Module/Admin/Profs.php:154 -#: ../../Zotlabs/Module/Settings/Oauth.php:149 -#: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Module/Editblock.php:114 -#: ../../Zotlabs/Module/Connections.php:296 -#: ../../Zotlabs/Module/Connections.php:316 ../../Zotlabs/Module/Wiki.php:165 -#: ../../Zotlabs/Module/Wiki.php:275 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Layouts.php:193 -#: ../../Zotlabs/Module/Editwebpage.php:142 -#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Editpost.php:80 -#: ../../Zotlabs/Lib/Apps.php:367 ../../Zotlabs/Lib/ThreadItem.php:107 -#: ../../Zotlabs/Storage/Browser.php:238 -#: ../../addon/cdav/include/widgets.php:125 -#: ../../addon/cdav/include/widgets.php:161 -#: ../../addon/gitwiki/Mod_Gitwiki.php:151 -#: ../../addon/gitwiki/Mod_Gitwiki.php:252 ../../include/channel.php:1044 -#: ../../include/channel.php:1048 ../../include/menu.php:113 -#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 -msgid "Edit" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Access/Permissions.php:55 +#: ../../Zotlabs/Access/Permissions.php:62 msgid "Can write to my wiki pages" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Access/Permissions.php:56 +#: ../../Zotlabs/Access/Permissions.php:63 msgid "Can post on my channel (wall) page" -======= -#: ../../Zotlabs/Module/Blocks.php:162 ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Admin/Accounts.php:173 -#: ../../Zotlabs/Module/Admin/Channels.php:149 -#: ../../Zotlabs/Module/Admin/Profs.php:155 -#: ../../Zotlabs/Module/Settings/Oauth.php:150 -#: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Connections.php:267 -#: ../../Zotlabs/Module/Photos.php:1143 ../../Zotlabs/Module/Connedit.php:650 -#: ../../Zotlabs/Module/Connedit.php:919 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Profiles.php:803 -#: ../../Zotlabs/Module/Editwebpage.php:167 -#: ../../Zotlabs/Module/Webpages.php:247 ../../Zotlabs/Lib/Apps.php:368 -#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Storage/Browser.php:239 -#: ../../addon/cdav/Mod_Cdav.php:864 ../../addon/cdav/Mod_Cdav.php:1153 -#: ../../include/conversation.php:654 -msgid "Delete" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Access/Permissions.php:57 +#: ../../Zotlabs/Access/Permissions.php:64 msgid "Can comment on or like my posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:58 +#: ../../Zotlabs/Access/Permissions.php:65 msgid "Can send me private mail messages" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:59 +#: ../../Zotlabs/Access/Permissions.php:66 msgid "Can like/dislike profiles and profile things" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:60 +#: ../../Zotlabs/Access/Permissions.php:67 msgid "Can forward to all my channel connections via @+ mentions in posts" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:61 +#: ../../Zotlabs/Access/Permissions.php:68 msgid "Can chat with me" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:62 +#: ../../Zotlabs/Access/Permissions.php:69 msgid "Can source my public posts in derived channels" msgstr "" -#: ../../Zotlabs/Access/Permissions.php:63 +#: ../../Zotlabs/Access/Permissions.php:70 msgid "Can administer my channel" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:106 ../../Zotlabs/Storage/Browser.php:237 +#: ../../Zotlabs/Storage/Browser.php:107 ../../Zotlabs/Storage/Browser.php:238 msgid "parent" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2706 +#: ../../Zotlabs/Storage/Browser.php:131 ../../include/text.php:2692 msgid "Collection" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Storage/Browser.php:133 +#: ../../Zotlabs/Storage/Browser.php:134 msgid "Principal" -======= -#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:303 -msgid "Your message:" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Storage/Browser.php:136 +#: ../../Zotlabs/Storage/Browser.php:137 msgid "Addressbook" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:139 +#: ../../Zotlabs/Storage/Browser.php:140 msgid "Calendar" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:142 +#: ../../Zotlabs/Storage/Browser.php:143 msgid "Schedule Inbox" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:145 +#: ../../Zotlabs/Storage/Browser.php:146 msgid "Schedule Outbox" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:163 ../../Zotlabs/Module/Photos.php:757 +#: ../../Zotlabs/Storage/Browser.php:164 ../../Zotlabs/Module/Photos.php:757 #: ../../Zotlabs/Module/Photos.php:1213 -#: ../../Zotlabs/Module/Embedphotos.php:145 ../../Zotlabs/Lib/Apps.php:571 -#: ../../Zotlabs/Lib/Apps.php:649 ../../Zotlabs/Widget/Album.php:84 -#: ../../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:1110 +#: ../../Zotlabs/Module/Embedphotos.php:146 ../../Zotlabs/Module/Cdav.php:727 +#: ../../Zotlabs/Module/Cdav.php:728 ../../Zotlabs/Module/Cdav.php:735 +#: ../../Zotlabs/Lib/Apps.php:696 ../../Zotlabs/Lib/Apps.php:774 +#: ../../Zotlabs/Widget/Album.php:84 ../../Zotlabs/Widget/Portfolio.php:86 +#: ../../include/conversation.php:1107 msgid "Unknown" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:224 ../../Zotlabs/Module/Fbrowser.php:85 -#: ../../Zotlabs/Lib/Apps.php:224 ../../include/conversation.php:1782 +#: ../../Zotlabs/Storage/Browser.php:225 ../../Zotlabs/Module/Fbrowser.php:85 +#: ../../Zotlabs/Lib/Apps.php:225 ../../include/nav.php:390 +#: ../../include/conversation.php:1788 msgid "Files" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Storage/Browser.php:225 +#: ../../Zotlabs/Storage/Browser.php:226 msgid "Total" -======= -#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Events.php:493 -#: ../../Zotlabs/Module/Appman.php:134 -#: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Setup.php:309 -#: ../../Zotlabs/Module/Setup.php:357 ../../Zotlabs/Module/Connect.php:98 -#: ../../Zotlabs/Module/Admin/Features.php:66 -#: ../../Zotlabs/Module/Admin/Plugins.php:438 -#: ../../Zotlabs/Module/Admin/Accounts.php:166 -#: ../../Zotlabs/Module/Admin/Logs.php:84 -#: ../../Zotlabs/Module/Admin/Channels.php:147 -#: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:279 -#: ../../Zotlabs/Module/Admin/Profs.php:157 -#: ../../Zotlabs/Module/Admin/Account_edit.php:74 -#: ../../Zotlabs/Module/Admin/Security.php:104 -#: ../../Zotlabs/Module/Settings/Permcats.php:110 -#: ../../Zotlabs/Module/Settings/Channel.php:476 -#: ../../Zotlabs/Module/Settings/Features.php:47 -#: ../../Zotlabs/Module/Settings/Tokens.php:168 -#: ../../Zotlabs/Module/Settings/Account.php:118 -#: ../../Zotlabs/Module/Settings/Featured.php:50 -#: ../../Zotlabs/Module/Settings/Display.php:203 -#: ../../Zotlabs/Module/Settings/Oauth.php:87 -#: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 -#: ../../Zotlabs/Module/Import.php:514 ../../Zotlabs/Module/Cal.php:343 -#: ../../Zotlabs/Module/Mood.php:139 ../../Zotlabs/Module/Photos.php:657 -#: ../../Zotlabs/Module/Photos.php:1022 ../../Zotlabs/Module/Photos.php:1062 -#: ../../Zotlabs/Module/Photos.php:1180 ../../Zotlabs/Module/Wiki.php:169 -#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Poke.php:186 -#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Chat.php:194 -#: ../../Zotlabs/Module/Chat.php:240 ../../Zotlabs/Module/Pconfig.php:107 -#: ../../Zotlabs/Module/Group.php:85 ../../Zotlabs/Module/Profiles.php:726 -#: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Module/Mail.php:449 -#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Rate.php:166 -#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../Zotlabs/Widget/Eventstools.php:16 -#: ../../view/theme/redbasic/php/config.php:84 -#: ../../addon/skeleton/skeleton.php:65 ../../addon/gnusoc/gnusoc.php:134 -#: ../../addon/cdav/cdav.php:246 ../../addon/planets/planets.php:157 -#: ../../addon/openclipatar/openclipatar.php:53 -#: ../../addon/wppost/wppost.php:113 ../../addon/nsfw/nsfw.php:92 -#: ../../addon/ijpost/ijpost.php:89 ../../addon/dwpost/dwpost.php:89 -#: ../../addon/mailhost/mailhost.php:40 -#: ../../addon/likebanner/likebanner.php:57 -#: ../../addon/redphotos/redphotos.php:136 ../../addon/irc/irc.php:53 -#: ../../addon/ljpost/ljpost.php:86 ../../addon/startpage/startpage.php:113 -#: ../../addon/diaspora/diaspora.php:712 -#: ../../addon/gitwiki/Mod_Gitwiki.php:155 -#: ../../addon/rainbowtag/rainbowtag.php:85 ../../addon/visage/visage.php:170 -#: ../../addon/nsabait/nsabait.php:161 ../../addon/mailtest/mailtest.php:100 -#: ../../addon/openstreetmap/openstreetmap.php:168 -#: ../../addon/rtof/rtof.php:101 ../../addon/jappixmini/jappixmini.php:371 -#: ../../addon/superblock/superblock.php:120 ../../addon/nofed/nofed.php:80 -#: ../../addon/redred/redred.php:119 ../../addon/logrot/logrot.php:35 -#: ../../addon/frphotos/frphotos.php:96 ../../addon/chords/Mod_Chords.php:60 -#: ../../addon/libertree/libertree.php:85 -#: ../../addon/flattrwidget/flattrwidget.php:124 -#: ../../addon/statusnet/statusnet.php:322 -#: ../../addon/statusnet/statusnet.php:380 -#: ../../addon/statusnet/statusnet.php:432 -#: ../../addon/statusnet/statusnet.php:899 ../../addon/twitter/twitter.php:217 -#: ../../addon/twitter/twitter.php:259 -#: ../../addon/smileybutton/smileybutton.php:281 ../../addon/piwik/piwik.php:95 -#: ../../addon/pageheader/pageheader.php:48 ../../addon/xmpp/xmpp.php:69 -#: ../../addon/pumpio/pumpio.php:237 ../../addon/redfiles/redfiles.php:124 -#: ../../addon/hubwall/hubwall.php:95 ../../include/js_strings.php:22 -msgid "Submit" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Storage/Browser.php:227 +#: ../../Zotlabs/Storage/Browser.php:228 msgid "Shared" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:228 ../../Zotlabs/Storage/Browser.php:332 +#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:333 #: ../../Zotlabs/Module/Profiles.php:801 ../../Zotlabs/Module/Layouts.php:185 -#: ../../Zotlabs/Module/Webpages.php:244 ../../Zotlabs/Module/Menu.php:118 +#: ../../Zotlabs/Module/Menu.php:118 ../../Zotlabs/Module/Connedit.php:934 #: ../../Zotlabs/Module/New_channel.php:147 -#: ../../Zotlabs/Module/Connedit.php:917 ../../Zotlabs/Module/Blocks.php:159 -#: ../../extend/addon/addon/cdav/include/widgets.php:127 -#: ../../extend/addon/addon/cdav/include/widgets.php:164 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1151 +#: ../../Zotlabs/Module/Webpages.php:237 ../../Zotlabs/Module/Blocks.php:159 +#: ../../Zotlabs/Module/Cdav.php:1124 ../../Zotlabs/Widget/Cdav.php:127 +#: ../../Zotlabs/Widget/Cdav.php:164 msgid "Create" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334 +#: ../../Zotlabs/Storage/Browser.php:230 ../../Zotlabs/Storage/Browser.php:335 #: ../../Zotlabs/Module/Cover_photo.php:361 #: ../../Zotlabs/Module/Profile_photo.php:423 #: ../../Zotlabs/Module/Photos.php:784 ../../Zotlabs/Module/Photos.php:1321 -#: ../../Zotlabs/Module/Embedphotos.php:157 ../../Zotlabs/Widget/Album.php:97 -#: ../../extend/addon/addon/cdav/include/widgets.php:132 -#: ../../extend/addon/addon/cdav/include/widgets.php:168 +#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Widget/Album.php:97 +#: ../../Zotlabs/Widget/Cdav.php:132 ../../Zotlabs/Widget/Cdav.php:168 +#: ../../Zotlabs/Widget/Portfolio.php:99 msgid "Upload" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:233 +#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:172 #: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902 +#: ../../Zotlabs/Module/Connedit.php:919 #: ../../Zotlabs/Module/Sharedwithme.php:100 #: ../../Zotlabs/Module/Settings/Oauth.php:89 #: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:528 +#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Module/Cdav.php:1109 +#: ../../Zotlabs/Lib/NativeWikiPage.php:539 #: ../../Zotlabs/Widget/Wiki_page_history.php:22 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1136 #: ../../extend/addon/addon/rendezvous/rendezvous.php:172 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:158 msgid "Name" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Storage/Browser.php:234 ../../Zotlabs/Module/Wiki.php:173 +#: ../../Zotlabs/Storage/Browser.php:235 ../../Zotlabs/Module/Wiki.php:173 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:159 msgid "Type" -======= -#: ../../Zotlabs/Module/Profperm.php:28 ../../Zotlabs/Module/Subthread.php:62 -#: ../../Zotlabs/Module/Import_items.php:120 ../../Zotlabs/Module/Group.php:72 -#: ../../Zotlabs/Module/Dreport.php:10 ../../Zotlabs/Module/Dreport.php:68 -#: ../../Zotlabs/Module/Like.php:283 ../../Zotlabs/Web/WebServer.php:130 -#: ../../addon/redphotos/redphotos.php:119 ../../addon/frphotos/frphotos.php:81 -#: ../../addon/redfiles/redfiles.php:109 ../../include/items.php:327 -msgid "Permission denied" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Storage/Browser.php:235 -#: ../../Zotlabs/Module/Sharedwithme.php:102 ../../include/text.php:1415 +#: ../../Zotlabs/Storage/Browser.php:236 +#: ../../Zotlabs/Module/Sharedwithme.php:102 ../../include/text.php:1386 msgid "Size" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:236 +#: ../../Zotlabs/Storage/Browser.php:237 #: ../../Zotlabs/Module/Sharedwithme.php:103 msgid "Last Modified" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Storage/Browser.php:238 ../../Zotlabs/Module/Layouts.php:193 -#: ../../Zotlabs/Module/Webpages.php:245 -#: ../../Zotlabs/Module/Connections.php:296 -#: ../../Zotlabs/Module/Connections.php:316 +#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Layouts.php:193 +#: ../../Zotlabs/Module/Wiki.php:165 ../../Zotlabs/Module/Wiki.php:298 +#: ../../Zotlabs/Module/Connections.php:261 +#: ../../Zotlabs/Module/Connections.php:298 +#: ../../Zotlabs/Module/Connections.php:318 #: ../../Zotlabs/Module/Admin/Profs.php:154 #: ../../Zotlabs/Module/Editlayout.php:114 -#: ../../Zotlabs/Module/Editwebpage.php:147 ../../Zotlabs/Module/Menu.php:112 -#: ../../Zotlabs/Module/Editpost.php:85 ../../Zotlabs/Module/Editblock.php:114 -#: ../../Zotlabs/Module/Wiki.php:165 ../../Zotlabs/Module/Wiki.php:275 -#: ../../Zotlabs/Module/Blocks.php:160 +#: ../../Zotlabs/Module/Editwebpage.php:142 ../../Zotlabs/Module/Menu.php:112 +#: ../../Zotlabs/Module/Editblock.php:114 ../../Zotlabs/Module/Editpost.php:85 +#: ../../Zotlabs/Module/Webpages.php:238 ../../Zotlabs/Module/Blocks.php:160 #: ../../Zotlabs/Module/Settings/Oauth.php:149 #: ../../Zotlabs/Module/Thing.php:260 ../../Zotlabs/Lib/ThreadItem.php:107 -#: ../../Zotlabs/Lib/Apps.php:367 -#: ../../extend/addon/addon/cdav/include/widgets.php:125 -#: ../../extend/addon/addon/cdav/include/widgets.php:161 +#: ../../Zotlabs/Lib/Apps.php:368 ../../Zotlabs/Widget/Cdav.php:125 +#: ../../Zotlabs/Widget/Cdav.php:161 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:151 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252 -#: ../../include/page_widgets.php:9 ../../include/page_widgets.php:39 -#: ../../include/channel.php:1043 ../../include/channel.php:1047 -#: ../../include/menu.php:113 +#: ../../include/menu.php:113 ../../include/channel.php:1059 +#: ../../include/channel.php:1063 msgid "Edit" -======= -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1362 -msgid "Profile" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Storage/Browser.php:239 ../../Zotlabs/Module/Profiles.php:803 -#: ../../Zotlabs/Module/Webpages.php:247 -#: ../../Zotlabs/Module/Connections.php:267 +#: ../../Zotlabs/Storage/Browser.php:240 ../../Zotlabs/Module/Profiles.php:803 +#: ../../Zotlabs/Module/Connections.php:269 #: ../../Zotlabs/Module/Admin/Profs.php:155 #: ../../Zotlabs/Module/Admin/Accounts.php:173 #: ../../Zotlabs/Module/Admin/Channels.php:149 #: ../../Zotlabs/Module/Editlayout.php:138 -#: ../../Zotlabs/Module/Editwebpage.php:172 ../../Zotlabs/Module/Group.php:177 -#: ../../Zotlabs/Module/Editblock.php:139 -#: ../../Zotlabs/Module/Connedit.php:650 ../../Zotlabs/Module/Connedit.php:919 -#: ../../Zotlabs/Module/Blocks.php:162 +#: ../../Zotlabs/Module/Editwebpage.php:167 +#: ../../Zotlabs/Module/Connedit.php:650 ../../Zotlabs/Module/Connedit.php:936 +#: ../../Zotlabs/Module/Group.php:177 ../../Zotlabs/Module/Editblock.php:139 +#: ../../Zotlabs/Module/Webpages.php:240 ../../Zotlabs/Module/Blocks.php:162 #: ../../Zotlabs/Module/Settings/Oauth.php:150 #: ../../Zotlabs/Module/Thing.php:261 ../../Zotlabs/Module/Photos.php:1143 -#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Lib/Apps.php:368 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:864 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1153 -#: ../../include/conversation.php:654 +#: ../../Zotlabs/Module/Cdav.php:837 ../../Zotlabs/Module/Cdav.php:1126 +#: ../../Zotlabs/Lib/ThreadItem.php:127 ../../Zotlabs/Lib/Apps.php:369 +#: ../../include/conversation.php:649 ../../include/conversation.php:686 msgid "Delete" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:301 +#: ../../Zotlabs/Storage/Browser.php:302 #, php-format msgid "You are using %1$s of your available file storage." msgstr "" -#: ../../Zotlabs/Storage/Browser.php:306 +#: ../../Zotlabs/Storage/Browser.php:307 #, php-format msgid "You are using %1$s of %2$s available file storage. (%3$s%)" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:317 +#: ../../Zotlabs/Storage/Browser.php:318 msgid "WARNING:" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:327 +#: ../../Zotlabs/Storage/Browser.php:328 msgid "" "Please use DAV to upload large (video, audio) files.<br>See <a class=\"zrl\" " "href=\"help/member/member_guide#Cloud_Desktop_Clients\">Cloud Desktop " "Clients</a>" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:331 +#: ../../Zotlabs/Storage/Browser.php:332 msgid "Create new folder" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:333 +#: ../../Zotlabs/Storage/Browser.php:334 msgid "Upload file" msgstr "" -#: ../../Zotlabs/Storage/Browser.php:347 +#: ../../Zotlabs/Storage/Browser.php:348 msgid "Drop files here to immediately upload" msgstr "" -#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Page.php:94 -#: ../../Zotlabs/Module/Block.php:79 ../../Zotlabs/Module/Display.php:122 -#: ../../Zotlabs/Lib/NativeWikiPage.php:489 ../../include/help.php:68 +#: ../../Zotlabs/Web/Router.php:146 ../../Zotlabs/Module/Block.php:77 +#: ../../Zotlabs/Module/Page.php:128 ../../Zotlabs/Module/Display.php:122 +#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../include/help.php:68 msgid "Page not found." msgstr "" @@ -650,7 +348,7 @@ msgstr "" #: ../../extend/addon/addon/frphotos/frphotos.php:81 #: ../../extend/addon/addon/redfiles/redfiles.php:109 #: ../../extend/addon/addon/redphotos/redphotos.php:119 -#: ../../include/items.php:325 +#: ../../include/items.php:340 msgid "Permission denied" msgstr "" @@ -658,70 +356,70 @@ msgstr "" #: ../../Zotlabs/Module/Achievements.php:34 #: ../../Zotlabs/Module/Register.php:77 ../../Zotlabs/Module/Message.php:18 #: ../../Zotlabs/Module/Profiles.php:198 ../../Zotlabs/Module/Profiles.php:635 -#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Layouts.php:71 +#: ../../Zotlabs/Module/Authtest.php:16 ../../Zotlabs/Module/Item.php:223 +#: ../../Zotlabs/Module/Item.php:240 ../../Zotlabs/Module/Item.php:250 +#: ../../Zotlabs/Module/Item.php:1071 ../../Zotlabs/Module/Layouts.php:71 #: ../../Zotlabs/Module/Layouts.php:78 ../../Zotlabs/Module/Layouts.php:89 -#: ../../Zotlabs/Module/Page.php:35 ../../Zotlabs/Module/Page.php:91 -#: ../../Zotlabs/Module/Webpages.php:116 -#: ../../Zotlabs/Module/Connections.php:29 +#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:233 +#: ../../Zotlabs/Module/Wiki.php:339 ../../Zotlabs/Module/Block.php:24 +#: ../../Zotlabs/Module/Block.php:74 ../../Zotlabs/Module/Connections.php:29 #: ../../Zotlabs/Module/Cover_photo.php:281 #: ../../Zotlabs/Module/Cover_photo.php:294 #: ../../Zotlabs/Module/Editlayout.php:67 #: ../../Zotlabs/Module/Editlayout.php:90 #: ../../Zotlabs/Module/Editwebpage.php:68 #: ../../Zotlabs/Module/Editwebpage.php:89 -#: ../../Zotlabs/Module/Editwebpage.php:104 -#: ../../Zotlabs/Module/Editwebpage.php:126 +#: ../../Zotlabs/Module/Editwebpage.php:107 +#: ../../Zotlabs/Module/Editwebpage.php:121 #: ../../Zotlabs/Module/Network.php:15 ../../Zotlabs/Module/Menu.php:78 -#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Locs.php:87 -#: ../../Zotlabs/Module/Channel.php:115 ../../Zotlabs/Module/Channel.php:245 -#: ../../Zotlabs/Module/Channel.php:285 +#: ../../Zotlabs/Module/Locs.php:87 ../../Zotlabs/Module/Connedit.php:385 #: ../../Zotlabs/Module/Filestorage.php:23 #: ../../Zotlabs/Module/Filestorage.php:78 #: ../../Zotlabs/Module/Filestorage.php:93 -#: ../../Zotlabs/Module/Filestorage.php:120 +#: ../../Zotlabs/Module/Filestorage.php:120 ../../Zotlabs/Module/Setup.php:206 #: ../../Zotlabs/Module/Settings.php:59 ../../Zotlabs/Module/Group.php:13 -#: ../../Zotlabs/Module/Block.php:26 ../../Zotlabs/Module/Block.php:76 -#: ../../Zotlabs/Module/Setup.php:212 ../../Zotlabs/Module/Manage.php:10 -#: ../../Zotlabs/Module/Editblock.php:67 ../../Zotlabs/Module/Mitem.php:115 -#: ../../Zotlabs/Module/Wiki.php:50 ../../Zotlabs/Module/Wiki.php:216 -#: ../../Zotlabs/Module/Wiki.php:315 ../../Zotlabs/Module/Api.php:24 -#: ../../Zotlabs/Module/Invite.php:17 ../../Zotlabs/Module/Invite.php:94 +#: ../../Zotlabs/Module/Mail.php:146 ../../Zotlabs/Module/Editblock.php:67 +#: ../../Zotlabs/Module/Mitem.php:115 ../../Zotlabs/Module/Moderate.php:13 +#: ../../Zotlabs/Module/Editpost.php:17 ../../Zotlabs/Module/Api.php:24 +#: ../../Zotlabs/Module/Page.php:34 ../../Zotlabs/Module/Page.php:125 #: ../../Zotlabs/Module/New_channel.php:77 #: ../../Zotlabs/Module/New_channel.php:104 #: ../../Zotlabs/Module/Profile.php:83 ../../Zotlabs/Module/Profile.php:100 -#: ../../Zotlabs/Module/Notifications.php:11 ../../Zotlabs/Module/Poke.php:137 -#: ../../Zotlabs/Module/Like.php:181 ../../Zotlabs/Module/Mood.php:116 -#: ../../Zotlabs/Module/Connedit.php:385 ../../Zotlabs/Module/Blocks.php:73 +#: ../../Zotlabs/Module/Notifications.php:11 +#: ../../Zotlabs/Module/Webpages.php:116 ../../Zotlabs/Module/Invite.php:17 +#: ../../Zotlabs/Module/Invite.php:94 ../../Zotlabs/Module/Like.php:181 +#: ../../Zotlabs/Module/Mood.php:116 ../../Zotlabs/Module/Blocks.php:73 #: ../../Zotlabs/Module/Blocks.php:80 ../../Zotlabs/Module/Rate.php:113 #: ../../Zotlabs/Module/Profile_photo.php:280 #: ../../Zotlabs/Module/Profile_photo.php:293 #: ../../Zotlabs/Module/Appman.php:82 ../../Zotlabs/Module/Common.php:39 -#: ../../Zotlabs/Module/Item.php:220 ../../Zotlabs/Module/Item.php:230 -#: ../../Zotlabs/Module/Item.php:1037 ../../Zotlabs/Module/Regmod.php:21 +#: ../../Zotlabs/Module/Manage.php:10 ../../Zotlabs/Module/Regmod.php:21 #: ../../Zotlabs/Module/Pdledit.php:29 ../../Zotlabs/Module/Events.php:271 +#: ../../Zotlabs/Module/Viewsrc.php:19 #: ../../Zotlabs/Module/Service_limits.php:11 #: ../../Zotlabs/Module/Bookmarks.php:61 #: ../../Zotlabs/Module/Sharedwithme.php:11 -#: ../../Zotlabs/Module/Viewsrc.php:18 ../../Zotlabs/Module/Sources.php:74 -#: ../../Zotlabs/Module/Mail.php:164 ../../Zotlabs/Module/Suggest.php:28 -#: ../../Zotlabs/Module/Thing.php:274 ../../Zotlabs/Module/Thing.php:294 -#: ../../Zotlabs/Module/Thing.php:335 +#: ../../Zotlabs/Module/Sources.php:74 ../../Zotlabs/Module/Poke.php:149 +#: ../../Zotlabs/Module/Suggest.php:28 ../../Zotlabs/Module/Thing.php:274 +#: ../../Zotlabs/Module/Thing.php:294 ../../Zotlabs/Module/Thing.php:335 #: ../../Zotlabs/Module/Viewconnections.php:28 #: ../../Zotlabs/Module/Viewconnections.php:33 #: ../../Zotlabs/Module/Photos.php:69 ../../Zotlabs/Module/Chat.php:98 -#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Lib/Chatroom.php:137 +#: ../../Zotlabs/Module/Chat.php:103 ../../Zotlabs/Module/Channel.php:115 +#: ../../Zotlabs/Module/Channel.php:245 ../../Zotlabs/Module/Channel.php:285 +#: ../../Zotlabs/Lib/Chatroom.php:137 #: ../../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/gitwiki/Mod_Gitwiki.php:196 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:292 -#: ../../include/photos.php:28 ../../include/attach.php:144 -#: ../../include/attach.php:191 ../../include/attach.php:255 -#: ../../include/attach.php:269 ../../include/attach.php:276 -#: ../../include/attach.php:344 ../../include/attach.php:358 -#: ../../include/attach.php:365 ../../include/attach.php:442 -#: ../../include/attach.php:909 ../../include/attach.php:983 -#: ../../include/attach.php:1148 ../../include/items.php:3395 +#: ../../include/attach.php:144 ../../include/attach.php:191 +#: ../../include/attach.php:255 ../../include/attach.php:269 +#: ../../include/attach.php:276 ../../include/attach.php:344 +#: ../../include/attach.php:358 ../../include/attach.php:365 +#: ../../include/attach.php:442 ../../include/attach.php:909 +#: ../../include/attach.php:983 ../../include/attach.php:1148 +#: ../../include/items.php:3440 ../../include/photos.php:28 msgid "Permission denied." msgstr "" @@ -740,12 +438,12 @@ msgstr "" #: ../../Zotlabs/Module/Achievements.php:15 #: ../../Zotlabs/Module/Layouts.php:31 ../../Zotlabs/Module/Connect.php:17 -#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Editlayout.php:31 +#: ../../Zotlabs/Module/Editlayout.php:31 #: ../../Zotlabs/Module/Editwebpage.php:32 -#: ../../Zotlabs/Module/Filestorage.php:59 +#: ../../Zotlabs/Module/Filestorage.php:59 ../../Zotlabs/Module/Hcard.php:12 #: ../../Zotlabs/Module/Editblock.php:31 ../../Zotlabs/Module/Profile.php:20 -#: ../../Zotlabs/Module/Hcard.php:12 ../../Zotlabs/Module/Blocks.php:33 -#: ../../include/channel.php:944 +#: ../../Zotlabs/Module/Webpages.php:33 ../../Zotlabs/Module/Blocks.php:33 +#: ../../include/channel.php:960 msgid "Requested profile is not available." msgstr "" @@ -766,17 +464,9 @@ msgstr "" msgid "Passwords do not match." msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Register.php:131 msgid "" "Registration successful. Please check your email for validation instructions." -======= -#: ../../Zotlabs/Module/Search.php:44 ../../Zotlabs/Module/Connections.php:312 -#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../include/text.php:1027 ../../include/text.php:1039 -#: ../../include/acl_selectors.php:213 ../../include/nav.php:164 -msgid "Search" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Register.php:137 @@ -819,16 +509,8 @@ msgstr "" msgid "I am over 13 years of age and accept the %s for this website" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Register.php:233 msgid "Your email address" -======= -#: ../../Zotlabs/Module/Locs.php:118 -#: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Connedit.php:909 ../../Zotlabs/Module/Profiles.php:502 -#: ../../Zotlabs/Module/Profiles.php:793 ../../addon/cdav/Mod_Cdav.php:1143 -msgid "Address" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Register.php:234 @@ -891,22 +573,21 @@ msgstr "" msgid "yes" msgstr "" -#: ../../Zotlabs/Module/Register.php:253 -#: ../../Zotlabs/Module/Admin/Site.php:280 +#: ../../Zotlabs/Module/Register.php:251 +#: ../../Zotlabs/Module/Admin/Site.php:272 msgid "Registration" msgstr "" -#: ../../Zotlabs/Module/Register.php:258 +#: ../../Zotlabs/Module/Register.php:256 msgid "Membership on this site is by invitation only." msgstr "" -#: ../../Zotlabs/Module/Register.php:270 ../../include/nav.php:145 -#: ../../boot.php:1572 +#: ../../Zotlabs/Module/Register.php:268 ../../include/nav.php:147 +#: ../../boot.php:1573 msgid "Register" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Register.php:271 +#: ../../Zotlabs/Module/Register.php:269 msgid "" "This site may require email verification after submitting this form. If you " "are returned to a login page, please check your email for instructions." @@ -915,102 +596,6 @@ msgstr "" #: ../../Zotlabs/Module/Probe.php:28 ../../Zotlabs/Module/Probe.php:32 #, php-format msgid "Fetching URL returns error: %1$s" -======= -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:240 -msgid "Use magic-auth if available" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:237 -#: ../../Zotlabs/Module/Settings/Channel.php:294 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Photos.php:642 -#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392 -#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633 -#: ../../view/theme/redbasic/php/config.php:89 -#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234 -#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82 -#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 -#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 -#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 -#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 -#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 -#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 -#: ../../addon/jappixmini/jappixmini.php:313 -#: ../../addon/jappixmini/jappixmini.php:343 -#: ../../addon/jappixmini/jappixmini.php:351 -#: ../../addon/jappixmini/jappixmini.php:355 -#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72 -#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95 -#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69 -#: ../../addon/libertree/libertree.php:81 -#: ../../addon/flattrwidget/flattrwidget.php:120 -#: ../../addon/statusnet/statusnet.php:389 -#: ../../addon/statusnet/statusnet.php:411 -#: ../../addon/statusnet/statusnet.php:415 -#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242 -#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255 -#: ../../addon/smileybutton/smileybutton.php:273 -#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53 -#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 -#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 -msgid "No" -msgstr "" - -#: ../../Zotlabs/Module/Mitem.php:162 ../../Zotlabs/Module/Mitem.php:163 -#: ../../Zotlabs/Module/Mitem.php:240 ../../Zotlabs/Module/Mitem.php:241 -#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 -#: ../../Zotlabs/Module/Removeme.php:63 ../../Zotlabs/Module/Admin/Site.php:239 -#: ../../Zotlabs/Module/Settings/Channel.php:294 -#: ../../Zotlabs/Module/Settings/Display.php:103 -#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Photos.php:642 -#: ../../Zotlabs/Module/Wiki.php:180 ../../Zotlabs/Module/Connedit.php:392 -#: ../../Zotlabs/Module/Menu.php:100 ../../Zotlabs/Module/Menu.php:157 -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Filestorage.php:160 -#: ../../Zotlabs/Module/Filestorage.php:168 ../../boot.php:1633 -#: ../../view/theme/redbasic/php/config.php:89 -#: ../../view/theme/redbasic/php/config.php:104 ../../addon/cdav/cdav.php:234 -#: ../../addon/planets/planets.php:153 ../../addon/wppost/wppost.php:82 -#: ../../addon/wppost/wppost.php:105 ../../addon/wppost/wppost.php:109 -#: ../../addon/nsfw/nsfw.php:84 ../../addon/ijpost/ijpost.php:73 -#: ../../addon/ijpost/ijpost.php:85 ../../addon/dwpost/dwpost.php:73 -#: ../../addon/dwpost/dwpost.php:85 ../../addon/ljpost/ljpost.php:70 -#: ../../addon/ljpost/ljpost.php:82 ../../addon/gitwiki/Mod_Gitwiki.php:166 -#: ../../addon/rainbowtag/rainbowtag.php:81 ../../addon/visage/visage.php:166 -#: ../../addon/nsabait/nsabait.php:157 ../../addon/rtof/rtof.php:81 -#: ../../addon/rtof/rtof.php:85 ../../addon/jappixmini/jappixmini.php:309 -#: ../../addon/jappixmini/jappixmini.php:313 -#: ../../addon/jappixmini/jappixmini.php:343 -#: ../../addon/jappixmini/jappixmini.php:351 -#: ../../addon/jappixmini/jappixmini.php:355 -#: ../../addon/jappixmini/jappixmini.php:359 ../../addon/nofed/nofed.php:72 -#: ../../addon/nofed/nofed.php:76 ../../addon/redred/redred.php:95 -#: ../../addon/redred/redred.php:99 ../../addon/libertree/libertree.php:69 -#: ../../addon/libertree/libertree.php:81 -#: ../../addon/flattrwidget/flattrwidget.php:120 -#: ../../addon/statusnet/statusnet.php:389 -#: ../../addon/statusnet/statusnet.php:411 -#: ../../addon/statusnet/statusnet.php:415 -#: ../../addon/statusnet/statusnet.php:424 ../../addon/twitter/twitter.php:242 -#: ../../addon/twitter/twitter.php:246 ../../addon/twitter/twitter.php:255 -#: ../../addon/smileybutton/smileybutton.php:273 -#: ../../addon/smileybutton/smileybutton.php:277 ../../addon/xmpp/xmpp.php:53 -#: ../../addon/pumpio/pumpio.php:219 ../../addon/pumpio/pumpio.php:223 -#: ../../addon/pumpio/pumpio.php:227 ../../addon/pumpio/pumpio.php:231 -#: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 -msgid "Yes" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Directory.php:63 ../../Zotlabs/Module/Ratings.php:83 @@ -1039,12 +624,12 @@ msgstr "" msgid "Homepage: " msgstr "" -#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1272 +#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1314 msgid "Age:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:314 ../../include/channel.php:1133 -#: ../../include/event.php:52 ../../include/event.php:84 +#: ../../Zotlabs/Module/Directory.php:314 ../../include/event.php:52 +#: ../../include/event.php:84 ../../include/channel.php:1149 msgid "Location:" msgstr "" @@ -1052,18 +637,18 @@ msgstr "" msgid "Description:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1288 +#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1330 msgid "Hometown:" msgstr "" -#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1296 +#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1338 msgid "About:" msgstr "" #: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54 #: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/connections.php:110 ../../include/channel.php:1118 -#: ../../include/conversation.php:1002 +#: ../../include/connections.php:111 ../../include/conversation.php:999 +#: ../../include/channel.php:1134 msgid "Connect" msgstr "" @@ -1093,7 +678,7 @@ msgstr "" #: ../../Zotlabs/Module/Directory.php:391 #: ../../Zotlabs/Module/Directory.php:396 -#: ../../Zotlabs/Module/Connections.php:315 +#: ../../Zotlabs/Module/Connections.php:317 #: ../../include/contact_widgets.php:23 msgid "Find" msgstr "" @@ -1131,15 +716,8 @@ msgstr "" msgid "Newest to Oldest" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Directory.php:402 msgid "Oldest to Newest" -======= -#: ../../Zotlabs/Module/Events.php:260 ../../Zotlabs/Module/Tagger.php:51 -#: ../../Zotlabs/Module/Like.php:372 ../../include/conversation.php:119 -#: ../../include/text.php:1940 ../../include/event.php:1141 -msgid "event" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Directory.php:419 @@ -1222,15 +800,14 @@ msgstr "" #: ../../Zotlabs/Module/Profiles.php:502 ../../Zotlabs/Module/Profiles.php:793 #: ../../Zotlabs/Module/Admin/Channels.php:160 -#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:909 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1143 +#: ../../Zotlabs/Module/Locs.php:118 ../../Zotlabs/Module/Connedit.php:926 +#: ../../Zotlabs/Module/Cdav.php:1116 msgid "Address" msgstr "" #: ../../Zotlabs/Module/Profiles.php:509 ../../Zotlabs/Module/Profiles.php:737 #: ../../Zotlabs/Module/Locs.php:117 ../../Zotlabs/Module/Pubsites.php:51 -#: ../../Zotlabs/Module/Events.php:475 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:839 +#: ../../Zotlabs/Module/Events.php:475 ../../Zotlabs/Module/Cdav.php:812 #: ../../include/js_strings.php:25 msgid "Location" msgstr "" @@ -1243,18 +820,18 @@ msgstr "" msgid "Hide your connections list from viewers of this profile" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Admin/Site.php:237 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Wiki.php:180 +#: ../../Zotlabs/Module/Admin/Site.php:235 ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:392 +#: ../../Zotlabs/Module/Connedit.php:775 +#: ../../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/Wiki.php:180 -#: ../../Zotlabs/Module/Api.php:97 ../../Zotlabs/Module/Connedit.php:392 -#: ../../Zotlabs/Module/Connedit.php:775 ../../Zotlabs/Module/Events.php:470 -#: ../../Zotlabs/Module/Events.php:471 ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Settings/Display.php:103 +#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:97 +#: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 +#: ../../Zotlabs/Module/Removeme.php:63 #: ../../Zotlabs/Module/Settings/Channel.php:294 +#: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../Zotlabs/Module/Photos.php:642 #: ../../extend/addon/addon/dwpost/dwpost.php:73 #: ../../extend/addon/addon/dwpost/dwpost.php:85 @@ -1275,7 +852,7 @@ msgstr "" #: ../../extend/addon/addon/nofed/nofed.php:76 #: ../../extend/addon/addon/nsabait/nsabait.php:157 #: ../../extend/addon/addon/nsfw/nsfw.php:84 -#: ../../extend/addon/addon/planets/planets.php:153 +#: ../../extend/addon/addon/planets/planets.php:149 #: ../../extend/addon/addon/pumpio/pumpio.php:219 #: ../../extend/addon/addon/pumpio/pumpio.php:223 #: ../../extend/addon/addon/pumpio/pumpio.php:227 @@ -1285,8 +862,8 @@ msgstr "" #: ../../extend/addon/addon/redred/redred.php:99 #: ../../extend/addon/addon/rtof/rtof.php:81 #: ../../extend/addon/addon/rtof/rtof.php:85 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:273 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:277 +#: ../../extend/addon/addon/smileybutton/smileybutton.php:211 +#: ../../extend/addon/addon/smileybutton/smileybutton.php:215 #: ../../extend/addon/addon/statusnet/statusnet.php:389 #: ../../extend/addon/addon/statusnet/statusnet.php:411 #: ../../extend/addon/addon/statusnet/statusnet.php:415 @@ -1299,30 +876,25 @@ 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 +#: ../../extend/addon/addon/authchoose/authchoose.php:67 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:89 -#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1595 +#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1596 msgid "No" -======= -#: ../../Zotlabs/Module/Events.php:660 ../../Zotlabs/Module/Cal.php:313 -#: ../../include/text.php:1759 -msgid "Link to Source" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Profiles.php:681 -#: ../../Zotlabs/Module/Admin/Site.php:239 ../../Zotlabs/Module/Menu.php:100 -#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Filestorage.php:160 +#: ../../Zotlabs/Module/Profiles.php:681 ../../Zotlabs/Module/Wiki.php:180 +#: ../../Zotlabs/Module/Admin/Site.php:237 ../../Zotlabs/Module/Menu.php:100 +#: ../../Zotlabs/Module/Menu.php:157 ../../Zotlabs/Module/Connedit.php:392 +#: ../../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/Wiki.php:180 -#: ../../Zotlabs/Module/Api.php:96 ../../Zotlabs/Module/Connedit.php:392 +#: ../../Zotlabs/Module/Mitem.php:241 ../../Zotlabs/Module/Api.php:96 #: ../../Zotlabs/Module/Events.php:470 ../../Zotlabs/Module/Events.php:471 #: ../../Zotlabs/Module/Removeme.php:63 -#: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../Zotlabs/Module/Settings/Channel.php:294 +#: ../../Zotlabs/Module/Settings/Display.php:103 #: ../../Zotlabs/Module/Photos.php:642 #: ../../extend/addon/addon/dwpost/dwpost.php:73 #: ../../extend/addon/addon/dwpost/dwpost.php:85 @@ -1343,7 +915,7 @@ msgstr "" #: ../../extend/addon/addon/nofed/nofed.php:76 #: ../../extend/addon/addon/nsabait/nsabait.php:157 #: ../../extend/addon/addon/nsfw/nsfw.php:84 -#: ../../extend/addon/addon/planets/planets.php:153 +#: ../../extend/addon/addon/planets/planets.php:149 #: ../../extend/addon/addon/pumpio/pumpio.php:219 #: ../../extend/addon/addon/pumpio/pumpio.php:223 #: ../../extend/addon/addon/pumpio/pumpio.php:227 @@ -1353,8 +925,8 @@ msgstr "" #: ../../extend/addon/addon/redred/redred.php:99 #: ../../extend/addon/addon/rtof/rtof.php:81 #: ../../extend/addon/addon/rtof/rtof.php:85 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:273 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:277 +#: ../../extend/addon/addon/smileybutton/smileybutton.php:211 +#: ../../extend/addon/addon/smileybutton/smileybutton.php:215 #: ../../extend/addon/addon/statusnet/statusnet.php:389 #: ../../extend/addon/addon/statusnet/statusnet.php:411 #: ../../extend/addon/addon/statusnet/statusnet.php:415 @@ -1367,11 +939,11 @@ 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 +#: ../../extend/addon/addon/authchoose/authchoose.php:67 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166 #: ../../include/dir_fns.php:143 ../../include/dir_fns.php:144 -#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:89 -#: ../../view/theme/redbasic/php/config.php:104 ../../boot.php:1595 +#: ../../include/dir_fns.php:145 ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:115 ../../boot.php:1596 msgid "Yes" msgstr "" @@ -1380,7 +952,7 @@ msgid "Edit Profile Details" msgstr "" #: ../../Zotlabs/Module/Profiles.php:726 ../../Zotlabs/Module/Connect.php:98 -#: ../../Zotlabs/Module/Import.php:514 +#: ../../Zotlabs/Module/Wiki.php:169 #: ../../Zotlabs/Module/Admin/Features.php:66 #: ../../Zotlabs/Module/Admin/Logs.php:84 #: ../../Zotlabs/Module/Admin/Profs.php:157 @@ -1390,31 +962,31 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:147 #: ../../Zotlabs/Module/Admin/Plugins.php:438 #: ../../Zotlabs/Module/Admin/Themes.php:158 -#: ../../Zotlabs/Module/Admin/Site.php:279 ../../Zotlabs/Module/Locs.php:121 -#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Group.php:85 -#: ../../Zotlabs/Module/Setup.php:309 ../../Zotlabs/Module/Setup.php:350 -#: ../../Zotlabs/Module/Import_items.php:129 -#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Wiki.php:169 -#: ../../Zotlabs/Module/Invite.php:149 ../../Zotlabs/Module/Poke.php:186 +#: ../../Zotlabs/Module/Admin/Site.php:271 ../../Zotlabs/Module/Locs.php:121 +#: ../../Zotlabs/Module/Connedit.php:899 +#: ../../Zotlabs/Module/Filestorage.php:165 ../../Zotlabs/Module/Setup.php:303 +#: ../../Zotlabs/Module/Setup.php:344 ../../Zotlabs/Module/Group.php:85 +#: ../../Zotlabs/Module/Import_items.php:129 ../../Zotlabs/Module/Mail.php:431 +#: ../../Zotlabs/Module/Mitem.php:243 ../../Zotlabs/Module/Invite.php:149 #: ../../Zotlabs/Module/Pconfig.php:107 ../../Zotlabs/Module/Mood.php:139 -#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Cal.php:343 -#: ../../Zotlabs/Module/Rate.php:166 ../../Zotlabs/Module/Appman.php:134 -#: ../../Zotlabs/Module/Pdledit.php:74 ../../Zotlabs/Module/Events.php:493 +#: ../../Zotlabs/Module/Cal.php:343 ../../Zotlabs/Module/Rate.php:166 +#: ../../Zotlabs/Module/Appman.php:148 ../../Zotlabs/Module/Pdledit.php:74 +#: ../../Zotlabs/Module/Import.php:518 ../../Zotlabs/Module/Events.php:493 #: ../../Zotlabs/Module/Sources.php:114 ../../Zotlabs/Module/Sources.php:149 -#: ../../Zotlabs/Module/Mail.php:425 +#: ../../Zotlabs/Module/Poke.php:198 #: ../../Zotlabs/Module/Settings/Features.php:47 #: ../../Zotlabs/Module/Settings/Oauth.php:87 #: ../../Zotlabs/Module/Settings/Account.php:118 +#: ../../Zotlabs/Module/Settings/Channel.php:476 #: ../../Zotlabs/Module/Settings/Display.php:203 -#: ../../Zotlabs/Module/Settings/Featured.php:50 +#: ../../Zotlabs/Module/Settings/Featured.php:52 #: ../../Zotlabs/Module/Settings/Tokens.php:168 -#: ../../Zotlabs/Module/Settings/Channel.php:476 #: ../../Zotlabs/Module/Settings/Permcats.php:110 #: ../../Zotlabs/Module/Thing.php:320 ../../Zotlabs/Module/Thing.php:370 #: ../../Zotlabs/Module/Photos.php:657 ../../Zotlabs/Module/Photos.php:1022 #: ../../Zotlabs/Module/Photos.php:1062 ../../Zotlabs/Module/Photos.php:1180 #: ../../Zotlabs/Module/Chat.php:194 ../../Zotlabs/Module/Chat.php:240 -#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:732 +#: ../../Zotlabs/Module/Xchan.php:15 ../../Zotlabs/Lib/ThreadItem.php:730 #: ../../Zotlabs/Widget/Eventstools.php:16 #: ../../extend/addon/addon/chords/Mod_Chords.php:60 #: ../../extend/addon/addon/dwpost/dwpost.php:89 @@ -1435,7 +1007,7 @@ msgstr "" #: ../../extend/addon/addon/openstreetmap/openstreetmap.php:168 #: ../../extend/addon/addon/pageheader/pageheader.php:48 #: ../../extend/addon/addon/piwik/piwik.php:95 -#: ../../extend/addon/addon/planets/planets.php:157 +#: ../../extend/addon/addon/planets/planets.php:153 #: ../../extend/addon/addon/pumpio/pumpio.php:237 #: ../../extend/addon/addon/rainbowtag/rainbowtag.php:85 #: ../../extend/addon/addon/redfiles/redfiles.php:124 @@ -1443,7 +1015,7 @@ msgstr "" #: ../../extend/addon/addon/redred/redred.php:119 #: ../../extend/addon/addon/rtof/rtof.php:101 #: ../../extend/addon/addon/skeleton/skeleton.php:65 -#: ../../extend/addon/addon/smileybutton/smileybutton.php:281 +#: ../../extend/addon/addon/smileybutton/smileybutton.php:219 #: ../../extend/addon/addon/startpage/startpage.php:113 #: ../../extend/addon/addon/statusnet/statusnet.php:322 #: ../../extend/addon/addon/statusnet/statusnet.php:380 @@ -1455,11 +1027,13 @@ msgstr "" #: ../../extend/addon/addon/visage/visage.php:170 #: ../../extend/addon/addon/wppost/wppost.php:113 #: ../../extend/addon/addon/xmpp/xmpp.php:69 -#: ../../extend/addon/addon/cdav/cdav.php:246 #: ../../extend/addon/addon/likebanner/likebanner.php:57 +#: ../../extend/addon/addon/authchoose/authchoose.php:71 #: ../../extend/addon/addon/mailtest/mailtest.php:100 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:155 -#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:84 +#: ../../extend/addon/addon/diaspora/diaspora.php:749 +#: ../../extend/addon/addon/gnusoc/gnusoc.php:226 +#: ../../include/js_strings.php:22 ../../view/theme/redbasic/php/config.php:95 msgid "Submit" msgstr "" @@ -1468,25 +1042,19 @@ msgid "View this profile" msgstr "" #: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1065 +#: ../../include/channel.php:1081 msgid "Edit visibility" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Profiles.php:729 msgid "Profile Tools" -======= -#: ../../Zotlabs/Module/Events.php:691 ../../Zotlabs/Module/Cal.php:339 -#: ../../include/channel.php:1365 -msgid "Export" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Profiles.php:730 msgid "Change cover photo" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1036 +#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1052 msgid "Change profile photo" msgstr "" @@ -1506,7 +1074,7 @@ msgstr "" msgid "Add profile things" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1648 +#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1654 msgid "Personal" msgstr "" @@ -1543,7 +1111,7 @@ msgid "Profile name" msgstr "" #: ../../Zotlabs/Module/Profiles.php:748 ../../Zotlabs/Module/Profiles.php:752 -#: ../../Zotlabs/Module/Appman.php:122 ../../Zotlabs/Module/Appman.php:123 +#: ../../Zotlabs/Module/Appman.php:136 ../../Zotlabs/Module/Appman.php:137 #: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Events.php:465 #: ../../include/datetime.php:259 msgid "Required" @@ -1569,31 +1137,16 @@ msgstr "" msgid "Locality/City" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Profiles.php:758 msgid "Region/State" msgstr "" #: ../../Zotlabs/Module/Profiles.php:759 msgid "Postal/Zip code" -======= -#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Tagger.php:47 -#: ../../Zotlabs/Module/Like.php:370 -#: ../../addon/redphotos/redphotohelper.php:71 -#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:116 -#: ../../include/text.php:1937 -msgid "photo" msgstr "" -#: ../../Zotlabs/Module/Subthread.php:87 ../../Zotlabs/Module/Like.php:370 -#: ../../addon/diaspora/inbound.php:1783 ../../include/conversation.php:144 -#: ../../include/text.php:1943 -msgid "status" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:927 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1161 +#: ../../Zotlabs/Module/Profiles.php:760 ../../Zotlabs/Module/Connedit.php:944 +#: ../../Zotlabs/Module/Cdav.php:1134 msgid "Country" msgstr "" @@ -1601,7 +1154,6 @@ msgstr "" msgid "Who (if applicable)" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Profiles.php:765 msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgstr "" @@ -1633,41 +1185,6 @@ msgstr "" #: ../../Zotlabs/Module/Profiles.php:774 msgid "Keywords used in directory listings" -======= -#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 -msgid "Nothing to import." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79 -#: ../../Zotlabs/Module/Import.php:95 -msgid "Unable to download data from old server" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:77 ../../Zotlabs/Module/Import.php:102 -msgid "Imported file is empty." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:93 ../../Zotlabs/Module/Import.php:121 -#, php-format -msgid "Warning: Database versions differ by %1$d updates." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:108 -msgid "Import completed" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:125 -msgid "Import Items" -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:126 -msgid "Use this form to import existing posts and content from an export file." -msgstr "" - -#: ../../Zotlabs/Module/Import_items.php:127 -#: ../../Zotlabs/Module/Import.php:501 -msgid "File to Upload" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Profiles.php:774 @@ -1714,162 +1231,139 @@ msgstr "" msgid "Communications" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:905 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1139 +#: ../../Zotlabs/Module/Profiles.php:789 ../../Zotlabs/Module/Connedit.php:922 +#: ../../Zotlabs/Module/Cdav.php:1112 msgid "Phone" msgstr "" #: ../../Zotlabs/Module/Profiles.php:790 #: ../../Zotlabs/Module/Admin/Accounts.php:169 #: ../../Zotlabs/Module/Admin/Accounts.php:181 -#: ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Connedit.php:923 ../../Zotlabs/Module/Cdav.php:1113 #: ../../extend/addon/addon/redred/redred.php:107 #: ../../extend/addon/addon/rtof/rtof.php:93 -#: ../../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:1749 +#: ../../include/network.php:1696 msgid "Email" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:907 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1141 +#: ../../Zotlabs/Module/Profiles.php:791 ../../Zotlabs/Module/Connedit.php:924 +#: ../../Zotlabs/Module/Cdav.php:1114 msgid "Instant messenger" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:908 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1142 +#: ../../Zotlabs/Module/Profiles.php:792 ../../Zotlabs/Module/Connedit.php:925 +#: ../../Zotlabs/Module/Cdav.php:1115 msgid "Website" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:910 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1144 +#: ../../Zotlabs/Module/Profiles.php:794 ../../Zotlabs/Module/Connedit.php:927 +#: ../../Zotlabs/Module/Cdav.php:1117 msgid "Note" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:911 -#: ../../extend/addon/addon/cdav/cdav.php:270 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1145 -#: ../../include/connections.php:668 +#: ../../Zotlabs/Module/Profiles.php:795 ../../Zotlabs/Module/Connedit.php:928 +#: ../../Zotlabs/Module/Cdav.php:1118 ../../include/connections.php:674 +#: ../../include/event.php:1290 msgid "Mobile" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:912 -#: ../../extend/addon/addon/cdav/cdav.php:271 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1146 -#: ../../include/connections.php:669 +#: ../../Zotlabs/Module/Profiles.php:796 ../../Zotlabs/Module/Connedit.php:929 +#: ../../Zotlabs/Module/Cdav.php:1119 ../../include/connections.php:675 +#: ../../include/event.php:1291 msgid "Home" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:913 -#: ../../extend/addon/addon/cdav/cdav.php:274 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1147 -#: ../../include/connections.php:672 +#: ../../Zotlabs/Module/Profiles.php:797 ../../Zotlabs/Module/Connedit.php:930 +#: ../../Zotlabs/Module/Cdav.php:1120 ../../include/connections.php:678 +#: ../../include/event.php:1294 msgid "Work" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:915 +#: ../../Zotlabs/Module/Profiles.php:799 ../../Zotlabs/Module/Connedit.php:932 +#: ../../Zotlabs/Module/Cdav.php:1122 #: ../../extend/addon/addon/jappixmini/jappixmini.php:368 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1149 msgid "Add Contact" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:916 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1150 +#: ../../Zotlabs/Module/Profiles.php:800 ../../Zotlabs/Module/Connedit.php:933 +#: ../../Zotlabs/Module/Cdav.php:1123 msgid "Add Field" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Profiles.php:802 #: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Connedit.php:918 +#: ../../Zotlabs/Module/Connedit.php:935 #: ../../Zotlabs/Module/Settings/Oauth.php:42 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 ../../Zotlabs/Lib/Apps.php:358 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1152 +#: ../../Zotlabs/Module/Settings/Oauth.php:113 +#: ../../Zotlabs/Module/Cdav.php:1125 ../../Zotlabs/Lib/Apps.php:359 msgid "Update" -======= -#: ../../Zotlabs/Module/Sharedwithme.php:100 -#: ../../Zotlabs/Module/Admin/Channels.php:159 -#: ../../Zotlabs/Module/Settings/Oauth.php:89 -#: ../../Zotlabs/Module/Settings/Oauth.php:115 -#: ../../Zotlabs/Module/Wiki.php:172 ../../Zotlabs/Module/Connedit.php:902 -#: ../../Zotlabs/Module/Chat.php:249 ../../Zotlabs/Lib/NativeWikiPage.php:539 -#: ../../Zotlabs/Storage/Browser.php:233 -#: ../../Zotlabs/Widget/Wiki_page_history.php:22 -#: ../../addon/rendezvous/rendezvous.php:172 ../../addon/cdav/Mod_Cdav.php:1136 -#: ../../addon/gitwiki/Mod_Gitwiki.php:158 -msgid "Name" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Profiles.php:804 +#: ../../Zotlabs/Module/Profiles.php:804 ../../Zotlabs/Module/Wiki.php:288 +#: ../../Zotlabs/Module/Wiki.php:314 #: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Wiki.php:265 -#: ../../Zotlabs/Module/Wiki.php:290 ../../Zotlabs/Module/Connedit.php:920 +#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Connedit.php:937 +#: ../../Zotlabs/Module/Fbrowser.php:66 ../../Zotlabs/Module/Fbrowser.php:88 #: ../../Zotlabs/Module/Settings/Oauth.php:88 #: ../../Zotlabs/Module/Settings/Oauth.php:114 #: ../../Zotlabs/Module/Tagrm.php:15 ../../Zotlabs/Module/Tagrm.php:138 +#: ../../Zotlabs/Module/Cdav.php:839 ../../Zotlabs/Module/Cdav.php:1127 #: ../../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:244 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:267 -#: ../../include/conversation.php:1327 ../../include/conversation.php:1376 +#: ../../include/conversation.php:1324 ../../include/conversation.php:1373 msgid "Cancel" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1061 +#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1077 msgid "Profile Image" -======= -#: ../../Zotlabs/Module/Sharedwithme.php:102 -#: ../../Zotlabs/Storage/Browser.php:235 ../../include/text.php:1409 -msgid "Size" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:105 -#: ../../include/channel.php:1043 +#: ../../Zotlabs/Module/Profiles.php:833 ../../include/nav.php:107 +#: ../../include/channel.php:1059 msgid "Edit Profiles" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Manage.php:143 -#: ../../Zotlabs/Module/Wiki.php:168 ../../Zotlabs/Module/Chat.php:254 +#: ../../Zotlabs/Module/Profiles.php:834 ../../Zotlabs/Module/Wiki.php:168 +#: ../../Zotlabs/Module/Manage.php:143 ../../Zotlabs/Module/Chat.php:254 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:154 msgid "Create New" msgstr "" -#: ../../Zotlabs/Module/Help.php:23 -msgid "Documentation Search" +#: ../../Zotlabs/Module/Item.php:185 +msgid "Unable to locate original post." msgstr "" -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1764 -msgid "About" +#: ../../Zotlabs/Module/Item.php:470 +msgid "Empty post discarded." msgstr "" -#: ../../Zotlabs/Module/Help.php:81 ../../Zotlabs/Module/Group.php:197 -msgid "Members" +#: ../../Zotlabs/Module/Item.php:844 +msgid "Duplicate post suppressed." msgstr "" -#: ../../Zotlabs/Module/Help.php:82 -msgid "Administrators" +#: ../../Zotlabs/Module/Item.php:984 +msgid "System error. Post not saved." msgstr "" -#: ../../Zotlabs/Module/Help.php:83 -msgid "Developers" +#: ../../Zotlabs/Module/Item.php:1020 +msgid "Your comment is awaiting approval." msgstr "" -#: ../../Zotlabs/Module/Help.php:84 -msgid "Tutorials" +#: ../../Zotlabs/Module/Item.php:1118 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../Zotlabs/Module/Help.php:93 -msgid "$Projectname Documentation" +#: ../../Zotlabs/Module/Item.php:1125 +#, php-format +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../Zotlabs/Module/Help.php:94 -msgid "Contents" +#: ../../Zotlabs/Module/Item.php:1132 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" #: ../../Zotlabs/Module/Layouts.php:129 ../../Zotlabs/Module/Layouts.php:189 @@ -1882,12 +1376,12 @@ msgstr "" msgid "Layout Description (Optional)" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2296 +#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2282 msgid "Layouts" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232 -#: ../../include/nav.php:157 ../../include/nav.php:264 +#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:233 +#: ../../include/nav.php:159 ../../include/nav.php:255 #: ../../include/help.php:55 ../../include/help.php:61 msgid "Help" msgstr "" @@ -1900,22 +1394,19 @@ msgstr "" msgid "Layout Description" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Webpages.php:256 -#: ../../Zotlabs/Module/Menu.php:114 ../../Zotlabs/Module/Blocks.php:157 -#: ../../include/page_widgets.php:47 +#: ../../Zotlabs/Module/Layouts.php:191 ../../Zotlabs/Module/Menu.php:114 +#: ../../Zotlabs/Module/Webpages.php:249 ../../Zotlabs/Module/Blocks.php:157 msgid "Created" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Webpages.php:257 -#: ../../Zotlabs/Module/Menu.php:115 ../../Zotlabs/Module/Blocks.php:158 -#: ../../include/page_widgets.php:48 +#: ../../Zotlabs/Module/Layouts.php:192 ../../Zotlabs/Module/Menu.php:115 +#: ../../Zotlabs/Module/Webpages.php:250 ../../Zotlabs/Module/Blocks.php:158 msgid "Edited" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:246 +#: ../../Zotlabs/Module/Layouts.php:194 ../../Zotlabs/Module/Webpages.php:239 #: ../../Zotlabs/Module/Blocks.php:161 ../../Zotlabs/Module/Photos.php:1042 -#: ../../extend/addon/addon/cdav/include/widgets.php:123 -#: ../../include/conversation.php:1311 +#: ../../Zotlabs/Widget/Cdav.php:123 ../../include/conversation.php:1308 msgid "Share" msgstr "" @@ -1923,11 +1414,10 @@ msgstr "" msgid "Download PDL file" msgstr "" -#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Webpages.php:251 -#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Wiki.php:167 +#: ../../Zotlabs/Module/Layouts.php:198 ../../Zotlabs/Module/Wiki.php:167 +#: ../../Zotlabs/Module/Pubsites.php:59 ../../Zotlabs/Module/Webpages.php:244 #: ../../Zotlabs/Module/Blocks.php:166 ../../Zotlabs/Module/Events.php:694 #: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:153 -#: ../../include/page_widgets.php:42 msgid "View" msgstr "" @@ -1974,269 +1464,204 @@ msgstr "" msgid "Restricted or Premium Channel" msgstr "" -#: ../../Zotlabs/Module/Admin.php:60 -#: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 -#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35 -#: ../../Zotlabs/Module/Viewsrc.php:24 ../../Zotlabs/Module/Thing.php:89 -#: ../../include/items.php:3316 -msgid "Item not found." +#: ../../Zotlabs/Module/Chanview.php:96 ../../Zotlabs/Module/Block.php:41 +#: ../../Zotlabs/Module/Page.php:75 ../../Zotlabs/Module/Cal.php:62 +#: ../../Zotlabs/Module/Wall_upload.php:31 +msgid "Channel not found." msgstr "" -#: ../../Zotlabs/Module/Admin.php:94 -msgid "# Accounts" +#: ../../Zotlabs/Module/Chanview.php:139 +msgid "toggle full screen mode" msgstr "" -#: ../../Zotlabs/Module/Admin.php:95 -msgid "# blocked accounts" +#: ../../Zotlabs/Module/Wiki.php:30 +msgid "Profile Unavailable." msgstr "" -#: ../../Zotlabs/Module/Admin.php:96 -msgid "# expired accounts" +#: ../../Zotlabs/Module/Wiki.php:44 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42 +msgid "Not found" msgstr "" -#: ../../Zotlabs/Module/Admin.php:97 -msgid "# expiring accounts" +#: ../../Zotlabs/Module/Wiki.php:68 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62 +msgid "Invalid channel" msgstr "" -#: ../../Zotlabs/Module/Admin.php:108 -msgid "# Channels" +#: ../../Zotlabs/Module/Wiki.php:160 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146 +#: ../../include/nav.php:452 ../../include/conversation.php:1851 +msgid "Wikis" msgstr "" -#: ../../Zotlabs/Module/Admin.php:109 -msgid "# primary" +#: ../../Zotlabs/Module/Wiki.php:166 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152 +msgid "Download" msgstr "" -#: ../../Zotlabs/Module/Admin.php:110 -msgid "# clones" +#: ../../Zotlabs/Module/Wiki.php:170 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156 +msgid "Wiki name" msgstr "" -#: ../../Zotlabs/Module/Admin.php:116 -msgid "Message queues" +#: ../../Zotlabs/Module/Wiki.php:171 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157 +msgid "Content type" msgstr "" -#: ../../Zotlabs/Module/Admin.php:133 -msgid "Your software should be updated" +#: ../../Zotlabs/Module/Wiki.php:180 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166 +msgid "Create a status post for this wiki" msgstr "" -#: ../../Zotlabs/Module/Admin.php:137 ../../Zotlabs/Module/Admin/Logs.php:82 -#: ../../Zotlabs/Module/Admin/Security.php:86 -#: ../../Zotlabs/Module/Admin/Accounts.php:164 -#: ../../Zotlabs/Module/Admin/Channels.php:145 -#: ../../Zotlabs/Module/Admin/Plugins.php:341 -#: ../../Zotlabs/Module/Admin/Plugins.php:436 -#: ../../Zotlabs/Module/Admin/Themes.php:122 -#: ../../Zotlabs/Module/Admin/Themes.php:156 -#: ../../Zotlabs/Module/Admin/Site.php:277 -msgid "Administration" +#: ../../Zotlabs/Module/Wiki.php:222 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185 +msgid "Wiki not found" msgstr "" -#: ../../Zotlabs/Module/Admin.php:138 -msgid "Summary" +#: ../../Zotlabs/Module/Wiki.php:246 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210 +msgid "Rename page" msgstr "" -#: ../../Zotlabs/Module/Admin.php:141 -msgid "Registered accounts" +#: ../../Zotlabs/Module/Wiki.php:256 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214 +msgid "Error retrieving page content" msgstr "" -#: ../../Zotlabs/Module/Admin.php:142 -msgid "Pending registrations" +#: ../../Zotlabs/Module/Wiki.php:262 +msgid "New page" msgstr "" -#: ../../Zotlabs/Module/Admin.php:143 -msgid "Registered channels" +#: ../../Zotlabs/Module/Wiki.php:286 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242 +msgid "Revision Comparison" msgstr "" -#: ../../Zotlabs/Module/Admin.php:144 -msgid "Active plugins" +#: ../../Zotlabs/Module/Wiki.php:287 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243 +msgid "Revert" msgstr "" -#: ../../Zotlabs/Module/Admin.php:145 -msgid "Version" +#: ../../Zotlabs/Module/Wiki.php:291 +msgid "Short description of your changes (optional)" msgstr "" -#: ../../Zotlabs/Module/Admin.php:146 -msgid "Repository version (master)" +#: ../../Zotlabs/Module/Wiki.php:298 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252 +msgid "Source" msgstr "" -#: ../../Zotlabs/Module/Admin.php:147 -msgid "Repository version (dev)" +#: ../../Zotlabs/Module/Wiki.php:307 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260 +msgid "New page name" msgstr "" -#: ../../Zotlabs/Module/Import.php:64 ../../Zotlabs/Module/Import_items.php:48 -msgid "Nothing to import." +#: ../../Zotlabs/Module/Wiki.php:312 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265 +#: ../../include/conversation.php:1229 +msgid "Embed image from photo albums" msgstr "" -#: ../../Zotlabs/Module/Import.php:79 ../../Zotlabs/Module/Import.php:95 -#: ../../Zotlabs/Module/Import_items.php:72 -msgid "Unable to download data from old server" +#: ../../Zotlabs/Module/Wiki.php:313 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266 +#: ../../include/conversation.php:1323 +msgid "Embed an image from your albums" msgstr "" -#: ../../Zotlabs/Module/Import.php:102 -#: ../../Zotlabs/Module/Import_items.php:77 -msgid "Imported file is empty." +#: ../../Zotlabs/Module/Wiki.php:315 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268 +#: ../../include/conversation.php:1325 ../../include/conversation.php:1372 +msgid "OK" msgstr "" -#: ../../Zotlabs/Module/Import.php:121 -#: ../../Zotlabs/Module/Import_items.php:93 -#, php-format -msgid "Warning: Database versions differ by %1$d updates." +#: ../../Zotlabs/Module/Wiki.php:316 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269 +#: ../../include/conversation.php:1265 +msgid "Choose images to embed" msgstr "" -#: ../../Zotlabs/Module/Import.php:144 -#, php-format -msgid "Your service plan only allows %d channels." +#: ../../Zotlabs/Module/Wiki.php:317 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270 +#: ../../include/conversation.php:1266 +msgid "Choose an album" msgstr "" -#: ../../Zotlabs/Module/Import.php:158 -msgid "No channel. Import failed." +#: ../../Zotlabs/Module/Wiki.php:318 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271 +msgid "Choose a different album" msgstr "" -#: ../../Zotlabs/Module/Import.php:466 -msgid "Import completed." +#: ../../Zotlabs/Module/Wiki.php:319 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272 +#: ../../include/conversation.php:1268 +msgid "Error getting album list" msgstr "" -#: ../../Zotlabs/Module/Import.php:494 -msgid "You must be logged in to use this feature." +#: ../../Zotlabs/Module/Wiki.php:320 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273 +#: ../../include/conversation.php:1269 +msgid "Error getting photo link" msgstr "" -#: ../../Zotlabs/Module/Import.php:499 -msgid "Import Channel" +#: ../../Zotlabs/Module/Wiki.php:321 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274 +#: ../../include/conversation.php:1270 +msgid "Error getting album" msgstr "" -#: ../../Zotlabs/Module/Import.php:500 -msgid "" -"Use this form to import an existing channel from a different server/hub. You " -"may retrieve the channel identity from the old server/hub via the network or " -"provide an export file." +#: ../../Zotlabs/Module/Wiki.php:389 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337 +msgid "Error creating wiki. Invalid name." msgstr "" -#: ../../Zotlabs/Module/Import.php:501 -#: ../../Zotlabs/Module/Import_items.php:127 -msgid "File to Upload" +#: ../../Zotlabs/Module/Wiki.php:396 +msgid "A wiki with this name already exists." msgstr "" -#: ../../Zotlabs/Module/Import.php:502 -msgid "Or provide the old server/hub details" +#: ../../Zotlabs/Module/Wiki.php:409 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348 +msgid "Wiki created, but error creating Home page." msgstr "" -#: ../../Zotlabs/Module/Import.php:503 -msgid "Your old identity address (xyz@example.com)" +#: ../../Zotlabs/Module/Wiki.php:416 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353 +msgid "Error creating wiki" msgstr "" -#: ../../Zotlabs/Module/Import.php:504 -msgid "Your old login email address" +#: ../../Zotlabs/Module/Wiki.php:428 +msgid "Wiki delete permission denied." msgstr "" -#: ../../Zotlabs/Module/Import.php:505 -msgid "Your old login password" +#: ../../Zotlabs/Module/Wiki.php:438 +msgid "Error deleting wiki" msgstr "" -#: ../../Zotlabs/Module/Import.php:506 -msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." +#: ../../Zotlabs/Module/Wiki.php:464 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400 +msgid "New page created" msgstr "" -#: ../../Zotlabs/Module/Import.php:507 -msgid "Make this hub my primary location" +#: ../../Zotlabs/Module/Wiki.php:585 +msgid "Cannot delete Home" msgstr "" -#: ../../Zotlabs/Module/Import.php:508 -msgid "Move this channel (disable all previous locations)" +#: ../../Zotlabs/Module/Wiki.php:649 +msgid "Current Revision" msgstr "" -#: ../../Zotlabs/Module/Import.php:509 -msgid "Import a few months of posts if possible (limited by available memory" +#: ../../Zotlabs/Module/Wiki.php:649 +msgid "Selected Revision" msgstr "" -#: ../../Zotlabs/Module/Import.php:510 -msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +#: ../../Zotlabs/Module/Wiki.php:699 +msgid "You must be authenticated." msgstr "" -#: ../../Zotlabs/Module/Page.php:40 ../../Zotlabs/Module/Block.php:31 +#: ../../Zotlabs/Module/Block.php:29 ../../Zotlabs/Module/Page.php:39 msgid "Invalid item." msgstr "" -#: ../../Zotlabs/Module/Page.php:56 ../../Zotlabs/Module/Block.php:43 -#: ../../Zotlabs/Module/Cal.php:62 ../../Zotlabs/Module/Chanview.php:96 -#: ../../Zotlabs/Module/Wall_upload.php:31 -msgid "Channel not found." -msgstr "" - -#: ../../Zotlabs/Module/Page.php:131 -msgid "" -"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " -"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " -"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " -"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " -"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " -"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:52 -msgid "Import Webpage Elements" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:53 -msgid "Import selected" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:76 -msgid "Export Webpage Elements" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:77 -msgid "Export selected" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225 -#: ../../include/conversation.php:1832 -msgid "Webpages" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:252 ../../Zotlabs/Module/Events.php:478 -#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Lib/ThreadItem.php:741 -#: ../../include/page_widgets.php:43 ../../include/conversation.php:1280 -msgid "Preview" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:253 ../../include/page_widgets.php:44 -msgid "Actions" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:254 ../../include/page_widgets.php:45 -msgid "Page Link" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:255 -msgid "Page Title" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:285 -msgid "Invalid file type." -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:297 -msgid "Error opening zip file" -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:308 -msgid "Invalid folder path." -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:335 -msgid "No webpage elements detected." -msgstr "" - -#: ../../Zotlabs/Module/Webpages.php:410 -msgid "Import complete." -msgstr "" - #: ../../Zotlabs/Module/Ping.php:254 msgid "sent you a private message" msgstr "" @@ -2277,13 +1702,12 @@ msgstr "" #: ../../Zotlabs/Module/Connections.php:67 #: ../../Zotlabs/Module/Connections.php:171 -#: ../../Zotlabs/Module/Connections.php:243 -msgid "Archived" +msgid "Archived/Unreachable" msgstr "" #: ../../Zotlabs/Module/Connections.php:72 #: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1657 +#: ../../include/conversation.php:1663 msgid "New" msgstr "" @@ -2319,7 +1743,7 @@ msgid "Only show ignored connections" msgstr "" #: ../../Zotlabs/Module/Connections.php:174 -msgid "Only show archived connections" +msgid "Only show archived/unreachable connections" msgstr "" #: ../../Zotlabs/Module/Connections.php:181 @@ -2330,93 +1754,93 @@ msgstr "" msgid "Pending approval" msgstr "" -#: ../../Zotlabs/Module/Connections.php:258 +#: ../../Zotlabs/Module/Connections.php:243 +msgid "Archived" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:247 +msgid "Not connected at this location" +msgstr "" + +#: ../../Zotlabs/Module/Connections.php:259 #, php-format msgid "%1$s [%2$s]" msgstr "" -#: ../../Zotlabs/Module/Connections.php:259 +#: ../../Zotlabs/Module/Connections.php:260 msgid "Edit connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:260 +#: ../../Zotlabs/Module/Connections.php:262 msgid "Delete connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:269 +#: ../../Zotlabs/Module/Connections.php:271 msgid "Channel address" msgstr "" -#: ../../Zotlabs/Module/Connections.php:271 +#: ../../Zotlabs/Module/Connections.php:273 msgid "Network" msgstr "" -#: ../../Zotlabs/Module/Connections.php:274 +#: ../../Zotlabs/Module/Connections.php:276 msgid "Call" msgstr "" -#: ../../Zotlabs/Module/Connections.php:276 +#: ../../Zotlabs/Module/Connections.php:278 msgid "Status" msgstr "" -#: ../../Zotlabs/Module/Connections.php:278 +#: ../../Zotlabs/Module/Connections.php:280 msgid "Connected" msgstr "" -#: ../../Zotlabs/Module/Connections.php:280 +#: ../../Zotlabs/Module/Connections.php:282 msgid "Approve connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:281 +#: ../../Zotlabs/Module/Connections.php:283 #: ../../Zotlabs/Module/Admin/Accounts.php:171 +#: ../../include/conversation.php:685 msgid "Approve" msgstr "" -#: ../../Zotlabs/Module/Connections.php:282 +#: ../../Zotlabs/Module/Connections.php:284 msgid "Ignore connection" msgstr "" -#: ../../Zotlabs/Module/Connections.php:283 +#: ../../Zotlabs/Module/Connections.php:285 #: ../../Zotlabs/Module/Connedit.php:626 msgid "Ignore" msgstr "" -#: ../../Zotlabs/Module/Connections.php:284 +#: ../../Zotlabs/Module/Connections.php:286 msgid "Recent activity" msgstr "" -#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216 -#: ../../include/text.php:957 ../../include/nav.php:181 +#: ../../Zotlabs/Module/Connections.php:310 ../../Zotlabs/Lib/Apps.php:217 +#: ../../include/text.php:951 ../../include/nav.php:183 msgid "Connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:312 ../../Zotlabs/Module/Search.php:44 -#: ../../Zotlabs/Lib/Apps.php:237 ../../Zotlabs/Widget/Sitesearch.php:31 -#: ../../include/text.php:1027 ../../include/text.php:1039 -#: ../../include/nav.php:160 ../../include/acl_selectors.php:213 +#: ../../Zotlabs/Module/Connections.php:314 ../../Zotlabs/Module/Search.php:44 +#: ../../Zotlabs/Lib/Apps.php:238 ../../Zotlabs/Widget/Sitesearch.php:31 +#: ../../include/text.php:1021 ../../include/text.php:1033 +#: ../../include/nav.php:162 ../../include/acl_selectors.php:213 msgid "Search" msgstr "" -#: ../../Zotlabs/Module/Connections.php:313 +#: ../../Zotlabs/Module/Connections.php:315 msgid "Search your connections" msgstr "" -#: ../../Zotlabs/Module/Connections.php:314 +#: ../../Zotlabs/Module/Connections.php:316 msgid "Connections search" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Cover_photo.php:56 #: ../../Zotlabs/Module/Profile_photo.php:61 msgid "Image uploaded but image cropping failed." -======= -#: ../../Zotlabs/Module/Admin/Plugins.php:259 -#: ../../Zotlabs/Module/Admin/Themes.php:72 ../../Zotlabs/Module/Thing.php:89 -#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Display.php:35 -#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Admin.php:60 -#: ../../include/items.php:3391 -msgid "Item not found." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Cover_photo.php:136 @@ -2444,37 +1868,30 @@ msgstr "" msgid "Unable to process image." msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4224 +#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4273 msgid "female" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4225 +#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4274 #, php-format msgid "%1$s updated her %2$s" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4226 +#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4275 msgid "male" -======= -#: ../../Zotlabs/Module/Admin/Plugins.php:344 -#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223 -#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:207 -msgid "Settings" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4227 +#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4276 #, php-format msgid "%1$s updated his %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4229 +#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4278 #, php-format msgid "%1$s updated their %2$s" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1738 +#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1776 msgid "cover photo" msgstr "" @@ -2536,7 +1953,6 @@ msgstr "" msgid "Off" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Admin/Features.php:55 #: ../../Zotlabs/Module/Admin/Features.php:56 #: ../../Zotlabs/Module/Settings/Features.php:38 @@ -2546,25 +1962,6 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Features.php:56 #, php-format msgid "Lock feature %s" -======= -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358 -msgid "Install" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Plugins.php:423 -#: ../../Zotlabs/Module/Settings/Oauth.php:88 -#: ../../Zotlabs/Module/Settings/Oauth.php:114 -#: ../../Zotlabs/Module/Wiki.php:265 ../../Zotlabs/Module/Wiki.php:290 -#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Fbrowser.php:66 -#: ../../Zotlabs/Module/Fbrowser.php:88 ../../Zotlabs/Module/Profiles.php:804 -#: ../../Zotlabs/Module/Filer.php:55 ../../Zotlabs/Module/Tagrm.php:15 -#: ../../Zotlabs/Module/Tagrm.php:138 ../../addon/cdav/Mod_Cdav.php:866 -#: ../../addon/cdav/Mod_Cdav.php:1154 ../../addon/js_upload/js_upload.php:46 -#: ../../addon/gitwiki/Mod_Gitwiki.php:244 -#: ../../addon/gitwiki/Mod_Gitwiki.php:267 ../../include/conversation.php:1327 -#: ../../include/conversation.php:1376 -msgid "Cancel" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Admin/Features.php:64 @@ -2575,22 +1972,25 @@ msgstr "" msgid "Log settings updated." msgstr "" +#: ../../Zotlabs/Module/Admin/Logs.php:82 +#: ../../Zotlabs/Module/Admin/Security.php:86 +#: ../../Zotlabs/Module/Admin/Accounts.php:164 +#: ../../Zotlabs/Module/Admin/Channels.php:145 +#: ../../Zotlabs/Module/Admin/Plugins.php:341 +#: ../../Zotlabs/Module/Admin/Plugins.php:436 +#: ../../Zotlabs/Module/Admin/Themes.php:122 +#: ../../Zotlabs/Module/Admin/Themes.php:156 +#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Module/Admin.php:134 +msgid "Administration" +msgstr "" + #: ../../Zotlabs/Module/Admin/Logs.php:83 ../../Zotlabs/Widget/Admin.php:48 #: ../../Zotlabs/Widget/Admin.php:58 msgid "Logs" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Admin/Logs.php:85 msgid "Clear" -======= -#: ../../Zotlabs/Module/Admin/Plugins.php:453 -#: ../../Zotlabs/Module/Settings/Oauth.php:42 -#: ../../Zotlabs/Module/Settings/Oauth.php:113 -#: ../../Zotlabs/Module/Connedit.php:918 ../../Zotlabs/Module/Profiles.php:802 -#: ../../Zotlabs/Lib/Apps.php:358 ../../addon/cdav/Mod_Cdav.php:1152 -msgid "Update" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Admin/Logs.php:91 @@ -2640,19 +2040,9 @@ msgstr "" msgid "Label on profile pages" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Admin/Profs.php:73 #: ../../Zotlabs/Module/Admin/Profs.php:93 msgid "Help text" -======= -#: ../../Zotlabs/Module/Admin/Accounts.php:169 -#: ../../Zotlabs/Module/Admin/Accounts.php:181 -#: ../../Zotlabs/Module/Connedit.php:906 ../../Zotlabs/Module/Profiles.php:790 -#: ../../addon/cdav/Mod_Cdav.php:1140 ../../addon/openid/MysqlProvider.php:56 -#: ../../addon/openid/MysqlProvider.php:57 ../../addon/rtof/rtof.php:93 -#: ../../addon/redred/redred.php:107 ../../include/network.php:2315 -msgid "Email" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:73 @@ -2663,8 +2053,8 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:74 #: ../../Zotlabs/Module/Admin/Profs.php:94 ../../Zotlabs/Module/Filer.php:53 #: ../../Zotlabs/Module/Rbmark.php:32 ../../Zotlabs/Module/Rbmark.php:104 -#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1028 -#: ../../include/text.php:1040 +#: ../../Zotlabs/Widget/Notes.php:18 ../../include/text.php:1022 +#: ../../include/text.php:1034 msgid "Save" msgstr "" @@ -2672,23 +2062,12 @@ msgstr "" msgid "Field definition not found" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Admin/Profs.php:89 msgid "Edit Profile Field" msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:147 ../../Zotlabs/Widget/Admin.php:30 msgid "Profile Fields" -======= -#: ../../Zotlabs/Module/Admin/Accounts.php:174 -#: ../../Zotlabs/Module/Connedit.php:618 -msgid "Block" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Accounts.php:175 -#: ../../Zotlabs/Module/Connedit.php:618 -msgid "Unblock" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Admin/Profs.php:148 @@ -2823,14 +2202,8 @@ msgstr "" msgid "One site per line. By default embedded content is filtered." msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Admin/Security.php:100 msgid "Block embedded HTML from these domains" -======= -#: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1760 ../../include/nav.php:369 -msgid "Channel" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Admin/Account_edit.php:29 @@ -2866,13 +2239,8 @@ msgstr "" msgid "Account language (for emails)" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Admin/Account_edit.php:73 msgid "Service class" -======= -#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2915 -msgid "Default" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:36 @@ -2910,7 +2278,7 @@ msgstr "" #: ../../Zotlabs/Module/Admin/Accounts.php:165 #: ../../Zotlabs/Module/Admin/Accounts.php:178 -#: ../../Zotlabs/Widget/Admin.php:23 +#: ../../Zotlabs/Module/Admin.php:94 ../../Zotlabs/Widget/Admin.php:23 msgid "Accounts" msgstr "" @@ -3032,7 +2400,7 @@ msgid "Channel '%s' code disallowed" msgstr "" #: ../../Zotlabs/Module/Admin/Channels.php:146 -#: ../../Zotlabs/Widget/Admin.php:24 +#: ../../Zotlabs/Module/Admin.php:108 ../../Zotlabs/Widget/Admin.php:24 msgid "Channels" msgstr "" @@ -3052,8 +2420,8 @@ msgstr "" msgid "Disallow Code" msgstr "" -#: ../../Zotlabs/Module/Admin/Channels.php:154 -#: ../../include/conversation.php:1751 +#: ../../Zotlabs/Module/Admin/Channels.php:154 ../../include/nav.php:359 +#: ../../include/conversation.php:1757 msgid "Channel" msgstr "" @@ -3141,6 +2509,14 @@ msgstr "" msgid "Last known contact" msgstr "" +#: ../../Zotlabs/Module/Admin/Plugins.php:259 +#: ../../Zotlabs/Module/Admin/Themes.php:72 +#: ../../Zotlabs/Module/Filestorage.php:32 ../../Zotlabs/Module/Display.php:35 +#: ../../Zotlabs/Module/Viewsrc.php:25 ../../Zotlabs/Module/Admin.php:60 +#: ../../Zotlabs/Module/Thing.php:89 ../../include/items.php:3361 +msgid "Item not found." +msgstr "" + #: ../../Zotlabs/Module/Admin/Plugins.php:289 #, php-format msgid "Plugin %s disabled." @@ -3173,8 +2549,8 @@ msgid "Toggle" msgstr "" #: ../../Zotlabs/Module/Admin/Plugins.php:344 -#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:223 -#: ../../Zotlabs/Widget/Settings_menu.php:131 ../../include/nav.php:203 +#: ../../Zotlabs/Module/Admin/Themes.php:125 ../../Zotlabs/Lib/Apps.php:224 +#: ../../Zotlabs/Widget/Settings_menu.php:133 ../../include/nav.php:204 msgid "Settings" msgstr "" @@ -3237,7 +2613,7 @@ msgstr "" msgid "Install new repo" msgstr "" -#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:358 +#: ../../Zotlabs/Module/Admin/Plugins.php:422 ../../Zotlabs/Lib/Apps.php:359 msgid "Install" msgstr "" @@ -3288,435 +2664,376 @@ msgstr "" msgid "[Unsupported]" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:144 +#: ../../Zotlabs/Module/Admin/Site.php:142 msgid "Site settings updated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:170 ../../include/text.php:2942 +#: ../../Zotlabs/Module/Admin/Site.php:168 ../../include/text.php:2928 +#: ../../view/theme/redbasic/php/config.php:15 msgid "Default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:181 +#: ../../Zotlabs/Module/Admin/Site.php:179 #: ../../Zotlabs/Module/Settings/Display.php:137 #, php-format msgid "%s - (Incompatible)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:188 +#: ../../Zotlabs/Module/Admin/Site.php:186 #: ../../Zotlabs/Module/Settings/Display.php:151 msgid "mobile" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:190 +#: ../../Zotlabs/Module/Admin/Site.php:188 msgid "experimental" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:192 +#: ../../Zotlabs/Module/Admin/Site.php:190 msgid "unsupported" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:238 +#: ../../Zotlabs/Module/Admin/Site.php:236 msgid "Yes - with approval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:244 +#: ../../Zotlabs/Module/Admin/Site.php:242 msgid "My site is not a public server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:245 +#: ../../Zotlabs/Module/Admin/Site.php:243 msgid "My site has paid access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:246 +#: ../../Zotlabs/Module/Admin/Site.php:244 msgid "My site has free access only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:247 +#: ../../Zotlabs/Module/Admin/Site.php:245 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:258 -msgid "Basic/Minimal Social Networking" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:259 -msgid "Standard Configuration (default)" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:260 -msgid "Professional" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:264 ../../Zotlabs/Lib/Techlevels.php:10 +#: ../../Zotlabs/Module/Admin/Site.php:256 msgid "Beginner/Basic" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:265 ../../Zotlabs/Lib/Techlevels.php:11 +#: ../../Zotlabs/Module/Admin/Site.php:257 msgid "Novice - not skilled but willing to learn" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:266 ../../Zotlabs/Lib/Techlevels.php:12 +#: ../../Zotlabs/Module/Admin/Site.php:258 msgid "Intermediate - somewhat comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:267 ../../Zotlabs/Lib/Techlevels.php:13 +#: ../../Zotlabs/Module/Admin/Site.php:259 msgid "Advanced - very comfortable" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:268 ../../Zotlabs/Lib/Techlevels.php:14 +#: ../../Zotlabs/Module/Admin/Site.php:260 msgid "Expert - I can write computer code" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:269 ../../Zotlabs/Lib/Techlevels.php:15 +#: ../../Zotlabs/Module/Admin/Site.php:261 msgid "Wizard - I probably know more than you do" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:278 ../../Zotlabs/Widget/Admin.php:22 +#: ../../Zotlabs/Module/Admin/Site.php:270 ../../Zotlabs/Widget/Admin.php:22 msgid "Site" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:281 +#: ../../Zotlabs/Module/Admin/Site.php:273 msgid "File upload" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:282 +#: ../../Zotlabs/Module/Admin/Site.php:274 msgid "Policies" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Admin/Site.php:283 +#: ../../Zotlabs/Module/Admin/Site.php:275 #: ../../include/contact_widgets.php:16 msgid "Advanced" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:287 +#: ../../Zotlabs/Module/Admin/Site.php:279 #: ../../extend/addon/addon/statusnet/statusnet.php:890 msgid "Site name" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:289 -msgid "Server Configuration/Role" -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:281 msgid "Site default technical skill level" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:291 +#: ../../Zotlabs/Module/Admin/Site.php:281 msgid "Used to provide a member experience matched to technical comfort level" -======= -#: ../../Zotlabs/Module/Settings/Permcats.php:103 -#: ../../Zotlabs/Module/Settings/Tokens.php:161 -#: ../../Zotlabs/Module/Connedit.php:886 -msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Permcats.php:105 -#: ../../Zotlabs/Module/Settings/Tokens.php:163 -#: ../../Zotlabs/Module/Connedit.php:881 -msgid "inherited" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:108 -#: ../../Zotlabs/Module/Settings/Tokens.php:166 -#: ../../Zotlabs/Module/Connedit.php:888 -msgid "Individual Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Permcats.php:109 -#: ../../Zotlabs/Module/Settings/Tokens.php:167 -#: ../../Zotlabs/Module/Connedit.php:889 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:62 -#: ../../Zotlabs/Module/Settings/Channel.php:66 -#: ../../Zotlabs/Module/Settings/Channel.php:67 -#: ../../Zotlabs/Module/Settings/Channel.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:81 -#: ../../Zotlabs/Module/Connedit.php:707 ../../Zotlabs/Widget/Affinity.php:28 -#: ../../include/selectors.php:123 ../../include/channel.php:406 -#: ../../include/channel.php:407 ../../include/channel.php:414 -msgid "Friends" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Lock the technical skill level setting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:293 +#: ../../Zotlabs/Module/Admin/Site.php:283 msgid "Members can set their own technical comfort level by default" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:295 +#: ../../Zotlabs/Module/Admin/Site.php:285 msgid "Banner/Logo" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:286 msgid "Administrator Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:296 +#: ../../Zotlabs/Module/Admin/Site.php:286 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:287 #: ../../Zotlabs/Module/Siteinfo.php:23 msgid "Site Information" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:297 +#: ../../Zotlabs/Module/Admin/Site.php:287 msgid "" "Publicly visible description of this site. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:298 +#: ../../Zotlabs/Module/Admin/Site.php:288 msgid "System language" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "System theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:299 +#: ../../Zotlabs/Module/Admin/Site.php:289 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Mobile system theme" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:300 +#: ../../Zotlabs/Module/Admin/Site.php:290 msgid "Theme for mobile devices" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "Allow Feeds as Connections" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:302 +#: ../../Zotlabs/Module/Admin/Site.php:292 msgid "(Heavy system resource usage)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "Maximum image size" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:303 +#: ../../Zotlabs/Module/Admin/Site.php:293 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Admin/Site.php:304 +#: ../../Zotlabs/Module/Admin/Site.php:294 msgid "Does this site allow new member registration?" -======= -#: ../../Zotlabs/Module/Settings/Channel.php:482 ../../include/channel.php:1250 -msgid "Full Name:" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "Invitation only" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:305 +#: ../../Zotlabs/Module/Admin/Site.php:295 msgid "" "Only allow new member registrations with an invitation code. Above register " "policy must be set to Yes." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:306 +#: ../../Zotlabs/Module/Admin/Site.php:296 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Register text" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:307 +#: ../../Zotlabs/Module/Admin/Site.php:297 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "Site homepage to show visitors (default: login box)" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:308 +#: ../../Zotlabs/Module/Admin/Site.php:298 msgid "" "example: 'public' to show public stream, 'page/sys/home' to show a system " "webpage called 'home' or 'include:home.html' to include a file." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "Preserve site homepage URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:309 +#: ../../Zotlabs/Module/Admin/Site.php:299 msgid "" "Present the site homepage in a frame at the original location instead of " "redirecting" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "Accounts abandoned after x days" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:310 +#: ../../Zotlabs/Module/Admin/Site.php:300 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "Allowed friend domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:311 +#: ../../Zotlabs/Module/Admin/Site.php:301 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "Verify Email Addresses" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:312 +#: ../../Zotlabs/Module/Admin/Site.php:302 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "Force publish" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:313 +#: ../../Zotlabs/Module/Admin/Site.php:303 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "Import Public Streams" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:314 +#: ../../Zotlabs/Module/Admin/Site.php:304 msgid "" "Import and allow access to public content pulled from other sites. Warning: " "this content is unmoderated." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "Login on Homepage" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:315 +#: ../../Zotlabs/Module/Admin/Site.php:305 msgid "" "Present a login box to visitors on the home page if no other content has " "been configured." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "Enable context help" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:316 +#: ../../Zotlabs/Module/Admin/Site.php:306 msgid "" "Display contextual help for the current page when the help button is pressed." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:318 +#: ../../Zotlabs/Module/Admin/Site.php:308 msgid "Reply-to email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:319 +#: ../../Zotlabs/Module/Admin/Site.php:309 msgid "Sender (From) email address for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:320 +#: ../../Zotlabs/Module/Admin/Site.php:310 msgid "Name of email sender for system generated email." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Directory Server URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:322 +#: ../../Zotlabs/Module/Admin/Site.php:312 msgid "Default directory server" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:324 +#: ../../Zotlabs/Module/Admin/Site.php:314 msgid "Proxy user" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:325 +#: ../../Zotlabs/Module/Admin/Site.php:315 msgid "Proxy URL" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Network timeout" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:326 +#: ../../Zotlabs/Module/Admin/Site.php:316 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "Delivery interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:327 +#: ../../Zotlabs/Module/Admin/Site.php:317 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "Deliveries per process" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:328 +#: ../../Zotlabs/Module/Admin/Site.php:318 msgid "" "Number of deliveries to attempt in a single operating system process. Adjust " "if necessary to tune system performance. Recommend: 1-5." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "Poll interval" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:329 +#: ../../Zotlabs/Module/Admin/Site.php:319 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "Maximum Load Average" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:330 +#: ../../Zotlabs/Module/Admin/Site.php:320 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "Expiration period in days for imported (grid/network) content" msgstr "" -#: ../../Zotlabs/Module/Admin/Site.php:331 +#: ../../Zotlabs/Module/Admin/Site.php:321 msgid "0 for no expiration of imported content" msgstr "" @@ -3734,8 +3051,8 @@ msgstr "" #: ../../Zotlabs/Module/Editlayout.php:79 #: ../../Zotlabs/Module/Editwebpage.php:80 -#: ../../Zotlabs/Module/Editpost.php:24 ../../Zotlabs/Module/Editblock.php:79 -#: ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Editblock.php:79 ../../Zotlabs/Module/Editblock.php:95 +#: ../../Zotlabs/Module/Editpost.php:24 msgid "Item not found" msgstr "" @@ -3743,18 +3060,17 @@ msgstr "" msgid "Edit Layout" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:144 +#: ../../Zotlabs/Module/Editwebpage.php:139 msgid "Page link" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:148 -#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Mail.php:287 -#: ../../Zotlabs/Module/Mail.php:424 ../../Zotlabs/Module/Chat.php:205 -#: ../../include/conversation.php:1228 +#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:288 +#: ../../Zotlabs/Module/Mail.php:430 ../../Zotlabs/Module/Editblock.php:116 +#: ../../Zotlabs/Module/Chat.php:205 ../../include/conversation.php:1225 msgid "Insert web link" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:171 +#: ../../Zotlabs/Module/Editwebpage.php:166 msgid "Edit Webpage" msgstr "" @@ -3843,7 +3159,7 @@ msgstr "" msgid "Submit and proceed" msgstr "" -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2295 +#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2281 msgid "Menus" msgstr "" @@ -3903,22 +3219,12 @@ msgstr "" msgid "Allow bookmarks" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Menu.php:166 ../../Zotlabs/Module/Mitem.php:120 #: ../../Zotlabs/Module/Xchan.php:41 msgid "Not found." -======= -#: ../../Zotlabs/Module/Settings/Tokens.php:160 -#: ../../Zotlabs/Module/Connedit.php:885 -msgid "Their Settings" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Editpost.php:35 -msgid "Item is not editable" -msgstr "" - -#: ../../Zotlabs/Module/Editpost.php:108 ../../Zotlabs/Module/Rpost.php:138 +#: ../../Zotlabs/Module/Rpost.php:138 ../../Zotlabs/Module/Editpost.php:108 msgid "Edit post" msgstr "" @@ -3948,7 +3254,7 @@ msgstr "" msgid "Manage Channel Locations" msgstr "" -#: ../../Zotlabs/Module/Locs.php:119 +#: ../../Zotlabs/Module/Locs.php:119 ../../Zotlabs/Module/Admin.php:109 msgid "Primary" msgstr "" @@ -4004,7 +3310,7 @@ msgid "Software" msgstr "" #: ../../Zotlabs/Module/Pubsites.php:35 ../../Zotlabs/Module/Ratings.php:97 -#: ../../include/conversation.php:1032 +#: ../../include/conversation.php:1029 msgid "Ratings" msgstr "" @@ -4012,808 +3318,888 @@ msgstr "" msgid "Rate" msgstr "" -#: ../../Zotlabs/Module/Channel.php:32 ../../Zotlabs/Module/Chat.php:25 -#: ../../extend/addon/addon/chess/chess.php:403 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:28 -msgid "You must be logged in to see this page." +#: ../../Zotlabs/Module/Connedit.php:79 +msgid "Could not access contact record." msgstr "" -#: ../../Zotlabs/Module/Channel.php:47 ../../Zotlabs/Module/Profile.php:43 -#: ../../Zotlabs/Module/Hcard.php:35 -msgid "Posts and comments" +#: ../../Zotlabs/Module/Connedit.php:109 +msgid "Could not locate selected profile." msgstr "" -#: ../../Zotlabs/Module/Channel.php:54 ../../Zotlabs/Module/Profile.php:50 -#: ../../Zotlabs/Module/Hcard.php:42 -msgid "Only posts" +#: ../../Zotlabs/Module/Connedit.php:246 +msgid "Connection updated." msgstr "" -#: ../../Zotlabs/Module/Channel.php:112 -msgid "Insufficient permissions. Request redirected to profile page." +#: ../../Zotlabs/Module/Connedit.php:248 +msgid "Failed to update connection record." msgstr "" -#: ../../Zotlabs/Module/Apps.php:45 -msgid "Apps" +#: ../../Zotlabs/Module/Connedit.php:298 +msgid "is now connected to" msgstr "" -#: ../../Zotlabs/Module/Apps.php:48 -msgid "Manage apps" +#: ../../Zotlabs/Module/Connedit.php:423 +msgid "Could not access address book record." msgstr "" -#: ../../Zotlabs/Module/Apps.php:49 -msgid "Create new app" +#: ../../Zotlabs/Module/Connedit.php:471 +msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 -#: ../../extend/addon/addon/opensearch/opensearch.php:42 -msgid "$Projectname" +#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:495 +#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513 +#: ../../Zotlabs/Module/Connedit.php:526 +msgid "Unable to set address book parameters." msgstr "" -#: ../../Zotlabs/Module/Home.php:92 +#: ../../Zotlabs/Module/Connedit.php:550 +msgid "Connection has been removed." +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:229 +#: ../../extend/addon/addon/openclipatar/openclipatar.php:57 +#: ../../include/nav.php:104 ../../include/conversation.php:979 +msgid "View Profile" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:593 #, php-format -msgid "Welcome to %s" +msgid "View %s's profile" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:87 -msgid "Permission Denied." +#: ../../Zotlabs/Module/Connedit.php:597 +msgid "Refresh Permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:103 -msgid "File not found." +#: ../../Zotlabs/Module/Connedit.php:600 +msgid "Fetch updated permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:146 -msgid "Edit file permissions" +#: ../../Zotlabs/Module/Connedit.php:604 +msgid "Refresh Photo" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:607 +msgid "Fetch updated photo" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:611 +msgid "Recent Activity" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:614 +msgid "View recent posts and comments" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:621 +msgid "Block (or Unblock) all communications with this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:622 +msgid "This connection is blocked!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:626 +msgid "Unignore" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:629 +msgid "Ignore (or Unignore) all inbound communications from this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:630 +msgid "This connection is ignored!" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:152 -#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Thing.php:313 +#: ../../Zotlabs/Module/Connedit.php:634 +msgid "Unarchive" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:634 +msgid "Archive" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:637 +msgid "" +"Archive (or Unarchive) this connection - mark channel dead but keep content" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:638 +msgid "This connection is archived!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:642 +msgid "Unhide" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:642 +msgid "Hide" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:645 +msgid "Hide or Unhide this connection from your other connections" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:646 +msgid "This connection is hidden!" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:653 +msgid "Delete this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:661 +msgid "Fetch Vcard" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:664 +msgid "Fetch electronic calling card for this connection" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:672 +#: ../../Zotlabs/Module/Filestorage.php:152 ../../Zotlabs/Module/Thing.php:313 #: ../../Zotlabs/Module/Thing.php:363 ../../Zotlabs/Module/Photos.php:647 #: ../../Zotlabs/Module/Photos.php:1011 ../../Zotlabs/Module/Chat.php:233 #: ../../include/acl_selectors.php:218 msgid "Permissions" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:159 -msgid "Set/edit permissions" +#: ../../Zotlabs/Module/Connedit.php:675 +msgid "Open Individual Permissions section by default" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:160 -msgid "Include all files and sub folders" +#: ../../Zotlabs/Module/Connedit.php:698 +msgid "Affinity" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:161 -msgid "Return to file list" +#: ../../Zotlabs/Module/Connedit.php:701 +msgid "Open Set Affinity section by default" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:163 -msgid "Copy/paste this code to attach file to a post" +#: ../../Zotlabs/Module/Connedit.php:705 ../../Zotlabs/Widget/Affinity.php:26 +msgid "Me" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:164 -msgid "Copy/paste this URL to link file from a web page" +#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Widget/Affinity.php:27 +msgid "Family" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:166 -msgid "Share this file" +#: ../../Zotlabs/Module/Connedit.php:707 +#: ../../Zotlabs/Module/Settings/Channel.php:62 +#: ../../Zotlabs/Module/Settings/Channel.php:66 +#: ../../Zotlabs/Module/Settings/Channel.php:67 +#: ../../Zotlabs/Module/Settings/Channel.php:70 +#: ../../Zotlabs/Module/Settings/Channel.php:81 +#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123 +#: ../../include/channel.php:408 ../../include/channel.php:409 +#: ../../include/channel.php:416 +msgid "Friends" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:167 -msgid "Show URL to this file" +#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29 +msgid "Acquaintances" msgstr "" -#: ../../Zotlabs/Module/Filestorage.php:168 -msgid "Notify your contacts about this file" +#: ../../Zotlabs/Module/Connedit.php:735 +msgid "Filter" msgstr "" -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229 -#: ../../include/conversation.php:1774 -msgid "Photos" +#: ../../Zotlabs/Module/Connedit.php:738 +msgid "Open Custom Filter section by default" msgstr "" -#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117 -#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183 -msgctxt "acl" -msgid "Profile" +#: ../../Zotlabs/Module/Connedit.php:775 +msgid "Approve this connection" msgstr "" -#: ../../Zotlabs/Module/Acl.php:344 -msgid "network" +#: ../../Zotlabs/Module/Connedit.php:775 +msgid "Accept connection to allow communication" msgstr "" -#: ../../Zotlabs/Module/Acl.php:354 -msgid "RSS" +#: ../../Zotlabs/Module/Connedit.php:780 +msgid "Set Affinity" msgstr "" -#: ../../Zotlabs/Module/Group.php:24 -msgid "Privacy group created." +#: ../../Zotlabs/Module/Connedit.php:783 +msgid "Set Profile" msgstr "" -#: ../../Zotlabs/Module/Group.php:30 -msgid "Could not create privacy group." +#: ../../Zotlabs/Module/Connedit.php:786 +msgid "Set Affinity & Profile" msgstr "" -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3847 -msgid "Privacy group not found." +#: ../../Zotlabs/Module/Connedit.php:844 +msgid "none" msgstr "" -#: ../../Zotlabs/Module/Group.php:58 -msgid "Privacy group updated." +#: ../../Zotlabs/Module/Connedit.php:851 +msgid "This connection is unreachable from this location." msgstr "" -#: ../../Zotlabs/Module/Group.php:90 -msgid "Create a group of channels." +#: ../../Zotlabs/Module/Connedit.php:852 +msgid "This connection may be unreachable from other channel locations." msgstr "" -#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 -msgid "Privacy group name: " +#: ../../Zotlabs/Module/Connedit.php:854 +msgid "Location independence is not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 -msgid "Members are visible to other channels" +#: ../../Zotlabs/Module/Connedit.php:860 +msgid "" +"This connection is unreachable from this location. Location independence is " +"not supported by their network." msgstr "" -#: ../../Zotlabs/Module/Group.php:111 -msgid "Privacy group removed." +#: ../../Zotlabs/Module/Connedit.php:863 +#: ../../Zotlabs/Widget/Settings_menu.php:109 +msgid "Connection Default Permissions" msgstr "" -#: ../../Zotlabs/Module/Group.php:113 -msgid "Unable to remove privacy group." +#: ../../Zotlabs/Module/Connedit.php:863 ../../include/items.php:3925 +#, php-format +msgid "Connection: %s" msgstr "" -#: ../../Zotlabs/Module/Group.php:183 -msgid "Privacy group editor" +#: ../../Zotlabs/Module/Connedit.php:864 +msgid "Apply these permissions automatically" msgstr "" -#: ../../Zotlabs/Module/Group.php:199 -msgid "All Connected Channels" +#: ../../Zotlabs/Module/Connedit.php:864 +msgid "Connection requests will be approved without your interaction" msgstr "" -#: ../../Zotlabs/Module/Group.php:231 -msgid "Click on a channel to add or remove." +#: ../../Zotlabs/Module/Connedit.php:865 +msgid "Permission role" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:45 -msgid "Invalid message" +#: ../../Zotlabs/Module/Connedit.php:866 +msgid "Add permission role" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:78 -msgid "no results" +#: ../../Zotlabs/Module/Connedit.php:872 +msgid "This connection's primary address is" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:93 -msgid "channel sync processed" +#: ../../Zotlabs/Module/Connedit.php:873 +msgid "Available locations:" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:97 -msgid "queued" +#: ../../Zotlabs/Module/Connedit.php:878 +msgid "" +"The permissions indicated on this page will be applied to all new " +"connections." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:101 -msgid "posted" +#: ../../Zotlabs/Module/Connedit.php:879 +msgid "Connection Tools" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:105 -msgid "accepted for delivery" +#: ../../Zotlabs/Module/Connedit.php:881 +msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:109 -msgid "updated" +#: ../../Zotlabs/Module/Connedit.php:882 ../../Zotlabs/Module/Rate.php:155 +#: ../../include/js_strings.php:20 +msgid "Rating" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:112 -msgid "update ignored" +#: ../../Zotlabs/Module/Connedit.php:883 +msgid "Slide to adjust your rating" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Dreport.php:115 -msgid "permission denied" +#: ../../Zotlabs/Module/Connedit.php:884 ../../Zotlabs/Module/Connedit.php:889 +msgid "Optionally explain your rating" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:119 -msgid "recipient not found" +#: ../../Zotlabs/Module/Connedit.php:886 +msgid "Custom Filter" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:122 -msgid "mail recalled" +#: ../../Zotlabs/Module/Connedit.php:887 +msgid "Only import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:125 -msgid "duplicate mail received" -======= -#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Module/Photos.php:751 -#: ../../Zotlabs/Module/Photos.php:1290 ../../Zotlabs/Widget/Album.php:78 -msgid "View Photo" +#: ../../Zotlabs/Module/Connedit.php:887 ../../Zotlabs/Module/Connedit.php:888 +msgid "" +"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " +"all posts" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:146 ../../Zotlabs/Module/Photos.php:757 -#: ../../Zotlabs/Module/Photos.php:1213 ../../Zotlabs/Lib/Apps.php:571 -#: ../../Zotlabs/Lib/Apps.php:649 ../../Zotlabs/Storage/Browser.php:163 -#: ../../Zotlabs/Widget/Album.php:84 ../../addon/cdav/Mod_Cdav.php:745 -#: ../../addon/cdav/Mod_Cdav.php:746 ../../addon/cdav/Mod_Cdav.php:753 -#: ../../include/conversation.php:1110 -msgid "Unknown" +#: ../../Zotlabs/Module/Connedit.php:888 +msgid "Do not import posts with this text" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Module/Photos.php:782 -#: ../../Zotlabs/Widget/Album.php:95 -msgid "Edit Album" +#: ../../Zotlabs/Module/Connedit.php:890 +msgid "This information is public!" msgstr "" -#: ../../Zotlabs/Module/Embedphotos.php:158 ../../Zotlabs/Module/Photos.php:784 -#: ../../Zotlabs/Module/Photos.php:1321 -#: ../../Zotlabs/Module/Profile_photo.php:423 -#: ../../Zotlabs/Module/Cover_photo.php:361 -#: ../../Zotlabs/Storage/Browser.php:229 ../../Zotlabs/Storage/Browser.php:334 -#: ../../Zotlabs/Widget/Album.php:97 ../../addon/cdav/include/widgets.php:132 -#: ../../addon/cdav/include/widgets.php:168 -msgid "Upload" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../Zotlabs/Module/Connedit.php:895 +msgid "Connection Pending Approval" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:128 -msgid "mail delivered" +#: ../../Zotlabs/Module/Connedit.php:898 +#: ../../Zotlabs/Module/Settings/Tokens.php:163 +#: ../../Zotlabs/Module/Settings/Permcats.php:105 +msgid "inherited" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:148 +#: ../../Zotlabs/Module/Connedit.php:900 #, php-format -msgid "Delivery report for %1$s" +msgid "" +"Please choose the profile you would like to display to %s when viewing your " +"profile securely." msgstr "" -#: ../../Zotlabs/Module/Dreport.php:151 -msgid "Options" +#: ../../Zotlabs/Module/Connedit.php:902 +#: ../../Zotlabs/Module/Settings/Tokens.php:160 +msgid "Their Settings" msgstr "" -#: ../../Zotlabs/Module/Dreport.php:152 -msgid "Redeliver" +#: ../../Zotlabs/Module/Connedit.php:903 +#: ../../Zotlabs/Module/Settings/Tokens.php:161 +#: ../../Zotlabs/Module/Settings/Permcats.php:103 +msgid "My Settings" msgstr "" -#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:203 -msgid "webpage" +#: ../../Zotlabs/Module/Connedit.php:905 +#: ../../Zotlabs/Module/Settings/Tokens.php:166 +#: ../../Zotlabs/Module/Settings/Permcats.php:108 +msgid "Individual Permissions" msgstr "" -#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:209 -msgid "block" +#: ../../Zotlabs/Module/Connedit.php:906 +#: ../../Zotlabs/Module/Settings/Tokens.php:167 +#: ../../Zotlabs/Module/Settings/Permcats.php:109 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can <strong>not</strong> change those settings here." msgstr "" -#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:206 -msgid "layout" +#: ../../Zotlabs/Module/Connedit.php:907 +msgid "" +"Some permissions may be inherited from your channel's <a href=\"settings" +"\"><strong>privacy settings</strong></a>, which have higher priority than " +"individual settings. You can change those settings here but they wont have " +"any impact unless the inherited setting changes." msgstr "" -#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:212 -msgid "menu" +#: ../../Zotlabs/Module/Connedit.php:908 +msgid "Last update:" msgstr "" -#: ../../Zotlabs/Module/Impel.php:181 -#, php-format -msgid "%s element installed" +#: ../../Zotlabs/Module/Connedit.php:917 +msgid "Details" msgstr "" -#: ../../Zotlabs/Module/Impel.php:184 +#: ../../Zotlabs/Module/Connedit.php:920 ../../Zotlabs/Module/Cdav.php:1110 +msgid "Organisation" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:921 ../../Zotlabs/Module/Cdav.php:1111 +msgid "Title" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:938 ../../Zotlabs/Module/Cdav.php:1128 +msgid "P.O. Box" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:939 ../../Zotlabs/Module/Cdav.php:1129 +msgid "Additional" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:940 ../../Zotlabs/Module/Cdav.php:1130 +msgid "Street" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:941 ../../Zotlabs/Module/Cdav.php:1131 +msgid "Locality" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:942 ../../Zotlabs/Module/Cdav.php:1132 +msgid "Region" +msgstr "" + +#: ../../Zotlabs/Module/Connedit.php:943 ../../Zotlabs/Module/Cdav.php:1133 +msgid "ZIP Code" +msgstr "" + +#: ../../Zotlabs/Module/Apps.php:45 ../../Zotlabs/Lib/Apps.php:212 +msgid "Apps" +msgstr "" + +#: ../../Zotlabs/Module/Apps.php:48 +msgid "Manage apps" +msgstr "" + +#: ../../Zotlabs/Module/Apps.php:49 +msgid "Create new app" +msgstr "" + +#: ../../Zotlabs/Module/Home.php:74 ../../Zotlabs/Module/Home.php:82 +#: ../../extend/addon/addon/opensearch/opensearch.php:42 +msgid "$Projectname" +msgstr "" + +#: ../../Zotlabs/Module/Home.php:92 #, php-format -msgid "%s element installation failed" +msgid "Welcome to %s" msgstr "" -#: ../../Zotlabs/Module/Setup.php:176 +#: ../../Zotlabs/Module/Filestorage.php:87 +msgid "Permission Denied." +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:103 +msgid "File not found." +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:146 +msgid "Edit file permissions" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:159 +msgid "Set/edit permissions" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:160 +msgid "Include all files and sub folders" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:161 +msgid "Return to file list" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:163 +msgid "Copy/paste this code to attach file to a post" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:164 +msgid "Copy/paste this URL to link file from a web page" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:166 +msgid "Share this file" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:167 +msgid "Show URL to this file" +msgstr "" + +#: ../../Zotlabs/Module/Filestorage.php:168 +msgid "Notify your contacts about this file" +msgstr "" + +#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:230 +#: ../../include/nav.php:382 ../../include/conversation.php:1780 +msgid "Photos" +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:170 msgid "$Projectname Server - Setup" msgstr "" -#: ../../Zotlabs/Module/Setup.php:180 +#: ../../Zotlabs/Module/Setup.php:174 msgid "Could not connect to database." msgstr "" -#: ../../Zotlabs/Module/Setup.php:184 +#: ../../Zotlabs/Module/Setup.php:178 msgid "" "Could not connect to specified site URL. Possible SSL certificate or DNS " "issue." msgstr "" -#: ../../Zotlabs/Module/Setup.php:191 +#: ../../Zotlabs/Module/Setup.php:185 msgid "Could not create table." msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:196 +#: ../../Zotlabs/Module/Setup.php:190 msgid "Your site database has been installed." -======= -#: ../../Zotlabs/Module/Thing.php:313 ../../Zotlabs/Module/Thing.php:363 -#: ../../Zotlabs/Module/Photos.php:647 ../../Zotlabs/Module/Photos.php:1011 -#: ../../Zotlabs/Module/Connedit.php:672 ../../Zotlabs/Module/Chat.php:233 -#: ../../Zotlabs/Module/Filestorage.php:152 ../../include/acl_selectors.php:218 -msgid "Permissions" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Setup.php:200 +#: ../../Zotlabs/Module/Setup.php:194 msgid "" "You may need to import the file \"install/schema_xxx.sql\" manually using a " "database client." msgstr "" -#: ../../Zotlabs/Module/Setup.php:201 ../../Zotlabs/Module/Setup.php:263 -#: ../../Zotlabs/Module/Setup.php:741 +#: ../../Zotlabs/Module/Setup.php:195 ../../Zotlabs/Module/Setup.php:257 +#: ../../Zotlabs/Module/Setup.php:740 msgid "Please see the file \"install/INSTALL.txt\"." msgstr "" -#: ../../Zotlabs/Module/Setup.php:260 +#: ../../Zotlabs/Module/Setup.php:254 msgid "System check" msgstr "" -#: ../../Zotlabs/Module/Setup.php:264 ../../Zotlabs/Module/Cal.php:338 +#: ../../Zotlabs/Module/Setup.php:258 ../../Zotlabs/Module/Cal.php:338 #: ../../Zotlabs/Module/Cal.php:345 ../../Zotlabs/Module/Events.php:690 #: ../../Zotlabs/Module/Events.php:699 ../../Zotlabs/Module/Photos.php:920 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:847 +#: ../../Zotlabs/Module/Cdav.php:820 msgid "Next" msgstr "" -#: ../../Zotlabs/Module/Setup.php:265 +#: ../../Zotlabs/Module/Setup.php:259 msgid "Check again" msgstr "" -#: ../../Zotlabs/Module/Setup.php:287 +#: ../../Zotlabs/Module/Setup.php:281 msgid "Database connection" msgstr "" -#: ../../Zotlabs/Module/Setup.php:288 +#: ../../Zotlabs/Module/Setup.php:282 msgid "" "In order to install $Projectname we need to know how to connect to your " "database." msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:289 +#: ../../Zotlabs/Module/Setup.php:283 msgid "" "Please contact your hosting provider or site administrator if you have " "questions about these settings." msgstr "" -#: ../../Zotlabs/Module/Setup.php:290 +#: ../../Zotlabs/Module/Setup.php:284 msgid "" "The database you specify below should already exist. If it does not, please " "create it before continuing." msgstr "" -#: ../../Zotlabs/Module/Setup.php:294 +#: ../../Zotlabs/Module/Setup.php:288 msgid "Database Server Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:294 +#: ../../Zotlabs/Module/Setup.php:288 msgid "Default is 127.0.0.1" msgstr "" -#: ../../Zotlabs/Module/Setup.php:295 +#: ../../Zotlabs/Module/Setup.php:289 msgid "Database Port" msgstr "" -#: ../../Zotlabs/Module/Setup.php:295 +#: ../../Zotlabs/Module/Setup.php:289 msgid "Communication port number - use 0 for default" msgstr "" -#: ../../Zotlabs/Module/Setup.php:296 +#: ../../Zotlabs/Module/Setup.php:290 msgid "Database Login Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:297 +#: ../../Zotlabs/Module/Setup.php:291 msgid "Database Login Password" msgstr "" -#: ../../Zotlabs/Module/Setup.php:298 +#: ../../Zotlabs/Module/Setup.php:292 msgid "Database Name" msgstr "" -#: ../../Zotlabs/Module/Setup.php:299 +#: ../../Zotlabs/Module/Setup.php:293 msgid "Database Type" msgstr "" -#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342 +#: ../../Zotlabs/Module/Setup.php:295 ../../Zotlabs/Module/Setup.php:336 msgid "Site administrator email address" msgstr "" -#: ../../Zotlabs/Module/Setup.php:301 ../../Zotlabs/Module/Setup.php:342 -======= -#: ../../Zotlabs/Module/Import.php:494 -msgid "You must be logged in to use this feature." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:499 -msgid "Import Channel" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:500 -msgid "" -"Use this form to import an existing channel from a different server/hub. You " -"may retrieve the channel identity from the old server/hub via the network or " -"provide an export file." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:502 -msgid "Or provide the old server/hub details" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:503 -msgid "Your old identity address (xyz@example.com)" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:504 -msgid "Your old login email address" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:505 -msgid "Your old login password" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:506 -msgid "" -"For either option, please choose whether to make this hub your new primary " -"address, or whether your old location should continue this role. You will be " -"able to post from either location, but only one can be marked as the primary " -"location for files, photos, and media." -msgstr "" - -#: ../../Zotlabs/Module/Import.php:507 -msgid "Make this hub my primary location" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:508 -msgid "Move this channel (disable all previous locations)" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:509 -msgid "Import a few months of posts if possible (limited by available memory" -msgstr "" - -#: ../../Zotlabs/Module/Import.php:510 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../Zotlabs/Module/Setup.php:295 ../../Zotlabs/Module/Setup.php:336 msgid "" "Your account email address must match this in order to use the web admin " "panel." msgstr "" -#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344 +#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:338 msgid "Website URL" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:302 ../../Zotlabs/Module/Setup.php:344 +#: ../../Zotlabs/Module/Setup.php:296 ../../Zotlabs/Module/Setup.php:338 msgid "Please use SSL (https) URL if available." msgstr "" -#: ../../Zotlabs/Module/Setup.php:303 ../../Zotlabs/Module/Setup.php:346 +#: ../../Zotlabs/Module/Setup.php:297 ../../Zotlabs/Module/Setup.php:340 msgid "Please select a default timezone for your website" msgstr "" -#: ../../Zotlabs/Module/Setup.php:331 +#: ../../Zotlabs/Module/Setup.php:325 msgid "Site settings" -======= -#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1984 -msgid "Remote Authentication" -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1985 -msgid "Enter your channel address (e.g. channel@example.com)" -msgstr "" - -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1986 -msgid "Authenticate" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Setup.php:385 +#: ../../Zotlabs/Module/Setup.php:379 msgid "PHP version 5.5 or greater is required." msgstr "" -#: ../../Zotlabs/Module/Setup.php:386 +#: ../../Zotlabs/Module/Setup.php:380 msgid "PHP version" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:402 +#: ../../Zotlabs/Module/Setup.php:396 msgid "Could not find a command line version of PHP in the web server PATH." -======= -#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2291 -msgid "Import" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Setup.php:403 +#: ../../Zotlabs/Module/Setup.php:397 msgid "" "If you don't have a command line version of PHP installed on server, you " "will not be able to run background polling via cron." msgstr "" -#: ../../Zotlabs/Module/Setup.php:407 +#: ../../Zotlabs/Module/Setup.php:401 msgid "PHP executable path" msgstr "" -#: ../../Zotlabs/Module/Setup.php:407 +#: ../../Zotlabs/Module/Setup.php:401 msgid "" "Enter full path to php executable. You can leave this blank to continue the " "installation." msgstr "" -#: ../../Zotlabs/Module/Setup.php:412 +#: ../../Zotlabs/Module/Setup.php:406 msgid "Command line PHP" msgstr "" -#: ../../Zotlabs/Module/Setup.php:422 +#: ../../Zotlabs/Module/Setup.php:416 msgid "" "Unable to check command line PHP, as shell_exec() is disabled. This is " "required." msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:425 +#: ../../Zotlabs/Module/Setup.php:419 msgid "" "The command line version of PHP on your system does not have " "\"register_argc_argv\" enabled." -======= -#: ../../Zotlabs/Module/Editblock.php:116 ../../Zotlabs/Module/Chat.php:205 -#: ../../Zotlabs/Module/Editwebpage.php:143 ../../Zotlabs/Module/Mail.php:306 -#: ../../Zotlabs/Module/Mail.php:448 ../../include/conversation.php:1228 -msgid "Insert web link" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Setup.php:426 +#: ../../Zotlabs/Module/Setup.php:420 msgid "This is required for message delivery to work." msgstr "" -#: ../../Zotlabs/Module/Setup.php:429 +#: ../../Zotlabs/Module/Setup.php:423 msgid "PHP register_argc_argv" msgstr "" -#: ../../Zotlabs/Module/Setup.php:447 +#: ../../Zotlabs/Module/Setup.php:441 #, php-format msgid "" "Your max allowed total upload size is set to %s. Maximum size of one file to " "upload is set to %s. You are allowed to upload up to %d files at once." msgstr "" -#: ../../Zotlabs/Module/Setup.php:452 +#: ../../Zotlabs/Module/Setup.php:446 msgid "You can adjust these settings in the server php.ini file." msgstr "" -#: ../../Zotlabs/Module/Setup.php:454 +#: ../../Zotlabs/Module/Setup.php:448 msgid "PHP upload limits" msgstr "" -#: ../../Zotlabs/Module/Setup.php:477 +#: ../../Zotlabs/Module/Setup.php:471 msgid "" "Error: the \"openssl_pkey_new\" function on this system is not able to " "generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:478 +#: ../../Zotlabs/Module/Setup.php:472 msgid "" "If running under Windows, please see \"http://www.php.net/manual/en/openssl." "installation.php\"." msgstr "" -#: ../../Zotlabs/Module/Setup.php:481 +#: ../../Zotlabs/Module/Setup.php:475 msgid "Generate encryption keys" msgstr "" -#: ../../Zotlabs/Module/Setup.php:498 +#: ../../Zotlabs/Module/Setup.php:492 msgid "libCurl PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:499 +#: ../../Zotlabs/Module/Setup.php:493 msgid "GD graphics PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:500 +#: ../../Zotlabs/Module/Setup.php:494 msgid "OpenSSL PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:501 +#: ../../Zotlabs/Module/Setup.php:495 msgid "PDO database PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:502 +#: ../../Zotlabs/Module/Setup.php:496 msgid "mb_string PHP module" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:503 +#: ../../Zotlabs/Module/Setup.php:497 msgid "xml PHP module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:507 ../../Zotlabs/Module/Setup.php:509 -msgid "Apache mod_rewrite module" -======= -#: ../../Zotlabs/Module/Connections.php:72 -#: ../../Zotlabs/Module/Connections.php:82 ../../Zotlabs/Module/Menu.php:116 -#: ../../include/conversation.php:1666 -msgid "New" +#: ../../Zotlabs/Module/Setup.php:498 +msgid "zip PHP module" msgstr "" -#: ../../Zotlabs/Module/Connections.php:88 -#: ../../Zotlabs/Module/Connections.php:103 -#: ../../Zotlabs/Module/Connedit.php:709 ../../Zotlabs/Widget/Affinity.php:30 -msgid "All" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../Zotlabs/Module/Setup.php:502 ../../Zotlabs/Module/Setup.php:504 +msgid "Apache mod_rewrite module" msgstr "" -#: ../../Zotlabs/Module/Setup.php:507 +#: ../../Zotlabs/Module/Setup.php:502 msgid "" "Error: Apache webserver mod-rewrite module is required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:513 ../../Zotlabs/Module/Setup.php:516 +#: ../../Zotlabs/Module/Setup.php:508 ../../Zotlabs/Module/Setup.php:511 msgid "exec" msgstr "" -#: ../../Zotlabs/Module/Setup.php:513 +#: ../../Zotlabs/Module/Setup.php:508 msgid "" "Error: exec is required but is either not installed or has been disabled in " "php.ini" msgstr "" -#: ../../Zotlabs/Module/Setup.php:519 ../../Zotlabs/Module/Setup.php:522 +#: ../../Zotlabs/Module/Setup.php:514 ../../Zotlabs/Module/Setup.php:517 msgid "shell_exec" msgstr "" -#: ../../Zotlabs/Module/Setup.php:519 +#: ../../Zotlabs/Module/Setup.php:514 msgid "" "Error: shell_exec is required but is either not installed or has been " "disabled in php.ini" msgstr "" -#: ../../Zotlabs/Module/Setup.php:527 +#: ../../Zotlabs/Module/Setup.php:522 msgid "Error: libCURL PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:531 +#: ../../Zotlabs/Module/Setup.php:526 msgid "" "Error: GD graphics PHP module with JPEG support required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:535 +#: ../../Zotlabs/Module/Setup.php:530 msgid "Error: openssl PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:539 +#: ../../Zotlabs/Module/Setup.php:534 msgid "Error: PDO database PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:543 +#: ../../Zotlabs/Module/Setup.php:538 msgid "Error: mb_string PHP module required but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:547 +#: ../../Zotlabs/Module/Setup.php:542 msgid "Error: xml PHP module required for DAV but not installed." msgstr "" -#: ../../Zotlabs/Module/Setup.php:565 +#: ../../Zotlabs/Module/Setup.php:546 +msgid "Error: zip PHP module required but not installed." +msgstr "" + +#: ../../Zotlabs/Module/Setup.php:564 msgid "" "The web installer needs to be able to create a file called \".htconfig.php\" " "in the top folder of your web server and it is unable to do so." msgstr "" -#: ../../Zotlabs/Module/Setup.php:566 +#: ../../Zotlabs/Module/Setup.php:565 msgid "" "This is most often a permission setting, as the web server may not be able " "to write files in your folder - even if you can." msgstr "" -#: ../../Zotlabs/Module/Setup.php:567 +#: ../../Zotlabs/Module/Setup.php:566 msgid "" "At the end of this procedure, we will give you a text to save in a file " "named .htconfig.php in your Red top folder." msgstr "" -#: ../../Zotlabs/Module/Setup.php:568 +#: ../../Zotlabs/Module/Setup.php:567 msgid "" "You can alternatively skip this procedure and perform a manual installation. " "Please see the file \"install/INSTALL.txt\" for instructions." msgstr "" -#: ../../Zotlabs/Module/Setup.php:571 +#: ../../Zotlabs/Module/Setup.php:570 msgid ".htconfig.php is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:585 +#: ../../Zotlabs/Module/Setup.php:584 msgid "" "This software uses the Smarty3 template engine to render its web views. " "Smarty3 compiles templates to PHP to speed up rendering." msgstr "" -#: ../../Zotlabs/Module/Setup.php:586 +#: ../../Zotlabs/Module/Setup.php:585 #, php-format msgid "" "In order to store these compiled templates, the web server needs to have " "write access to the directory %s under the top level web folder." msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:587 ../../Zotlabs/Module/Setup.php:608 +#: ../../Zotlabs/Module/Setup.php:586 ../../Zotlabs/Module/Setup.php:607 msgid "" "Please ensure that the user that your web server runs as (e.g. www-data) has " "write access to this folder." -======= -#: ../../Zotlabs/Module/Connections.php:283 -#: ../../Zotlabs/Module/Connedit.php:626 -msgid "Ignore" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Setup.php:588 +#: ../../Zotlabs/Module/Setup.php:587 #, php-format msgid "" "Note: as a security measure, you should give the web server write access to " "%s only--not the template files (.tpl) that it contains." msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:591 +#: ../../Zotlabs/Module/Setup.php:590 #, php-format msgid "%s is writable" -======= -#: ../../Zotlabs/Module/Connections.php:308 ../../Zotlabs/Lib/Apps.php:216 -#: ../../include/text.php:957 ../../include/nav.php:185 -msgid "Connections" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Setup.php:607 +#: ../../Zotlabs/Module/Setup.php:606 msgid "" "This software uses the store directory to save uploaded files. The web " "server needs to have write access to the store directory under the top level " "web folder" msgstr "" -#: ../../Zotlabs/Module/Setup.php:611 +#: ../../Zotlabs/Module/Setup.php:610 msgid "store is writable" msgstr "" -#: ../../Zotlabs/Module/Setup.php:643 +#: ../../Zotlabs/Module/Setup.php:642 msgid "" "SSL certificate cannot be validated. Fix certificate or disable https access " "to this site." msgstr "" -#: ../../Zotlabs/Module/Setup.php:644 +#: ../../Zotlabs/Module/Setup.php:643 msgid "" "If you have https access to your website or allow connections to TCP port " "443 (the https: port), you MUST use a browser-valid certificate. You MUST " "NOT use self-signed certificates!" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Setup.php:645 +#: ../../Zotlabs/Module/Setup.php:644 msgid "" "This restriction is incorporated because public posts from you may for " "example contain references to images on your own hub." -======= -#: ../../Zotlabs/Module/Viewsrc.php:43 -msgid "item" -msgstr "" - -#: ../../Zotlabs/Module/Viewsrc.php:55 -msgid "Source of Item" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Setup.php:646 +#: ../../Zotlabs/Module/Setup.php:645 msgid "" "If your certificate is not recognized, members of other sites (who may " "themselves have valid certificates) will get a warning message on their own " "site complaining about security issues." msgstr "" -#: ../../Zotlabs/Module/Setup.php:647 +#: ../../Zotlabs/Module/Setup.php:646 msgid "" "This can cause usability issues elsewhere (not just on your own site) so we " "must insist on this requirement." msgstr "" -#: ../../Zotlabs/Module/Setup.php:648 +#: ../../Zotlabs/Module/Setup.php:647 msgid "" "Providers are available that issue free certificates which are browser-valid." msgstr "" -#: ../../Zotlabs/Module/Setup.php:650 +#: ../../Zotlabs/Module/Setup.php:649 msgid "" "If you are confident that the certificate is valid and signed by a trusted " "authority, check to see if you have failed to install an intermediate cert. " @@ -4821,42 +4207,229 @@ msgid "" "server communications." msgstr "" -#: ../../Zotlabs/Module/Setup.php:652 +#: ../../Zotlabs/Module/Setup.php:651 msgid "SSL certificate validation" msgstr "" -#: ../../Zotlabs/Module/Setup.php:658 +#: ../../Zotlabs/Module/Setup.php:657 msgid "" "Url rewrite in .htaccess is not working. Check your server configuration." "Test: " msgstr "" -#: ../../Zotlabs/Module/Setup.php:661 +#: ../../Zotlabs/Module/Setup.php:660 msgid "Url rewrite is working" msgstr "" -#: ../../Zotlabs/Module/Setup.php:675 +#: ../../Zotlabs/Module/Setup.php:674 msgid "" "The database configuration file \".htconfig.php\" could not be written. " "Please use the enclosed text to create a configuration file in your web " "server root." msgstr "" -#: ../../Zotlabs/Module/Setup.php:699 -#: ../../extend/addon/addon/cdav/cdav.php:41 +#: ../../Zotlabs/Module/Setup.php:698 #: ../../extend/addon/addon/rendezvous/rendezvous.php:401 msgid "Errors encountered creating database tables." msgstr "" -#: ../../Zotlabs/Module/Setup.php:739 +#: ../../Zotlabs/Module/Setup.php:738 msgid "<h1>What next</h1>" msgstr "" -#: ../../Zotlabs/Module/Setup.php:740 +#: ../../Zotlabs/Module/Setup.php:739 msgid "" "IMPORTANT: You will need to [manually] setup a scheduled task for the poller." msgstr "" +#: ../../Zotlabs/Module/Acl.php:117 ../../Zotlabs/Module/Lockview.php:117 +#: ../../Zotlabs/Module/Lockview.php:153 ../../include/acl_selectors.php:183 +msgctxt "acl" +msgid "Profile" +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:344 +msgid "network" +msgstr "" + +#: ../../Zotlabs/Module/Acl.php:354 +msgid "RSS" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:24 +msgid "Privacy group created." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:30 +msgid "Could not create privacy group." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 +#: ../../include/items.php:3892 +msgid "Privacy group not found." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:58 +msgid "Privacy group updated." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:90 +msgid "Create a group of channels." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:91 ../../Zotlabs/Module/Group.php:184 +msgid "Privacy group name: " +msgstr "" + +#: ../../Zotlabs/Module/Group.php:93 ../../Zotlabs/Module/Group.php:187 +msgid "Members are visible to other channels" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:111 +msgid "Privacy group removed." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:113 +msgid "Unable to remove privacy group." +msgstr "" + +#: ../../Zotlabs/Module/Group.php:183 +msgid "Privacy group editor" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:197 ../../Zotlabs/Module/Help.php:81 +msgid "Members" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:199 +msgid "All Connected Channels" +msgstr "" + +#: ../../Zotlabs/Module/Group.php:231 +msgid "Click on a channel to add or remove." +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:45 +msgid "Invalid message" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:78 +msgid "no results" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:93 +msgid "channel sync processed" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:97 +msgid "queued" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:101 +msgid "posted" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:105 +msgid "accepted for delivery" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:109 +msgid "updated" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:112 +msgid "update ignored" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:115 +msgid "permission denied" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:119 +msgid "recipient not found" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:122 +msgid "mail recalled" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:125 +msgid "duplicate mail received" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:128 +msgid "mail delivered" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:148 +#, php-format +msgid "Delivery report for %1$s" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:151 +msgid "Options" +msgstr "" + +#: ../../Zotlabs/Module/Dreport.php:152 +msgid "Redeliver" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:41 ../../include/bbcode.php:263 +msgid "webpage" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:46 ../../include/bbcode.php:269 +msgid "block" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:51 ../../include/bbcode.php:266 +msgid "layout" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:58 ../../include/bbcode.php:272 +msgid "menu" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:181 +#, php-format +msgid "%s element installed" +msgstr "" + +#: ../../Zotlabs/Module/Impel.php:184 +#, php-format +msgid "%s element installation failed" +msgstr "" + +#: ../../Zotlabs/Module/Hcard.php:37 ../../Zotlabs/Module/Profile.php:43 +#: ../../Zotlabs/Module/Channel.php:47 +msgid "Posts and comments" +msgstr "" + +#: ../../Zotlabs/Module/Hcard.php:44 ../../Zotlabs/Module/Profile.php:50 +#: ../../Zotlabs/Module/Channel.php:54 +msgid "Only posts" +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:48 ../../Zotlabs/Module/Import.php:64 +msgid "Nothing to import." +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:72 ../../Zotlabs/Module/Import.php:79 +#: ../../Zotlabs/Module/Import.php:95 +msgid "Unable to download data from old server" +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:77 +#: ../../Zotlabs/Module/Import.php:102 +msgid "Imported file is empty." +msgstr "" + +#: ../../Zotlabs/Module/Import_items.php:93 +#: ../../Zotlabs/Module/Import.php:121 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "" + #: ../../Zotlabs/Module/Import_items.php:108 msgid "Import completed" msgstr "" @@ -4869,49 +4442,125 @@ msgstr "" msgid "Use this form to import existing posts and content from an export file." msgstr "" -#: ../../Zotlabs/Module/Manage.php:136 -#: ../../Zotlabs/Module/New_channel.php:121 -#, php-format -msgid "You have created %1$.0f of %2$.0f allowed channels." +#: ../../Zotlabs/Module/Import_items.php:127 +#: ../../Zotlabs/Module/Import.php:505 +msgid "File to Upload" msgstr "" -#: ../../Zotlabs/Module/Manage.php:143 -msgid "Create a new channel" +#: ../../Zotlabs/Module/Mail.php:73 +msgid "Unable to lookup recipient." msgstr "" -#: ../../Zotlabs/Module/Manage.php:164 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/nav.php:201 -msgid "Channel Manager" +#: ../../Zotlabs/Module/Mail.php:80 +msgid "Unable to communicate with requested channel." msgstr "" -#: ../../Zotlabs/Module/Manage.php:165 -msgid "Current Channel" +#: ../../Zotlabs/Module/Mail.php:87 +msgid "Cannot verify requested channel." msgstr "" -#: ../../Zotlabs/Module/Manage.php:167 -msgid "Switch to one of your channels by selecting it." +#: ../../Zotlabs/Module/Mail.php:105 +msgid "Selected channel has private message restrictions. Send failed." msgstr "" -#: ../../Zotlabs/Module/Manage.php:168 -msgid "Default Channel" +#: ../../Zotlabs/Module/Mail.php:160 +msgid "Messages" msgstr "" -#: ../../Zotlabs/Module/Manage.php:169 -msgid "Make Default" +#: ../../Zotlabs/Module/Mail.php:173 +msgid "message" msgstr "" -#: ../../Zotlabs/Module/Manage.php:172 -#, php-format -msgid "%d new messages" +#: ../../Zotlabs/Module/Mail.php:214 +msgid "Message recalled." msgstr "" -#: ../../Zotlabs/Module/Manage.php:173 -#, php-format -msgid "%d new introductions" +#: ../../Zotlabs/Module/Mail.php:227 +msgid "Conversation removed." msgstr "" -#: ../../Zotlabs/Module/Manage.php:175 -msgid "Delegated Channel" +#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:362 +#: ../../Zotlabs/Module/Chat.php:203 ../../include/conversation.php:1260 +msgid "Please enter a link URL:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:242 ../../Zotlabs/Module/Mail.php:363 +msgid "Expires YYYY-MM-DD HH:MM" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:270 +msgid "Requested channel is not in this network" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:278 +msgid "Send Private Message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:279 ../../Zotlabs/Module/Mail.php:421 +msgid "To:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:282 ../../Zotlabs/Module/Mail.php:423 +msgid "Subject:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:285 ../../Zotlabs/Module/Invite.php:138 +msgid "Your message:" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:287 ../../Zotlabs/Module/Mail.php:429 +#: ../../include/conversation.php:1320 +msgid "Attach file" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:289 +msgid "Send" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:292 ../../Zotlabs/Module/Mail.php:434 +#: ../../include/conversation.php:1365 +msgid "Set expiration date" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:294 ../../Zotlabs/Module/Mail.php:436 +#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Lib/ThreadItem.php:742 +#: ../../include/conversation.php:1370 +msgid "Encrypt text" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:393 +msgid "Delete message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:394 +msgid "Delivery report" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:395 +msgid "Recall message" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:397 +msgid "Message has been recalled." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:414 +msgid "Delete Conversation" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:416 +msgid "" +"No secure communications available. You <strong>may</strong> be able to " +"respond from the sender's profile page." +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:420 +msgid "Send Reply" +msgstr "" + +#: ../../Zotlabs/Module/Mail.php:425 +#, php-format +msgid "Your message for %s (%s):" msgstr "" #: ../../Zotlabs/Module/Oexchange.php:27 @@ -4927,7 +4576,7 @@ msgstr "" msgid "Block Name" msgstr "" -#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1339 +#: ../../Zotlabs/Module/Editblock.php:129 ../../include/conversation.php:1336 msgid "Title (optional)" msgstr "" @@ -4956,7 +4605,7 @@ msgid "Menu Item Permissions" msgstr "" #: ../../Zotlabs/Module/Mitem.php:154 ../../Zotlabs/Module/Mitem.php:231 -#: ../../Zotlabs/Module/Settings/Channel.php:510 +#: ../../Zotlabs/Module/Settings/Channel.php:509 msgid "(click to open/close)" msgstr "" @@ -5040,7 +4689,6 @@ msgstr "" msgid "Menu item not found." msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Mitem.php:219 msgid "Menu item deleted." msgstr "" @@ -5048,24 +4696,6 @@ msgstr "" #: ../../Zotlabs/Module/Mitem.php:221 msgid "Menu item could not be deleted." msgstr "" -======= -#: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191 -#: ../../include/conversation.php:1907 ../../include/channel.php:1268 -#: ../../include/taxonomy.php:403 -msgctxt "noun" -msgid "Like" -msgid_plural "Likes" -msgstr[0] "" -msgstr[1] "" - -#: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196 -#: ../../include/conversation.php:1910 -msgctxt "noun" -msgid "Dislike" -msgid_plural "Dislikes" -msgstr[0] "" -msgstr[1] "" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 #: ../../Zotlabs/Module/Mitem.php:228 msgid "Edit Menu Element" @@ -5091,231 +4721,196 @@ msgstr "" msgid "Description: " msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Attach.php:13 msgid "Item not available." -======= -#: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318 -#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:529 -msgid "Recent Photos" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Wiki.php:30 -msgid "Profile Unavailable." +#: ../../Zotlabs/Module/Moderate.php:37 +msgid "Comment approved" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:44 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:42 -msgid "Not found" +#: ../../Zotlabs/Module/Moderate.php:41 +msgid "Comment deleted" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:68 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:62 -msgid "Invalid channel" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Wiki.php:160 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1845 -======= -#: ../../Zotlabs/Module/Wiki.php:160 ../../addon/gitwiki/Mod_Gitwiki.php:146 -#: ../../include/conversation.php:1854 ../../include/nav.php:462 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgid "Wikis" -msgstr "" - -#: ../../Zotlabs/Module/Wiki.php:166 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:152 -msgid "Download" +#: ../../Zotlabs/Module/Notify.php:57 +#: ../../Zotlabs/Module/Notifications.php:38 +msgid "No more system notifications." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:170 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:156 -msgid "Wiki name" +#: ../../Zotlabs/Module/Notify.php:61 +#: ../../Zotlabs/Module/Notifications.php:42 +msgid "System Notifications" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:171 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:157 -msgid "Content type" +#: ../../Zotlabs/Module/Editpost.php:38 ../../Zotlabs/Module/Editpost.php:43 +msgid "Item is not editable" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:180 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:166 -msgid "Create a status post for this wiki" +#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 +msgid "Authorize application connection" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:205 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:185 -msgid "Wiki not found" +#: ../../Zotlabs/Module/Api.php:73 +msgid "Return to your app and insert this Security Code:" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:229 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:210 -msgid "Rename page" +#: ../../Zotlabs/Module/Api.php:83 +msgid "Please login to continue." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:233 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:214 -msgid "Error retrieving page content" +#: ../../Zotlabs/Module/Api.php:95 +msgid "" +"Do you want to authorize this application to access your posts and contacts, " +"and/or create new posts for you?" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:239 -msgid "New page" +#: ../../Zotlabs/Module/Page.php:165 +msgid "" +"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod " +"tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, " +"quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo " +"consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse " +"cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat " +"non proident, sunt in culpa qui officia deserunt mollit anim id est laborum." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:263 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:242 -msgid "Revision Comparison" +#: ../../Zotlabs/Module/Siteinfo.php:20 +msgid "About this site" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:264 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:243 -msgid "Revert" +#: ../../Zotlabs/Module/Siteinfo.php:21 +msgid "Site Name" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:268 -msgid "Short description of your changes (optional)" +#: ../../Zotlabs/Module/Siteinfo.php:25 +msgid "Administrator" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:275 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:252 -msgid "Source" +#: ../../Zotlabs/Module/Siteinfo.php:28 +msgid "Software and Project information" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:283 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:260 -msgid "New page name" +#: ../../Zotlabs/Module/Siteinfo.php:29 +msgid "This site is powered by $Projectname" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:288 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:265 -#: ../../include/conversation.php:1232 -msgid "Embed image from photo albums" +#: ../../Zotlabs/Module/Siteinfo.php:30 +msgid "" +"Federated and decentralised networking and identity services provided by Zot" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:289 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:266 -#: ../../include/conversation.php:1326 -msgid "Embed an image from your albums" +#: ../../Zotlabs/Module/Siteinfo.php:32 +#, php-format +msgid "Version %s" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:291 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:268 -#: ../../include/conversation.php:1328 ../../include/conversation.php:1375 -msgid "OK" +#: ../../Zotlabs/Module/Siteinfo.php:33 +msgid "Project homepage" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:292 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:269 -#: ../../include/conversation.php:1268 -msgid "Choose images to embed" +#: ../../Zotlabs/Module/Siteinfo.php:34 +msgid "Developer homepage" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:293 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:270 -#: ../../include/conversation.php:1269 -msgid "Choose an album" +#: ../../Zotlabs/Module/New_channel.php:121 +#: ../../Zotlabs/Module/Manage.php:136 +#, php-format +msgid "You have created %1$.0f of %2$.0f allowed channels." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:294 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:271 -msgid "Choose a different album" +#: ../../Zotlabs/Module/New_channel.php:140 +msgid "Create Channel" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:295 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:272 -#: ../../include/conversation.php:1271 -msgid "Error getting album list" +#: ../../Zotlabs/Module/New_channel.php:141 +msgid "" +"A channel is your identity on this network. It can represent a person, a " +"blog, or a forum to name a few. Channels can make connections with other " +"channels to share information with highly detailed permissions." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:296 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:273 -#: ../../include/conversation.php:1272 -msgid "Error getting photo link" +#: ../../Zotlabs/Module/New_channel.php:142 +msgid "" +"or <a href=\"import\">import an existing channel</a> from another location." msgstr "" -#: ../../Zotlabs/Module/Wiki.php:297 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:274 -#: ../../include/conversation.php:1273 -msgid "Error getting album" +#: ../../Zotlabs/Module/Profile.php:91 +msgid "vcard" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:365 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:337 -msgid "Error creating wiki. Invalid name." +#: ../../Zotlabs/Module/Notifications.php:43 +#: ../../Zotlabs/Lib/ThreadItem.php:392 +msgid "Mark all seen" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:372 -msgid "A wiki with this name already exists." +#: ../../Zotlabs/Module/Search.php:224 +#, php-format +msgid "Items tagged with: %s" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:385 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:348 -msgid "Wiki created, but error creating Home page." +#: ../../Zotlabs/Module/Search.php:226 +#, php-format +msgid "Search results for: %s" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:392 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:353 -msgid "Error creating wiki" +#: ../../Zotlabs/Module/Webpages.php:52 +msgid "Import Webpage Elements" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:404 -msgid "Wiki delete permission denied." +#: ../../Zotlabs/Module/Webpages.php:53 +msgid "Import selected" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:414 -msgid "Error deleting wiki" +#: ../../Zotlabs/Module/Webpages.php:76 +msgid "Export Webpage Elements" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:440 -#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:400 -msgid "New page created" +#: ../../Zotlabs/Module/Webpages.php:77 +msgid "Export selected" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:559 -msgid "Cannot delete Home" +#: ../../Zotlabs/Module/Webpages.php:235 ../../Zotlabs/Lib/Apps.php:226 +#: ../../include/nav.php:439 ../../include/conversation.php:1838 +msgid "Webpages" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:623 -msgid "Current Revision" +#: ../../Zotlabs/Module/Webpages.php:245 ../../Zotlabs/Module/Events.php:478 +#: ../../Zotlabs/Module/Photos.php:1063 ../../Zotlabs/Lib/ThreadItem.php:739 +#: ../../include/conversation.php:1277 +msgid "Preview" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:623 -msgid "Selected Revision" +#: ../../Zotlabs/Module/Webpages.php:246 +msgid "Actions" msgstr "" -#: ../../Zotlabs/Module/Wiki.php:673 -msgid "You must be authenticated." +#: ../../Zotlabs/Module/Webpages.php:247 +msgid "Page Link" msgstr "" -#: ../../Zotlabs/Module/Notify.php:57 -#: ../../Zotlabs/Module/Notifications.php:38 -msgid "No more system notifications." +#: ../../Zotlabs/Module/Webpages.php:248 +msgid "Page Title" msgstr "" -#: ../../Zotlabs/Module/Notify.php:61 -#: ../../Zotlabs/Module/Notifications.php:42 -msgid "System Notifications" +#: ../../Zotlabs/Module/Webpages.php:278 +msgid "Invalid file type." msgstr "" -#: ../../Zotlabs/Module/Api.php:72 ../../Zotlabs/Module/Api.php:93 -msgid "Authorize application connection" +#: ../../Zotlabs/Module/Webpages.php:290 +msgid "Error opening zip file" msgstr "" -#: ../../Zotlabs/Module/Api.php:73 -msgid "Return to your app and insert this Security Code:" +#: ../../Zotlabs/Module/Webpages.php:301 +msgid "Invalid folder path." msgstr "" -#: ../../Zotlabs/Module/Api.php:83 -msgid "Please login to continue." +#: ../../Zotlabs/Module/Webpages.php:328 +msgid "No webpage elements detected." msgstr "" -#: ../../Zotlabs/Module/Api.php:95 -msgid "" -"Do you want to authorize this application to access your posts and contacts, " -"and/or create new posts for you?" +#: ../../Zotlabs/Module/Webpages.php:403 +msgid "Import complete." msgstr "" #: ../../Zotlabs/Module/Invite.php:29 @@ -5359,10 +4954,6 @@ msgstr "" msgid "Enter email addresses, one per line:" msgstr "" -#: ../../Zotlabs/Module/Invite.php:138 ../../Zotlabs/Module/Mail.php:284 -msgid "Your message:" -msgstr "" - #: ../../Zotlabs/Module/Invite.php:139 msgid "Please join my community on $Projectname." msgstr "" @@ -5387,124 +4978,6 @@ msgstr "" msgid "3. Click [Connect]" msgstr "" -#: ../../Zotlabs/Module/Siteinfo.php:20 -msgid "About this site" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:21 -msgid "Site Name" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:1474 -msgid "Administrator" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:28 -msgid "Software and Project information" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:29 -msgid "This site is powered by $Projectname" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:30 -msgid "" -"Federated and decentralised networking and identity services provided by Zot" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:32 -#, php-format -msgid "Version %s" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:33 -msgid "Project homepage" -msgstr "" - -#: ../../Zotlabs/Module/Siteinfo.php:34 -msgid "Developer homepage" -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:140 -msgid "Create Channel" -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:141 -msgid "" -"A channel is your identity on this network. It can represent a person, a " -"blog, or a forum to name a few. Channels can make connections with other " -"channels to share information with highly detailed permissions." -msgstr "" - -#: ../../Zotlabs/Module/New_channel.php:142 -msgid "" -"or <a href=\"import\">import an existing channel</a> from another location." -msgstr "" - -#: ../../Zotlabs/Module/Profile.php:91 -msgid "vcard" -msgstr "" - -#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:186 -msgid "Mark all system notifications seen" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:168 ../../Zotlabs/Lib/Apps.php:235 -#: ../../include/conversation.php:1042 -msgid "Poke" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:169 -msgid "Poke somebody" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:172 -msgid "Poke/Prod" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:173 -msgid "Poke, prod or do other things to somebody" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:180 -msgid "Recipient" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:181 -msgid "Choose what you wish to do to recipient" -msgstr "" - -#: ../../Zotlabs/Module/Poke.php:184 ../../Zotlabs/Module/Poke.php:185 -msgid "Make this post private" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Search.php:224 -#, php-format -msgid "Items tagged with: %s" -======= -#: ../../Zotlabs/Module/Profile_photo.php:61 -#: ../../Zotlabs/Module/Cover_photo.php:56 -msgid "Image uploaded but image cropping failed." -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:115 -#: ../../Zotlabs/Module/Profile_photo.php:226 -#: ../../include/photo/photo_driver.php:647 -msgid "Profile Photos" -msgstr "" - -#: ../../Zotlabs/Module/Profile_photo.php:137 -#: ../../Zotlabs/Module/Cover_photo.php:159 -msgid "Image resize failed." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Search.php:226 -#, php-format -msgid "Search results for: %s" -msgstr "" - #: ../../Zotlabs/Module/Like.php:19 msgid "Like/Dislike" msgstr "" @@ -5543,67 +5016,70 @@ msgstr "" #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 #: ../../Zotlabs/Module/Tagger.php:47 #: ../../extend/addon/addon/redphotos/redphotohelper.php:71 -#: ../../include/text.php:1943 ../../include/conversation.php:116 +#: ../../extend/addon/addon/diaspora/Receiver.php:1369 +#: ../../include/text.php:1930 ../../include/conversation.php:116 msgid "photo" msgstr "" #: ../../Zotlabs/Module/Like.php:370 ../../Zotlabs/Module/Subthread.php:87 -#: ../../include/text.php:1949 ../../include/conversation.php:144 +#: ../../extend/addon/addon/diaspora/Receiver.php:1369 +#: ../../include/text.php:1936 ../../include/conversation.php:144 msgid "status" msgstr "" #: ../../Zotlabs/Module/Like.php:372 ../../Zotlabs/Module/Events.php:260 -#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1946 +#: ../../Zotlabs/Module/Tagger.php:51 ../../include/text.php:1933 #: ../../include/event.php:1145 ../../include/conversation.php:119 msgid "event" msgstr "" -#: ../../Zotlabs/Module/Like.php:419 ../../include/conversation.php:160 +#: ../../Zotlabs/Module/Like.php:423 +#: ../../extend/addon/addon/diaspora/Receiver.php:1398 +#: ../../include/conversation.php:160 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:421 ../../include/conversation.php:163 +#: ../../Zotlabs/Module/Like.php:425 ../../include/conversation.php:163 #, php-format msgid "%1$s doesn't like %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:423 +#: ../../Zotlabs/Module/Like.php:427 #, php-format msgid "%1$s agrees with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:425 +#: ../../Zotlabs/Module/Like.php:429 #, php-format msgid "%1$s doesn't agree with %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:427 +#: ../../Zotlabs/Module/Like.php:431 #, php-format msgid "%1$s abstains from a decision on %2$s's %3$s" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Like.php:429 +#: ../../Zotlabs/Module/Like.php:433 #, php-format msgid "%1$s is attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:431 +#: ../../Zotlabs/Module/Like.php:435 #, php-format msgid "%1$s is not attending %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:433 +#: ../../Zotlabs/Module/Like.php:437 #, php-format msgid "%1$s may attend %2$s's %3$s" msgstr "" -#: ../../Zotlabs/Module/Like.php:538 +#: ../../Zotlabs/Module/Like.php:542 msgid "Action completed." msgstr "" -#: ../../Zotlabs/Module/Like.php:539 +#: ../../Zotlabs/Module/Like.php:543 msgid "Thank you." msgstr "" @@ -5613,36 +5089,6 @@ msgstr "" #: ../../Zotlabs/Module/Lockview.php:96 msgid "Visible to:" -======= -#: ../../Zotlabs/Module/Item.php:185 -msgid "Unable to locate original post." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:451 -msgid "Empty post discarded." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:825 -msgid "Duplicate post suppressed." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:955 -msgid "System error. Post not saved." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:1085 -msgid "Unable to obtain post information from database." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:1092 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." -msgstr "" - -#: ../../Zotlabs/Module/Item.php:1099 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Pconfig.php:26 ../../Zotlabs/Module/Pconfig.php:59 @@ -5676,518 +5122,16 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:234 +#: ../../Zotlabs/Module/Mood.php:135 ../../Zotlabs/Lib/Apps.php:235 msgid "Mood" -======= -#: ../../Zotlabs/Module/Page.php:94 ../../Zotlabs/Module/Block.php:79 -#: ../../Zotlabs/Module/Display.php:122 -#: ../../Zotlabs/Lib/NativeWikiPage.php:500 ../../Zotlabs/Web/Router.php:146 -#: ../../include/help.php:68 -msgid "Page not found." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Mood.php:136 msgid "Set your current mood and tell your friends" msgstr "" -#: ../../Zotlabs/Module/Connedit.php:79 -msgid "Could not access contact record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:109 -msgid "Could not locate selected profile." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:246 -msgid "Connection updated." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:248 -msgid "Failed to update connection record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:298 -msgid "is now connected to" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:423 -msgid "Could not access address book record." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:471 -msgid "Refresh failed - channel is currently unavailable." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:486 ../../Zotlabs/Module/Connedit.php:495 -#: ../../Zotlabs/Module/Connedit.php:504 ../../Zotlabs/Module/Connedit.php:513 -#: ../../Zotlabs/Module/Connedit.php:526 -msgid "Unable to set address book parameters." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:550 -msgid "Connection has been removed." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:590 ../../Zotlabs/Lib/Apps.php:228 -<<<<<<< HEAD -#: ../../extend/addon/addon/openclipatar/openclipatar.php:57 -#: ../../include/nav.php:102 ../../include/conversation.php:982 -======= -#: ../../addon/openclipatar/openclipatar.php:57 -#: ../../include/conversation.php:982 ../../include/nav.php:106 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgid "View Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:593 -#, php-format -msgid "View %s's profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:597 -msgid "Refresh Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:600 -msgid "Fetch updated permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:604 -msgid "Refresh Photo" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:607 -msgid "Fetch updated photo" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:611 -msgid "Recent Activity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:614 -msgid "View recent posts and comments" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:621 -msgid "Block (or Unblock) all communications with this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:622 -msgid "This connection is blocked!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:626 -msgid "Unignore" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:629 -msgid "Ignore (or Unignore) all inbound communications from this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:630 -msgid "This connection is ignored!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:634 -msgid "Unarchive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:634 -msgid "Archive" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:637 -msgid "" -"Archive (or Unarchive) this connection - mark channel dead but keep content" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:638 -msgid "This connection is archived!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:642 -msgid "Unhide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:642 -msgid "Hide" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:645 -msgid "Hide or Unhide this connection from your other connections" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:646 -msgid "This connection is hidden!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:653 -msgid "Delete this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:661 -msgid "Fetch Vcard" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:664 -msgid "Fetch electronic calling card for this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:675 -msgid "Open Individual Permissions section by default" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:698 -msgid "Affinity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:701 -msgid "Open Set Affinity section by default" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:705 ../../Zotlabs/Widget/Affinity.php:26 -msgid "Me" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:706 ../../Zotlabs/Widget/Affinity.php:27 -msgid "Family" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Connedit.php:707 -#: ../../Zotlabs/Module/Settings/Channel.php:62 -#: ../../Zotlabs/Module/Settings/Channel.php:66 -#: ../../Zotlabs/Module/Settings/Channel.php:67 -#: ../../Zotlabs/Module/Settings/Channel.php:70 -#: ../../Zotlabs/Module/Settings/Channel.php:81 -#: ../../Zotlabs/Widget/Affinity.php:28 ../../include/selectors.php:123 -#: ../../include/channel.php:407 ../../include/channel.php:408 -#: ../../include/channel.php:415 -msgid "Friends" -msgstr "" - -======= ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -#: ../../Zotlabs/Module/Connedit.php:708 ../../Zotlabs/Widget/Affinity.php:29 -msgid "Acquaintances" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:735 -msgid "Filter" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:738 -msgid "Open Custom Filter section by default" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:775 -msgid "Approve this connection" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:775 -msgid "Accept connection to allow communication" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:780 -msgid "Set Affinity" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:783 -msgid "Set Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:786 -msgid "Set Affinity & Profile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:844 -msgid "none" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:847 -#: ../../Zotlabs/Widget/Settings_menu.php:107 -msgid "Connection Default Permissions" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3880 -======= -#: ../../Zotlabs/Module/Connedit.php:847 ../../include/items.php:3955 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -#, php-format -msgid "Connection: %s" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:848 -msgid "Apply these permissions automatically" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:848 -msgid "Connection requests will be approved without your interaction" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:849 -msgid "Permission role" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:850 -msgid "Add permission role" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:856 -msgid "This connection's primary address is" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:857 -msgid "Available locations:" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:861 -msgid "" -"The permissions indicated on this page will be applied to all new " -"connections." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:862 -msgid "Connection Tools" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:864 -msgid "Slide to adjust your degree of friendship" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:865 ../../Zotlabs/Module/Rate.php:155 -#: ../../include/js_strings.php:20 -msgid "Rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:866 -msgid "Slide to adjust your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:867 ../../Zotlabs/Module/Connedit.php:872 -msgid "Optionally explain your rating" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:869 -msgid "Custom Filter" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:870 -msgid "Only import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:870 ../../Zotlabs/Module/Connedit.php:871 -msgid "" -"words one per line or #tags or /patterns/ or lang=xx, leave blank to import " -"all posts" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:871 -msgid "Do not import posts with this text" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:873 -msgid "This information is public!" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:878 -msgid "Connection Pending Approval" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Connedit.php:881 -#: ../../Zotlabs/Module/Settings/Tokens.php:163 -#: ../../Zotlabs/Module/Settings/Permcats.php:105 -msgid "inherited" -msgstr "" - -======= ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -#: ../../Zotlabs/Module/Connedit.php:883 -#, php-format -msgid "" -"Please choose the profile you would like to display to %s when viewing your " -"profile securely." -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Connedit.php:885 -#: ../../Zotlabs/Module/Settings/Tokens.php:160 -msgid "Their Settings" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:886 -#: ../../Zotlabs/Module/Settings/Tokens.php:161 -#: ../../Zotlabs/Module/Settings/Permcats.php:103 -msgid "My Settings" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:888 -#: ../../Zotlabs/Module/Settings/Tokens.php:166 -#: ../../Zotlabs/Module/Settings/Permcats.php:108 -msgid "Individual Permissions" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:889 -#: ../../Zotlabs/Module/Settings/Tokens.php:167 -#: ../../Zotlabs/Module/Settings/Permcats.php:109 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can <strong>not</strong> change those settings here." -msgstr "" - -======= ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -#: ../../Zotlabs/Module/Connedit.php:890 -msgid "" -"Some permissions may be inherited from your channel's <a href=\"settings" -"\"><strong>privacy settings</strong></a>, which have higher priority than " -"individual settings. You can change those settings here but they wont have " -"any impact unless the inherited setting changes." -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:891 -msgid "Last update:" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:900 -msgid "Details" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Connedit.php:903 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1137 -msgid "Organisation" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:904 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1138 -#: ../../include/page_widgets.php:46 -msgid "Title" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:921 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1155 -msgid "P.O. Box" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:922 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1156 -msgid "Additional" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:923 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1157 -msgid "Street" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:924 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1158 -msgid "Locality" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:925 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1159 -msgid "Region" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:926 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:1160 -msgid "ZIP Code" -msgstr "" - -#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2294 +#: ../../Zotlabs/Module/Blocks.php:154 ../../include/text.php:2280 msgid "Blocks" -======= -#: ../../Zotlabs/Module/Connedit.php:903 ../../addon/cdav/Mod_Cdav.php:1137 -msgid "Organisation" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:904 ../../addon/cdav/Mod_Cdav.php:1138 -#: ../../include/page_widgets.php:46 -msgid "Title" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:905 ../../Zotlabs/Module/Profiles.php:789 -#: ../../addon/cdav/Mod_Cdav.php:1139 -msgid "Phone" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:907 ../../Zotlabs/Module/Profiles.php:791 -#: ../../addon/cdav/Mod_Cdav.php:1141 -msgid "Instant messenger" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:908 ../../Zotlabs/Module/Profiles.php:792 -#: ../../addon/cdav/Mod_Cdav.php:1142 -msgid "Website" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:910 ../../Zotlabs/Module/Profiles.php:794 -#: ../../addon/cdav/Mod_Cdav.php:1144 -msgid "Note" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:911 ../../Zotlabs/Module/Profiles.php:795 -#: ../../addon/cdav/Mod_Cdav.php:1145 ../../addon/cdav/cdav.php:270 -#: ../../include/connections.php:668 -msgid "Mobile" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:912 ../../Zotlabs/Module/Profiles.php:796 -#: ../../addon/cdav/Mod_Cdav.php:1146 ../../addon/cdav/cdav.php:271 -#: ../../include/connections.php:669 -msgid "Home" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:913 ../../Zotlabs/Module/Profiles.php:797 -#: ../../addon/cdav/Mod_Cdav.php:1147 ../../addon/cdav/cdav.php:274 -#: ../../include/connections.php:672 -msgid "Work" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:915 ../../Zotlabs/Module/Profiles.php:799 -#: ../../addon/cdav/Mod_Cdav.php:1149 ../../addon/jappixmini/jappixmini.php:368 -msgid "Add Contact" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:916 ../../Zotlabs/Module/Profiles.php:800 -#: ../../addon/cdav/Mod_Cdav.php:1150 -msgid "Add Field" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:921 ../../addon/cdav/Mod_Cdav.php:1155 -msgid "P.O. Box" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:922 ../../addon/cdav/Mod_Cdav.php:1156 -msgid "Additional" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:923 ../../addon/cdav/Mod_Cdav.php:1157 -msgid "Street" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:924 ../../addon/cdav/Mod_Cdav.php:1158 -msgid "Locality" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:925 ../../addon/cdav/Mod_Cdav.php:1159 -msgid "Region" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:926 ../../addon/cdav/Mod_Cdav.php:1160 -msgid "ZIP Code" -msgstr "" - -#: ../../Zotlabs/Module/Connedit.php:927 ../../Zotlabs/Module/Profiles.php:760 -#: ../../addon/cdav/Mod_Cdav.php:1161 -msgid "Country" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Blocks.php:156 @@ -6203,7 +5147,7 @@ msgid "l, F j" msgstr "" #: ../../Zotlabs/Module/Cal.php:313 ../../Zotlabs/Module/Events.php:660 -#: ../../include/text.php:1765 +#: ../../include/text.php:1752 msgid "Link to Source" msgstr "" @@ -6215,36 +5159,23 @@ msgstr "" msgid "Create Event" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Cal.php:337 ../../Zotlabs/Module/Cal.php:344 #: ../../Zotlabs/Module/Events.php:689 ../../Zotlabs/Module/Events.php:698 -#: ../../Zotlabs/Module/Photos.php:911 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:846 +#: ../../Zotlabs/Module/Photos.php:911 ../../Zotlabs/Module/Cdav.php:819 msgid "Previous" msgstr "" #: ../../Zotlabs/Module/Cal.php:339 ../../Zotlabs/Module/Events.php:691 -#: ../../include/channel.php:1344 +#: ../../include/channel.php:1386 msgid "Export" -======= -#: ../../Zotlabs/Module/Chat.php:203 ../../Zotlabs/Module/Mail.php:259 -#: ../../Zotlabs/Module/Mail.php:380 ../../include/conversation.php:1263 -msgid "Please enter a link URL:" -msgstr "" - -#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Module/Mail.php:312 -#: ../../Zotlabs/Module/Mail.php:454 ../../Zotlabs/Lib/ThreadItem.php:744 -#: ../../include/conversation.php:1373 -msgid "Encrypt text" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2318 +#: ../../Zotlabs/Module/Cal.php:342 ../../include/text.php:2304 msgid "Import" msgstr "" #: ../../Zotlabs/Module/Cal.php:346 ../../Zotlabs/Module/Events.php:700 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:848 +#: ../../Zotlabs/Module/Cdav.php:821 msgid "Today" msgstr "" @@ -6267,11 +5198,10 @@ msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:115 #: ../../Zotlabs/Module/Profile_photo.php:226 -#: ../../include/photo/photo_driver.php:646 +#: ../../include/photo/photo_driver.php:658 msgid "Profile Photos" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Profile_photo.php:196 #: ../../extend/addon/addon/openclipatar/openclipatar.php:298 msgid "" @@ -6281,17 +5211,6 @@ msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:422 msgid "Use Photo for Profile" -======= -#: ../../Zotlabs/Module/Fbrowser.php:29 ../../Zotlabs/Lib/Apps.php:229 -#: ../../include/conversation.php:1783 ../../include/nav.php:392 -msgid "Photos" -msgstr "" - -#: ../../Zotlabs/Module/Fbrowser.php:85 ../../Zotlabs/Lib/Apps.php:224 -#: ../../Zotlabs/Storage/Browser.php:224 ../../include/conversation.php:1791 -#: ../../include/nav.php:400 -msgid "Files" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Profile_photo.php:422 @@ -6312,59 +5231,53 @@ msgstr "" msgid "Malformed app." msgstr "" -#: ../../Zotlabs/Module/Appman.php:111 +#: ../../Zotlabs/Module/Appman.php:125 msgid "Embed code" msgstr "" -#: ../../Zotlabs/Module/Appman.php:117 +#: ../../Zotlabs/Module/Appman.php:131 msgid "Edit App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:117 +#: ../../Zotlabs/Module/Appman.php:131 msgid "Create App" msgstr "" -#: ../../Zotlabs/Module/Appman.php:122 +#: ../../Zotlabs/Module/Appman.php:136 msgid "Name of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:123 +#: ../../Zotlabs/Module/Appman.php:137 msgid "Location (URL) of app" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Appman.php:124 ../../Zotlabs/Module/Rbmark.php:101 -#: ../../Zotlabs/Module/Events.php:473 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:838 +#: ../../Zotlabs/Module/Appman.php:138 ../../Zotlabs/Module/Rbmark.php:101 +#: ../../Zotlabs/Module/Events.php:473 ../../Zotlabs/Module/Cdav.php:811 #: ../../extend/addon/addon/rendezvous/rendezvous.php:173 msgid "Description" -======= -#: ../../Zotlabs/Module/Menu.php:107 ../../include/text.php:2268 -msgid "Menus" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Appman.php:125 +#: ../../Zotlabs/Module/Appman.php:139 msgid "Photo icon URL" msgstr "" -#: ../../Zotlabs/Module/Appman.php:125 +#: ../../Zotlabs/Module/Appman.php:139 msgid "80 x 80 pixels - optional" msgstr "" -#: ../../Zotlabs/Module/Appman.php:126 +#: ../../Zotlabs/Module/Appman.php:140 msgid "Categories (optional, comma separated list)" msgstr "" -#: ../../Zotlabs/Module/Appman.php:127 +#: ../../Zotlabs/Module/Appman.php:141 msgid "Version ID" msgstr "" -#: ../../Zotlabs/Module/Appman.php:128 +#: ../../Zotlabs/Module/Appman.php:142 msgid "Price of app" msgstr "" -#: ../../Zotlabs/Module/Appman.php:129 +#: ../../Zotlabs/Module/Appman.php:143 msgid "Location (URL) to purchase app" msgstr "" @@ -6380,8 +5293,33 @@ msgstr "" msgid "No connections in common." msgstr "" -#: ../../Zotlabs/Module/Chanview.php:134 -msgid "toggle full screen mode" +#: ../../Zotlabs/Module/Help.php:23 +msgid "Documentation Search" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:80 ../../include/nav.php:372 +#: ../../include/conversation.php:1770 +msgid "About" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:82 +msgid "Administrators" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:83 +msgid "Developers" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:84 +msgid "Tutorials" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:93 +msgid "$Projectname Documentation" +msgstr "" + +#: ../../Zotlabs/Module/Help.php:94 +msgid "Contents" msgstr "" #: ../../Zotlabs/Module/Uexport.php:57 ../../Zotlabs/Module/Uexport.php:58 @@ -6395,7 +5333,6 @@ msgid "" "import your data to a new server hub, but does not contain your content." msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Uexport.php:60 msgid "Export Content" msgstr "" @@ -6407,16 +5344,6 @@ msgid "" "connections, permissions, profile data and several months of posts. This " "file may be VERY large. Please be patient - it may take several minutes for " "this download to begin." -======= -#: ../../Zotlabs/Module/Layouts.php:184 ../../include/text.php:2269 -msgid "Layouts" -msgstr "" - -#: ../../Zotlabs/Module/Layouts.php:186 ../../Zotlabs/Lib/Apps.php:232 -#: ../../include/nav.php:161 ../../include/nav.php:268 -#: ../../include/help.php:55 ../../include/help.php:61 -msgid "Help" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Uexport.php:63 @@ -6445,54 +5372,51 @@ msgid "" "<a href=\"%1$s\">%2$s</a>" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Uexport.php:68 #, php-format msgid "" "These content files may be imported or restored by visiting <a href=\"%1$s\">" "%2$s</a> on any site containing your channel. For best results please import " "or restore these in date order (oldest first)." -======= -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/conversation.php:146 -#: ../../include/text.php:1945 -msgid "comment" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Item.php:184 -msgid "Unable to locate original post." +#: ../../Zotlabs/Module/Manage.php:143 +msgid "Create a new channel" msgstr "" -#: ../../Zotlabs/Module/Item.php:450 -msgid "Empty post discarded." +#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:222 +#: ../../include/nav.php:202 +msgid "Channel Manager" msgstr "" -#: ../../Zotlabs/Module/Item.php:824 -msgid "Duplicate post suppressed." +#: ../../Zotlabs/Module/Manage.php:169 +msgid "Current Channel" msgstr "" -#: ../../Zotlabs/Module/Item.php:954 -msgid "System error. Post not saved." +#: ../../Zotlabs/Module/Manage.php:171 +msgid "Switch to one of your channels by selecting it." msgstr "" -#: ../../Zotlabs/Module/Item.php:1084 -msgid "Unable to obtain post information from database." +#: ../../Zotlabs/Module/Manage.php:172 +msgid "Default Channel" msgstr "" -#: ../../Zotlabs/Module/Item.php:1091 +#: ../../Zotlabs/Module/Manage.php:173 +msgid "Make Default" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:176 #, php-format -msgid "You have reached your limit of %1$.0f top level posts." +msgid "%d new messages" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Item.php:1098 +#: ../../Zotlabs/Module/Manage.php:177 #, php-format -msgid "You have reached your limit of %1$.0f webpages." -======= -#: ../../Zotlabs/Module/Group.php:42 ../../Zotlabs/Module/Group.php:141 -#: ../../include/items.php:3922 -msgid "Privacy group not found." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +msgid "%d new introductions" +msgstr "" + +#: ../../Zotlabs/Module/Manage.php:179 +msgid "Delegated Channel" msgstr "" #: ../../Zotlabs/Module/Lostpass.php:19 @@ -6519,7 +5443,7 @@ msgid "" "Password reset failed." msgstr "" -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1599 +#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1600 msgid "Password Reset" msgstr "" @@ -6656,14 +5580,8 @@ msgstr "" msgid "Layout not found." msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Pdledit.php:70 msgid "Module Name:" -======= -#: ../../Zotlabs/Module/Profiles.php:728 ../../Zotlabs/Module/Profiles.php:827 -#: ../../include/channel.php:1066 -msgid "Edit visibility" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Pdledit.php:71 @@ -6674,16 +5592,11 @@ msgstr "" msgid "Invalid profile identifier." msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Profperm.php:111 msgid "Profile Visibility Editor" -======= -#: ../../Zotlabs/Module/Profiles.php:731 ../../include/channel.php:1037 -msgid "Change profile photo" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1341 +#: ../../Zotlabs/Module/Profperm.php:113 ../../include/channel.php:1383 msgid "Profile" msgstr "" @@ -6695,17 +5608,83 @@ msgstr "" msgid "Visible To" msgstr "" +#: ../../Zotlabs/Module/Import.php:143 +#, php-format +msgid "Your service plan only allows %d channels." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:157 +msgid "No channel. Import failed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:470 +#: ../../extend/addon/addon/diaspora/import_diaspora.php:142 +msgid "Import completed." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:498 +msgid "You must be logged in to use this feature." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:503 +msgid "Import Channel" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:504 +msgid "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:506 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:507 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:508 +msgid "Your old login email address" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:509 +msgid "Your old login password" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:510 +msgid "" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." +msgstr "" + +#: ../../Zotlabs/Module/Import.php:511 +msgid "Make this hub my primary location" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:512 +msgid "Move this channel (disable all previous locations)" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:513 +msgid "Import a few months of posts if possible (limited by available memory" +msgstr "" + +#: ../../Zotlabs/Module/Import.php:514 +msgid "" +"This process may take several minutes to complete. Please submit the form " +"only once and leave this page open until finished." +msgstr "" + #: ../../Zotlabs/Module/Events.php:25 msgid "Calendar entries imported." msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Events.php:27 msgid "No calendar entries found." -======= -#: ../../Zotlabs/Module/Profiles.php:736 ../../include/conversation.php:1657 -msgid "Personal" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Events.php:110 @@ -6729,8 +5708,7 @@ msgstr "" msgid "Edit event title" msgstr "" -#: ../../Zotlabs/Module/Events.php:460 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:835 +#: ../../Zotlabs/Module/Events.php:460 ../../Zotlabs/Module/Cdav.php:808 msgid "Event title" msgstr "" @@ -6750,8 +5728,7 @@ msgstr "" msgid "Edit start date and time" msgstr "" -#: ../../Zotlabs/Module/Events.php:466 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836 +#: ../../Zotlabs/Module/Events.php:466 ../../Zotlabs/Module/Cdav.php:809 msgid "Start date and time" msgstr "" @@ -6785,7 +5762,7 @@ msgstr "" msgid "Edit Location" msgstr "" -#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1343 +#: ../../Zotlabs/Module/Events.php:479 ../../include/conversation.php:1340 msgid "Permission settings" msgstr "" @@ -6809,18 +5786,15 @@ msgstr "" msgid "calendar" msgstr "" -#: ../../Zotlabs/Module/Events.php:695 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:849 +#: ../../Zotlabs/Module/Events.php:695 ../../Zotlabs/Module/Cdav.php:822 msgid "Month" msgstr "" -#: ../../Zotlabs/Module/Events.php:696 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:850 +#: ../../Zotlabs/Module/Events.php:696 ../../Zotlabs/Module/Cdav.php:823 msgid "Week" msgstr "" -#: ../../Zotlabs/Module/Events.php:697 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:851 +#: ../../Zotlabs/Module/Events.php:697 ../../Zotlabs/Module/Cdav.php:824 msgid "Day" msgstr "" @@ -6832,6 +5806,14 @@ msgstr "" msgid "Failed to remove event" msgstr "" +#: ../../Zotlabs/Module/Viewsrc.php:43 +msgid "item" +msgstr "" + +#: ../../Zotlabs/Module/Viewsrc.php:55 +msgid "Source of Item" +msgstr "" + #: ../../Zotlabs/Module/Service_limits.php:23 msgid "No service class restrictions found." msgstr "" @@ -6858,7 +5840,6 @@ msgstr "" msgid "Remove This Channel" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Removeme.php:61 msgid "This channel will be completely removed from the network. " msgstr "" @@ -6874,101 +5855,100 @@ msgid "" msgstr "" #: ../../Zotlabs/Module/Removeme.php:64 -#: ../../Zotlabs/Module/Settings/Channel.php:575 +#: ../../Zotlabs/Module/Settings/Channel.php:574 msgid "Remove Channel" -======= -#: ../../Zotlabs/Module/Profiles.php:823 ../../include/channel.php:1062 -msgid "Profile Image" msgstr "" -#: ../../Zotlabs/Module/Profiles.php:833 ../../include/channel.php:1044 -#: ../../include/nav.php:109 -msgid "Edit Profiles" +#: ../../Zotlabs/Module/Admin.php:95 +msgid "Blocked accounts" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:139 -msgid "Page link" +#: ../../Zotlabs/Module/Admin.php:96 +msgid "Expired accounts" msgstr "" -#: ../../Zotlabs/Module/Editwebpage.php:166 -msgid "Edit Webpage" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../Zotlabs/Module/Admin.php:97 +msgid "Expiring accounts" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:99 -msgid "Files: shared with me" +#: ../../Zotlabs/Module/Admin.php:110 +msgid "Clones" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Sharedwithme.php:101 -msgid "NEW" +#: ../../Zotlabs/Module/Admin.php:116 +msgid "Message queues" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:104 -msgid "Remove all files" +#: ../../Zotlabs/Module/Admin.php:130 +msgid "Your software should be updated" msgstr "" -#: ../../Zotlabs/Module/Sharedwithme.php:105 -msgid "Remove this file" +#: ../../Zotlabs/Module/Admin.php:135 +msgid "Summary" msgstr "" -#: ../../Zotlabs/Module/Viewsrc.php:46 -msgid "Source of Item" +#: ../../Zotlabs/Module/Admin.php:138 +msgid "Registered accounts" msgstr "" -#: ../../Zotlabs/Module/Sources.php:37 -msgid "Failed to create source. No channel selected." +#: ../../Zotlabs/Module/Admin.php:139 +msgid "Pending registrations" msgstr "" -#: ../../Zotlabs/Module/Sources.php:51 -msgid "Source created." +#: ../../Zotlabs/Module/Admin.php:140 +msgid "Registered channels" msgstr "" -#: ../../Zotlabs/Module/Sources.php:64 -msgid "Source updated." +#: ../../Zotlabs/Module/Admin.php:141 +msgid "Active plugins" msgstr "" -#: ../../Zotlabs/Module/Sources.php:90 -msgid "*" -======= -#: ../../Zotlabs/Module/Manage.php:168 ../../Zotlabs/Lib/Apps.php:221 -#: ../../include/nav.php:205 -msgid "Channel Manager" +#: ../../Zotlabs/Module/Admin.php:142 +msgid "Version" msgstr "" -#: ../../Zotlabs/Module/Manage.php:169 -msgid "Current Channel" +#: ../../Zotlabs/Module/Admin.php:143 +msgid "Repository version (master)" msgstr "" -#: ../../Zotlabs/Module/Manage.php:171 -msgid "Switch to one of your channels by selecting it." +#: ../../Zotlabs/Module/Admin.php:144 +msgid "Repository version (dev)" msgstr "" -#: ../../Zotlabs/Module/Manage.php:172 -msgid "Default Channel" +#: ../../Zotlabs/Module/Sharedwithme.php:99 +msgid "Files: shared with me" msgstr "" -#: ../../Zotlabs/Module/Manage.php:173 -msgid "Make Default" +#: ../../Zotlabs/Module/Sharedwithme.php:101 +msgid "NEW" msgstr "" -#: ../../Zotlabs/Module/Manage.php:176 -#, php-format -msgid "%d new messages" +#: ../../Zotlabs/Module/Sharedwithme.php:104 +msgid "Remove all files" msgstr "" -#: ../../Zotlabs/Module/Manage.php:177 -#, php-format -msgid "%d new introductions" +#: ../../Zotlabs/Module/Sharedwithme.php:105 +msgid "Remove this file" msgstr "" -#: ../../Zotlabs/Module/Manage.php:179 -msgid "Delegated Channel" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../Zotlabs/Module/Sources.php:37 +msgid "Failed to create source. No channel selected." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:51 +msgid "Source created." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:64 +msgid "Source updated." +msgstr "" + +#: ../../Zotlabs/Module/Sources.php:90 +msgid "*" msgstr "" #: ../../Zotlabs/Module/Sources.php:96 -#: ../../Zotlabs/Widget/Settings_menu.php:123 ../../include/features.php:213 +#: ../../Zotlabs/Widget/Settings_menu.php:125 ../../include/features.php:209 msgid "Channel Sources" msgstr "" @@ -6980,15 +5960,10 @@ msgstr "" msgid "New Source" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Sources.php:109 ../../Zotlabs/Module/Sources.php:143 msgid "" "Import all or selected content from the following channel into this channel " "and distribute it according to your channel settings." -======= -#: ../../Zotlabs/Module/Siteinfo.php:25 ../../include/network.php:2025 -msgid "Administrator" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Sources.php:110 ../../Zotlabs/Module/Sources.php:144 @@ -7034,127 +6009,33 @@ msgstr "" msgid "Unable to remove source." msgstr "" -#: ../../Zotlabs/Module/Mail.php:65 -msgid "Unable to lookup recipient." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:72 -msgid "Unable to communicate with requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:79 -msgid "Cannot verify requested channel." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:97 -msgid "Selected channel has private message restrictions. Send failed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:178 -msgid "Messages" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:213 -msgid "Message recalled." -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Mail.php:226 -msgid "Conversation removed." -======= -#: ../../Zotlabs/Module/Webpages.php:242 ../../Zotlabs/Lib/Apps.php:225 -#: ../../include/conversation.php:1841 ../../include/nav.php:449 -msgid "Webpages" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:240 ../../Zotlabs/Module/Mail.php:361 -#: ../../Zotlabs/Module/Chat.php:203 ../../include/conversation.php:1263 -msgid "Please enter a link URL:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:241 ../../Zotlabs/Module/Mail.php:362 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:269 -msgid "Requested channel is not in this network" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:277 -msgid "Send Private Message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:278 ../../Zotlabs/Module/Mail.php:415 -msgid "To:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:281 ../../Zotlabs/Module/Mail.php:417 -msgid "Subject:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:286 ../../Zotlabs/Module/Mail.php:423 -#: ../../include/conversation.php:1323 -msgid "Attach file" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:288 -msgid "Send" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Mail.php:291 ../../Zotlabs/Module/Mail.php:428 -#: ../../include/conversation.php:1368 -msgid "Set expiration date" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:293 ../../Zotlabs/Module/Mail.php:430 -#: ../../Zotlabs/Module/Chat.php:204 ../../Zotlabs/Lib/ThreadItem.php:744 -#: ../../include/conversation.php:1373 -msgid "Encrypt text" -======= -#: ../../Zotlabs/Module/Editpost.php:38 -msgid "Item is not editable" -msgstr "" - -#: ../../Zotlabs/Module/Editpost.php:103 ../../Zotlabs/Module/Rpost.php:138 -msgid "Edit post" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:387 -msgid "Delete message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:388 -msgid "Delivery report" +#: ../../Zotlabs/Module/Poke.php:180 ../../Zotlabs/Lib/Apps.php:236 +#: ../../include/conversation.php:1039 +msgid "Poke" msgstr "" -#: ../../Zotlabs/Module/Mail.php:389 -msgid "Recall message" +#: ../../Zotlabs/Module/Poke.php:181 +msgid "Poke somebody" msgstr "" -#: ../../Zotlabs/Module/Mail.php:391 -msgid "Message has been recalled." +#: ../../Zotlabs/Module/Poke.php:184 +msgid "Poke/Prod" msgstr "" -#: ../../Zotlabs/Module/Mail.php:408 -msgid "Delete Conversation" +#: ../../Zotlabs/Module/Poke.php:185 +msgid "Poke, prod or do other things to somebody" msgstr "" -#: ../../Zotlabs/Module/Mail.php:410 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." +#: ../../Zotlabs/Module/Poke.php:192 +msgid "Recipient" msgstr "" -#: ../../Zotlabs/Module/Mail.php:414 -msgid "Send Reply" +#: ../../Zotlabs/Module/Poke.php:193 +msgid "Choose what you wish to do to recipient" msgstr "" -#: ../../Zotlabs/Module/Mail.php:419 -#, php-format -msgid "Your message for %s (%s):" +#: ../../Zotlabs/Module/Poke.php:196 ../../Zotlabs/Module/Poke.php:197 +msgid "Make this post private" msgstr "" #: ../../Zotlabs/Module/Suggest.php:37 @@ -7171,15 +6052,15 @@ msgstr "" msgid "Authentication failed." msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:1963 +#: ../../Zotlabs/Module/Rmagic.php:75 ../../include/channel.php:2000 msgid "Remote Authentication" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:1964 +#: ../../Zotlabs/Module/Rmagic.php:76 ../../include/channel.php:2001 msgid "Enter your channel address (e.g. channel@example.com)" msgstr "" -#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:1965 +#: ../../Zotlabs/Module/Rmagic.php:77 ../../include/channel.php:2002 msgid "Authenticate" msgstr "" @@ -7303,15 +6184,8 @@ msgstr "" msgid "Current Password" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Settings/Account.php:114 msgid "Enter New Password" -======= -#: ../../Zotlabs/Module/Like.php:419 ../../addon/diaspora/inbound.php:1812 -#: ../../include/conversation.php:160 -#, php-format -msgid "%1$s likes %2$s's %3$s" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Settings/Account.php:115 @@ -7339,215 +6213,6 @@ msgstr "" msgid "Remove this account including all its channels" msgstr "" -#: ../../Zotlabs/Module/Settings/Display.php:145 -msgid "No special theme for mobile devices" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:148 -#, php-format -msgid "%s - (Experimental)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:198 -msgid "Display Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:199 -msgid "Theme Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:200 -msgid "Custom Theme Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:201 -msgid "Content Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:207 -msgid "Display Theme:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:208 -msgid "Select scheme" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Settings/Display.php:210 -msgid "Mobile Theme:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:211 -msgid "Preload images before rendering the page" -======= -#: ../../Zotlabs/Module/Directory.php:309 ../../include/channel.php:1293 -msgid "Age:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:314 ../../include/markdown.php:560 -#: ../../include/channel.php:1134 ../../include/event.php:52 -#: ../../include/event.php:84 -msgid "Location:" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:211 -msgid "" -"The subjective page load time will be longer but the page will be ready when " -"displayed" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Settings/Display.php:212 -msgid "Enable user zoom on mobile devices" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:213 -msgid "Update browser every xx seconds" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:213 -msgid "Minimum of 10 seconds, no maximum" -======= -#: ../../Zotlabs/Module/Directory.php:325 ../../include/channel.php:1309 -msgid "Hometown:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:327 ../../include/channel.php:1317 -msgid "About:" -msgstr "" - -#: ../../Zotlabs/Module/Directory.php:328 ../../Zotlabs/Module/Suggest.php:54 -#: ../../Zotlabs/Widget/Follow.php:32 ../../Zotlabs/Widget/Suggestions.php:44 -#: ../../include/conversation.php:1002 ../../include/channel.php:1119 -#: ../../include/connections.php:110 -msgid "Connect" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:214 -msgid "Maximum number of conversations to load at any time:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:214 -msgid "Maximum of 100 items" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:215 -msgid "Show emoticons (smilies) as images" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:216 -msgid "Manual conversation updates" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:216 -msgid "Default is on, turning this off may increase screen jumping" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:217 -msgid "Link post titles to source" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:218 -msgid "System Page Layout Editor - (advanced)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:221 -msgid "Use blog/list mode on channel page" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:221 -#: ../../Zotlabs/Module/Settings/Display.php:222 -msgid "(comments displayed separately)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:222 -msgid "Use blog/list mode on grid page" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:223 -msgid "Channel page max height of content (in pixels)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:223 -#: ../../Zotlabs/Module/Settings/Display.php:224 -msgid "click to expand content exceeding this height" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Display.php:224 -msgid "Grid page max height of content (in pixels)" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Featured.php:20 -msgid "Affinity Slider settings updated." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Featured.php:34 -msgid "No feature settings configured" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Featured.php:41 -msgid "Default maximum affinity level" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Featured.php:46 -msgid "Default minimum affinity level" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Featured.php:50 -msgid "Affinity Slider Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Featured.php:60 -msgid "Feature/Addon Settings" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:31 -#, php-format -msgid "This channel is limited to %d tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:37 -msgid "Name and Password are required." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:77 -msgid "Token saved." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:113 -msgid "" -"Use this form to create temporary access identifiers to share things with " -"non-members. These identities may be used in Access Control Lists and " -"visitors may login using these credentials to access private content." -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:115 -msgid "" -"You may also provide <em>dropbox</em> style access links to friends and " -"associates by adding the Login Password to any specific site URL as shown. " -"Examples:" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:150 -#: ../../Zotlabs/Widget/Settings_menu.php:90 -msgid "Guest Access Tokens" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:157 -msgid "Login Name" -msgstr "" - -#: ../../Zotlabs/Module/Settings/Tokens.php:158 -msgid "Login Password" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Module/Settings/Tokens.php:159 -msgid "Expires (yyyy-mm-dd)" -msgstr "" - #: ../../Zotlabs/Module/Settings/Channel.php:251 #: ../../extend/addon/addon/logrot/logrot.php:54 #: ../../extend/addon/addon/msgfooter/msgfooter.php:54 @@ -7616,93 +6281,12 @@ msgid "Basic Settings" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:482 -#: ../../include/channel.php:1229 +#: ../../include/channel.php:1271 msgid "Full Name:" msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:484 msgid "Your Timezone:" -======= -#: ../../Zotlabs/Module/Mail.php:191 -msgid "message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:232 -msgid "Message recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:245 -msgid "Conversation removed." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:260 ../../Zotlabs/Module/Mail.php:381 -msgid "Expires YYYY-MM-DD HH:MM" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:288 -msgid "Requested channel is not in this network" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:296 -msgid "Send Private Message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:297 ../../Zotlabs/Module/Mail.php:439 -msgid "To:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:300 ../../Zotlabs/Module/Mail.php:441 -msgid "Subject:" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:305 ../../Zotlabs/Module/Mail.php:447 -#: ../../include/conversation.php:1323 -msgid "Attach file" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:307 -msgid "Send" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:310 ../../Zotlabs/Module/Mail.php:452 -#: ../../include/conversation.php:1368 -msgid "Set expiration date" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:411 -msgid "Delete message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:412 -msgid "Delivery report" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:413 -msgid "Recall message" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:415 -msgid "Message has been recalled." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:432 -msgid "Delete Conversation" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:434 -msgid "" -"No secure communications available. You <strong>may</strong> be able to " -"respond from the sender's profile page." -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:438 -msgid "Send Reply" -msgstr "" - -#: ../../Zotlabs/Module/Mail.php:443 -#, php-format -msgid "Your message for %s (%s):" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Settings/Channel.php:485 @@ -7731,321 +6315,462 @@ msgstr "" msgid "Security and Privacy Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:493 +#: ../../Zotlabs/Module/Settings/Channel.php:492 msgid "Your permissions are already configured. Click to view/adjust" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Channel.php:494 msgid "Hide my online presence" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:495 +#: ../../Zotlabs/Module/Settings/Channel.php:494 msgid "Prevents displaying in your profile that you are online" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:497 +#: ../../Zotlabs/Module/Settings/Channel.php:496 msgid "Simple Privacy Settings:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:498 +#: ../../Zotlabs/Module/Settings/Channel.php:497 msgid "" "Very Public - <em>extremely permissive (should be used with caution)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:499 +#: ../../Zotlabs/Module/Settings/Channel.php:498 msgid "" "Typical - <em>default public, privacy when desired (similar to social " "network permissions but with improved privacy)</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:500 +#: ../../Zotlabs/Module/Settings/Channel.php:499 msgid "Private - <em>default private, never open or public</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:501 +#: ../../Zotlabs/Module/Settings/Channel.php:500 msgid "Blocked - <em>default blocked to/from everybody</em>" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "Allow others to tag your posts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:503 +#: ../../Zotlabs/Module/Settings/Channel.php:502 msgid "" "Often used by the community to retro-actively flag inappropriate content" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:505 +#: ../../Zotlabs/Module/Settings/Channel.php:504 msgid "Channel Permission Limits" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "Expire other channel content after this many days" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "0 or blank to use the website limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:506 #, php-format msgid "This website expires after %d days." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "This website does not expire imported content." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:507 +#: ../../Zotlabs/Module/Settings/Channel.php:506 msgid "The website limit takes precedence if lower than your limit." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "Maximum Friend Requests/Day:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:508 +#: ../../Zotlabs/Module/Settings/Channel.php:507 msgid "May reduce spam activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:509 +#: ../../Zotlabs/Module/Settings/Channel.php:508 msgid "Default Access Control List (ACL)" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:511 +#: ../../Zotlabs/Module/Settings/Channel.php:510 msgid "Use my default audience setting for the type of object published" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:518 +#: ../../Zotlabs/Module/Settings/Channel.php:517 msgid "Channel permissions category:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:519 +#: ../../Zotlabs/Module/Settings/Channel.php:518 msgid "Default Permissions Group" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Maximum private messages per day from unknown people:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:525 +#: ../../Zotlabs/Module/Settings/Channel.php:524 msgid "Useful to reduce spamming" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:528 +#: ../../Zotlabs/Module/Settings/Channel.php:527 msgid "Notification Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:529 +#: ../../Zotlabs/Module/Settings/Channel.php:528 msgid "By default post a status message when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:530 +#: ../../Zotlabs/Module/Settings/Channel.php:529 msgid "accepting a friend request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:531 +#: ../../Zotlabs/Module/Settings/Channel.php:530 msgid "joining a forum/community" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:532 +#: ../../Zotlabs/Module/Settings/Channel.php:531 msgid "making an <em>interesting</em> profile change" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:533 +#: ../../Zotlabs/Module/Settings/Channel.php:532 msgid "Send a notification email when:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:534 +#: ../../Zotlabs/Module/Settings/Channel.php:533 msgid "You receive a connection request" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:535 +#: ../../Zotlabs/Module/Settings/Channel.php:534 msgid "Your connections are confirmed" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:536 +#: ../../Zotlabs/Module/Settings/Channel.php:535 msgid "Someone writes on your profile wall" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:537 +#: ../../Zotlabs/Module/Settings/Channel.php:536 msgid "Someone writes a followup comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:538 +#: ../../Zotlabs/Module/Settings/Channel.php:537 msgid "You receive a private message" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Settings/Channel.php:539 +#: ../../Zotlabs/Module/Settings/Channel.php:538 msgid "You receive a friend suggestion" -======= -#: ../../Zotlabs/Module/Register.php:270 ../../boot.php:1610 -#: ../../include/nav.php:149 -msgid "Register" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:540 +#: ../../Zotlabs/Module/Settings/Channel.php:539 msgid "You are tagged in a post" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:541 +#: ../../Zotlabs/Module/Settings/Channel.php:540 msgid "You are poked/prodded/etc. in a post" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Settings/Channel.php:543 +#: ../../Zotlabs/Module/Settings/Channel.php:542 msgid "Someone likes your post/comment" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:546 +#: ../../Zotlabs/Module/Settings/Channel.php:545 msgid "Show visual notifications including:" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:548 +#: ../../Zotlabs/Module/Settings/Channel.php:547 msgid "Unseen grid activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:548 msgid "Unseen channel activity" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:549 msgid "Unseen private messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:550 +#: ../../Zotlabs/Module/Settings/Channel.php:549 +#: ../../Zotlabs/Module/Settings/Channel.php:554 #: ../../Zotlabs/Module/Settings/Channel.php:555 #: ../../Zotlabs/Module/Settings/Channel.php:556 -#: ../../Zotlabs/Module/Settings/Channel.php:557 #: ../../extend/addon/addon/jappixmini/jappixmini.php:343 msgid "Recommended" -======= -#: ../../Zotlabs/Module/Cover_photo.php:237 ../../include/items.php:4303 -msgid "female" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:238 ../../include/items.php:4304 -#, php-format -msgid "%1$s updated her %2$s" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:239 ../../include/items.php:4305 -msgid "male" msgstr "" -#: ../../Zotlabs/Module/Cover_photo.php:240 ../../include/items.php:4306 -#, php-format -msgid "%1$s updated his %2$s" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:242 ../../include/items.php:4308 -#, php-format -msgid "%1$s updated their %2$s" -msgstr "" - -#: ../../Zotlabs/Module/Cover_photo.php:244 ../../include/channel.php:1759 -msgid "cover photo" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Settings/Channel.php:551 +#: ../../Zotlabs/Module/Settings/Channel.php:550 msgid "Upcoming events" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:552 +#: ../../Zotlabs/Module/Settings/Channel.php:551 msgid "Events today" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Upcoming birthdays" -======= -#: ../../Zotlabs/Module/Help.php:80 ../../include/conversation.php:1773 -#: ../../include/nav.php:382 -msgid "About" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:553 +#: ../../Zotlabs/Module/Settings/Channel.php:552 msgid "Not available in all themes" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:554 +#: ../../Zotlabs/Module/Settings/Channel.php:553 msgid "System (personal) notifications" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:555 +#: ../../Zotlabs/Module/Settings/Channel.php:554 msgid "System info messages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:556 +#: ../../Zotlabs/Module/Settings/Channel.php:555 msgid "System critical alerts" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:557 +#: ../../Zotlabs/Module/Settings/Channel.php:556 msgid "New connections" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:558 +#: ../../Zotlabs/Module/Settings/Channel.php:557 msgid "System Registrations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:559 +#: ../../Zotlabs/Module/Settings/Channel.php:558 msgid "" "Also show new wall posts, private messages and connections under Notices" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "Notify me of events this many days in advance" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:561 +#: ../../Zotlabs/Module/Settings/Channel.php:560 msgid "Must be greater than 0" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:567 +#: ../../Zotlabs/Module/Settings/Channel.php:566 msgid "Advanced Account/Page Type Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:568 +#: ../../Zotlabs/Module/Settings/Channel.php:567 msgid "Change the behaviour of this account for special situations" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:570 +#: ../../Zotlabs/Module/Settings/Channel.php:569 msgid "Miscellaneous Settings" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:571 +#: ../../Zotlabs/Module/Settings/Channel.php:570 msgid "Default photo upload folder" msgstr "" +#: ../../Zotlabs/Module/Settings/Channel.php:570 #: ../../Zotlabs/Module/Settings/Channel.php:571 -#: ../../Zotlabs/Module/Settings/Channel.php:572 msgid "%Y - current year, %m - current month" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:572 +#: ../../Zotlabs/Module/Settings/Channel.php:571 msgid "Default file upload folder" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:574 +#: ../../Zotlabs/Module/Settings/Channel.php:573 msgid "Personal menu to display in your channel pages" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:576 +#: ../../Zotlabs/Module/Settings/Channel.php:575 msgid "Remove this channel." msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:577 +#: ../../Zotlabs/Module/Settings/Channel.php:576 msgid "Firefox Share $Projectname provider" msgstr "" -#: ../../Zotlabs/Module/Settings/Channel.php:578 +#: ../../Zotlabs/Module/Settings/Channel.php:577 msgid "Start calendar week on Monday" msgstr "" +#: ../../Zotlabs/Module/Settings/Display.php:145 +msgid "No special theme for mobile devices" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:148 +#, php-format +msgid "%s - (Experimental)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:198 +msgid "Display Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:199 +msgid "Theme Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:200 +msgid "Custom Theme Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:201 +msgid "Content Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:207 +msgid "Display Theme:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:208 +msgid "Select scheme" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:210 +msgid "Mobile Theme:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:211 +msgid "Preload images before rendering the page" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:211 +msgid "" +"The subjective page load time will be longer but the page will be ready when " +"displayed" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:212 +msgid "Enable user zoom on mobile devices" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:213 +msgid "Update browser every xx seconds" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:213 +msgid "Minimum of 10 seconds, no maximum" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:214 +msgid "Maximum number of conversations to load at any time:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:214 +msgid "Maximum of 100 items" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:215 +msgid "Show emoticons (smilies) as images" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:216 +msgid "Manual conversation updates" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:216 +msgid "Default is on, turning this off may increase screen jumping" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:217 +msgid "Link post titles to source" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:218 +msgid "System Page Layout Editor - (advanced)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:221 +msgid "Use blog/list mode on channel page" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:221 +#: ../../Zotlabs/Module/Settings/Display.php:222 +msgid "(comments displayed separately)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:222 +msgid "Use blog/list mode on grid page" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:223 +msgid "Channel page max height of content (in pixels)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:223 +#: ../../Zotlabs/Module/Settings/Display.php:224 +msgid "click to expand content exceeding this height" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Display.php:224 +msgid "Grid page max height of content (in pixels)" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:21 +msgid "Affinity Slider settings updated." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:36 +msgid "No feature settings configured" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:43 +msgid "Default maximum affinity level" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:48 +msgid "Default minimum affinity level" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:52 +msgid "Affinity Slider Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Featured.php:62 +msgid "Feature/Addon Settings" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:31 +#, php-format +msgid "This channel is limited to %d tokens" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:37 +msgid "Name and Password are required." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:77 +msgid "Token saved." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:113 +msgid "" +"Use this form to create temporary access identifiers to share things with " +"non-members. These identities may be used in Access Control Lists and " +"visitors may login using these credentials to access private content." +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:115 +msgid "" +"You may also provide <em>dropbox</em> style access links to friends and " +"associates by adding the Login Password to any specific site URL as shown. " +"Examples:" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:150 +#: ../../Zotlabs/Widget/Settings_menu.php:92 +msgid "Guest Access Tokens" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:157 +msgid "Login Name" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:158 +msgid "Login Password" +msgstr "" + +#: ../../Zotlabs/Module/Settings/Tokens.php:159 +msgid "Expires (yyyy-mm-dd)" +msgstr "" + #: ../../Zotlabs/Module/Settings/Permcats.php:37 msgid "Permission category saved." msgstr "" @@ -8133,11 +6858,11 @@ msgstr "" msgid "Add Thing to your Profile" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:274 +#: ../../Zotlabs/Module/Tagger.php:55 ../../include/bbcode.php:334 msgid "post" msgstr "" -#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1951 +#: ../../Zotlabs/Module/Tagger.php:57 ../../include/text.php:1938 #: ../../include/conversation.php:146 msgid "comment" msgstr "" @@ -8227,22 +6952,19 @@ msgid "Show Oldest First" msgstr "" #: ../../Zotlabs/Module/Photos.php:751 ../../Zotlabs/Module/Photos.php:1290 -#: ../../Zotlabs/Module/Embedphotos.php:139 ../../Zotlabs/Widget/Album.php:78 +#: ../../Zotlabs/Module/Embedphotos.php:140 ../../Zotlabs/Widget/Album.php:78 +#: ../../Zotlabs/Widget/Portfolio.php:78 msgid "View Photo" msgstr "" #: ../../Zotlabs/Module/Photos.php:782 -#: ../../Zotlabs/Module/Embedphotos.php:155 ../../Zotlabs/Widget/Album.php:95 +#: ../../Zotlabs/Module/Embedphotos.php:156 ../../Zotlabs/Widget/Album.php:95 +#: ../../Zotlabs/Widget/Portfolio.php:97 msgid "Edit Album" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Photos.php:832 msgid "Permission denied. Access to this item may be restricted." -======= -#: ../../Zotlabs/Module/Lostpass.php:91 ../../boot.php:1637 -msgid "Password Reset" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Photos.php:834 @@ -8285,13 +7007,8 @@ msgstr "" msgid "Enter a new album name" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Photos.php:1005 msgid "or select an existing one (doubleclick)" -======= -#: ../../Zotlabs/Module/Notifications.php:43 ../../include/nav.php:190 -msgid "Mark all system notifications seen" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Module/Photos.php:1008 @@ -8310,94 +7027,65 @@ msgstr "" msgid "Flag as adult in album view" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:269 +#: ../../Zotlabs/Module/Photos.php:1040 ../../Zotlabs/Lib/ThreadItem.php:267 msgid "I like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:270 +#: ../../Zotlabs/Module/Photos.php:1041 ../../Zotlabs/Lib/ThreadItem.php:268 msgid "I don't like this (toggle)" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:412 -#: ../../include/conversation.php:739 +#: ../../Zotlabs/Module/Photos.php:1043 ../../Zotlabs/Lib/ThreadItem.php:410 +#: ../../include/conversation.php:736 msgid "Please wait" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Photos.php:1059 ../../Zotlabs/Module/Photos.php:1177 -#: ../../Zotlabs/Lib/ThreadItem.php:729 +#: ../../Zotlabs/Lib/ThreadItem.php:727 msgid "This is you" msgstr "" #: ../../Zotlabs/Module/Photos.php:1061 ../../Zotlabs/Module/Photos.php:1179 -#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/js_strings.php:6 +#: ../../Zotlabs/Lib/ThreadItem.php:729 ../../include/js_strings.php:6 msgid "Comment" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574 +#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:569 msgctxt "title" msgid "Likes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:574 +#: ../../Zotlabs/Module/Photos.php:1077 ../../include/conversation.php:569 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:570 msgctxt "title" msgid "Agree" -======= -#: ../../Zotlabs/Lib/Apps.php:220 ../../boot.php:1629 ../../include/nav.php:117 -msgid "Login" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:222 -msgid "Activity" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1857 -#: ../../include/features.php:99 ../../include/nav.php:465 -msgid "Wiki" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:180 -msgid "Channel Home" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/conversation.php:1802 -#: ../../include/conversation.php:1805 ../../include/nav.php:200 -#: ../../include/nav.php:411 ../../include/nav.php:414 -msgid "Events" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:570 msgctxt "title" msgid "Disagree" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:575 +#: ../../Zotlabs/Module/Photos.php:1078 ../../include/conversation.php:570 msgctxt "title" msgid "Abstain" -======= -#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:192 -msgid "Mail" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:571 msgctxt "title" msgid "Attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:571 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:576 +#: ../../Zotlabs/Module/Photos.php:1079 ../../include/conversation.php:571 msgctxt "title" msgid "Might attend" msgstr "" @@ -8408,8 +7096,8 @@ msgid "View all" msgstr "" #: ../../Zotlabs/Module/Photos.php:1100 ../../Zotlabs/Lib/ThreadItem.php:191 -#: ../../include/taxonomy.php:403 ../../include/channel.php:1247 -#: ../../include/conversation.php:1898 +#: ../../include/taxonomy.php:433 ../../include/conversation.php:1904 +#: ../../include/channel.php:1289 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -8417,7 +7105,7 @@ msgstr[0] "" msgstr[1] "" #: ../../Zotlabs/Module/Photos.php:1105 ../../Zotlabs/Lib/ThreadItem.php:196 -#: ../../include/conversation.php:1901 +#: ../../include/conversation.php:1907 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -8436,45 +7124,34 @@ msgstr "" msgid "Map" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:401 +#: ../../Zotlabs/Module/Photos.php:1227 ../../Zotlabs/Lib/ThreadItem.php:399 msgctxt "noun" msgid "Likes" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:402 +#: ../../Zotlabs/Module/Photos.php:1228 ../../Zotlabs/Lib/ThreadItem.php:400 msgctxt "noun" msgid "Dislikes" msgstr "" -#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:407 +#: ../../Zotlabs/Module/Photos.php:1233 ../../Zotlabs/Lib/ThreadItem.php:405 #: ../../include/acl_selectors.php:220 msgid "Close" msgstr "" #: ../../Zotlabs/Module/Photos.php:1305 ../../Zotlabs/Module/Photos.php:1318 -#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:525 +#: ../../Zotlabs/Module/Photos.php:1319 ../../include/photos.php:526 msgid "Recent Photos" msgstr "" -#: ../../Zotlabs/Module/Chat.php:179 -msgid "Room not found" -======= -#: ../../Zotlabs/Lib/Apps.php:365 -msgid "Purchase" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:369 -msgid "Undelete" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:374 -msgid "Add to app-tray" +#: ../../Zotlabs/Module/Chat.php:25 ../../Zotlabs/Module/Channel.php:32 +#: ../../extend/addon/addon/chess/chess.php:403 +#: ../../extend/addon/addon/gitwiki/Mod_Gitwiki.php:28 +msgid "You must be logged in to see this page." msgstr "" -#: ../../Zotlabs/Lib/Apps.php:375 -msgid "Remove from app-tray" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../Zotlabs/Module/Chat.php:179 +msgid "Room not found" msgstr "" #: ../../Zotlabs/Module/Chat.php:195 @@ -8493,7 +7170,6 @@ msgstr "" msgid "I am online" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Module/Chat.php:200 msgid "Bookmark this room" msgstr "" @@ -8535,93 +7211,108 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:27 -msgid "Missing room name" +#: ../../Zotlabs/Module/Channel.php:112 +msgid "Insufficient permissions. Request redirected to profile page." msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:36 -msgid "Duplicate room name" +#: ../../Zotlabs/Module/Apporder.php:34 +msgid "Change Order of Navigation Apps" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 -msgid "Invalid room specifier." +#: ../../Zotlabs/Module/Apporder.php:35 +msgid "Use arrows to move the corresponding app up or down in the display list" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:126 -msgid "Room not found." +#: ../../Zotlabs/Module/Cdav.php:726 +msgid "INVALID EVENT DISMISSED!" msgstr "" -#: ../../Zotlabs/Lib/Chatroom.php:147 -msgid "Room is full" -======= -#: ../../Zotlabs/Lib/NativeWikiPage.php:42 -#: ../../Zotlabs/Lib/NativeWikiPage.php:83 -msgid "(No Title)" +#: ../../Zotlabs/Module/Cdav.php:727 +msgid "Summary: " msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:97 -msgid "Wiki page create failed." +#: ../../Zotlabs/Module/Cdav.php:728 +msgid "Date: " msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:110 -msgid "Wiki not found." +#: ../../Zotlabs/Module/Cdav.php:729 ../../Zotlabs/Module/Cdav.php:736 +msgid "Reason: " msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:121 -msgid "Destination name already exists" +#: ../../Zotlabs/Module/Cdav.php:734 +msgid "INVALID CARD DISMISSED!" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:147 -#: ../../Zotlabs/Lib/NativeWikiPage.php:342 -msgid "Page not found" +#: ../../Zotlabs/Module/Cdav.php:735 +msgid "Name: " msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:177 -msgid "Error reading page content" +#: ../../Zotlabs/Module/Cdav.php:809 ../../Zotlabs/Module/Cdav.php:810 +msgid "Example: YYYY-MM-DD HH:mm" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:333 -#: ../../Zotlabs/Lib/NativeWikiPage.php:381 -#: ../../Zotlabs/Lib/NativeWikiPage.php:448 -#: ../../Zotlabs/Lib/NativeWikiPage.php:489 -msgid "Error reading wiki" +#: ../../Zotlabs/Module/Cdav.php:810 +msgid "End date and time" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:369 -msgid "Page update failed." +#: ../../Zotlabs/Module/Cdav.php:825 +msgid "List month" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:403 -msgid "Nothing deleted" +#: ../../Zotlabs/Module/Cdav.php:826 +msgid "List week" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:469 -msgid "Compare: object not found." +#: ../../Zotlabs/Module/Cdav.php:827 +msgid "List day" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:475 -msgid "Page updated" +#: ../../Zotlabs/Module/Cdav.php:834 +msgid "More" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:478 -msgid "Untitled" +#: ../../Zotlabs/Module/Cdav.php:835 +msgid "Less" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:484 -msgid "Wiki resource_id required for git commit" +#: ../../Zotlabs/Module/Cdav.php:836 +msgid "Select calendar" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:540 -#: ../../Zotlabs/Widget/Wiki_page_history.php:23 -msgctxt "wiki_history" -msgid "Message" +#: ../../Zotlabs/Module/Cdav.php:838 +msgid "Delete all" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:578 -#: ../../addon/gitwiki/gitwiki_backend.php:579 ../../include/bbcode.php:610 -#: ../../include/bbcode.php:756 -msgid "Different viewers will see this text differently" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../Zotlabs/Module/Cdav.php:840 +msgid "Sorry! Editing of recurrent events is not yet implemented." +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1181 +msgid "Default Calendar" +msgstr "" + +#: ../../Zotlabs/Module/Cdav.php:1191 +msgid "Default Addressbook" +msgstr "" + +#: ../../Zotlabs/Lib/Chatroom.php:27 +msgid "Missing room name" +msgstr "" + +#: ../../Zotlabs/Lib/Chatroom.php:36 +msgid "Duplicate room name" +msgstr "" + +#: ../../Zotlabs/Lib/Chatroom.php:86 ../../Zotlabs/Lib/Chatroom.php:94 +msgid "Invalid room specifier." +msgstr "" + +#: ../../Zotlabs/Lib/Chatroom.php:126 +msgid "Room not found." +msgstr "" + +#: ../../Zotlabs/Lib/Chatroom.php:147 +msgid "Room is full" msgstr "" #: ../../Zotlabs/Lib/PermissionDescription.php:34 @@ -8687,21 +7378,11 @@ msgstr "" msgid "This is your default setting for the audience of your webpages" msgstr "" -#: ../../Zotlabs/Lib/DB_Upgrade.php:93 -#, php-format -msgid "Update Error at %s" -msgstr "" - -#: ../../Zotlabs/Lib/DB_Upgrade.php:99 -#, php-format -msgid "Update %s failed. See error logs." -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:661 +#: ../../Zotlabs/Lib/ThreadItem.php:96 ../../include/conversation.php:656 msgid "Private Message" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:653 +#: ../../Zotlabs/Lib/ThreadItem.php:133 ../../include/conversation.php:648 msgid "Select" msgstr "" @@ -8741,171 +7422,159 @@ msgstr "" msgid "Toggle Star Status" msgstr "" -<<<<<<< HEAD #: ../../Zotlabs/Lib/ThreadItem.php:230 msgid "starred" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:668 +#: ../../Zotlabs/Lib/ThreadItem.php:240 ../../include/conversation.php:663 msgid "Message signature validated" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:669 +#: ../../Zotlabs/Lib/ThreadItem.php:241 ../../include/conversation.php:664 msgid "Message signature incorrect" msgstr "" #: ../../Zotlabs/Lib/ThreadItem.php:249 msgid "Add Tag" -======= -#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1977 -msgid "$Projectname Notification" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:61 ../../addon/diaspora/util.php:218 -#: ../../addon/diaspora/util.php:231 ../../addon/diaspora/p.php:46 -#: ../../include/network.php:1978 -msgid "$projectname" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1980 -msgid "Thank You," -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1982 -#, php-format -msgid "%s Administrator" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:269 ../../include/taxonomy.php:316 +#: ../../Zotlabs/Lib/ThreadItem.php:267 ../../include/taxonomy.php:346 msgid "like" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:270 ../../include/taxonomy.php:317 +#: ../../Zotlabs/Lib/ThreadItem.php:268 ../../include/taxonomy.php:347 msgid "dislike" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:274 +#: ../../Zotlabs/Lib/ThreadItem.php:272 msgid "Share This" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:274 +#: ../../Zotlabs/Lib/ThreadItem.php:272 msgid "share" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:283 +#: ../../Zotlabs/Lib/ThreadItem.php:281 msgid "Delivery Report" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:301 +#: ../../Zotlabs/Lib/ThreadItem.php:299 #, php-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "" msgstr[1] "" -#: ../../Zotlabs/Lib/ThreadItem.php:330 ../../Zotlabs/Lib/ThreadItem.php:331 +#: ../../Zotlabs/Lib/ThreadItem.php:328 ../../Zotlabs/Lib/ThreadItem.php:329 #, php-format msgid "View %s's profile - %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:334 +#: ../../Zotlabs/Lib/ThreadItem.php:332 msgid "to" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:335 +#: ../../Zotlabs/Lib/ThreadItem.php:333 msgid "via" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:336 +#: ../../Zotlabs/Lib/ThreadItem.php:334 msgid "Wall-to-Wall" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:337 +#: ../../Zotlabs/Lib/ThreadItem.php:335 msgid "via Wall-To-Wall:" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:350 ../../include/conversation.php:718 +#: ../../Zotlabs/Lib/ThreadItem.php:348 ../../include/conversation.php:715 #, php-format msgid "from %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:353 ../../include/conversation.php:721 +#: ../../Zotlabs/Lib/ThreadItem.php:351 ../../include/conversation.php:718 #, php-format msgid "last edited: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:354 ../../include/conversation.php:722 +#: ../../Zotlabs/Lib/ThreadItem.php:352 ../../include/conversation.php:719 #, php-format msgid "Expires: %s" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:360 +#: ../../Zotlabs/Lib/ThreadItem.php:358 msgid "Attend" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:361 +#: ../../Zotlabs/Lib/ThreadItem.php:359 msgid "Attendance Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:362 +#: ../../Zotlabs/Lib/ThreadItem.php:360 msgid "Vote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:363 +#: ../../Zotlabs/Lib/ThreadItem.php:361 msgid "Voting Options" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:384 +#: ../../Zotlabs/Lib/ThreadItem.php:382 #: ../../extend/addon/addon/bookmarker/bookmarker.php:38 msgid "Save Bookmarks" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:385 +#: ../../Zotlabs/Lib/ThreadItem.php:383 msgid "Add to Calendar" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:394 -msgid "Mark all seen" -msgstr "" - -#: ../../Zotlabs/Lib/ThreadItem.php:443 ../../include/js_strings.php:7 +#: ../../Zotlabs/Lib/ThreadItem.php:441 ../../include/js_strings.php:7 #, php-format msgid "%s show all" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1318 +#: ../../Zotlabs/Lib/ThreadItem.php:731 ../../include/conversation.php:1315 msgid "Bold" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1319 +#: ../../Zotlabs/Lib/ThreadItem.php:732 ../../include/conversation.php:1316 msgid "Italic" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1320 +#: ../../Zotlabs/Lib/ThreadItem.php:733 ../../include/conversation.php:1317 msgid "Underline" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:736 ../../include/conversation.php:1321 +#: ../../Zotlabs/Lib/ThreadItem.php:734 ../../include/conversation.php:1318 msgid "Quote" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:737 ../../include/conversation.php:1322 +#: ../../Zotlabs/Lib/ThreadItem.php:735 ../../include/conversation.php:1319 msgid "Code" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:738 +#: ../../Zotlabs/Lib/ThreadItem.php:736 msgid "Image" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:739 +#: ../../Zotlabs/Lib/ThreadItem.php:737 msgid "Insert Link" msgstr "" -#: ../../Zotlabs/Lib/ThreadItem.php:740 +#: ../../Zotlabs/Lib/ThreadItem.php:738 msgid "Video" msgstr "" +#: ../../Zotlabs/Lib/ThreadItem.php:747 +msgid "Your full name (required)" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:748 +msgid "Your email address (required)" +msgstr "" + +#: ../../Zotlabs/Lib/ThreadItem.php:749 +msgid "Your website URL (optional)" +msgstr "" + #: ../../Zotlabs/Lib/Permcat.php:58 msgctxt "permcat" msgid "default" @@ -8926,149 +7595,21 @@ msgctxt "permcat" msgid "publisher" msgstr "" -#: ../../Zotlabs/Lib/Apps.php:212 -msgid "Site Admin" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:213 -#: ../../extend/addon/addon/buglink/buglink.php:16 -msgid "Report Bug" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:214 -msgid "View Bookmarks" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:215 -msgid "My Chatrooms" -msgstr "" - -<<<<<<< HEAD -#: ../../Zotlabs/Lib/Apps.php:217 -msgid "Firefox Share" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:218 -msgid "Remote Diagnostics" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:219 ../../include/features.php:337 -msgid "Suggest Channels" -======= -#: ../../Zotlabs/Lib/Enotify.php:620 -msgid "[$Projectname:Notify]" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:780 -msgid "created a new post" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:781 -#, php-format -msgid "commented on %s's post" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:220 ../../include/nav.php:113 -#: ../../boot.php:1591 -msgid "Login" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:222 -msgid "Activity" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:226 ../../include/conversation.php:1848 -#: ../../include/features.php:99 -msgid "Wiki" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:176 -msgid "Channel Home" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:230 ../../include/nav.php:196 -#: ../../include/conversation.php:1793 ../../include/conversation.php:1796 -msgid "Events" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:231 -msgid "Directory" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:233 ../../include/nav.php:188 -msgid "Mail" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:236 -msgid "Chat" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:238 -msgid "Probe" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:239 -msgid "Suggest" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:240 -msgid "Random Channel" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:241 -msgid "Invite" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:242 ../../Zotlabs/Widget/Admin.php:26 -msgid "Features" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:243 -#: ../../extend/addon/addon/openid/MysqlProvider.php:69 -msgid "Language" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:244 -msgid "Post" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:245 -#: ../../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:365 -msgid "Purchase" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:369 -msgid "Undelete" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:374 -msgid "Add to app-tray" -msgstr "" - -#: ../../Zotlabs/Lib/Apps.php:375 -msgid "Remove from app-tray" -msgstr "" - -#: ../../Zotlabs/Lib/Enotify.php:60 ../../include/network.php:1426 +#: ../../Zotlabs/Lib/Enotify.php:60 msgid "$Projectname Notification" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:61 ../../include/network.php:1427 +#: ../../Zotlabs/Lib/Enotify.php:61 ../../extend/addon/addon/diaspora/p.php:46 +#: ../../extend/addon/addon/diaspora/util.php:253 +#: ../../extend/addon/addon/diaspora/util.php:266 msgid "$projectname" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:63 ../../include/network.php:1429 +#: ../../Zotlabs/Lib/Enotify.php:63 msgid "Thank You," msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:65 ../../include/network.php:1431 +#: ../../Zotlabs/Lib/Enotify.php:65 #, php-format msgid "%s Administrator" msgstr "" @@ -9102,180 +7643,185 @@ msgstr "" msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:183 +#: ../../Zotlabs/Lib/Enotify.php:184 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]a %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:191 +#: ../../Zotlabs/Lib/Enotify.php:192 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]%4$s's %5$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:200 +#: ../../Zotlabs/Lib/Enotify.php:201 #, php-format msgid "%1$s, %2$s commented on [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:211 +#: ../../Zotlabs/Lib/Enotify.php:213 +#, php-format +msgid "[$Projectname:Notify] Moderated Comment to conversation #%1$d by %2$s" +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:215 #, php-format msgid "[$Projectname:Notify] Comment to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:212 +#: ../../Zotlabs/Lib/Enotify.php:216 #, php-format msgid "%1$s, %2$s commented on an item/conversation you have been following." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:215 ../../Zotlabs/Lib/Enotify.php:292 -#: ../../Zotlabs/Lib/Enotify.php:309 ../../Zotlabs/Lib/Enotify.php:335 -#: ../../Zotlabs/Lib/Enotify.php:353 ../../Zotlabs/Lib/Enotify.php:367 +#: ../../Zotlabs/Lib/Enotify.php:219 ../../Zotlabs/Lib/Enotify.php:301 +#: ../../Zotlabs/Lib/Enotify.php:318 ../../Zotlabs/Lib/Enotify.php:344 +#: ../../Zotlabs/Lib/Enotify.php:362 ../../Zotlabs/Lib/Enotify.php:376 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:273 +#: ../../Zotlabs/Lib/Enotify.php:223 ../../Zotlabs/Lib/Enotify.php:224 +#, php-format +msgid "Please visit %s to approve or reject this comment." +msgstr "" + +#: ../../Zotlabs/Lib/Enotify.php:282 #, php-format msgid "%1$s, %2$s liked [zrl=%3$s]your %4$s[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:288 +#: ../../Zotlabs/Lib/Enotify.php:297 #, php-format msgid "[$Projectname:Notify] Like received to conversation #%1$d by %2$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:289 +#: ../../Zotlabs/Lib/Enotify.php:298 #, php-format msgid "%1$s, %2$s liked an item/conversation you created." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:300 +#: ../../Zotlabs/Lib/Enotify.php:309 #, php-format msgid "[$Projectname:Notify] %s posted to your profile wall" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:302 +#: ../../Zotlabs/Lib/Enotify.php:311 #, php-format msgid "%1$s, %2$s posted to your profile wall at %3$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:304 +#: ../../Zotlabs/Lib/Enotify.php:313 #, php-format msgid "%1$s, %2$s posted to [zrl=%3$s]your wall[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:328 +#: ../../Zotlabs/Lib/Enotify.php:337 #, php-format msgid "[$Projectname:Notify] %s tagged you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:329 +#: ../../Zotlabs/Lib/Enotify.php:338 #, php-format msgid "%1$s, %2$s tagged you at %3$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:330 +#: ../../Zotlabs/Lib/Enotify.php:339 #, php-format msgid "%1$s, %2$s [zrl=%3$s]tagged you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:342 +#: ../../Zotlabs/Lib/Enotify.php:351 #, php-format msgid "[$Projectname:Notify] %1$s poked you" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:343 +#: ../../Zotlabs/Lib/Enotify.php:352 #, php-format msgid "%1$s, %2$s poked you at %3$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:344 +#: ../../Zotlabs/Lib/Enotify.php:353 #, php-format msgid "%1$s, %2$s [zrl=%2$s]poked you[/zrl]." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:360 +#: ../../Zotlabs/Lib/Enotify.php:369 #, php-format msgid "[$Projectname:Notify] %s tagged your post" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Lib/Enotify.php:361 +#: ../../Zotlabs/Lib/Enotify.php:370 #, php-format msgid "%1$s, %2$s tagged your post at %3$s" -======= -#: ../../Zotlabs/Storage/Browser.php:130 ../../include/text.php:2679 -msgid "Collection" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:362 +#: ../../Zotlabs/Lib/Enotify.php:371 #, php-format msgid "%1$s, %2$s tagged [zrl=%3$s]your post[/zrl]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:374 +#: ../../Zotlabs/Lib/Enotify.php:383 msgid "[$Projectname:Notify] Introduction received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:375 +#: ../../Zotlabs/Lib/Enotify.php:384 #, php-format msgid "%1$s, you've received an new connection request from '%2$s' at %3$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:376 +#: ../../Zotlabs/Lib/Enotify.php:385 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a new connection request[/zrl] from %3$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:380 ../../Zotlabs/Lib/Enotify.php:399 +#: ../../Zotlabs/Lib/Enotify.php:389 ../../Zotlabs/Lib/Enotify.php:408 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:382 +#: ../../Zotlabs/Lib/Enotify.php:391 #, php-format msgid "Please visit %s to approve or reject the connection request." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:389 +#: ../../Zotlabs/Lib/Enotify.php:398 msgid "[$Projectname:Notify] Friend suggestion received" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:390 +#: ../../Zotlabs/Lib/Enotify.php:399 #, php-format msgid "%1$s, you've received a friend suggestion from '%2$s' at %3$s" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:391 +#: ../../Zotlabs/Lib/Enotify.php:400 #, php-format msgid "" "%1$s, you've received [zrl=%2$s]a friend suggestion[/zrl] for %3$s from %4$s." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:397 +#: ../../Zotlabs/Lib/Enotify.php:406 msgid "Name:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:398 +#: ../../Zotlabs/Lib/Enotify.php:407 msgid "Photo:" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:401 +#: ../../Zotlabs/Lib/Enotify.php:410 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:619 +#: ../../Zotlabs/Lib/Enotify.php:629 msgid "[$Projectname:Notify]" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:779 +#: ../../Zotlabs/Lib/Enotify.php:789 msgid "created a new post" msgstr "" -#: ../../Zotlabs/Lib/Enotify.php:780 +#: ../../Zotlabs/Lib/Enotify.php:790 #, php-format msgid "commented on %s's post" msgstr "" @@ -9284,99 +7830,226 @@ msgstr "" msgid "Wiki files deleted successfully" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:31 -#: ../../Zotlabs/Lib/NativeWikiPage.php:72 +#: ../../Zotlabs/Lib/Techlevels.php:10 +msgid "0. Beginner/Basic" +msgstr "" + +#: ../../Zotlabs/Lib/Techlevels.php:11 +msgid "1. Novice - not skilled but willing to learn" +msgstr "" + +#: ../../Zotlabs/Lib/Techlevels.php:12 +msgid "2. Intermediate - somewhat comfortable" +msgstr "" + +#: ../../Zotlabs/Lib/Techlevels.php:13 +msgid "3. Advanced - very comfortable" +msgstr "" + +#: ../../Zotlabs/Lib/Techlevels.php:14 +msgid "4. Expert - I can write computer code" +msgstr "" + +#: ../../Zotlabs/Lib/Techlevels.php:15 +msgid "5. Wizard - I probably know more than you do" +msgstr "" + +#: ../../Zotlabs/Lib/DB_Upgrade.php:93 +#, php-format +msgid "Update Error at %s" +msgstr "" + +#: ../../Zotlabs/Lib/DB_Upgrade.php:99 +#, php-format +msgid "Update %s failed. See error logs." +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:213 +msgid "Site Admin" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:214 +#: ../../extend/addon/addon/buglink/buglink.php:16 +msgid "Report Bug" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:215 +msgid "View Bookmarks" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:216 +msgid "My Chatrooms" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:218 +msgid "Firefox Share" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:219 +msgid "Remote Diagnostics" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:220 ../../include/features.php:333 +msgid "Suggest Channels" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:221 ../../include/nav.php:115 +#: ../../boot.php:1592 +msgid "Login" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:223 +msgid "Activity" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:227 ../../include/nav.php:455 +#: ../../include/features.php:95 ../../include/conversation.php:1854 +msgid "Wiki" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:228 ../../include/nav.php:178 +msgid "Channel Home" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:231 ../../include/nav.php:198 +#: ../../include/nav.php:401 ../../include/nav.php:404 +#: ../../include/conversation.php:1799 ../../include/conversation.php:1802 +msgid "Events" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:232 +msgid "Directory" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:234 ../../include/nav.php:190 +msgid "Mail" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:237 +msgid "Chat" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:239 +msgid "Probe" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:240 +msgid "Suggest" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:241 +msgid "Random Channel" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:242 +msgid "Invite" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:243 ../../Zotlabs/Widget/Admin.php:26 +msgid "Features" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:244 +#: ../../extend/addon/addon/openid/MysqlProvider.php:69 +msgid "Language" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:245 +msgid "Post" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:246 +#: ../../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:366 +msgid "Purchase" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:370 +msgid "Undelete" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:376 +msgid "Add to app-tray" +msgstr "" + +#: ../../Zotlabs/Lib/Apps.php:377 +msgid "Remove from app-tray" +msgstr "" + +#: ../../Zotlabs/Lib/NativeWikiPage.php:42 +#: ../../Zotlabs/Lib/NativeWikiPage.php:83 msgid "(No Title)" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:86 +#: ../../Zotlabs/Lib/NativeWikiPage.php:97 msgid "Wiki page create failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:99 +#: ../../Zotlabs/Lib/NativeWikiPage.php:110 msgid "Wiki not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:110 +#: ../../Zotlabs/Lib/NativeWikiPage.php:121 msgid "Destination name already exists" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:136 -#: ../../Zotlabs/Lib/NativeWikiPage.php:331 +#: ../../Zotlabs/Lib/NativeWikiPage.php:147 +#: ../../Zotlabs/Lib/NativeWikiPage.php:342 msgid "Page not found" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:166 +#: ../../Zotlabs/Lib/NativeWikiPage.php:177 msgid "Error reading page content" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:322 -#: ../../Zotlabs/Lib/NativeWikiPage.php:370 -#: ../../Zotlabs/Lib/NativeWikiPage.php:437 -#: ../../Zotlabs/Lib/NativeWikiPage.php:478 +#: ../../Zotlabs/Lib/NativeWikiPage.php:333 +#: ../../Zotlabs/Lib/NativeWikiPage.php:381 +#: ../../Zotlabs/Lib/NativeWikiPage.php:448 +#: ../../Zotlabs/Lib/NativeWikiPage.php:489 msgid "Error reading wiki" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Lib/NativeWikiPage.php:358 +#: ../../Zotlabs/Lib/NativeWikiPage.php:369 msgid "Page update failed." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:392 +#: ../../Zotlabs/Lib/NativeWikiPage.php:403 msgid "Nothing deleted" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:458 +#: ../../Zotlabs/Lib/NativeWikiPage.php:469 msgid "Compare: object not found." msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:464 +#: ../../Zotlabs/Lib/NativeWikiPage.php:475 msgid "Page updated" -======= -#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:195 -msgid "Inbox" -msgstr "" - -#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:196 -msgid "Outbox" -msgstr "" - -#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:197 -msgid "New Message" msgstr "" -#: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1816 ../../include/conversation.php:1819 -#: ../../include/nav.php:425 ../../include/nav.php:428 -msgid "Chatrooms" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../Zotlabs/Lib/NativeWikiPage.php:467 +#: ../../Zotlabs/Lib/NativeWikiPage.php:478 msgid "Untitled" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:473 +#: ../../Zotlabs/Lib/NativeWikiPage.php:484 msgid "Wiki resource_id required for git commit" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:529 +#: ../../Zotlabs/Lib/NativeWikiPage.php:540 #: ../../Zotlabs/Widget/Wiki_page_history.php:23 msgctxt "wiki_history" msgid "Message" msgstr "" -#: ../../Zotlabs/Lib/NativeWikiPage.php:567 +#: ../../Zotlabs/Lib/NativeWikiPage.php:578 #: ../../extend/addon/addon/gitwiki/gitwiki_backend.php:579 -#: ../../include/bbcode.php:610 ../../include/bbcode.php:756 +#: ../../include/bbcode.php:667 ../../include/bbcode.php:813 msgid "Different viewers will see this text differently" msgstr "" -#: ../../Zotlabs/Widget/Activity.php:50 -msgctxt "widget" -msgid "Activity" -msgstr "" - #: ../../Zotlabs/Widget/Admin.php:23 ../../Zotlabs/Widget/Admin.php:60 msgid "Member registrations waiting for confirmation" msgstr "" @@ -9389,7 +8062,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:211 +#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:212 msgid "Admin" msgstr "" @@ -9402,8 +8075,8 @@ msgid "Refresh" msgstr "" #: ../../Zotlabs/Widget/Appcategories.php:39 -#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/taxonomy.php:188 -#: ../../include/taxonomy.php:270 ../../include/contact_widgets.php:91 +#: ../../Zotlabs/Widget/Tagcloud.php:25 ../../include/contact_widgets.php:91 +#: ../../include/taxonomy.php:218 ../../include/taxonomy.php:300 msgid "Categories" msgstr "" @@ -9420,8 +8093,9 @@ msgstr "" msgid "Bookmarked Chatrooms" msgstr "" -#: ../../Zotlabs/Widget/Chatroom_list.php:16 -#: ../../include/conversation.php:1807 ../../include/conversation.php:1810 +#: ../../Zotlabs/Widget/Chatroom_list.php:16 ../../include/nav.php:415 +#: ../../include/nav.php:418 ../../include/conversation.php:1813 +#: ../../include/conversation.php:1816 msgid "Chatrooms" msgstr "" @@ -9450,7 +8124,7 @@ msgid "Import Calendar" msgstr "" #: ../../Zotlabs/Widget/Filer.php:28 ../../include/contact_widgets.php:53 -#: ../../include/features.php:390 +#: ../../include/features.php:386 msgid "Saved Folders" msgstr "" @@ -9471,10 +8145,6 @@ msgstr "" msgid "Examples: bob@example.com, https://example.com/barbara" msgstr "" -#: ../../Zotlabs/Widget/Forums.php:85 -msgid "Forums" -msgstr "" - #: ../../Zotlabs/Widget/Mailmenu.php:13 msgid "Private Mail Menu" msgstr "" @@ -9483,15 +8153,15 @@ msgstr "" msgid "Combined View" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:191 +#: ../../Zotlabs/Widget/Mailmenu.php:20 ../../include/nav.php:193 msgid "Inbox" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:192 +#: ../../Zotlabs/Widget/Mailmenu.php:25 ../../include/nav.php:194 msgid "Outbox" msgstr "" -#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:193 +#: ../../Zotlabs/Widget/Mailmenu.php:30 ../../include/nav.php:195 msgid "New Message" msgstr "" @@ -9519,195 +8189,212 @@ msgstr "" msgid "Remove term" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:301 +#: ../../Zotlabs/Widget/Savedsearch.php:83 ../../include/features.php:297 msgid "Saved Searches" -======= -#: ../../Zotlabs/Widget/Admin.php:55 ../../include/nav.php:215 -msgid "Admin" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../Zotlabs/Widget/Savedsearch.php:84 ../../include/group.php:336 msgid "add" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:35 -msgid "Account settings" +#: ../../Zotlabs/Widget/Suggestedchats.php:32 +msgid "Suggested Chatrooms" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:41 -msgid "Channel settings" +#: ../../Zotlabs/Widget/Suggestions.php:51 +msgid "Suggestions" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:50 -msgid "Additional features" +#: ../../Zotlabs/Widget/Suggestions.php:52 +msgid "See more..." msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:57 -msgid "Feature/Addon settings" +#: ../../Zotlabs/Widget/Wiki_list.php:15 +#: ../../extend/addon/addon/gitwiki/gitwiki.php:95 +msgid "Wiki List" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:63 -msgid "Display settings" +#: ../../Zotlabs/Widget/Forums.php:85 +msgid "Forums" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:70 -msgid "Manage locations" +#: ../../Zotlabs/Widget/Tasklist.php:23 +msgid "Tasks" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:77 -msgid "Export channel" +#: ../../Zotlabs/Widget/Wiki_pages.php:52 +#: ../../extend/addon/addon/gitwiki/gitwiki.php:76 +msgid "Wiki Pages" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:83 -msgid "Connected apps" +#: ../../Zotlabs/Widget/Wiki_pages.php:58 +#: ../../extend/addon/addon/gitwiki/gitwiki.php:81 +msgid "Add new page" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:98 ../../include/features.php:153 -msgid "Permission Groups" +#: ../../Zotlabs/Widget/Wiki_pages.php:59 +#: ../../extend/addon/addon/gitwiki/gitwiki.php:82 +msgid "Page name" msgstr "" -#: ../../Zotlabs/Widget/Settings_menu.php:115 -msgid "Premium Channel Settings" +#: ../../Zotlabs/Widget/Cdav.php:37 +msgid "Select Channel" msgstr "" -#: ../../Zotlabs/Widget/Suggestedchats.php:32 -msgid "Suggested Chatrooms" +#: ../../Zotlabs/Widget/Cdav.php:42 +msgid "Read-write" msgstr "" -#: ../../Zotlabs/Widget/Suggestions.php:51 -msgid "Suggestions" +#: ../../Zotlabs/Widget/Cdav.php:43 +msgid "Read-only" msgstr "" -<<<<<<< HEAD -#: ../../Zotlabs/Widget/Suggestions.php:52 -msgid "See more..." +#: ../../Zotlabs/Widget/Cdav.php:116 +msgid "My Calendars" msgstr "" -#: ../../Zotlabs/Widget/Wiki_list.php:15 -#: ../../extend/addon/addon/gitwiki/gitwiki.php:95 -msgid "Wiki List" +#: ../../Zotlabs/Widget/Cdav.php:118 +msgid "Shared Calendars" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:54 -#: ../../extend/addon/addon/gitwiki/gitwiki.php:76 -msgid "Wiki Pages" +#: ../../Zotlabs/Widget/Cdav.php:122 +msgid "Share this calendar" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:60 -#: ../../extend/addon/addon/gitwiki/gitwiki.php:81 -msgid "Add new page" +#: ../../Zotlabs/Widget/Cdav.php:124 +msgid "Calendar name and color" msgstr "" -#: ../../Zotlabs/Widget/Wiki_pages.php:61 -#: ../../extend/addon/addon/gitwiki/gitwiki.php:82 -msgid "Page name" +#: ../../Zotlabs/Widget/Cdav.php:126 +msgid "Create new calendar" msgstr "" -#: ../../Zotlabs/Widget/Tasklist.php:23 -msgid "Tasks" +#: ../../Zotlabs/Widget/Cdav.php:128 +msgid "Calendar Name" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:129 +msgid "Calendar Tools" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:130 +msgid "Import calendar" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:131 +msgid "Select a calendar to import to" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:158 +msgid "Addressbooks" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:160 +msgid "Addressbook name" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:162 +msgid "Create new addressbook" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:163 +msgid "Addressbook Name" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:165 +msgid "Addressbook Tools" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:166 +msgid "Import addressbook" +msgstr "" + +#: ../../Zotlabs/Widget/Cdav.php:167 +msgid "Select an addressbook to import to" msgstr "" #: ../../Zotlabs/Widget/Conversations.php:17 -#: ../../Zotlabs/Widget/Conversations.php:29 -msgid "Conversations" +msgid "Received Messages" msgstr "" #: ../../Zotlabs/Widget/Conversations.php:21 -msgid "Received Messages" +msgid "Sent Messages" msgstr "" #: ../../Zotlabs/Widget/Conversations.php:25 -msgid "Sent Messages" +msgid "Conversations" msgstr "" -#: ../../Zotlabs/Widget/Conversations.php:39 +#: ../../Zotlabs/Widget/Conversations.php:35 msgid "No messages." msgstr "" -#: ../../Zotlabs/Widget/Conversations.php:57 +#: ../../Zotlabs/Widget/Conversations.php:53 msgid "Delete conversation" msgstr "" -#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24 -msgid "Flag Adult Photos" -msgstr "" - -#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:25 -msgid "" -"Provide photo edit option to hide inappropriate photos from default album " -"view" -msgstr "" - -#: ../../extend/addon/addon/chords/Mod_Chords.php:44 -msgid "" -"This is a fairly comprehensive and complete guitar chord dictionary which " -"will list most of the available ways to play a certain chord, starting from " -"the base of the fingerboard up to a few frets beyond the twelfth fret " -"(beyond which everything repeats). A couple of non-standard tunings are " -"provided for the benefit of slide players, etc." -======= -#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:26 -#, php-format -msgctxt "opensearch" -msgid "Search %1$s (%2$s)" +#: ../../Zotlabs/Widget/Activity.php:50 +msgctxt "widget" +msgid "Activity" msgstr "" -#: ../../boot.php:1162 ../../addon/opensearch/opensearch.php:28 -msgctxt "opensearch" -msgid "$Projectname" +#: ../../Zotlabs/Widget/Settings_menu.php:35 +msgid "Account settings" msgstr "" -#: ../../boot.php:1609 -msgid "Create an account to access services and applications" +#: ../../Zotlabs/Widget/Settings_menu.php:41 +msgid "Channel settings" msgstr "" -#: ../../boot.php:1628 ../../include/nav.php:103 ../../include/nav.php:127 -msgid "Logout" +#: ../../Zotlabs/Widget/Settings_menu.php:50 +msgid "Additional features" msgstr "" -#: ../../boot.php:1631 -msgid "Login/Email" +#: ../../Zotlabs/Widget/Settings_menu.php:57 +msgid "Feature/Addon settings" msgstr "" -#: ../../boot.php:1632 -msgid "Password" +#: ../../Zotlabs/Widget/Settings_menu.php:63 +msgid "Display settings" msgstr "" -#: ../../boot.php:1633 -msgid "Remember me" +#: ../../Zotlabs/Widget/Settings_menu.php:70 +msgid "Manage locations" msgstr "" -#: ../../boot.php:1636 -msgid "Forgot your password?" +#: ../../Zotlabs/Widget/Settings_menu.php:77 +msgid "Export channel" msgstr "" -#: ../../boot.php:2174 -msgid "toggle mobile" +#: ../../Zotlabs/Widget/Settings_menu.php:84 +msgid "Connected apps" msgstr "" -#: ../../boot.php:2327 -#, php-format -msgid "[$Projectname] Website SSL error for %s" +#: ../../Zotlabs/Widget/Settings_menu.php:100 ../../include/features.php:149 +msgid "Permission Groups" msgstr "" -#: ../../boot.php:2332 -msgid "Website SSL certificate is not valid. Please correct." +#: ../../Zotlabs/Widget/Settings_menu.php:117 +msgid "Premium Channel Settings" msgstr "" -#: ../../boot.php:2450 -#, php-format -msgid "[$Projectname] Cron tasks not running on %s" +#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:24 +msgid "Flag Adult Photos" msgstr "" -#: ../../boot.php:2455 -msgid "Cron/Scheduled tasks not running." +#: ../../extend/addon/addon/adultphotoflag/adultphotoflag.php:25 +msgid "" +"Provide photo edit option to hide inappropriate photos from default album " +"view" msgstr "" -#: ../../boot.php:2456 ../../include/datetime.php:286 -msgid "never" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../extend/addon/addon/chords/Mod_Chords.php:44 +msgid "" +"This is a fairly comprehensive and complete guitar chord dictionary which " +"will list most of the available ways to play a certain chord, starting from " +"the base of the fingerboard up to a few frets beyond the twelfth fret " +"(beyond which everything repeats). A couple of non-standard tunings are " +"provided for the benefit of slide players, etc." msgstr "" #: ../../extend/addon/addon/chords/Mod_Chords.php:46 @@ -9767,13 +8454,8 @@ msgstr "" msgid "Diaspora Pods" msgstr "" -<<<<<<< HEAD #: ../../extend/addon/addon/dirstats/dirstats.php:103 msgid "Hubzilla Channels" -======= -#: ../../view/theme/redbasic/php/config.php:99 -msgid "Examples: 1rem, 100%, 16px" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../extend/addon/addon/dirstats/dirstats.php:105 @@ -9988,7 +8670,6 @@ msgstr "" msgid "Friendica Login Username" msgstr "" -<<<<<<< HEAD #: ../../extend/addon/addon/frphotos/frphotos.php:95 msgid "Friendica Login Password" msgstr "" @@ -10008,25 +8689,6 @@ msgid "No recipients found." msgstr "" #: ../../extend/addon/addon/hubwall/hubwall.php:73 -======= -#: ../../addon/gnusoc/gnusoc.php:119 -msgid "GNU-Social Protocol Settings updated." -msgstr "" - -#: ../../addon/gnusoc/gnusoc.php:130 -msgid "Enable the GNU-Social protocol for this channel" -msgstr "" - -#: ../../addon/gnusoc/gnusoc.php:134 -msgid "GNU-Social Protocol Settings" -msgstr "" - -#: ../../addon/gnusoc/gnusoc.php:324 -msgid "Follow" -msgstr "" - -#: ../../addon/gnusoc/gnusoc.php:327 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 #, php-format msgid "%1$d of %2$d messages sent." msgstr "" @@ -10103,7 +8765,7 @@ msgid "IRC Chatroom" msgstr "" #: ../../extend/addon/addon/jappixmini/jappixmini.php:305 -#: ../../include/channel.php:1138 ../../include/channel.php:1275 +#: ../../include/channel.php:1154 ../../include/channel.php:1317 msgid "Status:" msgstr "" @@ -10269,14 +8931,8 @@ msgstr "" msgid "Number of logfiles to retain" msgstr "" -<<<<<<< HEAD #: ../../extend/addon/addon/mailhost/mailhost.php:36 msgid "Email notification hub" -======= -#: ../../addon/openclipatar/openclipatar.php:58 ../../include/channel.php:1048 -#: ../../include/nav.php:111 -msgid "Edit Profile" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../extend/addon/addon/mailhost/mailhost.php:36 @@ -10645,7 +9301,7 @@ msgid "Page to load after image selection." msgstr "" #: ../../extend/addon/addon/openclipatar/openclipatar.php:58 -#: ../../include/nav.php:107 ../../include/channel.php:1047 +#: ../../include/nav.php:109 ../../include/channel.php:1063 msgid "Edit Profile" msgstr "" @@ -10819,11 +9475,11 @@ msgstr "" msgid "Planets Settings updated." msgstr "" -#: ../../extend/addon/addon/planets/planets.php:153 +#: ../../extend/addon/addon/planets/planets.php:149 msgid "Enable Planets Plugin" msgstr "" -#: ../../extend/addon/addon/planets/planets.php:157 +#: ../../extend/addon/addon/planets/planets.php:153 msgid "Planets Settings" msgstr "" @@ -11015,7 +9671,6 @@ msgstr "" msgid "Hubzilla login name" msgstr "" -<<<<<<< HEAD #: ../../extend/addon/addon/redred/redred.php:111 msgid "Hubzilla channel name" msgstr "" @@ -11039,30 +9694,6 @@ msgstr "" #: ../../extend/addon/addon/rtof/rtof.php:81 msgid "Allow posting to Friendica" -======= -#: ../../addon/diaspora/diaspora.php:675 -msgid "Diaspora Protocol Settings updated." -msgstr "" - -#: ../../addon/diaspora/diaspora.php:694 -msgid "Enable the Diaspora protocol for this channel" -msgstr "" - -#: ../../addon/diaspora/diaspora.php:698 -msgid "Allow any Diaspora member to comment on your public posts" -msgstr "" - -#: ../../addon/diaspora/diaspora.php:702 -msgid "Prevent your hashtags from being redirected to other sites" -msgstr "" - -#: ../../addon/diaspora/diaspora.php:707 -msgid "Followed hashtags (comma separated, do not include the #)" -msgstr "" - -#: ../../addon/diaspora/diaspora.php:712 -msgid "Diaspora Protocol Settings" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../extend/addon/addon/rtof/rtof.php:85 @@ -11107,15 +9738,15 @@ msgstr "" msgid "Skeleton Settings" msgstr "" -#: ../../extend/addon/addon/smileybutton/smileybutton.php:273 +#: ../../extend/addon/addon/smileybutton/smileybutton.php:211 msgid "Deactivate the feature" msgstr "" -#: ../../extend/addon/addon/smileybutton/smileybutton.php:277 +#: ../../extend/addon/addon/smileybutton/smileybutton.php:215 msgid "Hide the button and show the smilies directly." msgstr "" -#: ../../extend/addon/addon/smileybutton/smileybutton.php:281 +#: ../../extend/addon/addon/smileybutton/smileybutton.php:219 msgid "Smileybutton Settings" msgstr "" @@ -11311,14 +9942,8 @@ msgstr "" msgid "3D Tic-Tac-Toe" msgstr "" -<<<<<<< HEAD #: ../../extend/addon/addon/tictac/tictac.php:59 msgid "New game" -======= -#: ../../addon/jappixmini/jappixmini.php:305 ../../include/channel.php:1139 -#: ../../include/channel.php:1296 -msgid "Status:" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" #: ../../extend/addon/addon/tictac/tictac.php:60 @@ -11722,213 +10347,6 @@ msgid "" "\"auth_ejabberd.php\" script." msgstr "" -#: ../../extend/addon/addon/cdav/include/widgets.php:37 -msgid "Select Channel" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:42 -msgid "Read-write" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:43 -msgid "Read-only" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:116 -msgid "My Calendars" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:118 -msgid "Shared Calendars" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:122 -msgid "Share this calendar" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:124 -msgid "Calendar name and color" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:126 -msgid "Create new calendar" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:128 -msgid "Calendar Name" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:129 -msgid "Calendar Tools" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:130 -msgid "Import calendar" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:131 -msgid "Select a calendar to import to" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:158 -msgid "Addressbooks" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:160 -msgid "Addressbook name" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:162 -msgid "Create new addressbook" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:163 -msgid "Addressbook Name" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:165 -msgid "Addressbook Tools" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:166 -msgid "Import addressbook" -msgstr "" - -#: ../../extend/addon/addon/cdav/include/widgets.php:167 -msgid "Select an addressbook to import to" -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:36 -msgid "Errors encountered creating database table: " -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:197 -msgid "Default Calendar" -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:206 -msgid "Default Addressbook" -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:215 -msgid "CalDAV/CardDAV Settings saved." -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:234 -msgid "Enable CalDAV/CardDAV Server for this channel" -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:237 -#, php-format -msgid "Your CalDAV resources are located at %s " -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:240 -#, php-format -msgid "Your CardDAV resources are located at %s " -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:246 -msgid "CalDAV/CardDAV Settings" -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:272 -#: ../../include/connections.php:670 -msgid "Home, Voice" -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:273 -#: ../../include/connections.php:671 -msgid "Home, Fax" -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:275 -#: ../../include/connections.php:673 -msgid "Work, Voice" -msgstr "" - -#: ../../extend/addon/addon/cdav/cdav.php:276 -#: ../../include/connections.php:674 -msgid "Work, Fax" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:744 -msgid "INVALID EVENT DISMISSED!" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:745 -msgid "Summary: " -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:746 -msgid "Date: " -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:747 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:754 -msgid "Reason: " -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:752 -msgid "INVALID CARD DISMISSED!" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:753 -msgid "Name: " -msgstr "" - -<<<<<<< HEAD -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:770 -msgid "" -"You have to enable this plugin in Feature/Addon Settings > CalDAV/CardDAV " -"Settings before you can use it." -======= -#: ../../addon/chess/chess.php:381 ../../include/channel.php:899 -msgid "Requested channel is not available." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:836 -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:837 -msgid "Example: YYYY-MM-DD HH:mm" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:837 -msgid "End date and time" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:852 -msgid "List month" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:853 -msgid "List week" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:854 -msgid "List day" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:861 -msgid "More" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:862 -msgid "Less" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:863 -msgid "Select calendar" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:865 -msgid "Delete all" -msgstr "" - -#: ../../extend/addon/addon/cdav/Mod_Cdav.php:867 -msgid "Sorry! Editing of recurrent events is not yet implemented." -msgstr "" - #: ../../extend/addon/addon/chess/chess.php:276 #: ../../extend/addon/addon/chess/chess.php:433 msgid "Invalid game." @@ -11959,7 +10377,7 @@ msgstr "" msgid "Error creating new game." msgstr "" -#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:898 +#: ../../extend/addon/addon/chess/chess.php:381 ../../include/channel.php:914 msgid "Requested channel is not available." msgstr "" @@ -11993,11 +10411,13 @@ msgstr "" #: ../../extend/addon/addon/openid/Mod_Id.php:85 #: ../../include/selectors.php:49 ../../include/selectors.php:66 +#: ../../include/channel.php:1230 msgid "Male" msgstr "" #: ../../extend/addon/addon/openid/Mod_Id.php:87 #: ../../include/selectors.php:49 ../../include/selectors.php:66 +#: ../../include/channel.php:1228 msgid "Female" msgstr "" @@ -12076,6 +10496,22 @@ msgstr "" msgid "Login failed." msgstr "" +#: ../../extend/addon/addon/authchoose/authchoose.php:67 +msgid "Only authenticate automatically to sites of your friends" +msgstr "" + +#: ../../extend/addon/addon/authchoose/authchoose.php:67 +msgid "By default you are automatically authenticated anywhere in the network" +msgstr "" + +#: ../../extend/addon/addon/authchoose/authchoose.php:71 +msgid "Authchoose Settings" +msgstr "" + +#: ../../extend/addon/addon/authchoose/authchoose.php:85 +msgid "Atuhchoose Settings updated." +msgstr "" + #: ../../extend/addon/addon/mailtest/mailtest.php:19 msgid "Send test email" msgstr "" @@ -12252,129 +10688,113 @@ msgstr "" msgid "Search $Projectname" msgstr "" -#: ../../include/dba/dba_driver.php:189 -#, php-format -msgid "Cannot locate DNS info for database server '%s'" -msgstr "" - -#: ../../include/language.php:367 ../../include/text.php:1787 -msgid "default" -msgstr "" - -#: ../../include/language.php:380 -msgid "Select an alternate language" -msgstr "" - -#: ../../include/import.php:41 -msgid "" -"Cannot create a duplicate channel identifier on this system. Import failed." +#: ../../extend/addon/addon/diaspora/import_diaspora.php:16 +msgid "No username found in import file." msgstr "" +#: ../../extend/addon/addon/diaspora/import_diaspora.php:41 #: ../../include/import.php:62 msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/import.php:105 -msgid "Cloned channel not found. Import failed." -msgstr "" - -#: ../../include/photos.php:111 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" +#: ../../extend/addon/addon/diaspora/diaspora.php:710 +msgid "Diaspora Protocol Settings updated." msgstr "" -#: ../../include/photos.php:118 -msgid "Image file is empty." +#: ../../extend/addon/addon/diaspora/diaspora.php:728 +msgid "" +"The Diaspora protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." msgstr "" -#: ../../include/photos.php:257 -msgid "Photo storage failed." +#: ../../extend/addon/addon/diaspora/diaspora.php:731 +msgid "Enable the Diaspora protocol for this channel" msgstr "" -#: ../../include/photos.php:297 -msgid "a new photo" +#: ../../extend/addon/addon/diaspora/diaspora.php:735 +msgid "Allow any Diaspora member to comment on your public posts" msgstr "" -#: ../../include/photos.php:301 -#, php-format -msgctxt "photo_upload" -msgid "%1$s posted %2$s to %3$s" +#: ../../extend/addon/addon/diaspora/diaspora.php:739 +msgid "Prevent your hashtags from being redirected to other sites" msgstr "" -#: ../../include/photos.php:524 ../../include/conversation.php:1777 -msgid "Photo Albums" +#: ../../extend/addon/addon/diaspora/diaspora.php:744 +msgid "Followed hashtags (comma separated, do not include the #)" msgstr "" -#: ../../include/photos.php:529 -msgid "Upload New Photos" +#: ../../extend/addon/addon/diaspora/diaspora.php:749 +msgid "Diaspora Protocol Settings" msgstr "" -#: ../../include/account.php:35 -msgid "Not a valid email address" +#: ../../extend/addon/addon/gnusoc/gnusoc.php:200 +msgid "GNU-Social Protocol Settings updated." msgstr "" -#: ../../include/account.php:37 -msgid "Your email domain is not among those allowed on this site" +#: ../../extend/addon/addon/gnusoc/gnusoc.php:219 +msgid "" +"The GNU-Social protocol does not support location independence. Connections " +"you make within that network may be unreachable from alternate channel " +"locations." msgstr "" -#: ../../include/account.php:43 -msgid "Your email address is already registered at this site." +#: ../../extend/addon/addon/gnusoc/gnusoc.php:222 +msgid "Enable the GNU-Social protocol for this channel" msgstr "" -#: ../../include/account.php:75 -msgid "An invitation is required." +#: ../../extend/addon/addon/gnusoc/gnusoc.php:226 +msgid "GNU-Social Protocol Settings" msgstr "" -#: ../../include/account.php:79 -msgid "Invitation could not be verified." +#: ../../extend/addon/addon/gnusoc/gnusoc.php:417 +msgid "Follow" msgstr "" -#: ../../include/account.php:130 -msgid "Please enter the required information." +#: ../../extend/addon/addon/gnusoc/gnusoc.php:420 +#, php-format +msgid "%1$s is now following %2$s" msgstr "" -#: ../../include/account.php:198 -msgid "Failed to store account information." +#: ../../include/dba/dba_driver.php:189 +#, php-format +msgid "Cannot locate DNS info for database server '%s'" msgstr "" -#: ../../include/account.php:263 -#, php-format -msgid "Registration confirmation for %s" +#: ../../include/language.php:367 ../../include/text.php:1774 +msgid "default" msgstr "" -#: ../../include/account.php:330 -#, php-format -msgid "Registration request at %s" +#: ../../include/language.php:380 +msgid "Select an alternate language" msgstr "" -#: ../../include/account.php:352 -msgid "your registration password" +#: ../../include/follow.php:26 +msgid "Channel is blocked on this site." msgstr "" -#: ../../include/account.php:358 ../../include/account.php:420 -#, php-format -msgid "Registration details for %s" +#: ../../include/follow.php:31 +msgid "Channel location missing." msgstr "" -#: ../../include/account.php:431 -msgid "Account approved." +#: ../../include/follow.php:73 +msgid "Response from remote channel was incomplete." msgstr "" -#: ../../include/account.php:471 -#, php-format -msgid "Registration revoked for %s" +#: ../../include/follow.php:90 +msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/account.php:756 ../../include/account.php:758 -msgid "Click here to upgrade." +#: ../../include/follow.php:140 ../../include/follow.php:175 +msgid "Protocol disabled." msgstr "" -#: ../../include/account.php:764 -msgid "This action exceeds the limits set by your subscription plan." +#: ../../include/follow.php:163 +msgid "Channel discovery failed." msgstr "" -#: ../../include/account.php:769 -msgid "This action is not available under your subscription plan." +#: ../../include/follow.php:202 +msgid "Cannot connect to yourself." msgstr "" #: ../../include/text.php:478 @@ -12401,393 +10821,422 @@ msgstr "" msgid "newer" msgstr "" -#: ../../include/text.php:945 +#: ../../include/text.php:939 msgid "No connections" msgstr "" -#: ../../include/text.php:970 +#: ../../include/text.php:964 #, php-format msgid "View all %s connections" msgstr "" -#: ../../include/text.php:1115 ../../include/text.php:1120 +#: ../../include/text.php:1096 ../../include/text.php:1101 msgid "poke" msgstr "" -#: ../../include/text.php:1115 ../../include/text.php:1120 +#: ../../include/text.php:1096 ../../include/text.php:1101 #: ../../include/conversation.php:239 msgid "poked" msgstr "" -#: ../../include/text.php:1121 +#: ../../include/text.php:1102 msgid "ping" msgstr "" -#: ../../include/text.php:1121 +#: ../../include/text.php:1102 msgid "pinged" msgstr "" -#: ../../include/text.php:1122 +#: ../../include/text.php:1103 msgid "prod" msgstr "" -#: ../../include/text.php:1122 +#: ../../include/text.php:1103 msgid "prodded" msgstr "" -#: ../../include/text.php:1123 +#: ../../include/text.php:1104 msgid "slap" msgstr "" -#: ../../include/text.php:1123 +#: ../../include/text.php:1104 msgid "slapped" msgstr "" -#: ../../include/text.php:1124 +#: ../../include/text.php:1105 msgid "finger" msgstr "" -#: ../../include/text.php:1124 +#: ../../include/text.php:1105 msgid "fingered" msgstr "" -#: ../../include/text.php:1125 +#: ../../include/text.php:1106 msgid "rebuff" msgstr "" -#: ../../include/text.php:1125 +#: ../../include/text.php:1106 msgid "rebuffed" msgstr "" -<<<<<<< HEAD -#: ../../include/text.php:1137 +#: ../../include/text.php:1118 msgid "happy" -======= -#: ../../addon/redfiles/redfilehelper.php:64 -msgid "file" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 msgstr "" -#: ../../include/text.php:1138 +#: ../../include/text.php:1119 msgid "sad" msgstr "" -#: ../../include/text.php:1139 +#: ../../include/text.php:1120 msgid "mellow" msgstr "" -#: ../../include/text.php:1140 +#: ../../include/text.php:1121 msgid "tired" msgstr "" -#: ../../include/text.php:1141 +#: ../../include/text.php:1122 msgid "perky" msgstr "" -#: ../../include/text.php:1142 +#: ../../include/text.php:1123 msgid "angry" msgstr "" -#: ../../include/text.php:1143 +#: ../../include/text.php:1124 msgid "stupefied" msgstr "" -#: ../../include/text.php:1144 +#: ../../include/text.php:1125 msgid "puzzled" msgstr "" -#: ../../include/text.php:1145 +#: ../../include/text.php:1126 msgid "interested" msgstr "" -#: ../../include/text.php:1146 +#: ../../include/text.php:1127 msgid "bitter" msgstr "" -#: ../../include/text.php:1147 +#: ../../include/text.php:1128 msgid "cheerful" msgstr "" -#: ../../include/text.php:1148 +#: ../../include/text.php:1129 msgid "alive" msgstr "" -#: ../../include/text.php:1149 +#: ../../include/text.php:1130 msgid "annoyed" msgstr "" -#: ../../include/text.php:1150 +#: ../../include/text.php:1131 msgid "anxious" msgstr "" -#: ../../include/text.php:1151 +#: ../../include/text.php:1132 msgid "cranky" msgstr "" -#: ../../include/text.php:1152 +#: ../../include/text.php:1133 msgid "disturbed" msgstr "" -#: ../../include/text.php:1153 +#: ../../include/text.php:1134 msgid "frustrated" msgstr "" -#: ../../include/text.php:1154 +#: ../../include/text.php:1135 msgid "depressed" msgstr "" -#: ../../include/text.php:1155 +#: ../../include/text.php:1136 msgid "motivated" msgstr "" -#: ../../include/text.php:1156 +#: ../../include/text.php:1137 msgid "relaxed" msgstr "" -#: ../../include/text.php:1157 +#: ../../include/text.php:1138 msgid "surprised" msgstr "" -#: ../../include/text.php:1328 ../../include/js_strings.php:70 +#: ../../include/text.php:1312 ../../include/js_strings.php:70 msgid "Monday" msgstr "" -#: ../../include/text.php:1328 ../../include/js_strings.php:71 +#: ../../include/text.php:1312 ../../include/js_strings.php:71 msgid "Tuesday" msgstr "" -#: ../../include/text.php:1328 ../../include/js_strings.php:72 +#: ../../include/text.php:1312 ../../include/js_strings.php:72 msgid "Wednesday" msgstr "" -#: ../../include/text.php:1328 ../../include/js_strings.php:73 +#: ../../include/text.php:1312 ../../include/js_strings.php:73 msgid "Thursday" msgstr "" -#: ../../include/text.php:1328 ../../include/js_strings.php:74 +#: ../../include/text.php:1312 ../../include/js_strings.php:74 msgid "Friday" msgstr "" -#: ../../include/text.php:1328 ../../include/js_strings.php:75 +#: ../../include/text.php:1312 ../../include/js_strings.php:75 msgid "Saturday" msgstr "" -#: ../../include/text.php:1328 ../../include/js_strings.php:69 +#: ../../include/text.php:1312 ../../include/js_strings.php:69 msgid "Sunday" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:45 +#: ../../include/text.php:1316 ../../include/js_strings.php:45 msgid "January" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:46 +#: ../../include/text.php:1316 ../../include/js_strings.php:46 msgid "February" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:47 +#: ../../include/text.php:1316 ../../include/js_strings.php:47 msgid "March" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:48 +#: ../../include/text.php:1316 ../../include/js_strings.php:48 msgid "April" msgstr "" -#: ../../include/text.php:1332 +#: ../../include/text.php:1316 msgid "May" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:50 +#: ../../include/text.php:1316 ../../include/js_strings.php:50 msgid "June" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:51 +#: ../../include/text.php:1316 ../../include/js_strings.php:51 msgid "July" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:52 +#: ../../include/text.php:1316 ../../include/js_strings.php:52 msgid "August" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:53 +#: ../../include/text.php:1316 ../../include/js_strings.php:53 msgid "September" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:54 +#: ../../include/text.php:1316 ../../include/js_strings.php:54 msgid "October" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:55 +#: ../../include/text.php:1316 ../../include/js_strings.php:55 msgid "November" msgstr "" -#: ../../include/text.php:1332 ../../include/js_strings.php:56 +#: ../../include/text.php:1316 ../../include/js_strings.php:56 msgid "December" msgstr "" -#: ../../include/text.php:1409 ../../include/text.php:1413 +#: ../../include/text.php:1380 ../../include/text.php:1384 msgid "Unknown Attachment" msgstr "" -#: ../../include/text.php:1415 +#: ../../include/text.php:1386 ../../include/feedutils.php:777 msgid "unknown" msgstr "" -#: ../../include/text.php:1451 +#: ../../include/text.php:1422 msgid "remove category" msgstr "" -#: ../../include/text.php:1525 +#: ../../include/text.php:1496 msgid "remove from file" msgstr "" -#: ../../include/text.php:1795 +#: ../../include/text.php:1615 ../../include/message.php:12 +msgid "Download binary/encrypted content" +msgstr "" + +#: ../../include/text.php:1782 msgid "Page layout" msgstr "" -#: ../../include/text.php:1795 +#: ../../include/text.php:1782 msgid "You can create your own with the layouts tool" msgstr "" -#: ../../include/text.php:1823 +#: ../../include/text.php:1810 msgid "Page content type" msgstr "" -#: ../../include/text.php:1956 +#: ../../include/text.php:1943 msgid "activity" msgstr "" -#: ../../include/text.php:2019 +#: ../../include/text.php:2006 msgid "a-z, 0-9, -, _, and . only" msgstr "" -#: ../../include/text.php:2291 +#: ../../include/text.php:2277 msgid "Design Tools" msgstr "" -#: ../../include/text.php:2297 +#: ../../include/text.php:2283 msgid "Pages" msgstr "" -#: ../../include/text.php:2319 +#: ../../include/text.php:2305 msgid "Import website..." msgstr "" -#: ../../include/text.php:2320 +#: ../../include/text.php:2306 msgid "Select folder to import" msgstr "" -#: ../../include/text.php:2321 +#: ../../include/text.php:2307 msgid "Import from a zipped folder:" msgstr "" -#: ../../include/text.php:2322 +#: ../../include/text.php:2308 msgid "Import from cloud files:" msgstr "" -#: ../../include/text.php:2323 +#: ../../include/text.php:2309 msgid "/cloud/channel/path/to/folder" msgstr "" -#: ../../include/text.php:2324 +#: ../../include/text.php:2310 msgid "Enter path to website files" msgstr "" -#: ../../include/text.php:2325 +#: ../../include/text.php:2311 msgid "Select folder" msgstr "" -#: ../../include/text.php:2326 +#: ../../include/text.php:2312 msgid "Export website..." msgstr "" -#: ../../include/text.php:2327 +#: ../../include/text.php:2313 msgid "Export to a zip file" msgstr "" -#: ../../include/text.php:2328 +#: ../../include/text.php:2314 msgid "website.zip" msgstr "" -#: ../../include/text.php:2329 +#: ../../include/text.php:2315 msgid "Enter a name for the zip file." msgstr "" -#: ../../include/text.php:2330 +#: ../../include/text.php:2316 msgid "Export to cloud files" msgstr "" -#: ../../include/text.php:2331 +#: ../../include/text.php:2317 msgid "/path/to/export/folder" msgstr "" -#: ../../include/text.php:2332 +#: ../../include/text.php:2318 msgid "Enter a path to a cloud files destination." msgstr "" -#: ../../include/text.php:2333 +#: ../../include/text.php:2319 msgid "Specify folder" msgstr "" -#: ../../include/taxonomy.php:228 ../../include/taxonomy.php:249 -msgid "Tags" +#: ../../include/account.php:35 +msgid "Not a valid email address" msgstr "" -#: ../../include/taxonomy.php:293 -msgid "Keywords" +#: ../../include/account.php:37 +msgid "Your email domain is not among those allowed on this site" msgstr "" -#: ../../include/taxonomy.php:314 -msgid "have" +#: ../../include/account.php:43 +msgid "Your email address is already registered at this site." msgstr "" -#: ../../include/taxonomy.php:314 -msgid "has" +#: ../../include/account.php:75 +msgid "An invitation is required." msgstr "" -#: ../../include/taxonomy.php:315 -msgid "want" +#: ../../include/account.php:79 +msgid "Invitation could not be verified." msgstr "" -#: ../../include/taxonomy.php:315 -msgid "wants" +#: ../../include/account.php:157 +msgid "Please enter the required information." msgstr "" -#: ../../include/taxonomy.php:316 -msgid "likes" +#: ../../include/account.php:224 +msgid "Failed to store account information." msgstr "" -#: ../../include/taxonomy.php:317 -msgid "dislikes" +#: ../../include/account.php:291 +#, php-format +msgid "Registration confirmation for %s" msgstr "" -#: ../../include/connections.php:127 -msgid "New window" +#: ../../include/account.php:360 +#, php-format +msgid "Registration request at %s" +msgstr "" + +#: ../../include/account.php:382 +msgid "your registration password" +msgstr "" + +#: ../../include/account.php:388 ../../include/account.php:450 +#, php-format +msgid "Registration details for %s" +msgstr "" + +#: ../../include/account.php:461 +msgid "Account approved." +msgstr "" + +#: ../../include/account.php:501 +#, php-format +msgid "Registration revoked for %s" +msgstr "" + +#: ../../include/account.php:780 ../../include/account.php:782 +msgid "Click here to upgrade." +msgstr "" + +#: ../../include/account.php:788 +msgid "This action exceeds the limits set by your subscription plan." +msgstr "" + +#: ../../include/account.php:793 +msgid "This action is not available under your subscription plan." msgstr "" #: ../../include/connections.php:128 +msgid "New window" +msgstr "" + +#: ../../include/connections.php:129 msgid "Open the selected location in a different window or browser tab" msgstr "" -<<<<<<< HEAD -#: ../../include/zot.php:646 -msgid "Invalid data packet" -======= -#: ../../include/conversation.php:838 ../../include/nav.php:272 -msgid "Loading..." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../include/connections.php:676 ../../include/event.php:1292 +msgid "Home, Voice" msgstr "" -#: ../../include/zot.php:662 -msgid "Unable to verify channel signature" +#: ../../include/connections.php:677 ../../include/event.php:1293 +msgid "Home, Fax" msgstr "" -#: ../../include/zot.php:2313 -#, php-format -msgid "Unable to verify site signature for %s" +#: ../../include/connections.php:679 ../../include/event.php:1295 +msgid "Work, Voice" msgstr "" -#: ../../include/zot.php:3762 -msgid "invalid target signature" +#: ../../include/connections.php:680 ../../include/event.php:1296 +msgid "Work, Fax" msgstr "" #: ../../include/datetime.php:147 @@ -12802,7 +11251,7 @@ msgstr "" msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: ../../include/datetime.php:286 ../../boot.php:2419 +#: ../../include/datetime.php:286 ../../boot.php:2420 msgid "never" msgstr "" @@ -12903,7 +11352,6 @@ msgstr "" msgid "Currently Male" msgstr "" -<<<<<<< HEAD #: ../../include/selectors.php:49 msgid "Currently Female" msgstr "" @@ -12932,11 +11380,11 @@ msgstr "" msgid "Hermaphrodite" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:49 ../../include/channel.php:1234 msgid "Neuter" msgstr "" -#: ../../include/selectors.php:49 +#: ../../include/selectors.php:49 ../../include/channel.php:1236 msgid "Non-specific" msgstr "" @@ -13003,126 +11451,6 @@ msgstr "" #: ../../include/selectors.php:123 msgid "Lonely" msgstr "" -======= -#: ../../include/conversation.php:1634 -msgid "Discover" -msgstr "" - -#: ../../include/conversation.php:1637 -msgid "Imported public streams" -msgstr "" - -#: ../../include/conversation.php:1642 -msgid "Commented Order" -msgstr "" - -#: ../../include/conversation.php:1645 -msgid "Sort by Comment Date" -msgstr "" - -#: ../../include/conversation.php:1649 -msgid "Posted Order" -msgstr "" - -#: ../../include/conversation.php:1652 -msgid "Sort by Post Date" -msgstr "" - -#: ../../include/conversation.php:1660 -msgid "Posts that mention or involve you" -msgstr "" - -#: ../../include/conversation.php:1669 -msgid "Activity Stream - by date" -msgstr "" - -#: ../../include/conversation.php:1675 -msgid "Starred" -msgstr "" - -#: ../../include/conversation.php:1678 -msgid "Favourite Posts" -msgstr "" - -#: ../../include/conversation.php:1685 -msgid "Spam" -msgstr "" - -#: ../../include/conversation.php:1688 -msgid "Posts flagged as SPAM" -msgstr "" - -#: ../../include/conversation.php:1763 ../../include/nav.php:372 -msgid "Status Messages and Posts" -msgstr "" - -#: ../../include/conversation.php:1776 ../../include/nav.php:385 -msgid "Profile Details" -msgstr "" - -#: ../../include/conversation.php:1786 ../../include/nav.php:395 -#: ../../include/photos.php:528 -msgid "Photo Albums" -msgstr "" - -#: ../../include/conversation.php:1794 ../../include/nav.php:403 -msgid "Files and Storage" -msgstr "" - -#: ../../include/conversation.php:1830 ../../include/nav.php:438 -msgid "Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1833 ../../include/nav.php:441 -msgid "Saved Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1844 ../../include/nav.php:452 -msgid "View Webpages" -msgstr "" - -#: ../../include/conversation.php:1913 -msgctxt "noun" -msgid "Attending" -msgid_plural "Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1916 -msgctxt "noun" -msgid "Not Attending" -msgid_plural "Not Attending" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1919 -msgctxt "noun" -msgid "Undecided" -msgid_plural "Undecided" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1922 -msgctxt "noun" -msgid "Agree" -msgid_plural "Agrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1925 -msgctxt "noun" -msgid "Disagree" -msgid_plural "Disagrees" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/conversation.php:1928 -msgctxt "noun" -msgid "Abstain" -msgid_plural "Abstains" -msgstr[0] "" -msgstr[1] "" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 #: ../../include/selectors.php:123 msgid "Available" @@ -13311,530 +11639,620 @@ msgstr "" msgid "Empty path" msgstr "" -#: ../../include/page_widgets.php:7 -msgid "New Page" +#: ../../include/event.php:22 ../../include/event.php:69 +msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/contact_widgets.php:11 -#, php-format -msgid "%d invitation available" -msgid_plural "%d invitations available" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:19 -msgid "Find Channels" +#: ../../include/event.php:30 ../../include/event.php:73 +msgid "Starts:" msgstr "" -#: ../../include/contact_widgets.php:20 -msgid "Enter name or interest" +#: ../../include/event.php:40 ../../include/event.php:77 +msgid "Finishes:" msgstr "" -#: ../../include/contact_widgets.php:21 -msgid "Connect/Follow" +#: ../../include/event.php:1008 +msgid "This event has been added to your calendar." msgstr "" -#: ../../include/contact_widgets.php:22 -msgid "Examples: Robert Morgenstein, Fishing" +#: ../../include/event.php:1208 +msgid "Not specified" msgstr "" -#: ../../include/contact_widgets.php:26 -msgid "Random Profile" +#: ../../include/event.php:1209 +msgid "Needs Action" msgstr "" -#: ../../include/contact_widgets.php:27 -msgid "Invite Friends" +#: ../../include/event.php:1210 +msgid "Completed" msgstr "" -#: ../../include/contact_widgets.php:29 -msgid "Advanced example: name=fred and country=iceland" +#: ../../include/event.php:1211 +msgid "In Process" msgstr "" -#: ../../include/contact_widgets.php:122 -#, php-format -msgid "%d connection in common" -msgid_plural "%d connections in common" -msgstr[0] "" -msgstr[1] "" - -#: ../../include/contact_widgets.php:127 -msgid "show more" +#: ../../include/event.php:1212 +msgid "Cancelled" msgstr "" -#: ../../include/nav.php:88 +#: ../../include/nav.php:90 msgid "Remote authentication" msgstr "" -#: ../../include/nav.php:88 +#: ../../include/nav.php:90 msgid "Click to authenticate to your home hub" msgstr "" -#: ../../include/nav.php:99 ../../include/nav.php:123 ../../boot.php:1590 +#: ../../include/nav.php:101 ../../include/nav.php:125 ../../boot.php:1591 msgid "Logout" msgstr "" -#: ../../include/nav.php:99 ../../include/nav.php:123 +#: ../../include/nav.php:101 ../../include/nav.php:125 msgid "End this session" msgstr "" -#: ../../include/nav.php:102 +#: ../../include/nav.php:104 msgid "Your profile page" msgstr "" -<<<<<<< HEAD -#: ../../include/nav.php:105 +#: ../../include/nav.php:107 msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:107 +#: ../../include/nav.php:109 msgid "Edit your profile" msgstr "" -#: ../../include/nav.php:113 +#: ../../include/nav.php:115 msgid "Sign in" msgstr "" -#: ../../include/nav.php:138 +#: ../../include/nav.php:140 msgid "Take me home" msgstr "" -#: ../../include/nav.php:140 +#: ../../include/nav.php:142 msgid "Log me out of this site" msgstr "" -#: ../../include/nav.php:145 +#: ../../include/nav.php:147 msgid "Create an account" msgstr "" -#: ../../include/nav.php:157 +#: ../../include/nav.php:159 msgid "Help and documentation" msgstr "" -#: ../../include/nav.php:160 +#: ../../include/nav.php:162 msgid "Search site @name, #tag, ?docs, content" msgstr "" -#: ../../include/nav.php:172 +#: ../../include/nav.php:174 msgid "Grid" msgstr "" -#: ../../include/nav.php:172 +#: ../../include/nav.php:174 msgid "Your grid" msgstr "" -#: ../../include/nav.php:173 +#: ../../include/nav.php:175 msgid "View your network/grid" msgstr "" -#: ../../include/nav.php:174 +#: ../../include/nav.php:176 msgid "Mark all grid notifications seen" msgstr "" -#: ../../include/nav.php:176 +#: ../../include/nav.php:178 msgid "Channel home" msgstr "" -#: ../../include/nav.php:177 +#: ../../include/nav.php:179 msgid "View your channel home" msgstr "" -#: ../../include/nav.php:178 +#: ../../include/nav.php:180 msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:184 +#: ../../include/nav.php:186 msgid "Notices" msgstr "" -#: ../../include/nav.php:184 +#: ../../include/nav.php:186 msgid "Notifications" msgstr "" -#: ../../include/nav.php:185 +#: ../../include/nav.php:187 msgid "View all notifications" msgstr "" #: ../../include/nav.php:188 +msgid "Mark all system notifications seen" +msgstr "" + +#: ../../include/nav.php:190 msgid "Private mail" msgstr "" -#: ../../include/nav.php:189 +#: ../../include/nav.php:191 msgid "View your private messages" msgstr "" -#: ../../include/nav.php:190 +#: ../../include/nav.php:192 msgid "Mark all private messages seen" msgstr "" -#: ../../include/nav.php:196 +#: ../../include/nav.php:198 msgid "Event Calendar" msgstr "" -#: ../../include/nav.php:197 +#: ../../include/nav.php:199 msgid "View events" msgstr "" -#: ../../include/nav.php:198 +#: ../../include/nav.php:200 msgid "Mark all events seen" msgstr "" -#: ../../include/nav.php:201 +#: ../../include/nav.php:202 msgid "Manage Your Channels" msgstr "" -#: ../../include/nav.php:203 +#: ../../include/nav.php:204 msgid "Account/Channel Settings" msgstr "" -#: ../../include/nav.php:211 +#: ../../include/nav.php:212 msgid "Site Setup and Configuration" msgstr "" -#: ../../include/nav.php:268 ../../include/conversation.php:838 +#: ../../include/nav.php:259 ../../include/conversation.php:835 msgid "Loading..." msgstr "" -#: ../../include/nav.php:273 +#: ../../include/nav.php:264 msgid "@name, #tag, ?doc, content" msgstr "" -#: ../../include/nav.php:274 +#: ../../include/nav.php:265 msgid "Please wait..." msgstr "" -#: ../../include/nav.php:276 +#: ../../include/nav.php:268 msgid "Add Apps" msgstr "" -#: ../../include/channel.php:33 -msgid "Unable to obtain identity information from database" +#: ../../include/nav.php:269 +msgid "Arrange Apps" msgstr "" -#: ../../include/channel.php:67 -msgid "Empty name" +#: ../../include/nav.php:270 +msgid "Toggle System Apps" msgstr "" -#: ../../include/channel.php:70 -msgid "Name too long" +#: ../../include/nav.php:362 ../../include/conversation.php:1760 +msgid "Status Messages and Posts" msgstr "" -#: ../../include/channel.php:181 -msgid "No account identifier" +#: ../../include/nav.php:375 ../../include/conversation.php:1773 +msgid "Profile Details" msgstr "" -#: ../../include/channel.php:193 -msgid "Nickname is required." +#: ../../include/nav.php:385 ../../include/conversation.php:1783 +#: ../../include/photos.php:525 +msgid "Photo Albums" msgstr "" -#: ../../include/channel.php:207 -msgid "Reserved nickname. Please choose another." +#: ../../include/nav.php:393 ../../include/conversation.php:1791 +msgid "Files and Storage" msgstr "" -#: ../../include/channel.php:212 -msgid "" -"Nickname has unsupported characters or is already being used on this site." +#: ../../include/nav.php:428 ../../include/conversation.php:1827 +msgid "Bookmarks" msgstr "" -#: ../../include/channel.php:271 -msgid "Unable to retrieve created identity" +#: ../../include/nav.php:431 ../../include/conversation.php:1830 +msgid "Saved Bookmarks" msgstr "" -#: ../../include/channel.php:343 -msgid "Default Profile" +#: ../../include/nav.php:442 ../../include/conversation.php:1841 +msgid "View Webpages" msgstr "" -#: ../../include/channel.php:1044 -msgid "Create New Profile" +#: ../../include/contact_widgets.php:11 +#, php-format +msgid "%d invitation available" +msgid_plural "%d invitations available" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:19 +msgid "Find Channels" msgstr "" -#: ../../include/channel.php:1064 -msgid "Visible to everybody" +#: ../../include/contact_widgets.php:20 +msgid "Enter name or interest" msgstr "" -#: ../../include/channel.php:1137 ../../include/channel.php:1231 -msgid "Gender:" +#: ../../include/contact_widgets.php:21 +msgid "Connect/Follow" msgstr "" -#: ../../include/channel.php:1139 ../../include/channel.php:1286 -msgid "Homepage:" +#: ../../include/contact_widgets.php:22 +msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/channel.php:1140 -msgid "Online Now" -======= -#: ../../include/text.php:1335 ../../include/js_strings.php:70 -msgid "Monday" +#: ../../include/contact_widgets.php:26 +msgid "Random Profile" msgstr "" -#: ../../include/text.php:1335 ../../include/js_strings.php:71 -msgid "Tuesday" +#: ../../include/contact_widgets.php:27 +msgid "Invite Friends" msgstr "" -#: ../../include/text.php:1335 ../../include/js_strings.php:72 -msgid "Wednesday" +#: ../../include/contact_widgets.php:29 +msgid "Advanced example: name=fred and country=iceland" msgstr "" -#: ../../include/text.php:1335 ../../include/js_strings.php:73 -msgid "Thursday" +#: ../../include/contact_widgets.php:122 +#, php-format +msgid "%d connection in common" +msgid_plural "%d connections in common" +msgstr[0] "" +msgstr[1] "" + +#: ../../include/contact_widgets.php:127 +msgid "show more" msgstr "" -#: ../../include/text.php:1335 ../../include/js_strings.php:74 -msgid "Friday" +#: ../../include/features.php:54 +msgid "General Features" msgstr "" -#: ../../include/text.php:1335 ../../include/js_strings.php:75 -msgid "Saturday" +#: ../../include/features.php:59 +msgid "Multiple Profiles" msgstr "" -#: ../../include/text.php:1335 ../../include/js_strings.php:69 -msgid "Sunday" +#: ../../include/features.php:60 +msgid "Ability to create multiple profiles" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:45 -msgid "January" +#: ../../include/features.php:68 +msgid "Advanced Profiles" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:46 -msgid "February" +#: ../../include/features.php:69 +msgid "Additional profile sections and selections" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:47 -msgid "March" +#: ../../include/features.php:77 +msgid "Profile Import/Export" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:48 -msgid "April" +#: ../../include/features.php:78 +msgid "Save and load profile details across sites/channels" msgstr "" -#: ../../include/text.php:1339 -msgid "May" +#: ../../include/features.php:86 +msgid "Web Pages" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:50 -msgid "June" +#: ../../include/features.php:87 +msgid "Provide managed web pages on your channel" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:51 -msgid "July" +#: ../../include/features.php:96 +msgid "Provide a wiki for your channel" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:52 -msgid "August" +#: ../../include/features.php:113 +msgid "Private Notes" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:53 -msgid "September" +#: ../../include/features.php:114 +msgid "Enables a tool to store notes and reminders (note: not encrypted)" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:54 -msgid "October" +#: ../../include/features.php:122 +msgid "Navigation Channel Select" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:55 -msgid "November" +#: ../../include/features.php:123 +msgid "Change channels directly from within the navigation dropdown menu" msgstr "" -#: ../../include/text.php:1339 ../../include/js_strings.php:56 -msgid "December" +#: ../../include/features.php:131 +msgid "Photo Location" msgstr "" -#: ../../include/text.php:1403 ../../include/text.php:1407 -msgid "Unknown Attachment" +#: ../../include/features.php:132 +msgid "If location data is available on uploaded photos, link this to a map." msgstr "" -#: ../../include/text.php:1409 -msgid "unknown" +#: ../../include/features.php:140 +msgid "Access Controlled Chatrooms" msgstr "" -#: ../../include/text.php:1445 -msgid "remove category" +#: ../../include/features.php:141 +msgid "Provide chatrooms and chat services with access control." msgstr "" -#: ../../include/text.php:1519 -msgid "remove from file" +#: ../../include/features.php:150 +msgid "Provide alternate connection permission roles." msgstr "" -#: ../../include/text.php:1781 ../../include/language.php:367 -msgid "default" +#: ../../include/features.php:158 +msgid "Smart Birthdays" msgstr "" -#: ../../include/text.php:1789 -msgid "Page layout" +#: ../../include/features.php:159 +msgid "" +"Make birthday events timezone aware in case your friends are scattered " +"across the planet." msgstr "" -#: ../../include/text.php:1789 -msgid "You can create your own with the layouts tool" +#: ../../include/features.php:167 +msgid "Event Timezone Selection" msgstr "" -#: ../../include/text.php:1817 -msgid "Page content type" +#: ../../include/features.php:168 +msgid "Allow event creation in timezones other than your own." msgstr "" -#: ../../include/text.php:1950 -msgid "activity" +#: ../../include/features.php:176 +msgid "Advanced Directory Search" msgstr "" -#: ../../include/text.php:2264 -msgid "Design Tools" +#: ../../include/features.php:177 +msgid "Allows creation of complex directory search queries" msgstr "" -#: ../../include/text.php:2270 -msgid "Pages" +#: ../../include/features.php:185 +msgid "Advanced Theme and Layout Settings" msgstr "" -#: ../../include/text.php:2292 -msgid "Import website..." +#: ../../include/features.php:186 +msgid "Allows fine tuning of themes and page layouts" msgstr "" -#: ../../include/text.php:2293 -msgid "Select folder to import" +#: ../../include/features.php:196 +msgid "Post Composition Features" msgstr "" -#: ../../include/text.php:2294 -msgid "Import from a zipped folder:" +#: ../../include/features.php:200 +msgid "Large Photos" msgstr "" -#: ../../include/text.php:2295 -msgid "Import from cloud files:" +#: ../../include/features.php:201 +msgid "" +"Include large (1024px) photo thumbnails in posts. If not enabled, use small " +"(640px) photo thumbnails" msgstr "" -#: ../../include/text.php:2296 -msgid "/cloud/channel/path/to/folder" +#: ../../include/features.php:210 +msgid "Automatically import channel content from other channels or feeds" msgstr "" -#: ../../include/text.php:2297 -msgid "Enter path to website files" +#: ../../include/features.php:218 +msgid "Even More Encryption" msgstr "" -#: ../../include/text.php:2298 -msgid "Select folder" +#: ../../include/features.php:219 +msgid "" +"Allow optional encryption of content end-to-end with a shared secret key" msgstr "" -#: ../../include/text.php:2299 -msgid "Export website..." +#: ../../include/features.php:227 +msgid "Enable Voting Tools" msgstr "" -#: ../../include/text.php:2300 -msgid "Export to a zip file" +#: ../../include/features.php:228 +msgid "Provide a class of post which others can vote on" msgstr "" -#: ../../include/text.php:2301 -msgid "website.zip" +#: ../../include/features.php:236 +msgid "Disable Comments" msgstr "" -#: ../../include/text.php:2302 -msgid "Enter a name for the zip file." +#: ../../include/features.php:237 +msgid "Provide the option to disable comments for a post" msgstr "" -#: ../../include/text.php:2303 -msgid "Export to cloud files" +#: ../../include/features.php:245 +msgid "Delayed Posting" msgstr "" -#: ../../include/text.php:2304 -msgid "/path/to/export/folder" +#: ../../include/features.php:246 +msgid "Allow posts to be published at a later date" msgstr "" -#: ../../include/text.php:2305 -msgid "Enter a path to a cloud files destination." +#: ../../include/features.php:254 +msgid "Content Expiration" msgstr "" -#: ../../include/text.php:2306 -msgid "Specify folder" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../include/features.php:255 +msgid "Remove posts/comments and/or private messages at a future time" msgstr "" -#: ../../include/channel.php:1236 -msgid "Like this channel" +#: ../../include/features.php:263 +msgid "Suppress Duplicate Posts/Comments" msgstr "" -#: ../../include/channel.php:1260 -msgid "j F, Y" +#: ../../include/features.php:264 +msgid "" +"Prevent posts with identical content to be published with less than two " +"minutes in between submissions." msgstr "" -#: ../../include/channel.php:1261 -msgid "j F" +#: ../../include/features.php:275 +msgid "Network and Stream Filtering" msgstr "" -#: ../../include/channel.php:1268 -msgid "Birthday:" +#: ../../include/features.php:279 +msgid "Search by Date" msgstr "" -#: ../../include/channel.php:1281 -#, php-format -msgid "for %1$d %2$s" +#: ../../include/features.php:280 +msgid "Ability to select posts by date ranges" msgstr "" -#: ../../include/channel.php:1284 -msgid "Sexual Preference:" +#: ../../include/features.php:288 ../../include/group.php:331 +msgid "Privacy Groups" msgstr "" -#: ../../include/channel.php:1290 -msgid "Tags:" +#: ../../include/features.php:289 +msgid "Enable management and selection of privacy groups" msgstr "" -#: ../../include/channel.php:1292 -msgid "Political Views:" +#: ../../include/features.php:298 +msgid "Save search terms for re-use" msgstr "" -#: ../../include/channel.php:1294 -msgid "Religion:" +#: ../../include/features.php:306 +msgid "Network Personal Tab" msgstr "" -#: ../../include/channel.php:1298 -msgid "Hobbies/Interests:" +#: ../../include/features.php:307 +msgid "Enable tab to display only Network posts that you've interacted on" msgstr "" -#: ../../include/channel.php:1300 -msgid "Likes:" +#: ../../include/features.php:315 +msgid "Network New Tab" msgstr "" -#: ../../include/channel.php:1302 -msgid "Dislikes:" +#: ../../include/features.php:316 +msgid "Enable tab to display all new Network activity" msgstr "" -#: ../../include/channel.php:1304 -msgid "Contact information and Social Networks:" +#: ../../include/features.php:324 +msgid "Affinity Tool" msgstr "" -#: ../../include/channel.php:1306 -msgid "My other channels:" +#: ../../include/features.php:325 +msgid "Filter stream activity by depth of relationships" msgstr "" -#: ../../include/channel.php:1308 -msgid "Musical interests:" +#: ../../include/features.php:334 +msgid "Show friend and connection suggestions" msgstr "" -#: ../../include/channel.php:1310 -msgid "Books, literature:" +#: ../../include/features.php:342 +msgid "Connection Filtering" msgstr "" -#: ../../include/channel.php:1312 -msgid "Television:" +#: ../../include/features.php:343 +msgid "Filter incoming posts from connections based on keywords/content" msgstr "" -#: ../../include/channel.php:1314 -msgid "Film/dance/culture/entertainment:" +#: ../../include/features.php:355 +msgid "Post/Comment Tools" msgstr "" -#: ../../include/channel.php:1316 -msgid "Love/Romance:" +#: ../../include/features.php:359 +msgid "Community Tagging" msgstr "" -#: ../../include/channel.php:1318 -msgid "Work/employment:" +#: ../../include/features.php:360 +msgid "Ability to tag existing posts" msgstr "" -#: ../../include/channel.php:1320 -msgid "School/education:" +#: ../../include/features.php:368 +msgid "Post Categories" msgstr "" -#: ../../include/channel.php:1343 -msgid "Like this thing" +#: ../../include/features.php:369 +msgid "Add categories to your posts" msgstr "" -#: ../../include/channel.php:2114 -#, php-format -msgid "User '%s' deleted" +#: ../../include/features.php:377 +msgid "Emoji Reactions" +msgstr "" + +#: ../../include/features.php:378 +msgid "Add emoji reaction ability to posts" +msgstr "" + +#: ../../include/features.php:387 +msgid "Ability to file posts under folders" +msgstr "" + +#: ../../include/features.php:395 +msgid "Dislike Posts" +msgstr "" + +#: ../../include/features.php:396 +msgid "Ability to dislike posts/comments" +msgstr "" + +#: ../../include/features.php:404 +msgid "Star Posts" +msgstr "" + +#: ../../include/features.php:405 +msgid "Ability to mark special posts with a star indicator" +msgstr "" + +#: ../../include/features.php:413 +msgid "Tag Cloud" +msgstr "" + +#: ../../include/features.php:414 +msgid "Provide a personal tag cloud on your channel page" +msgstr "" + +#: ../../include/features.php:425 +msgid "Premium Channel" +msgstr "" + +#: ../../include/features.php:426 +msgid "" +"Allows you to set restrictions and terms on those that connect with your " +"channel" +msgstr "" + +#: ../../include/network.php:751 +msgid "view full size" +msgstr "" + +#: ../../include/network.php:1691 ../../include/network.php:1692 +msgid "Friendica" +msgstr "" + +#: ../../include/network.php:1693 +msgid "OStatus" +msgstr "" + +#: ../../include/network.php:1694 +msgid "GNU-Social" +msgstr "" + +#: ../../include/network.php:1695 +msgid "RSS/Atom" +msgstr "" + +#: ../../include/network.php:1697 +msgid "Diaspora" +msgstr "" + +#: ../../include/network.php:1698 +msgid "Facebook" +msgstr "" + +#: ../../include/network.php:1699 +msgid "Zot" +msgstr "" + +#: ../../include/network.php:1700 +msgid "LinkedIn" +msgstr "" + +#: ../../include/network.php:1701 +msgid "XMPP/IM" +msgstr "" + +#: ../../include/network.php:1702 +msgid "MySpace" msgstr "" #: ../../include/js_strings.php:5 @@ -14084,37 +12502,36 @@ msgctxt "calendar" msgid "All day" msgstr "" -<<<<<<< HEAD -#: ../../include/dir_fns.php:141 -msgid "Directory Options" +#: ../../include/taxonomy.php:258 ../../include/taxonomy.php:279 +msgid "Tags" msgstr "" -#: ../../include/dir_fns.php:143 -msgid "Safe Mode" -======= -#: ../../include/message.php:30 -msgid "Unable to determine sender." +#: ../../include/taxonomy.php:323 +msgid "Keywords" msgstr "" -#: ../../include/message.php:69 -msgid "No recipient provided." +#: ../../include/taxonomy.php:344 +msgid "have" msgstr "" -#: ../../include/message.php:74 -msgid "[no subject]" +#: ../../include/taxonomy.php:344 +msgid "has" msgstr "" -#: ../../include/message.php:227 -msgid "Stored post could not be verified." ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../include/taxonomy.php:345 +msgid "want" msgstr "" -#: ../../include/dir_fns.php:144 -msgid "Public Forums Only" +#: ../../include/taxonomy.php:345 +msgid "wants" msgstr "" -#: ../../include/dir_fns.php:145 -msgid "This Website Only" +#: ../../include/taxonomy.php:346 +msgid "likes" +msgstr "" + +#: ../../include/taxonomy.php:347 +msgid "dislikes" msgstr "" #: ../../include/group.php:26 @@ -14132,10 +12549,6 @@ msgstr "" msgid "edit" msgstr "" -#: ../../include/group.php:331 ../../include/features.php:292 -msgid "Privacy Groups" -msgstr "" - #: ../../include/group.php:332 msgid "Edit group" msgstr "" @@ -14148,40 +12561,56 @@ msgstr "" msgid "Channels not in any privacy group" msgstr "" -#: ../../include/event.php:22 ../../include/event.php:69 -msgid "l F d, Y \\@ g:i A" +#: ../../include/bbcode.php:194 ../../include/bbcode.php:1097 +#: ../../include/bbcode.php:1100 ../../include/bbcode.php:1105 +#: ../../include/bbcode.php:1108 ../../include/bbcode.php:1111 +#: ../../include/bbcode.php:1114 ../../include/bbcode.php:1119 +#: ../../include/bbcode.php:1122 ../../include/bbcode.php:1127 +#: ../../include/bbcode.php:1130 ../../include/bbcode.php:1133 +#: ../../include/bbcode.php:1136 +msgid "Image/photo" msgstr "" -#: ../../include/event.php:30 ../../include/event.php:73 -msgid "Starts:" +#: ../../include/bbcode.php:233 ../../include/bbcode.php:1147 +msgid "Encrypted content" msgstr "" -#: ../../include/event.php:40 ../../include/event.php:77 -msgid "Finishes:" +#: ../../include/bbcode.php:249 +#, php-format +msgid "Install %s element: " msgstr "" -#: ../../include/event.php:1008 -msgid "This event has been added to your calendar." +#: ../../include/bbcode.php:253 +#, php-format +msgid "" +"This post contains an installable %s element, however you lack permissions " +"to install it on this site." msgstr "" -#: ../../include/event.php:1208 -msgid "Not specified" +#: ../../include/bbcode.php:332 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/event.php:1209 -msgid "Needs Action" +#: ../../include/bbcode.php:409 ../../include/bbcode.php:417 +msgid "Click to open/close" msgstr "" -#: ../../include/event.php:1210 -msgid "Completed" +#: ../../include/bbcode.php:417 +msgid "spoiler" msgstr "" -#: ../../include/event.php:1211 -msgid "In Process" +#: ../../include/bbcode.php:1085 +msgid "$1 wrote:" msgstr "" -#: ../../include/event.php:1212 -msgid "Cancelled" +#: ../../include/import.php:41 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../include/import.php:105 +msgid "Cloned channel not found. Import failed." msgstr "" #: ../../include/conversation.php:200 @@ -14194,338 +12623,244 @@ msgstr "" msgid "%1$s poked %2$s" msgstr "" -#: ../../include/conversation.php:691 +#: ../../include/conversation.php:688 #, php-format msgid "View %s's profile @ %s" msgstr "" -#: ../../include/conversation.php:711 +#: ../../include/conversation.php:708 msgid "Categories:" msgstr "" -<<<<<<< HEAD -#: ../../include/conversation.php:712 +#: ../../include/conversation.php:709 msgid "Filed under:" msgstr "" -#: ../../include/conversation.php:737 +#: ../../include/conversation.php:734 msgid "View in context" msgstr "" -#: ../../include/conversation.php:834 +#: ../../include/conversation.php:831 msgid "remove" msgstr "" -#: ../../include/conversation.php:839 +#: ../../include/conversation.php:836 msgid "Delete Selected Items" msgstr "" -#: ../../include/conversation.php:882 +#: ../../include/conversation.php:879 msgid "View Source" msgstr "" -#: ../../include/conversation.php:892 +#: ../../include/conversation.php:889 msgid "Follow Thread" msgstr "" -#: ../../include/conversation.php:901 +#: ../../include/conversation.php:898 msgid "Unfollow Thread" msgstr "" -#: ../../include/conversation.php:992 +#: ../../include/conversation.php:989 msgid "Activity/Posts" msgstr "" -#: ../../include/conversation.php:1012 +#: ../../include/conversation.php:1009 msgid "Edit Connection" msgstr "" -#: ../../include/conversation.php:1022 +#: ../../include/conversation.php:1019 msgid "Message" msgstr "" -#: ../../include/conversation.php:1156 -======= -#: ../../include/items.php:869 ../../include/items.php:916 -msgid "(Unknown)" -msgstr "" - -#: ../../include/items.php:1110 -msgid "Visible to anybody on the internet." -msgstr "" - -#: ../../include/items.php:1112 -msgid "Visible to you only." -msgstr "" - -#: ../../include/items.php:1114 -msgid "Visible to anybody in this network." -msgstr "" - -#: ../../include/items.php:1116 -msgid "Visible to anybody authenticated." -msgstr "" - -#: ../../include/items.php:1118 -#, php-format -msgid "Visible to anybody on %s." -msgstr "" - -#: ../../include/items.php:1120 -msgid "Visible to all connections." -msgstr "" - -#: ../../include/items.php:1122 -msgid "Visible to approved connections." -msgstr "" - -#: ../../include/items.php:1124 -msgid "Visible to specific connections." -msgstr "" - -#: ../../include/items.php:3938 -msgid "Privacy group is empty." -msgstr "" - -#: ../../include/items.php:3945 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../include/conversation.php:1153 #, php-format msgid "%s likes this." msgstr "" -<<<<<<< HEAD -#: ../../include/conversation.php:1156 +#: ../../include/conversation.php:1153 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../include/conversation.php:1160 +#: ../../include/conversation.php:1157 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgid_plural "<span %1$s>%2$d people</span> like this." msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1162 -======= -#: ../../include/items.php:3957 -msgid "Connection not found." -msgstr "" - -#: ../../include/items.php:4310 -msgid "profile photo" -msgstr "" - -#: ../../include/items.php:4506 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 +#: ../../include/conversation.php:1159 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgid_plural "<span %1$s>%2$d people</span> don't like this." msgstr[0] "" msgstr[1] "" -<<<<<<< HEAD -#: ../../include/conversation.php:1168 +#: ../../include/conversation.php:1165 msgid "and" msgstr "" -#: ../../include/conversation.php:1171 +#: ../../include/conversation.php:1168 #, php-format msgid ", and %d other people" msgid_plural ", and %d other people" msgstr[0] "" msgstr[1] "" -======= -#: ../../include/items.php:4506 -msgctxt "edit_activity" -msgid "Post" -msgstr "" - -#: ../../include/items.php:4506 -msgctxt "edit_activity" -msgid "Comment" -msgstr "" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -#: ../../include/conversation.php:1172 +#: ../../include/conversation.php:1169 #, php-format msgid "%s like this." msgstr "" -#: ../../include/conversation.php:1172 +#: ../../include/conversation.php:1169 #, php-format msgid "%s don't like this." msgstr "" -#: ../../include/conversation.php:1215 +#: ../../include/conversation.php:1212 msgid "Set your location" msgstr "" -#: ../../include/conversation.php:1216 +#: ../../include/conversation.php:1213 msgid "Clear browser location" msgstr "" -#: ../../include/conversation.php:1264 +#: ../../include/conversation.php:1261 msgid "Tag term:" msgstr "" -#: ../../include/conversation.php:1265 +#: ../../include/conversation.php:1262 msgid "Where are you right now?" msgstr "" -#: ../../include/conversation.php:1270 +#: ../../include/conversation.php:1267 msgid "Choose a different album..." msgstr "" -#: ../../include/conversation.php:1274 +#: ../../include/conversation.php:1271 msgid "Comments enabled" msgstr "" -#: ../../include/conversation.php:1275 +#: ../../include/conversation.php:1272 msgid "Comments disabled" msgstr "" -<<<<<<< HEAD -#: ../../include/conversation.php:1313 +#: ../../include/conversation.php:1310 msgid "Page link name" msgstr "" -#: ../../include/conversation.php:1316 +#: ../../include/conversation.php:1313 msgid "Post as" msgstr "" -#: ../../include/conversation.php:1330 +#: ../../include/conversation.php:1327 msgid "Toggle voting" msgstr "" -#: ../../include/conversation.php:1333 +#: ../../include/conversation.php:1330 msgid "Disable comments" msgstr "" -#: ../../include/conversation.php:1334 +#: ../../include/conversation.php:1331 msgid "Toggle comments" msgstr "" -#: ../../include/conversation.php:1342 +#: ../../include/conversation.php:1339 msgid "Categories (optional, comma-separated list)" msgstr "" -#: ../../include/conversation.php:1365 +#: ../../include/conversation.php:1362 msgid "Other networks and post services" msgstr "" -#: ../../include/conversation.php:1371 +#: ../../include/conversation.php:1368 msgid "Set publish date" msgstr "" -#: ../../include/conversation.php:1625 +#: ../../include/conversation.php:1631 msgid "Discover" msgstr "" -#: ../../include/conversation.php:1628 +#: ../../include/conversation.php:1634 msgid "Imported public streams" msgstr "" -#: ../../include/conversation.php:1633 +#: ../../include/conversation.php:1639 msgid "Commented Order" msgstr "" -#: ../../include/conversation.php:1636 +#: ../../include/conversation.php:1642 msgid "Sort by Comment Date" msgstr "" -#: ../../include/conversation.php:1640 +#: ../../include/conversation.php:1646 msgid "Posted Order" msgstr "" -#: ../../include/conversation.php:1643 +#: ../../include/conversation.php:1649 msgid "Sort by Post Date" msgstr "" -#: ../../include/conversation.php:1651 +#: ../../include/conversation.php:1657 msgid "Posts that mention or involve you" msgstr "" -#: ../../include/conversation.php:1660 +#: ../../include/conversation.php:1666 msgid "Activity Stream - by date" msgstr "" -#: ../../include/conversation.php:1666 +#: ../../include/conversation.php:1672 msgid "Starred" msgstr "" -#: ../../include/conversation.php:1669 +#: ../../include/conversation.php:1675 msgid "Favourite Posts" msgstr "" -#: ../../include/conversation.php:1676 +#: ../../include/conversation.php:1682 msgid "Spam" msgstr "" -#: ../../include/conversation.php:1679 +#: ../../include/conversation.php:1685 msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1754 -msgid "Status Messages and Posts" -msgstr "" - -#: ../../include/conversation.php:1767 -msgid "Profile Details" -msgstr "" - -#: ../../include/conversation.php:1785 -msgid "Files and Storage" -msgstr "" - -#: ../../include/conversation.php:1821 -msgid "Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1824 -msgid "Saved Bookmarks" -msgstr "" - -#: ../../include/conversation.php:1835 -msgid "View Webpages" -msgstr "" - -#: ../../include/conversation.php:1904 +#: ../../include/conversation.php:1910 msgctxt "noun" msgid "Attending" msgid_plural "Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1907 +#: ../../include/conversation.php:1913 msgctxt "noun" msgid "Not Attending" msgid_plural "Not Attending" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1910 +#: ../../include/conversation.php:1916 msgctxt "noun" msgid "Undecided" msgid_plural "Undecided" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1913 +#: ../../include/conversation.php:1919 msgctxt "noun" msgid "Agree" msgid_plural "Agrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1916 +#: ../../include/conversation.php:1922 msgctxt "noun" msgid "Disagree" msgid_plural "Disagrees" msgstr[0] "" msgstr[1] "" -#: ../../include/conversation.php:1919 +#: ../../include/conversation.php:1925 msgctxt "noun" msgid "Abstain" msgid_plural "Abstains" @@ -14538,238 +12873,119 @@ msgstr "" #: ../../include/help.php:65 msgid "Not Found" -======= -#: ../../include/channel.php:1045 -msgid "Create New Profile" -msgstr "" - -#: ../../include/channel.php:1065 -msgid "Visible to everybody" msgstr "" -#: ../../include/channel.php:1138 ../../include/channel.php:1252 -msgid "Gender:" -msgstr "" - -#: ../../include/channel.php:1140 ../../include/channel.php:1307 -msgid "Homepage:" -msgstr "" - -#: ../../include/channel.php:1141 -msgid "Online Now" +#: ../../include/items.php:851 ../../include/items.php:903 +msgid "(Unknown)" msgstr "" -#: ../../include/channel.php:1257 -msgid "Like this channel" +#: ../../include/items.php:1087 +msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/channel.php:1281 -msgid "j F, Y" +#: ../../include/items.php:1089 +msgid "Visible to you only." msgstr "" -#: ../../include/channel.php:1282 -msgid "j F" +#: ../../include/items.php:1091 +msgid "Visible to anybody in this network." msgstr "" -#: ../../include/channel.php:1289 -msgid "Birthday:" +#: ../../include/items.php:1093 +msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/channel.php:1302 +#: ../../include/items.php:1095 #, php-format -msgid "for %1$d %2$s" -msgstr "" - -#: ../../include/channel.php:1305 -msgid "Sexual Preference:" -msgstr "" - -#: ../../include/channel.php:1311 -msgid "Tags:" -msgstr "" - -#: ../../include/channel.php:1313 -msgid "Political Views:" -msgstr "" - -#: ../../include/channel.php:1315 -msgid "Religion:" -msgstr "" - -#: ../../include/channel.php:1319 -msgid "Hobbies/Interests:" -msgstr "" - -#: ../../include/channel.php:1321 -msgid "Likes:" -msgstr "" - -#: ../../include/channel.php:1323 -msgid "Dislikes:" -msgstr "" - -#: ../../include/channel.php:1325 -msgid "Contact information and Social Networks:" -msgstr "" - -#: ../../include/channel.php:1327 -msgid "My other channels:" -msgstr "" - -#: ../../include/channel.php:1329 -msgid "Musical interests:" -msgstr "" - -#: ../../include/channel.php:1331 -msgid "Books, literature:" -msgstr "" - -#: ../../include/channel.php:1333 -msgid "Television:" -msgstr "" - -#: ../../include/channel.php:1335 -msgid "Film/dance/culture/entertainment:" +msgid "Visible to anybody on %s." msgstr "" -#: ../../include/channel.php:1337 -msgid "Love/Romance:" +#: ../../include/items.php:1097 +msgid "Visible to all connections." msgstr "" -#: ../../include/channel.php:1339 -msgid "Work/employment:" +#: ../../include/items.php:1099 +msgid "Visible to approved connections." msgstr "" -#: ../../include/channel.php:1341 -msgid "School/education:" +#: ../../include/items.php:1101 +msgid "Visible to specific connections." msgstr "" -#: ../../include/channel.php:1364 -msgid "Like this thing" +#: ../../include/items.php:3908 +msgid "Privacy group is empty." msgstr "" -#: ../../include/channel.php:2139 +#: ../../include/items.php:3915 #, php-format -msgid "User '%s' deleted" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../include/security.php:117 -msgid "guest:" -msgstr "" - -#: ../../include/security.php:532 -msgid "" -"The form security token was not correct. This probably happened because the " -"form has been opened for too long (>3 hours) before submitting it." -msgstr "" - -#: ../../include/message.php:30 -msgid "Unable to determine sender." -msgstr "" - -#: ../../include/message.php:67 -msgid "No recipient provided." -msgstr "" - -#: ../../include/message.php:72 -msgid "[no subject]" -msgstr "" - -#: ../../include/message.php:223 -msgid "Stored post could not be verified." -msgstr "" - -#: ../../include/network.php:776 -msgid "view full size" -msgstr "" - -<<<<<<< HEAD -#: ../../include/network.php:1490 -msgid "No Subject" -msgstr "" - -#: ../../include/network.php:1744 ../../include/network.php:1745 -msgid "Friendica" -msgstr "" - -#: ../../include/network.php:1746 -msgid "OStatus" -msgstr "" - -#: ../../include/network.php:1747 -msgid "GNU-Social" -msgstr "" - -#: ../../include/network.php:1748 -msgid "RSS/Atom" -msgstr "" - -#: ../../include/network.php:1750 -msgid "Diaspora" +msgid "Privacy group: %s" msgstr "" -#: ../../include/network.php:1751 -msgid "Facebook" +#: ../../include/items.php:3927 +msgid "Connection not found." msgstr "" -#: ../../include/network.php:1752 -msgid "Zot" +#: ../../include/items.php:4280 +msgid "profile photo" msgstr "" -#: ../../include/network.php:1753 -msgid "LinkedIn" +#: ../../include/items.php:4473 +#, php-format +msgid "[Edited %s]" msgstr "" -#: ../../include/network.php:1754 -msgid "XMPP/IM" +#: ../../include/items.php:4473 +msgctxt "edit_activity" +msgid "Post" msgstr "" -#: ../../include/network.php:1755 -======= -#: ../../include/network.php:2042 -msgid "No Subject" +#: ../../include/items.php:4473 +msgctxt "edit_activity" +msgid "Comment" msgstr "" -#: ../../include/network.php:2310 ../../include/network.php:2311 -msgid "Friendica" +#: ../../include/photos.php:111 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" msgstr "" -#: ../../include/network.php:2312 -msgid "OStatus" +#: ../../include/photos.php:118 +msgid "Image file is empty." msgstr "" -#: ../../include/network.php:2313 -msgid "GNU-Social" +#: ../../include/photos.php:257 +msgid "Photo storage failed." msgstr "" -#: ../../include/network.php:2314 -msgid "RSS/Atom" +#: ../../include/photos.php:297 +msgid "a new photo" msgstr "" -#: ../../include/network.php:2316 -msgid "Diaspora" +#: ../../include/photos.php:301 +#, php-format +msgctxt "photo_upload" +msgid "%1$s posted %2$s to %3$s" msgstr "" -#: ../../include/network.php:2317 -msgid "Facebook" +#: ../../include/photos.php:530 +msgid "Upload New Photos" msgstr "" -#: ../../include/network.php:2318 -msgid "Zot" +#: ../../include/zot.php:646 +msgid "Invalid data packet" msgstr "" -#: ../../include/network.php:2319 -msgid "LinkedIn" +#: ../../include/zot.php:662 +msgid "Unable to verify channel signature" msgstr "" -#: ../../include/network.php:2320 -msgid "XMPP/IM" +#: ../../include/zot.php:2310 +#, php-format +msgid "Unable to verify site signature for %s" msgstr "" -#: ../../include/network.php:2321 ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgid "MySpace" +#: ../../include/zot.php:3770 +msgid "invalid target signature" msgstr "" #: ../../include/acl_selectors.php:208 @@ -14824,775 +13040,354 @@ msgstr "" msgid "%1$s has an updated %2$s, changing %3$s." msgstr "" -#: ../../include/items.php:842 ../../include/items.php:889 -msgid "(Unknown)" -msgstr "" - -#: ../../include/items.php:1080 -msgid "Visible to anybody on the internet." -msgstr "" - -#: ../../include/items.php:1082 -msgid "Visible to you only." -msgstr "" - -#: ../../include/items.php:1084 -msgid "Visible to anybody in this network." -msgstr "" - -#: ../../include/items.php:1086 -msgid "Visible to anybody authenticated." -msgstr "" - -#: ../../include/items.php:1088 -#, php-format -msgid "Visible to anybody on %s." -msgstr "" - -#: ../../include/items.php:1090 -msgid "Visible to all connections." -msgstr "" - -#: ../../include/items.php:1092 -msgid "Visible to approved connections." -msgstr "" - -#: ../../include/items.php:1094 -msgid "Visible to specific connections." -msgstr "" - -#: ../../include/items.php:3863 -msgid "Privacy group is empty." -msgstr "" - -#: ../../include/items.php:3870 -#, php-format -msgid "Privacy group: %s" -msgstr "" - -#: ../../include/items.php:3882 -msgid "Connection not found." -msgstr "" - -#: ../../include/items.php:4231 -msgid "profile photo" -msgstr "" - -#: ../../include/items.php:4427 -#, php-format -msgid "[Edited %s]" -msgstr "" - -#: ../../include/items.php:4427 -msgctxt "edit_activity" -msgid "Post" -msgstr "" - -#: ../../include/items.php:4427 -msgctxt "edit_activity" -msgid "Comment" -msgstr "" - -#: ../../include/bbcode.php:134 ../../include/bbcode.php:1040 -#: ../../include/bbcode.php:1043 ../../include/bbcode.php:1048 -#: ../../include/bbcode.php:1051 ../../include/bbcode.php:1054 -#: ../../include/bbcode.php:1057 ../../include/bbcode.php:1062 -#: ../../include/bbcode.php:1065 ../../include/bbcode.php:1070 -#: ../../include/bbcode.php:1073 ../../include/bbcode.php:1076 -#: ../../include/bbcode.php:1079 -msgid "Image/photo" -msgstr "" - -#: ../../include/bbcode.php:173 ../../include/bbcode.php:1090 -msgid "Encrypted content" -msgstr "" - -#: ../../include/bbcode.php:189 -#, php-format -msgid "Install %s element: " -msgstr "" - -#: ../../include/bbcode.php:193 -#, php-format -msgid "" -"This post contains an installable %s element, however you lack permissions " -"to install it on this site." -msgstr "" - -#: ../../include/bbcode.php:272 -#, php-format -msgid "%1$s wrote the following %2$s %3$s" -msgstr "" - -#: ../../include/bbcode.php:349 ../../include/bbcode.php:357 -msgid "Click to open/close" -msgstr "" - -#: ../../include/bbcode.php:357 -msgid "spoiler" -msgstr "" - -#: ../../include/bbcode.php:1028 -msgid "$1 wrote:" -msgstr "" - -<<<<<<< HEAD -======= -#: ../../include/oembed.php:315 -msgid " by " -msgstr "" - -#: ../../include/oembed.php:316 -msgid " on " -msgstr "" - -#: ../../include/oembed.php:345 -msgid "Embedded content" -msgstr "" - -#: ../../include/oembed.php:354 -msgid "Embedding disabled" -msgstr "" - ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -#: ../../include/features.php:58 -msgid "General Features" -msgstr "" - -#: ../../include/features.php:63 -msgid "Multiple Profiles" -msgstr "" - -#: ../../include/features.php:64 -msgid "Ability to create multiple profiles" -msgstr "" - -#: ../../include/features.php:72 -msgid "Advanced Profiles" -msgstr "" - -#: ../../include/features.php:73 -msgid "Additional profile sections and selections" -msgstr "" - -#: ../../include/features.php:81 -msgid "Profile Import/Export" -msgstr "" - -#: ../../include/features.php:82 -msgid "Save and load profile details across sites/channels" -msgstr "" - -#: ../../include/features.php:90 -msgid "Web Pages" -msgstr "" - -#: ../../include/features.php:91 -msgid "Provide managed web pages on your channel" -msgstr "" - -#: ../../include/features.php:100 -msgid "Provide a wiki for your channel" -msgstr "" - -#: ../../include/features.php:117 -msgid "Private Notes" -msgstr "" - -#: ../../include/features.php:118 -msgid "Enables a tool to store notes and reminders (note: not encrypted)" -msgstr "" - -#: ../../include/features.php:126 -msgid "Navigation Channel Select" -msgstr "" - -#: ../../include/features.php:127 -msgid "Change channels directly from within the navigation dropdown menu" -msgstr "" - -#: ../../include/features.php:135 -msgid "Photo Location" -msgstr "" - -#: ../../include/features.php:136 -msgid "If location data is available on uploaded photos, link this to a map." -msgstr "" - -#: ../../include/features.php:144 -msgid "Access Controlled Chatrooms" -msgstr "" - -#: ../../include/features.php:145 -msgid "Provide chatrooms and chat services with access control." -msgstr "" - -#: ../../include/features.php:154 -msgid "Provide alternate connection permission roles." -msgstr "" - -#: ../../include/features.php:162 -msgid "Smart Birthdays" -msgstr "" - -#: ../../include/features.php:163 -msgid "" -"Make birthday events timezone aware in case your friends are scattered " -"across the planet." -msgstr "" - -#: ../../include/features.php:171 -msgid "Event Timezone Selection" -msgstr "" - -#: ../../include/features.php:172 -msgid "Allow event creation in timezones other than your own." +#: ../../include/dir_fns.php:141 +msgid "Directory Options" msgstr "" -#: ../../include/features.php:180 -msgid "Advanced Directory Search" +#: ../../include/dir_fns.php:143 +msgid "Safe Mode" msgstr "" -#: ../../include/features.php:181 -msgid "Allows creation of complex directory search queries" +#: ../../include/dir_fns.php:144 +msgid "Public Forums Only" msgstr "" -#: ../../include/features.php:189 -msgid "Advanced Theme and Layout Settings" +#: ../../include/dir_fns.php:145 +msgid "This Website Only" msgstr "" -#: ../../include/features.php:190 -msgid "Allows fine tuning of themes and page layouts" +#: ../../include/channel.php:33 +msgid "Unable to obtain identity information from database" msgstr "" -#: ../../include/features.php:200 -msgid "Post Composition Features" +#: ../../include/channel.php:68 +msgid "Empty name" msgstr "" -#: ../../include/features.php:204 -msgid "Large Photos" +#: ../../include/channel.php:71 +msgid "Name too long" msgstr "" -#: ../../include/features.php:205 -msgid "" -"Include large (1024px) photo thumbnails in posts. If not enabled, use small " -"(640px) photo thumbnails" +#: ../../include/channel.php:182 +msgid "No account identifier" msgstr "" -#: ../../include/features.php:214 -msgid "Automatically import channel content from other channels or feeds" +#: ../../include/channel.php:194 +msgid "Nickname is required." msgstr "" -#: ../../include/features.php:222 -msgid "Even More Encryption" +#: ../../include/channel.php:208 +msgid "Reserved nickname. Please choose another." msgstr "" -#: ../../include/features.php:223 +#: ../../include/channel.php:213 msgid "" -"Allow optional encryption of content end-to-end with a shared secret key" -msgstr "" - -#: ../../include/features.php:231 -msgid "Enable Voting Tools" -msgstr "" - -#: ../../include/features.php:232 -msgid "Provide a class of post which others can vote on" -msgstr "" - -#: ../../include/features.php:240 -msgid "Disable Comments" -msgstr "" - -#: ../../include/features.php:241 -msgid "Provide the option to disable comments for a post" -msgstr "" - -#: ../../include/features.php:249 -msgid "Delayed Posting" -msgstr "" - -#: ../../include/features.php:250 -msgid "Allow posts to be published at a later date" -msgstr "" - -#: ../../include/features.php:258 -msgid "Content Expiration" +"Nickname has unsupported characters or is already being used on this site." msgstr "" -#: ../../include/features.php:259 -msgid "Remove posts/comments and/or private messages at a future time" +#: ../../include/channel.php:272 +msgid "Unable to retrieve created identity" msgstr "" -#: ../../include/features.php:267 -msgid "Suppress Duplicate Posts/Comments" +#: ../../include/channel.php:344 +msgid "Default Profile" msgstr "" -#: ../../include/features.php:268 -msgid "" -"Prevent posts with identical content to be published with less than two " -"minutes in between submissions." +#: ../../include/channel.php:1060 +msgid "Create New Profile" msgstr "" -#: ../../include/features.php:279 -msgid "Network and Stream Filtering" +#: ../../include/channel.php:1080 +msgid "Visible to everybody" msgstr "" -#: ../../include/features.php:283 -msgid "Search by Date" +#: ../../include/channel.php:1153 ../../include/channel.php:1273 +msgid "Gender:" msgstr "" -#: ../../include/features.php:284 -msgid "Ability to select posts by date ranges" +#: ../../include/channel.php:1155 ../../include/channel.php:1328 +msgid "Homepage:" msgstr "" -#: ../../include/features.php:293 -msgid "Enable management and selection of privacy groups" +#: ../../include/channel.php:1156 +msgid "Online Now" msgstr "" -#: ../../include/features.php:302 -msgid "Save search terms for re-use" +#: ../../include/channel.php:1232 +msgid "Trans" msgstr "" -#: ../../include/features.php:310 -msgid "Network Personal Tab" +#: ../../include/channel.php:1278 +msgid "Like this channel" msgstr "" -#: ../../include/features.php:311 -msgid "Enable tab to display only Network posts that you've interacted on" +#: ../../include/channel.php:1302 +msgid "j F, Y" msgstr "" -#: ../../include/features.php:319 -msgid "Network New Tab" +#: ../../include/channel.php:1303 +msgid "j F" msgstr "" -#: ../../include/features.php:320 -msgid "Enable tab to display all new Network activity" +#: ../../include/channel.php:1310 +msgid "Birthday:" msgstr "" -#: ../../include/features.php:328 -msgid "Affinity Tool" +#: ../../include/channel.php:1323 +#, php-format +msgid "for %1$d %2$s" msgstr "" -#: ../../include/features.php:329 -msgid "Filter stream activity by depth of relationships" +#: ../../include/channel.php:1326 +msgid "Sexual Preference:" msgstr "" -#: ../../include/features.php:338 -msgid "Show friend and connection suggestions" +#: ../../include/channel.php:1332 +msgid "Tags:" msgstr "" -#: ../../include/features.php:346 -msgid "Connection Filtering" +#: ../../include/channel.php:1334 +msgid "Political Views:" msgstr "" -#: ../../include/features.php:347 -msgid "Filter incoming posts from connections based on keywords/content" +#: ../../include/channel.php:1336 +msgid "Religion:" msgstr "" -#: ../../include/features.php:359 -msgid "Post/Comment Tools" +#: ../../include/channel.php:1340 +msgid "Hobbies/Interests:" msgstr "" -#: ../../include/features.php:363 -msgid "Community Tagging" +#: ../../include/channel.php:1342 +msgid "Likes:" msgstr "" -#: ../../include/features.php:364 -msgid "Ability to tag existing posts" +#: ../../include/channel.php:1344 +msgid "Dislikes:" msgstr "" -#: ../../include/features.php:372 -msgid "Post Categories" +#: ../../include/channel.php:1346 +msgid "Contact information and Social Networks:" msgstr "" -<<<<<<< HEAD -#: ../../include/features.php:373 -msgid "Add categories to your posts" +#: ../../include/channel.php:1348 +msgid "My other channels:" msgstr "" -#: ../../include/features.php:381 -msgid "Emoji Reactions" +#: ../../include/channel.php:1350 +msgid "Musical interests:" msgstr "" -#: ../../include/features.php:382 -msgid "Add emoji reaction ability to posts" +#: ../../include/channel.php:1352 +msgid "Books, literature:" msgstr "" -#: ../../include/features.php:391 -msgid "Ability to file posts under folders" +#: ../../include/channel.php:1354 +msgid "Television:" msgstr "" -#: ../../include/features.php:399 -msgid "Dislike Posts" +#: ../../include/channel.php:1356 +msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/features.php:400 -msgid "Ability to dislike posts/comments" +#: ../../include/channel.php:1358 +msgid "Love/Romance:" msgstr "" -#: ../../include/features.php:408 -msgid "Star Posts" +#: ../../include/channel.php:1360 +msgid "Work/employment:" msgstr "" -#: ../../include/features.php:409 -msgid "Ability to mark special posts with a star indicator" +#: ../../include/channel.php:1362 +msgid "School/education:" msgstr "" -#: ../../include/features.php:417 -msgid "Tag Cloud" +#: ../../include/channel.php:1385 +msgid "Like this thing" msgstr "" -#: ../../include/features.php:418 -msgid "Provide a personal tag cloud on your channel page" +#: ../../include/channel.php:2154 +#, php-format +msgid "User '%s' deleted" msgstr "" -#: ../../include/features.php:430 -msgid "Premium Channel" +#: ../../include/security.php:117 +msgid "guest:" msgstr "" -#: ../../include/features.php:431 +#: ../../include/security.php:531 msgid "" -"Allows you to set restrictions and terms on those that connect with your " -"channel" -msgstr "" - -#: ../../include/follow.php:26 -msgid "Channel is blocked on this site." -msgstr "" - -#: ../../include/follow.php:31 -msgid "Channel location missing." -msgstr "" - -#: ../../include/follow.php:73 -msgid "Response from remote channel was incomplete." +"The form security token was not correct. This probably happened because the " +"form has been opened for too long (>3 hours) before submitting it." msgstr "" -#: ../../include/follow.php:90 -msgid "Channel was deleted and no longer exists." +#: ../../include/oembed.php:315 +msgid " by " msgstr "" -#: ../../include/follow.php:140 ../../include/follow.php:175 -msgid "Protocol disabled." +#: ../../include/oembed.php:316 +msgid " on " msgstr "" -#: ../../include/follow.php:163 -msgid "Channel discovery failed." +#: ../../include/oembed.php:345 +msgid "Embedded content" msgstr "" -#: ../../include/follow.php:202 -msgid "Cannot connect to yourself." +#: ../../include/oembed.php:354 +msgid "Embedding disabled" msgstr "" -#: ../../include/oembed.php:308 -msgid " by " +#: ../../include/message.php:40 +msgid "Unable to determine sender." msgstr "" -#: ../../include/oembed.php:309 -msgid " on " +#: ../../include/message.php:79 +msgid "No recipient provided." msgstr "" -#: ../../include/oembed.php:338 -msgid "Embedded content" +#: ../../include/message.php:84 +msgid "[no subject]" msgstr "" -#: ../../include/oembed.php:347 -msgid "Embedding disabled" +#: ../../include/message.php:214 +msgid "Stored post could not be verified." msgstr "" #: ../../util/nconfig.php:34 msgid "Source channel not found." msgstr "" -#: ../../view/theme/redbasic/php/config.php:9 +#: ../../view/theme/redbasic/php/config.php:16 +#: ../../view/theme/redbasic/php/config.php:19 msgid "Focus (Hubzilla default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:88 +#: ../../view/theme/redbasic/php/config.php:99 msgid "Theme settings" msgstr "" -#: ../../view/theme/redbasic/php/config.php:89 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:90 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:91 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:92 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:93 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:94 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:95 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Set the background color" -======= -#: ../../include/nav.php:92 -msgid "Remote authentication" -msgstr "" - -#: ../../include/nav.php:92 -msgid "Click to authenticate to your home hub" -msgstr "" - -#: ../../include/nav.php:103 ../../include/nav.php:127 -msgid "End this session" -msgstr "" - -#: ../../include/nav.php:106 -msgid "Your profile page" -msgstr "" - -#: ../../include/nav.php:109 -msgid "Manage/Edit profiles" -msgstr "" - -#: ../../include/nav.php:111 -msgid "Edit your profile" -msgstr "" - -#: ../../include/nav.php:117 -msgid "Sign in" -msgstr "" - -#: ../../include/nav.php:142 -msgid "Take me home" -msgstr "" - -#: ../../include/nav.php:144 -msgid "Log me out of this site" -msgstr "" - -#: ../../include/nav.php:149 -msgid "Create an account" -msgstr "" - -#: ../../include/nav.php:161 -msgid "Help and documentation" -msgstr "" - -#: ../../include/nav.php:164 -msgid "Search site @name, #tag, ?docs, content" -msgstr "" - -#: ../../include/nav.php:176 -msgid "Grid" -msgstr "" - -#: ../../include/nav.php:176 -msgid "Your grid" -msgstr "" - -#: ../../include/nav.php:177 -msgid "View your network/grid" -msgstr "" - -#: ../../include/nav.php:178 -msgid "Mark all grid notifications seen" -msgstr "" - -#: ../../include/nav.php:180 -msgid "Channel home" -msgstr "" - -#: ../../include/nav.php:181 -msgid "View your channel home" -msgstr "" - -#: ../../include/nav.php:182 -msgid "Mark all channel notifications seen" msgstr "" -#: ../../include/nav.php:188 -msgid "Notices" -msgstr "" - -#: ../../include/nav.php:188 -msgid "Notifications" -msgstr "" - -#: ../../include/nav.php:189 -msgid "View all notifications" -msgstr "" - -#: ../../include/nav.php:192 -msgid "Private mail" -msgstr "" - -#: ../../include/nav.php:193 -msgid "View your private messages" -msgstr "" - -#: ../../include/nav.php:194 -msgid "Mark all private messages seen" -msgstr "" - -#: ../../include/nav.php:200 -msgid "Event Calendar" -msgstr "" - -#: ../../include/nav.php:201 -msgid "View events" -msgstr "" - -#: ../../include/nav.php:202 -msgid "Mark all events seen" -msgstr "" - -#: ../../include/nav.php:205 -msgid "Manage Your Channels" -msgstr "" - -#: ../../include/nav.php:207 -msgid "Account/Channel Settings" -msgstr "" - -#: ../../include/nav.php:215 -msgid "Site Setup and Configuration" -msgstr "" - -#: ../../include/nav.php:277 -msgid "@name, #tag, ?doc, content" -msgstr "" - -#: ../../include/nav.php:278 -msgid "Please wait..." -msgstr "" - -#: ../../include/nav.php:280 -msgid "Add Apps" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../view/theme/redbasic/php/config.php:96 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:97 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:98 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:99 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Examples: 1rem, 100%, 16px" msgstr "" -<<<<<<< HEAD -#: ../../view/theme/redbasic/php/config.php:100 +#: ../../view/theme/redbasic/php/config.php:111 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:101 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Example: 4px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set maximum width of content region in pixel" -======= -#: ../../include/photos.php:533 -msgid "Upload New Photos" -msgstr "" - -#: ../../include/zot.php:646 -msgid "Invalid data packet" msgstr "" -#: ../../include/zot.php:662 -msgid "Unable to verify channel signature" -msgstr "" - -#: ../../include/zot.php:2313 -#, php-format -msgid "Unable to verify site signature for %s" -msgstr "" - -#: ../../include/zot.php:3764 -msgid "invalid target signature" ->>>>>>> 3645eb18f8b3a591ed6250a85d0e4805ed3615d1 -msgstr "" - -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Leave empty for default width" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Left align page content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set size of followup author photos" msgstr "" -#: ../../boot.php:1571 +#: ../../boot.php:1572 msgid "Create an account to access services and applications" msgstr "" -#: ../../boot.php:1593 +#: ../../boot.php:1594 msgid "Login/Email" msgstr "" -#: ../../boot.php:1594 +#: ../../boot.php:1595 msgid "Password" msgstr "" -#: ../../boot.php:1595 +#: ../../boot.php:1596 msgid "Remember me" msgstr "" -#: ../../boot.php:1598 +#: ../../boot.php:1599 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:2136 +#: ../../boot.php:2137 msgid "toggle mobile" msgstr "" -#: ../../boot.php:2289 +#: ../../boot.php:2290 #, php-format msgid "[$Projectname] Website SSL error for %s" msgstr "" -#: ../../boot.php:2294 +#: ../../boot.php:2295 msgid "Website SSL certificate is not valid. Please correct." msgstr "" -#: ../../boot.php:2413 +#: ../../boot.php:2414 #, php-format msgid "[$Projectname] Cron tasks not running on %s" msgstr "" -#: ../../boot.php:2418 +#: ../../boot.php:2419 msgid "Cron/Scheduled tasks not running." msgstr "" |