diff options
| -rwxr-xr-x | boot.php | 2 | ||||
| -rwxr-xr-x | include/items.php | 1 | ||||
| -rw-r--r-- | util/messages.po | 713 | ||||
| -rw-r--r-- | version.inc | 2 |
4 files changed, 618 insertions, 100 deletions
@@ -535,7 +535,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 - // Don't make us evaluate this same item again. +define ( 'ITEM_DOC', 0x1000); // hubzilla only, define here so that item import does the right thing define ( 'ITEM_TYPE_POST', 0 ); define ( 'ITEM_TYPE_BLOCK', 1 ); diff --git a/include/items.php b/include/items.php index 6484baeae..5e584b09c 100755 --- a/include/items.php +++ b/include/items.php @@ -1231,7 +1231,6 @@ function encode_item($item,$mirror = false) { $x['item_delayed'] = $item['item_delayed']; $x['item_pending_remove'] = $item['item_pending_remove']; $x['item_blocked'] = $item['item_blocked']; - } diff --git a/util/messages.po b/util/messages.po index 8be9f4977..692012537 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,15 @@ #, fuzzy msgid "" msgstr "" +<<<<<<< HEAD "Project-Id-Version: 2015-05-29.1047\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2015-05-29 00:04-0700\n" +======= +"Project-Id-Version: 2015-07-03.1082\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2015-07-03 00:04-0700\n" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 "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 +311,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,8 +339,13 @@ msgstr "" msgid "Select an alternate language" msgstr "" +<<<<<<< HEAD #: ../../include/text.php:1888 ../../include/conversation.php:120 #: ../../include/diaspora.php:2082 ../../mod/like.php:346 +======= +#: ../../include/text.php:1888 ../../include/diaspora.php:2115 +#: ../../include/conversation.php:120 ../../mod/like.php:346 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 #: ../../mod/tagger.php:43 msgid "photo" @@ -345,10 +356,14 @@ msgstr "" msgid "event" msgstr "" +<<<<<<< HEAD #: ../../include/text.php:1894 ../../include/conversation.php:148 #: ../../include/diaspora.php:2082 ../../mod/like.php:346 +======= +#: ../../include/text.php:1894 ../../include/diaspora.php:2115 +#: ../../include/conversation.php:148 ../../mod/like.php:346 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/subthread.php:72 ../../mod/subthread.php:174 -#: ../../mod/tagger.php:51 msgid "status" msgstr "" @@ -395,15 +410,21 @@ msgstr "" msgid "Image/photo" msgstr "" +<<<<<<< HEAD #: ../../include/bbcode.php:161 ../../include/bbcode.php:811 msgid "Encrypted content" msgstr "" #: ../../include/bbcode.php:178 +======= +#: ../../include/diaspora.php:2144 ../../include/conversation.php:164 +#: ../../mod/like.php:394 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Install %s element: " msgstr "" +<<<<<<< HEAD #: ../../include/bbcode.php:188 ../../mod/impel.php:37 msgid "webpage" msgstr "" @@ -423,6 +444,28 @@ msgstr "" #: ../../include/bbcode.php:259 #, php-format msgid "%1$s wrote the following %2$s %3$s" +======= +#: ../../include/diaspora.php:2490 +msgid "Please choose" +msgstr "" + +#: ../../include/diaspora.php:2492 +msgid "Agree" +msgstr "" + +#: ../../include/diaspora.php:2494 +msgid "Disagree" +msgstr "" + +#: ../../include/diaspora.php:2496 +msgid "Abstain" +msgstr "" + +#: ../../include/diaspora.php:2518 ../../include/diaspora.php:2529 +#: ../../include/network.php:1586 ../../include/enotify.php:59 +#: ../../mod/p.php:46 +msgid "$projectname" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../include/bbcode.php:261 @@ -441,6 +484,7 @@ msgstr "" msgid "$1 wrote:" msgstr "" +<<<<<<< HEAD #: ../../include/notify.php:23 msgid "created a new post" msgstr "" @@ -448,6 +492,14 @@ msgstr "" #: ../../include/notify.php:24 #, php-format msgid "commented on %s's post" +======= +#: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156 +msgid "Unable to create a unique channel address. Import failed." +msgstr "" + +#: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 +msgid "Import completed." +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../include/group.php:26 @@ -528,7 +580,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 "" @@ -768,9 +820,15 @@ msgstr "" msgid "Finishes:" msgstr "" +<<<<<<< HEAD #: ../../include/event.php:47 ../../include/bb2diaspora.php:473 #: ../../include/identity.php:875 ../../mod/events.php:647 #: ../../mod/directory.php:234 +======= +#: ../../include/event.php:47 ../../include/bb2diaspora.php:481 +#: ../../include/identity.php:879 ../../mod/events.php:647 +#: ../../mod/directory.php:295 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Location:" msgstr "" @@ -848,6 +906,7 @@ msgid "Describe (optional)" msgstr "" #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668 +<<<<<<< HEAD #: ../../mod/settings.php:587 ../../mod/settings.php:689 #: ../../mod/settings.php:715 ../../mod/settings.php:743 #: ../../mod/settings.php:766 ../../mod/settings.php:848 @@ -867,6 +926,28 @@ msgstr "" #: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 #: ../../view/theme/apw/php/config.php:256 #: ../../view/theme/redbasic/php/config.php:97 +======= +#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275 +#: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 +#: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941 +#: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58 +#: ../../mod/import.php:534 ../../mod/chat.php:177 ../../mod/chat.php:211 +#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 +#: ../../mod/sources.php:104 ../../mod/sources.php:138 +#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 +#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327 +#: ../../mod/setup.php:367 ../../mod/admin.php:453 ../../mod/admin.php:819 +#: ../../mod/admin.php:986 ../../mod/admin.php:1118 ../../mod/admin.php:1312 +#: ../../mod/admin.php:1397 ../../mod/settings.php:588 +#: ../../mod/settings.php:692 ../../mod/settings.php:718 +#: ../../mod/settings.php:746 ../../mod/settings.php:769 +#: ../../mod/settings.php:854 ../../mod/settings.php:1050 +#: ../../mod/mitem.php:237 ../../mod/mood.php:134 ../../mod/connedit.php:688 +#: ../../mod/mail.php:355 ../../mod/appman.php:99 ../../mod/pconfig.php:108 +#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 +#: ../../view/theme/apw/php/config.php:256 +#: ../../view/theme/redbasic/php/config.php:99 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Submit" msgstr "" @@ -1039,12 +1120,20 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120 #: ../../include/conversation.php:660 ../../include/apps.php:255 +<<<<<<< HEAD #: ../../mod/settings.php:650 ../../mod/webpages.php:182 #: ../../mod/thing.php:228 ../../mod/group.php:176 ../../mod/blocks.php:155 #: ../../mod/photos.php:1050 ../../mod/editlayout.php:107 #: ../../mod/editwebpage.php:225 ../../mod/admin.php:817 #: ../../mod/admin.php:979 ../../mod/editblock.php:113 #: ../../mod/connedit.php:543 +======= +#: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176 +#: ../../mod/blocks.php:155 ../../mod/photos.php:1062 +#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225 +#: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113 +#: ../../mod/settings.php:651 ../../mod/connedit.php:549 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Delete" msgstr "" @@ -1065,6 +1154,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 "" @@ -1252,63 +1358,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 "" @@ -1340,8 +1454,13 @@ msgstr "" #: ../../include/widgets.php:136 ../../include/widgets.php:175 #: ../../include/Contact.php:107 ../../include/conversation.php:945 +<<<<<<< HEAD #: ../../include/identity.php:824 ../../mod/match.php:64 #: ../../mod/directory.php:302 ../../mod/suggest.php:52 +======= +#: ../../include/identity.php:828 ../../mod/directory.php:309 +#: ../../mod/match.php:64 ../../mod/suggest.php:52 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Connect" msgstr "" @@ -1391,29 +1510,36 @@ 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 "" #: ../../include/widgets.php:429 ../../include/identity.php:394 #: ../../include/identity.php:395 ../../include/identity.php:402 +<<<<<<< HEAD #: ../../include/profile_selectors.php:80 ../../mod/settings.php:344 #: ../../mod/settings.php:348 ../../mod/settings.php:349 #: ../../mod/settings.php:352 ../../mod/settings.php:363 #: ../../mod/connedit.php:574 +======= +#: ../../include/profile_selectors.php:80 ../../mod/settings.php:345 +#: ../../mod/settings.php:349 ../../mod/settings.php:350 +#: ../../mod/settings.php:353 ../../mod/settings.php:364 +#: ../../mod/connedit.php:580 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 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 "" @@ -1449,7 +1575,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 "" @@ -1504,6 +1630,7 @@ msgstr "" msgid "Public Hubs" msgstr "" +<<<<<<< HEAD #: ../../include/enotify.php:58 msgid "$Projectname Notification" msgstr "" @@ -1522,6 +1649,8 @@ msgstr "" msgid "%s Administrator" msgstr "" +======= +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -2093,7 +2222,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 "" @@ -3013,6 +3142,7 @@ msgstr "" msgid "(Unknown)" msgstr "" +<<<<<<< HEAD #: ../../include/items.php:1234 msgid "Visible to anybody on the internet." msgstr "" @@ -3030,10 +3160,30 @@ msgid "Visible to anybody authenticated." msgstr "" #: ../../include/items.php:1242 +======= +#: ../../include/items.php:1304 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1306 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1308 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1310 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1312 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Visible to anybody on %s." msgstr "" +<<<<<<< HEAD #: ../../include/items.php:1244 msgid "Visible to all connections." msgstr "" @@ -3047,18 +3197,42 @@ msgid "Visible to specific connections." msgstr "" #: ../../include/items.php:4060 ../../mod/thing.php:74 +======= +#: ../../include/items.php:1314 +msgid "Visible to all connections." +msgstr "" + +#: ../../include/items.php:1316 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1318 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:4195 ../../mod/thing.php:74 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/display.php:36 ../../mod/filestorage.php:27 #: ../../mod/viewsrc.php:20 ../../mod/admin.php:167 ../../mod/admin.php:1016 #: ../../mod/admin.php:1216 msgid "Item not found." msgstr "" +<<<<<<< HEAD #: ../../include/items.php:4133 ../../include/photos.php:26 #: ../../include/attach.php:137 ../../include/attach.php:184 #: ../../include/attach.php:247 ../../include/attach.php:261 #: ../../include/attach.php:305 ../../include/attach.php:319 #: ../../include/attach.php:350 ../../include/attach.php:546 #: ../../include/attach.php:618 ../../include/chat.php:131 +======= +#: ../../include/items.php:4268 ../../include/attach.php:137 +#: ../../include/attach.php:184 ../../include/attach.php:247 +#: ../../include/attach.php:261 ../../include/attach.php:305 +#: ../../include/attach.php:319 ../../include/attach.php:350 +#: ../../include/attach.php:546 ../../include/attach.php:618 +#: ../../include/chat.php:131 ../../include/photos.php:26 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/profile.php:64 ../../mod/profile.php:72 #: ../../mod/achievements.php:30 ../../mod/manage.php:6 #: ../../mod/settings.php:569 ../../mod/api.php:26 ../../mod/api.php:31 @@ -3080,6 +3254,7 @@ msgstr "" #: ../../mod/fsuggest.php:78 ../../mod/poke.php:128 ../../mod/profiles.php:188 #: ../../mod/profiles.php:576 ../../mod/viewsrc.php:14 ../../mod/setup.php:223 #: ../../mod/viewconnections.php:22 ../../mod/viewconnections.php:27 +<<<<<<< HEAD #: ../../mod/editblock.php:65 ../../mod/register.php:72 ../../mod/item.php:206 #: ../../mod/item.php:214 ../../mod/item.php:974 ../../mod/layouts.php:69 #: ../../mod/layouts.php:76 ../../mod/layouts.php:87 ../../mod/id.php:71 @@ -3096,25 +3271,59 @@ msgid "Permission denied." msgstr "" #: ../../include/items.php:4535 ../../mod/group.php:38 ../../mod/group.php:140 +======= +#: ../../mod/editblock.php:65 ../../mod/register.php:72 +#: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16 +#: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337 +#: ../../mod/mail.php:114 ../../mod/notifications.php:66 +#: ../../mod/regmod.php:17 ../../mod/new_channel.php:68 +#: ../../mod/new_channel.php:99 ../../mod/appman.php:66 +#: ../../mod/layouts.php:69 ../../mod/layouts.php:76 ../../mod/layouts.php:87 +#: ../../mod/page.php:31 ../../mod/page.php:86 ../../mod/bookmarks.php:46 +#: ../../mod/channel.php:100 ../../mod/channel.php:219 +#: ../../mod/channel.php:262 ../../mod/suggest.php:26 +#: ../../mod/service_limits.php:7 ../../mod/sharedwithme.php:7 +#: ../../index.php:182 ../../index.php:382 +msgid "Permission denied." +msgstr "" + +#: ../../include/items.php:4670 ../../mod/group.php:38 ../../mod/group.php:140 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/bulksetclose.php:51 msgid "Collection not found." msgstr "" +<<<<<<< HEAD #: ../../include/items.php:4551 msgid "Collection is empty." msgstr "" #: ../../include/items.php:4558 +======= +#: ../../include/items.php:4686 +msgid "Collection is empty." +msgstr "" + +#: ../../include/items.php:4693 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Collection: %s" msgstr "" +<<<<<<< HEAD #: ../../include/items.php:4568 +======= +#: ../../include/items.php:4703 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #, php-format msgid "Connection: %s" msgstr "" +<<<<<<< HEAD #: ../../include/items.php:4570 +======= +#: ../../include/items.php:4705 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Connection not found." msgstr "" @@ -3147,7 +3356,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 "" @@ -3200,11 +3409,19 @@ msgid "Examples: Robert Morgenstein, Fishing" msgstr "" #: ../../include/contact_widgets.php:26 ../../mod/connections.php:413 +<<<<<<< HEAD #: ../../mod/directory.php:362 ../../mod/directory.php:367 msgid "Find" msgstr "" #: ../../include/contact_widgets.php:27 ../../mod/directory.php:366 +======= +#: ../../mod/directory.php:372 ../../mod/directory.php:377 +msgid "Find" +msgstr "" + +#: ../../include/contact_widgets.php:27 ../../mod/directory.php:376 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../mod/suggest.php:60 msgid "Channel Suggestions" msgstr "" @@ -3462,7 +3679,11 @@ msgstr "" msgid "Birthday:" msgstr "" +<<<<<<< HEAD #: ../../include/identity.php:1159 +======= +#: ../../include/identity.php:1163 ../../mod/directory.php:290 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Age:" msgstr "" @@ -3475,7 +3696,12 @@ msgstr "" msgid "Sexual Preference:" msgstr "" +<<<<<<< HEAD #: ../../include/identity.php:1175 ../../mod/profiles.php:693 +======= +#: ../../include/identity.php:1179 ../../mod/directory.php:306 +#: ../../mod/profiles.php:693 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Hometown:" msgstr "" @@ -3491,7 +3717,11 @@ msgstr "" msgid "Religion:" msgstr "" +<<<<<<< HEAD #: ../../include/identity.php:1183 +======= +#: ../../include/identity.php:1187 ../../mod/directory.php:308 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "About:" msgstr "" @@ -3841,6 +4071,69 @@ msgstr "" msgid "Purchase" msgstr "" +<<<<<<< HEAD +======= +#: ../../include/bbcode.php:122 ../../include/bbcode.php:764 +#: ../../include/bbcode.php:767 ../../include/bbcode.php:772 +#: ../../include/bbcode.php:775 ../../include/bbcode.php:778 +#: ../../include/bbcode.php:781 ../../include/bbcode.php:786 +#: ../../include/bbcode.php:789 ../../include/bbcode.php:794 +#: ../../include/bbcode.php:797 ../../include/bbcode.php:800 +#: ../../include/bbcode.php:803 +msgid "Image/photo" +msgstr "" + +#: ../../include/bbcode.php:161 ../../include/bbcode.php:814 +msgid "Encrypted content" +msgstr "" + +#: ../../include/bbcode.php:178 +#, php-format +msgid "Install %s element: " +msgstr "" + +#: ../../include/bbcode.php:188 ../../mod/impel.php:37 +msgid "webpage" +msgstr "" + +#: ../../include/bbcode.php:191 ../../mod/impel.php:47 +msgid "layout" +msgstr "" + +#: ../../include/bbcode.php:194 ../../mod/impel.php:42 +msgid "block" +msgstr "" + +#: ../../include/bbcode.php:197 ../../mod/impel.php:54 +msgid "menu" +msgstr "" + +#: ../../include/bbcode.php:211 +msgid "QR code" +msgstr "" + +#: ../../include/bbcode.php:262 +#, php-format +msgid "%1$s wrote the following %2$s %3$s" +msgstr "" + +#: ../../include/bbcode.php:264 ../../mod/tagger.php:51 +msgid "post" +msgstr "" + +#: ../../include/bbcode.php:514 +msgid "Different viewers will see this text differently" +msgstr "" + +#: ../../include/bbcode.php:725 +msgid "$1 spoiler" +msgstr "" + +#: ../../include/bbcode.php:752 +msgid "$1 wrote:" +msgstr "" + +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../include/chat.php:23 msgid "Missing room name" msgstr "" @@ -3920,6 +4213,7 @@ msgstr "" msgid "Delegated Channels" msgstr "" +<<<<<<< HEAD #: ../../mod/settings.php:76 msgid "Name is required" msgstr "" @@ -3995,6 +4289,10 @@ msgstr "" #: ../../mod/settings.php:590 ../../mod/settings.php:591 msgid "Automatically generated - change if desired. Max length 20" +======= +#: ../../mod/xchan.php:6 +msgid "Xchan Lookup" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/settings.php:591 ../../mod/settings.php:617 @@ -4389,8 +4687,17 @@ msgstr "" msgid "Your connections are confirmed" msgstr "" +<<<<<<< HEAD #: ../../mod/settings.php:1098 msgid "Someone writes on your profile wall" +======= +#: ../../mod/events.php:645 ../../mod/directory.php:301 +msgid "Description:" +msgstr "" + +#: ../../mod/events.php:649 +msgid "Title:" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/settings.php:1099 @@ -4647,12 +4954,21 @@ msgstr "" msgid "Post an activity" msgstr "" +<<<<<<< HEAD #: ../../mod/thing.php:267 ../../mod/thing.php:313 msgid "Only sends to viewers of the applicable profile" msgstr "" #: ../../mod/thing.php:269 ../../mod/thing.php:315 msgid "Name of thing e.g. something" +======= +#: ../../mod/connections.php:94 ../../mod/connedit.php:220 +msgid "Connection updated." +msgstr "" + +#: ../../mod/connections.php:96 ../../mod/connedit.php:222 +msgid "Failed to update connection record." +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/thing.php:271 ../../mod/thing.php:316 @@ -4744,8 +5060,74 @@ msgstr "" msgid "Done Editing" msgstr "" +<<<<<<< HEAD #: ../../mod/profile_photo.php:428 msgid "Image uploaded successfully." +======= +#: ../../mod/directory.php:48 ../../mod/photos.php:441 ../../mod/search.php:13 +#: ../../mod/display.php:13 ../../mod/ratings.php:82 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +msgstr "" + +#: ../../mod/directory.php:227 +#, php-format +msgid "%d rating" +msgid_plural "%d ratings" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/directory.php:238 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:240 +msgid "Status: " +msgstr "" + +#: ../../mod/directory.php:242 +msgid "Homepage: " +msgstr "" + +#: ../../mod/directory.php:310 +msgid "Public Forum:" +msgstr "" + +#: ../../mod/directory.php:313 +msgid "Keywords: " +msgstr "" + +#: ../../mod/directory.php:316 +msgid "Don't suggest" +msgstr "" + +#: ../../mod/directory.php:318 +msgid "Common connections:" +msgstr "" + +#: ../../mod/directory.php:367 +msgid "Global Directory" +msgstr "" + +#: ../../mod/directory.php:367 +msgid "Local Directory" +msgstr "" + +#: ../../mod/directory.php:373 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:378 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:378 +msgid "previous page" +msgstr "" + +#: ../../mod/directory.php:394 +msgid "No entries (some entries may be hidden)." +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/profile_photo.php:430 @@ -5014,6 +5396,7 @@ msgstr "" msgid "Collection Name: " msgstr "" +<<<<<<< HEAD #: ../../mod/group.php:89 ../../mod/group.php:186 msgid "Members are visible to other channels" msgstr "" @@ -5074,6 +5457,83 @@ msgid "Running at web location" msgstr "" #: ../../mod/siteinfo.php:164 +======= +#: ../../mod/import.php:110 +msgid "The data provided is not compatible with this project." +msgstr "" + +#: ../../mod/import.php:115 +#, php-format +msgid "Warning: Database versions differ by %1$d updates." +msgstr "" + +#: ../../mod/import.php:135 +msgid "" +"Cannot create a duplicate channel identifier on this system. Import failed." +msgstr "" + +#: ../../mod/import.php:176 +msgid "Channel clone failed. Import failed." +msgstr "" + +#: ../../mod/import.php:186 +msgid "Cloned channel not found. Import failed." +msgstr "" + +#: ../../mod/import.php:516 +msgid "You must be logged in to use this feature." +msgstr "" + +#: ../../mod/import.php:521 +msgid "Import Channel" +msgstr "" + +#: ../../mod/import.php:522 +msgid "" +"Use this form to import an existing channel from a different server/hub. You " +"may retrieve the channel identity from the old server/hub via the network or " +"provide an export file." +msgstr "" + +#: ../../mod/import.php:523 +msgid "File to Upload" +msgstr "" + +#: ../../mod/import.php:524 +msgid "Or provide the old server/hub details" +msgstr "" + +#: ../../mod/import.php:525 +msgid "Your old identity address (xyz@example.com)" +msgstr "" + +#: ../../mod/import.php:526 +msgid "Your old login email address" +msgstr "" + +#: ../../mod/import.php:527 +msgid "Your old login password" +msgstr "" + +#: ../../mod/import.php:528 +msgid "" +"For either option, please choose whether to make this hub your new primary " +"address, or whether your old location should continue this role. You will be " +"able to post from either location, but only one can be marked as the primary " +"location for files, photos, and media." +msgstr "" + +#: ../../mod/import.php:529 +msgid "Make this hub my primary location" +msgstr "" + +#: ../../mod/import.php:530 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" +msgstr "" + +#: ../../mod/import.php:531 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "" "Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " "about $Projectname." @@ -5238,6 +5698,7 @@ msgstr "" msgid "Delete Album" msgstr "" +<<<<<<< HEAD #: ../../mod/photos.php:159 ../../mod/photos.php:930 msgid "Delete Photo" msgstr "" @@ -5246,6 +5707,15 @@ msgstr "" #: ../../mod/ratings.php:82 ../../mod/directory.php:47 #: ../../mod/viewconnections.php:17 msgid "Public access denied." +======= +#: ../../mod/rate.php:161 ../../mod/connedit.php:669 +msgid "Rating (this information is public)" +msgstr "" + +#: ../../mod/rate.php:162 ../../mod/connedit.php:670 +#: ../../mod/connedit.php:674 +msgid "Optionally explain your rating (this information is public)" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/photos.php:440 @@ -6248,8 +6718,18 @@ msgstr "" msgid "Title/Description:" msgstr "" +<<<<<<< HEAD #: ../../mod/profiles.php:680 msgid "Your Gender:" +======= +#: ../../mod/tagger.php:96 +#, php-format +msgid "%1$s tagged %2$s's %3$s with %4$s" +msgstr "" + +#: ../../mod/uexport.php:33 ../../mod/uexport.php:34 +msgid "Export Channel" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/profiles.php:681 @@ -6846,6 +7326,7 @@ msgstr "" msgid "Public Forum:" msgstr "" +<<<<<<< HEAD #: ../../mod/directory.php:306 msgid "Keywords: " msgstr "" @@ -6853,6 +7334,16 @@ msgstr "" #: ../../mod/directory.php:311 #, php-format msgid "Common connections: %s" +======= +#: ../../mod/admin.php:827 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 +msgid "Block" +msgstr "" + +#: ../../mod/admin.php:828 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 +msgid "Unblock" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../mod/directory.php:363 @@ -8084,161 +8575,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 " @@ -8247,48 +8751,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 " @@ -8296,99 +8800,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 "" @@ -8661,6 +9165,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 |