diff options
| -rwxr-xr-x | boot.php | 1 | ||||
| -rwxr-xr-x | include/items.php | 7 | ||||
| -rw-r--r-- | util/messages.po | 549 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 307 insertions, 252 deletions
@@ -562,6 +562,7 @@ define ( 'ITEM_BUILDBLOCK', 0x0100); // Named thusly to make sure nobody co define ( 'ITEM_PDL', 0x0200); // Page Description Language - e.g. Comanche define ( 'ITEM_BUG', 0x0400); // Is a bug, can be used by the internal bug tracker define ( 'ITEM_PENDING_REMOVE', 0x0800); // deleted, notification period has lapsed +define ( 'ITEM_DOC', 0x1000); // hubzilla only, define here so that item import does the right thing /** * Item Flags diff --git a/include/items.php b/include/items.php index 1009530a4..73ed64116 100755 --- a/include/items.php +++ b/include/items.php @@ -1198,12 +1198,15 @@ function encode_item($item,$mirror = false) { case 2: $x['item_restrict'] |= ITEM_PDL; break; - case 2: + case 3: $x['item_restrict'] |= ITEM_WEBPAGE; break; - case 2: + case 4: $x['item_restrict'] |= ITEM_BUG; break; + case 5: + $x['item_restrict'] |= ITEM_DOC; + break; default: break; } diff --git a/util/messages.po b/util/messages.po index c6c95dd42..81a7de2a7 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2015-06-26.1075\n" +"Project-Id-Version: 2015-07-03.1082\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2015-06-26 00:05-0700\n" +"POT-Creation-Date: 2015-07-03 00:04-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" @@ -305,7 +305,7 @@ msgid "remove from file" msgstr "" #: ../../include/text.php:1498 ../../include/text.php:1509 -#: ../../mod/connedit.php:661 +#: ../../mod/connedit.php:667 msgid "Click to open/close" msgstr "" @@ -333,7 +333,7 @@ msgstr "" msgid "Select an alternate language" msgstr "" -#: ../../include/text.php:1888 ../../include/diaspora.php:2101 +#: ../../include/text.php:1888 ../../include/diaspora.php:2115 #: ../../include/conversation.php:120 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 #: ../../mod/tagger.php:43 @@ -345,10 +345,9 @@ msgstr "" msgid "event" msgstr "" -#: ../../include/text.php:1894 ../../include/diaspora.php:2101 +#: ../../include/text.php:1894 ../../include/diaspora.php:2115 #: ../../include/conversation.php:148 ../../mod/like.php:346 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:51 msgid "status" msgstr "" @@ -398,30 +397,31 @@ msgstr "" msgid "Edit" msgstr "" -#: ../../include/diaspora.php:2130 ../../include/conversation.php:164 +#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 #: ../../mod/like.php:394 #, php-format msgid "%1$s likes %2$s's %3$s" msgstr "" -#: ../../include/diaspora.php:2476 +#: ../../include/diaspora.php:2490 msgid "Please choose" msgstr "" -#: ../../include/diaspora.php:2478 +#: ../../include/diaspora.php:2492 msgid "Agree" msgstr "" -#: ../../include/diaspora.php:2480 +#: ../../include/diaspora.php:2494 msgid "Disagree" msgstr "" -#: ../../include/diaspora.php:2482 +#: ../../include/diaspora.php:2496 msgid "Abstain" msgstr "" -#: ../../include/diaspora.php:2504 ../../include/diaspora.php:2515 -#: ../../include/enotify.php:59 ../../mod/p.php:46 +#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 +#: ../../include/network.php:1586 ../../include/enotify.php:59 +#: ../../mod/p.php:46 msgid "$projectname" msgstr "" @@ -438,11 +438,11 @@ msgstr "" msgid "No username found in import file." msgstr "" -#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:142 +#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156 msgid "Unable to create a unique channel address. Import failed." msgstr "" -#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:490 +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 msgid "Import completed." msgstr "" @@ -524,7 +524,7 @@ msgid "Registration request at %s" msgstr "" #: ../../include/account.php:314 ../../include/account.php:341 -#: ../../include/account.php:401 +#: ../../include/account.php:401 ../../include/network.php:1632 msgid "Administrator" msgstr "" @@ -752,8 +752,8 @@ msgid "Finishes:" msgstr "" #: ../../include/event.php:47 ../../include/bb2diaspora.php:481 -#: ../../include/identity.php:879 ../../mod/directory.php:296 -#: ../../mod/events.php:647 +#: ../../include/identity.php:879 ../../mod/events.php:647 +#: ../../mod/directory.php:295 msgid "Location:" msgstr "" @@ -835,7 +835,7 @@ msgstr "" #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 #: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941 #: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58 -#: ../../mod/import.php:520 ../../mod/chat.php:177 ../../mod/chat.php:211 +#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211 #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 #: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 @@ -846,9 +846,10 @@ msgstr "" #: ../../mod/settings.php:692 ../../mod/settings.php:718 #: ../../mod/settings.php:746 ../../mod/settings.php:769 #: ../../mod/settings.php:854 ../../mod/settings.php:1050 -#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:679 -#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/poll.php:68 -#: ../../mod/bulksetclose.php:24 ../../view/theme/apw/php/config.php:256 +#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:688 +#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/pconfig.php:108 +#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 +#: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/redbasic/php/config.php:99 msgid "Submit" msgstr "" @@ -1026,7 +1027,7 @@ msgstr "" #: ../../mod/blocks.php:155 ../../mod/photos.php:1062 #: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225 #: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113 -#: ../../mod/settings.php:651 ../../mod/connedit.php:543 +#: ../../mod/settings.php:651 ../../mod/connedit.php:549 msgid "Delete" msgstr "" @@ -1047,6 +1048,23 @@ msgstr "" msgid "view full size" msgstr "" +#: ../../include/network.php:1585 ../../include/enotify.php:58 +msgid "$Projectname Notification" +msgstr "" + +#: ../../include/network.php:1588 ../../include/enotify.php:61 +msgid "Thank You," +msgstr "" + +#: ../../include/network.php:1590 ../../include/enotify.php:63 +#, php-format +msgid "%s Administrator" +msgstr "" + +#: ../../include/network.php:1646 +msgid "No Subject" +msgstr "" + #: ../../include/features.php:38 msgid "General Features" msgstr "" @@ -1234,63 +1252,71 @@ msgid "Filter stream activity by depth of relationships" msgstr "" #: ../../include/features.php:74 -msgid "Suggest Channels" +msgid "Connection Filtering" msgstr "" #: ../../include/features.php:74 +msgid "Filter incoming posts from connections based on keywords/content" +msgstr "" + +#: ../../include/features.php:75 +msgid "Suggest Channels" +msgstr "" + +#: ../../include/features.php:75 msgid "Show channel suggestions" msgstr "" -#: ../../include/features.php:79 +#: ../../include/features.php:80 msgid "Post/Comment Tools" msgstr "" -#: ../../include/features.php:80 +#: ../../include/features.php:81 msgid "Tagging" msgstr "" -#: ../../include/features.php:80 +#: ../../include/features.php:81 msgid "Ability to tag existing posts" msgstr "" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Post Categories" msgstr "" -#: ../../include/features.php:81 +#: ../../include/features.php:82 msgid "Add categories to your posts" msgstr "" -#: ../../include/features.php:82 ../../include/widgets.php:304 +#: ../../include/features.php:83 ../../include/widgets.php:304 #: ../../include/contact_widgets.php:57 msgid "Saved Folders" msgstr "" -#: ../../include/features.php:82 +#: ../../include/features.php:83 msgid "Ability to file posts under folders" msgstr "" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Dislike Posts" msgstr "" -#: ../../include/features.php:83 +#: ../../include/features.php:84 msgid "Ability to dislike posts/comments" msgstr "" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Star Posts" msgstr "" -#: ../../include/features.php:84 +#: ../../include/features.php:85 msgid "Ability to mark special posts with a star indicator" msgstr "" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Tag Cloud" msgstr "" -#: ../../include/features.php:85 +#: ../../include/features.php:86 msgid "Provide a personal tag cloud on your channel page" msgstr "" @@ -1322,7 +1348,7 @@ msgstr "" #: ../../include/widgets.php:136 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../include/conversation.php:945 -#: ../../include/identity.php:828 ../../mod/directory.php:310 +#: ../../include/identity.php:828 ../../mod/directory.php:309 #: ../../mod/match.php:64 ../../mod/suggest.php:52 msgid "Connect" msgstr "" @@ -1373,11 +1399,11 @@ msgstr "" msgid "Archives" msgstr "" -#: ../../include/widgets.php:427 ../../mod/connedit.php:572 +#: ../../include/widgets.php:427 ../../mod/connedit.php:578 msgid "Me" msgstr "" -#: ../../include/widgets.php:428 ../../mod/connedit.php:573 +#: ../../include/widgets.php:428 ../../mod/connedit.php:579 msgid "Family" msgstr "" @@ -1386,16 +1412,16 @@ msgstr "" #: ../../include/profile_selectors.php:80 ../../mod/settings.php:345 #: ../../mod/settings.php:349 ../../mod/settings.php:350 #: ../../mod/settings.php:353 ../../mod/settings.php:364 -#: ../../mod/connedit.php:574 +#: ../../mod/connedit.php:580 msgid "Friends" msgstr "" -#: ../../include/widgets.php:430 ../../mod/connedit.php:575 +#: ../../include/widgets.php:430 ../../mod/connedit.php:581 msgid "Acquaintances" msgstr "" #: ../../include/widgets.php:431 ../../mod/connections.php:231 -#: ../../mod/connections.php:246 ../../mod/connedit.php:576 +#: ../../mod/connections.php:246 ../../mod/connedit.php:582 msgid "All" msgstr "" @@ -1431,7 +1457,7 @@ msgstr "" msgid "Export channel" msgstr "" -#: ../../include/widgets.php:530 ../../mod/connedit.php:653 +#: ../../include/widgets.php:530 ../../mod/connedit.php:659 msgid "Connection Default Permissions" msgstr "" @@ -1486,19 +1512,6 @@ msgstr "" msgid "Public Hubs" msgstr "" -#: ../../include/enotify.php:58 -msgid "$Projectname Notification" -msgstr "" - -#: ../../include/enotify.php:61 -msgid "Thank You," -msgstr "" - -#: ../../include/enotify.php:63 -#, php-format -msgid "%s Administrator" -msgstr "" - #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -2074,7 +2087,7 @@ msgid "Your posts and conversations" msgstr "" #: ../../include/nav.php:91 ../../include/conversation.php:942 -#: ../../mod/connedit.php:494 ../../mod/connedit.php:660 +#: ../../mod/connedit.php:500 ../../mod/connedit.php:666 msgid "View Profile" msgstr "" @@ -2987,47 +3000,47 @@ msgstr "" msgid "(Unknown)" msgstr "" -#: ../../include/items.php:1249 +#: ../../include/items.php:1304 msgid "Visible to anybody on the internet." msgstr "" -#: ../../include/items.php:1251 +#: ../../include/items.php:1306 msgid "Visible to you only." msgstr "" -#: ../../include/items.php:1253 +#: ../../include/items.php:1308 msgid "Visible to anybody in this network." msgstr "" -#: ../../include/items.php:1255 +#: ../../include/items.php:1310 msgid "Visible to anybody authenticated." msgstr "" -#: ../../include/items.php:1257 +#: ../../include/items.php:1312 #, php-format msgid "Visible to anybody on %s." msgstr "" -#: ../../include/items.php:1259 +#: ../../include/items.php:1314 msgid "Visible to all connections." msgstr "" -#: ../../include/items.php:1261 +#: ../../include/items.php:1316 msgid "Visible to approved connections." msgstr "" -#: ../../include/items.php:1263 +#: ../../include/items.php:1318 msgid "Visible to specific connections." msgstr "" -#: ../../include/items.php:4076 ../../mod/thing.php:74 +#: ../../include/items.php:4195 ../../mod/thing.php:74 #: ../../mod/display.php:36 ../../mod/filestorage.php:27 #: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1025 #: ../../mod/admin.php:1225 msgid "Item not found." msgstr "" -#: ../../include/items.php:4149 ../../include/attach.php:137 +#: ../../include/items.php:4268 ../../include/attach.php:137 #: ../../include/attach.php:184 ../../include/attach.php:247 #: ../../include/attach.php:261 ../../include/attach.php:305 #: ../../include/attach.php:319 ../../include/attach.php:350 @@ -3057,7 +3070,7 @@ msgstr "" #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 #: ../../mod/editblock.php:65 ../../mod/register.php:72 #: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16 -#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:331 +#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337 #: ../../mod/mail.php:114 ../../mod/notifications.php:66 #: ../../mod/regmod.php:17 ../../mod/new_channel.php:68 #: ../../mod/new_channel.php:99 ../../mod/appman.php:66 @@ -3070,26 +3083,26 @@ msgstr "" msgid "Permission denied." msgstr "" -#: ../../include/items.php:4551 ../../mod/group.php:38 ../../mod/group.php:140 +#: ../../include/items.php:4670 ../../mod/group.php:38 ../../mod/group.php:140 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" -#: ../../include/items.php:4567 +#: ../../include/items.php:4686 msgid "Collection is empty." msgstr "" -#: ../../include/items.php:4574 +#: ../../include/items.php:4693 #, php-format msgid "Collection: %s" msgstr "" -#: ../../include/items.php:4584 +#: ../../include/items.php:4703 #, php-format msgid "Connection: %s" msgstr "" -#: ../../include/items.php:4586 +#: ../../include/items.php:4705 msgid "Connection not found." msgstr "" @@ -3101,7 +3114,7 @@ msgstr "" msgid "Unable to verify channel signature" msgstr "" -#: ../../include/zot.php:2109 +#: ../../include/zot.php:2126 #, php-format msgid "Unable to verify site signature for %s" msgstr "" @@ -3153,12 +3166,12 @@ msgstr "" msgid "Examples: Robert Morgenstein, Fishing" msgstr "" -#: ../../include/contact_widgets.php:26 ../../mod/directory.php:373 -#: ../../mod/directory.php:378 ../../mod/connections.php:413 +#: ../../include/contact_widgets.php:26 ../../mod/connections.php:413 +#: ../../mod/directory.php:372 ../../mod/directory.php:377 msgid "Find" msgstr "" -#: ../../include/contact_widgets.php:27 ../../mod/directory.php:377 +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:376 #: ../../mod/suggest.php:60 msgid "Channel Suggestions" msgstr "" @@ -3416,7 +3429,7 @@ msgstr "" msgid "Birthday:" msgstr "" -#: ../../include/identity.php:1163 ../../mod/directory.php:291 +#: ../../include/identity.php:1163 ../../mod/directory.php:290 msgid "Age:" msgstr "" @@ -3429,7 +3442,7 @@ msgstr "" msgid "Sexual Preference:" msgstr "" -#: ../../include/identity.php:1179 ../../mod/directory.php:307 +#: ../../include/identity.php:1179 ../../mod/directory.php:306 #: ../../mod/profiles.php:693 msgid "Hometown:" msgstr "" @@ -3446,7 +3459,7 @@ msgstr "" msgid "Religion:" msgstr "" -#: ../../include/identity.php:1187 ../../mod/directory.php:309 +#: ../../include/identity.php:1187 ../../mod/directory.php:308 msgid "About:" msgstr "" @@ -3840,7 +3853,7 @@ msgstr "" msgid "%1$s wrote the following %2$s %3$s" msgstr "" -#: ../../include/bbcode.php:264 +#: ../../include/bbcode.php:264 ../../mod/tagger.php:51 msgid "post" msgstr "" @@ -3940,75 +3953,6 @@ msgstr "" msgid "Delegated Channels" msgstr "" -#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 -#: ../../mod/display.php:13 ../../mod/ratings.php:82 -#: ../../mod/viewconnections.php:17 -msgid "Public access denied." -msgstr "" - -#: ../../mod/directory.php:227 -#, php-format -msgid "%d rating" -msgid_plural "%d ratings" -msgstr[0] "" -msgstr[1] "" - -#: ../../mod/directory.php:238 -msgid "Gender: " -msgstr "" - -#: ../../mod/directory.php:240 -msgid "Status: " -msgstr "" - -#: ../../mod/directory.php:242 -msgid "Homepage: " -msgstr "" - -#: ../../mod/directory.php:302 ../../mod/events.php:645 -msgid "Description:" -msgstr "" - -#: ../../mod/directory.php:311 -msgid "Public Forum:" -msgstr "" - -#: ../../mod/directory.php:314 -msgid "Keywords: " -msgstr "" - -#: ../../mod/directory.php:317 -msgid "Don't suggest" -msgstr "" - -#: ../../mod/directory.php:319 -msgid "Common connections:" -msgstr "" - -#: ../../mod/directory.php:368 -msgid "Global Directory" -msgstr "" - -#: ../../mod/directory.php:368 -msgid "Local Directory" -msgstr "" - -#: ../../mod/directory.php:374 -msgid "Finding:" -msgstr "" - -#: ../../mod/directory.php:379 -msgid "next page" -msgstr "" - -#: ../../mod/directory.php:379 -msgid "previous page" -msgstr "" - -#: ../../mod/directory.php:395 -msgid "No entries (some entries may be hidden)." -msgstr "" - #: ../../mod/xchan.php:6 msgid "Xchan Lookup" msgstr "" @@ -4435,6 +4379,10 @@ msgid "" "global holidays." msgstr "" +#: ../../mod/events.php:645 ../../mod/directory.php:301 +msgid "Description:" +msgstr "" + #: ../../mod/events.php:649 msgid "Title:" msgstr "" @@ -4689,11 +4637,11 @@ msgstr "" msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:94 ../../mod/connedit.php:214 +#: ../../mod/connections.php:94 ../../mod/connedit.php:220 msgid "Connection updated." msgstr "" -#: ../../mod/connections.php:96 ../../mod/connedit.php:216 +#: ../../mod/connections.php:96 ../../mod/connedit.php:222 msgid "Failed to update connection record." msgstr "" @@ -4782,9 +4730,69 @@ msgstr "" msgid "Block Title" msgstr "" -#: ../../mod/tagger.php:96 +#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 +#: ../../mod/display.php:13 ../../mod/ratings.php:82 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "" + +#: ../../mod/directory.php:227 #, php-format -msgid "%1$s tagged %2$s's %3$s with %4$s" +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/directory.php:238 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:240 +msgid "Status: " +msgstr "" + +#: ../../mod/directory.php:242 +msgid "Homepage: " +msgstr "" + +#: ../../mod/directory.php:310 +msgid "Public Forum:" +msgstr "" + +#: ../../mod/directory.php:313 +msgid "Keywords: " +msgstr "" + +#: ../../mod/directory.php:316 +msgid "Don't suggest" +msgstr "" + +#: ../../mod/directory.php:318 +msgid "Common connections:" +msgstr "" + +#: ../../mod/directory.php:367 +msgid "Global Directory" +msgstr "" + +#: ../../mod/directory.php:367 +msgid "Local Directory" +msgstr "" + +#: ../../mod/directory.php:373 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:378 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:378 +msgid "previous page" +msgstr "" + +#: ../../mod/directory.php:394 +msgid "No entries (some entries may be hidden)." msgstr "" #: ../../mod/cloud.php:120 @@ -5041,55 +5049,64 @@ msgstr "" msgid "Imported file is empty." msgstr "" -#: ../../mod/import.php:121 +#: ../../mod/import.php:110 +msgid "The data provided is not compatible with this project." +msgstr "" + +#: ../../mod/import.php:115 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "" + +#: ../../mod/import.php:135 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/import.php:162 +#: ../../mod/import.php:176 msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/import.php:172 +#: ../../mod/import.php:186 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:502 +#: ../../mod/import.php:516 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:507 +#: ../../mod/import.php:521 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:508 +#: ../../mod/import.php:522 msgid "" "Use this form to import an existing channel from a different server/hub. You " "may retrieve the channel identity from the old server/hub via the network or " "provide an export file." msgstr "" -#: ../../mod/import.php:509 +#: ../../mod/import.php:523 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:510 +#: ../../mod/import.php:524 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:511 +#: ../../mod/import.php:525 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:512 +#: ../../mod/import.php:526 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:513 +#: ../../mod/import.php:527 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:514 +#: ../../mod/import.php:528 msgid "" "For either option, please choose whether to make this hub your new primary " "address, or whether your old location should continue this role. You will be " @@ -5097,16 +5114,16 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:515 +#: ../../mod/import.php:529 msgid "Make this hub my primary location" msgstr "" -#: ../../mod/import.php:516 +#: ../../mod/import.php:530 msgid "" "Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../mod/import.php:517 +#: ../../mod/import.php:531 msgid "" "This process may take several minutes to complete. Please submit the form " "only once and leave this page open until finished." @@ -5289,11 +5306,12 @@ msgstr "" msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../mod/rate.php:161 ../../mod/connedit.php:663 +#: ../../mod/rate.php:161 ../../mod/connedit.php:669 msgid "Rating (this information is public)" msgstr "" -#: ../../mod/rate.php:162 ../../mod/connedit.php:664 +#: ../../mod/rate.php:162 ../../mod/connedit.php:670 +#: ../../mod/connedit.php:674 msgid "Optionally explain your rating (this information is public)" msgstr "" @@ -6364,6 +6382,11 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" +#: ../../mod/tagger.php:96 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "" + #: ../../mod/uexport.php:33 ../../mod/uexport.php:34 msgid "Export Channel" msgstr "" @@ -6955,13 +6978,13 @@ msgstr "" msgid "Deny" msgstr "" -#: ../../mod/admin.php:827 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 +#: ../../mod/admin.php:827 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 msgid "Block" msgstr "" -#: ../../mod/admin.php:828 ../../mod/connedit.php:517 -#: ../../mod/connedit.php:720 +#: ../../mod/admin.php:828 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 msgid "Unblock" msgstr "" @@ -8155,161 +8178,174 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/connedit.php:262 +#: ../../mod/connedit.php:268 msgid "is now connected to" msgstr "" -#: ../../mod/connedit.php:375 +#: ../../mod/connedit.php:381 msgid "Could not access address book record." msgstr "" -#: ../../mod/connedit.php:389 +#: ../../mod/connedit.php:395 msgid "Refresh failed - channel is currently unavailable." msgstr "" -#: ../../mod/connedit.php:396 +#: ../../mod/connedit.php:402 msgid "Channel has been unblocked" msgstr "" -#: ../../mod/connedit.php:397 +#: ../../mod/connedit.php:403 msgid "Channel has been blocked" msgstr "" -#: ../../mod/connedit.php:401 ../../mod/connedit.php:413 -#: ../../mod/connedit.php:425 ../../mod/connedit.php:437 -#: ../../mod/connedit.php:453 +#: ../../mod/connedit.php:407 ../../mod/connedit.php:419 +#: ../../mod/connedit.php:431 ../../mod/connedit.php:443 +#: ../../mod/connedit.php:459 msgid "Unable to set address book parameters." msgstr "" -#: ../../mod/connedit.php:408 +#: ../../mod/connedit.php:414 msgid "Channel has been unignored" msgstr "" -#: ../../mod/connedit.php:409 +#: ../../mod/connedit.php:415 msgid "Channel has been ignored" msgstr "" -#: ../../mod/connedit.php:420 +#: ../../mod/connedit.php:426 msgid "Channel has been unarchived" msgstr "" -#: ../../mod/connedit.php:421 +#: ../../mod/connedit.php:427 msgid "Channel has been archived" msgstr "" -#: ../../mod/connedit.php:432 +#: ../../mod/connedit.php:438 msgid "Channel has been unhidden" msgstr "" -#: ../../mod/connedit.php:433 +#: ../../mod/connedit.php:439 msgid "Channel has been hidden" msgstr "" -#: ../../mod/connedit.php:448 +#: ../../mod/connedit.php:454 msgid "Channel has been approved" msgstr "" -#: ../../mod/connedit.php:449 +#: ../../mod/connedit.php:455 msgid "Channel has been unapproved" msgstr "" -#: ../../mod/connedit.php:477 +#: ../../mod/connedit.php:483 msgid "Connection has been removed." msgstr "" -#: ../../mod/connedit.php:497 +#: ../../mod/connedit.php:503 #, php-format msgid "View %s's profile" msgstr "" -#: ../../mod/connedit.php:501 +#: ../../mod/connedit.php:507 msgid "Refresh Permissions" msgstr "" -#: ../../mod/connedit.php:504 +#: ../../mod/connedit.php:510 msgid "Fetch updated permissions" msgstr "" -#: ../../mod/connedit.php:508 +#: ../../mod/connedit.php:514 msgid "Recent Activity" msgstr "" -#: ../../mod/connedit.php:511 +#: ../../mod/connedit.php:517 msgid "View recent posts and comments" msgstr "" -#: ../../mod/connedit.php:520 +#: ../../mod/connedit.php:526 msgid "Block (or Unblock) all communications with this connection" msgstr "" -#: ../../mod/connedit.php:524 ../../mod/connedit.php:721 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 msgid "Unignore" msgstr "" -#: ../../mod/connedit.php:524 ../../mod/connedit.php:721 +#: ../../mod/connedit.php:530 ../../mod/connedit.php:730 #: ../../mod/notifications.php:51 msgid "Ignore" msgstr "" -#: ../../mod/connedit.php:527 +#: ../../mod/connedit.php:533 msgid "Ignore (or Unignore) all inbound communications from this connection" msgstr "" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:536 msgid "Unarchive" msgstr "" -#: ../../mod/connedit.php:530 +#: ../../mod/connedit.php:536 msgid "Archive" msgstr "" -#: ../../mod/connedit.php:533 +#: ../../mod/connedit.php:539 msgid "" "Archive (or Unarchive) this connection - mark channel dead but keep content" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:542 msgid "Unhide" msgstr "" -#: ../../mod/connedit.php:536 +#: ../../mod/connedit.php:542 msgid "Hide" msgstr "" -#: ../../mod/connedit.php:539 +#: ../../mod/connedit.php:545 msgid "Hide or Unhide this connection from your other connections" msgstr "" -#: ../../mod/connedit.php:546 +#: ../../mod/connedit.php:552 msgid "Delete this connection" msgstr "" -#: ../../mod/connedit.php:637 ../../mod/connedit.php:675 +#: ../../mod/connedit.php:643 ../../mod/connedit.php:684 msgid "Approve this connection" msgstr "" -#: ../../mod/connedit.php:637 +#: ../../mod/connedit.php:643 msgid "Accept connection to allow communication" msgstr "" -#: ../../mod/connedit.php:653 +#: ../../mod/connedit.php:659 #, php-format msgid "Connections: settings for %s" msgstr "" -#: ../../mod/connedit.php:654 +#: ../../mod/connedit.php:660 msgid "Apply these permissions automatically" msgstr "" -#: ../../mod/connedit.php:658 +#: ../../mod/connedit.php:664 msgid "Apply the permissions indicated on this page to all new connections." msgstr "" -#: ../../mod/connedit.php:662 +#: ../../mod/connedit.php:668 msgid "Slide to adjust your degree of friendship" msgstr "" -#: ../../mod/connedit.php:671 +#: ../../mod/connedit.php:672 +msgid "Only import posts with this text" +msgstr "" + +#: ../../mod/connedit.php:672 ../../mod/connedit.php:673 +msgid "" +"words one per line or #tags or /patterns/, leave blank to import all posts" +msgstr "" + +#: ../../mod/connedit.php:673 +msgid "Do not import posts with this text" +msgstr "" + +#: ../../mod/connedit.php:680 msgid "" "Default permissions for your channel type have (just) been applied. They " "have not yet been submitted. Please review the permissions on this page and " @@ -8318,48 +8354,48 @@ msgid "" "install and apply the selected permissions." msgstr "" -#: ../../mod/connedit.php:674 +#: ../../mod/connedit.php:683 msgid "inherited" msgstr "" -#: ../../mod/connedit.php:677 +#: ../../mod/connedit.php:686 msgid "Connection has no individual permissions!" msgstr "" -#: ../../mod/connedit.php:678 +#: ../../mod/connedit.php:687 msgid "" "This may be appropriate based on your <a href=\"settings\">privacy settings</" "a>, though you may wish to review the \"Advanced Permissions\"." msgstr "" -#: ../../mod/connedit.php:680 +#: ../../mod/connedit.php:689 msgid "Profile Visibility" msgstr "" -#: ../../mod/connedit.php:681 +#: ../../mod/connedit.php:690 #, php-format msgid "" "Please choose the profile you would like to display to %s when viewing your " "profile securely." msgstr "" -#: ../../mod/connedit.php:682 +#: ../../mod/connedit.php:691 msgid "Contact Information / Notes" msgstr "" -#: ../../mod/connedit.php:683 +#: ../../mod/connedit.php:692 msgid "Edit contact notes" msgstr "" -#: ../../mod/connedit.php:685 +#: ../../mod/connedit.php:694 msgid "Their Settings" msgstr "" -#: ../../mod/connedit.php:686 +#: ../../mod/connedit.php:695 msgid "My Settings" msgstr "" -#: ../../mod/connedit.php:688 +#: ../../mod/connedit.php:697 msgid "" "Default permissions for this channel type have (just) been applied. They " "have <em>not</em> been saved and there are currently no stored default " @@ -8367,99 +8403,99 @@ msgid "" "finalize." msgstr "" -#: ../../mod/connedit.php:689 +#: ../../mod/connedit.php:698 msgid "Clear/Disable Automatic Permissions" msgstr "" -#: ../../mod/connedit.php:690 +#: ../../mod/connedit.php:699 msgid "Forum Members" msgstr "" -#: ../../mod/connedit.php:691 +#: ../../mod/connedit.php:700 msgid "Soapbox" msgstr "" -#: ../../mod/connedit.php:692 +#: ../../mod/connedit.php:701 msgid "Full Sharing (typical social network permissions)" msgstr "" -#: ../../mod/connedit.php:693 +#: ../../mod/connedit.php:702 msgid "Cautious Sharing " msgstr "" -#: ../../mod/connedit.php:694 +#: ../../mod/connedit.php:703 msgid "Follow Only" msgstr "" -#: ../../mod/connedit.php:695 +#: ../../mod/connedit.php:704 msgid "Individual Permissions" msgstr "" -#: ../../mod/connedit.php:696 +#: ../../mod/connedit.php:705 msgid "" "Some permissions may be inherited from your channel <a href=\"settings" "\">privacy settings</a>, which have higher priority than individual " "settings. Changing those inherited settings on this page will have no effect." msgstr "" -#: ../../mod/connedit.php:697 +#: ../../mod/connedit.php:706 msgid "Advanced Permissions" msgstr "" -#: ../../mod/connedit.php:698 +#: ../../mod/connedit.php:707 msgid "Simple Permissions (select one and submit)" msgstr "" -#: ../../mod/connedit.php:702 +#: ../../mod/connedit.php:711 #, php-format msgid "Visit %s's profile - %s" msgstr "" -#: ../../mod/connedit.php:703 +#: ../../mod/connedit.php:712 msgid "Block/Unblock contact" msgstr "" -#: ../../mod/connedit.php:704 +#: ../../mod/connedit.php:713 msgid "Ignore contact" msgstr "" -#: ../../mod/connedit.php:705 +#: ../../mod/connedit.php:714 msgid "Repair URL settings" msgstr "" -#: ../../mod/connedit.php:706 +#: ../../mod/connedit.php:715 msgid "View conversations" msgstr "" -#: ../../mod/connedit.php:708 +#: ../../mod/connedit.php:717 msgid "Delete contact" msgstr "" -#: ../../mod/connedit.php:712 +#: ../../mod/connedit.php:721 msgid "Last update:" msgstr "" -#: ../../mod/connedit.php:714 +#: ../../mod/connedit.php:723 msgid "Update public posts" msgstr "" -#: ../../mod/connedit.php:716 +#: ../../mod/connedit.php:725 msgid "Update now" msgstr "" -#: ../../mod/connedit.php:722 +#: ../../mod/connedit.php:731 msgid "Currently blocked" msgstr "" -#: ../../mod/connedit.php:723 +#: ../../mod/connedit.php:732 msgid "Currently ignored" msgstr "" -#: ../../mod/connedit.php:724 +#: ../../mod/connedit.php:733 msgid "Currently archived" msgstr "" -#: ../../mod/connedit.php:725 +#: ../../mod/connedit.php:734 msgid "Currently pending" msgstr "" @@ -8721,6 +8757,21 @@ msgstr "" msgid "Insufficient permissions. Request redirected to profile page." msgstr "" +#: ../../mod/pconfig.php:27 ../../mod/pconfig.php:60 +msgid "This setting requires special processing and editing has been blocked." +msgstr "" + +#: ../../mod/pconfig.php:49 +msgid "Configuration Editor" +msgstr "" + +#: ../../mod/pconfig.php:50 +msgid "" +"Warning: Changing some settings could render your channel inoperable. Please " +"leave this page unless you are comfortable with and knowledgeable about how " +"to correctly use this feature." +msgstr "" + #: ../../mod/suggest.php:35 msgid "" "No suggestions available. If this is a new site, please try again in 24 " diff --git a/version.inc b/version.inc index 92d861e4c..39bb632b7 100644 --- a/version.inc +++ b/version.inc @@ -1 +1 @@ -2015-07-02.1081 +2015-07-03.1082 |