diff options
Diffstat (limited to 'util/messages.po')
| -rw-r--r-- | util/messages.po | 2854 |
1 files changed, 1631 insertions, 1223 deletions
diff --git a/util/messages.po b/util/messages.po index 81a7de2a7..692012537 100644 --- a/util/messages.po +++ b/util/messages.po @@ -1,14 +1,20 @@ -# Red Matrix Project -# Copyright (C) 2012-2014 the Red Matrix Project +# Hubzilla Project +# Copyright (C) 2012-2014 the Hubzilla Project # This file is distributed under the same license as the Red package. # Mike Macgirvin, 2012 # #, fuzzy msgid "" msgstr "" +<<<<<<< HEAD +"Project-Id-Version: 2015-05-29.1047\n" +"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" @@ -24,7 +30,7 @@ msgstr "" #: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424 -#: ../../mod/photos.php:92 ../../mod/photos.php:637 +#: ../../mod/photos.php:91 ../../mod/photos.php:625 msgid "Profile Photos" msgstr "" @@ -75,8 +81,8 @@ msgstr "" #: ../../include/text.php:919 ../../include/text.php:931 #: ../../include/widgets.php:192 ../../mod/rbmark.php:28 -#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1457 -#: ../../mod/admin.php:1477 +#: ../../mod/rbmark.php:98 ../../mod/filer.php:50 ../../mod/admin.php:1448 +#: ../../mod/admin.php:1468 msgid "Save" 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,8 +356,13 @@ 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 msgid "status" msgstr "" @@ -384,25 +400,51 @@ msgstr "" msgid "Collection" msgstr "" -#: ../../include/menu.php:107 ../../include/page_widgets.php:8 -#: ../../include/page_widgets.php:36 ../../include/RedDAV/RedBrowser.php:266 -#: ../../include/ItemObject.php:100 ../../include/apps.php:254 -#: ../../mod/webpages.php:181 ../../mod/thing.php:227 -#: ../../mod/connections.php:382 ../../mod/connections.php:395 -#: ../../mod/connections.php:414 ../../mod/blocks.php:153 -#: ../../mod/editlayout.php:139 ../../mod/editwebpage.php:178 -#: ../../mod/editpost.php:113 ../../mod/menu.php:103 -#: ../../mod/editblock.php:140 ../../mod/settings.php:650 -#: ../../mod/layouts.php:183 -msgid "Edit" +#: ../../include/bbcode.php:122 ../../include/bbcode.php:761 +#: ../../include/bbcode.php:764 ../../include/bbcode.php:769 +#: ../../include/bbcode.php:772 ../../include/bbcode.php:775 +#: ../../include/bbcode.php:778 ../../include/bbcode.php:783 +#: ../../include/bbcode.php:786 ../../include/bbcode.php:791 +#: ../../include/bbcode.php:794 ../../include/bbcode.php:797 +#: ../../include/bbcode.php:800 +msgid "Image/photo" +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 "%1$s likes %2$s's %3$s" +msgid "Install %s element: " +msgstr "" + +<<<<<<< HEAD +#: ../../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:208 +msgid "QR code" +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 "" @@ -423,8 +465,26 @@ msgstr "" #: ../../include/network.php:1586 ../../include/enotify.php:59 #: ../../mod/p.php:46 msgid "$projectname" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgstr "" + +#: ../../include/bbcode.php:261 +msgid "post" +msgstr "" + +#: ../../include/bbcode.php:511 +msgid "Different viewers will see this text differently" +msgstr "" + +#: ../../include/bbcode.php:722 +msgid "$1 spoiler" +msgstr "" + +#: ../../include/bbcode.php:749 +msgid "$1 wrote:" msgstr "" +<<<<<<< HEAD #: ../../include/notify.php:23 msgid "created a new post" msgstr "" @@ -432,18 +492,14 @@ msgstr "" #: ../../include/notify.php:24 #, php-format msgid "commented on %s's post" -msgstr "" - -#: ../../include/Import/import_diaspora.php:17 -msgid "No username found in import file." -msgstr "" - +======= #: ../../include/Import/import_diaspora.php:42 ../../mod/import.php:156 msgid "Unable to create a unique channel address. Import failed." msgstr "" #: ../../include/Import/import_diaspora.php:140 ../../mod/import.php:504 msgid "Import completed." +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgstr "" #: ../../include/group.php:26 @@ -457,7 +513,7 @@ msgstr "" msgid "Default privacy group for new contacts" msgstr "" -#: ../../include/group.php:254 ../../mod/admin.php:831 +#: ../../include/group.php:254 ../../mod/admin.php:822 msgid "All Channels" msgstr "" @@ -659,24 +715,37 @@ msgstr "" msgid "New Page" msgstr "" -#: ../../include/page_widgets.php:39 ../../mod/webpages.php:187 +#: ../../include/page_widgets.php:8 ../../include/page_widgets.php:36 +#: ../../include/RedDAV/RedBrowser.php:269 ../../include/ItemObject.php:100 +#: ../../include/apps.php:254 ../../include/menu.php:103 +#: ../../mod/settings.php:649 ../../mod/webpages.php:180 +#: ../../mod/thing.php:227 ../../mod/connections.php:382 +#: ../../mod/connections.php:395 ../../mod/connections.php:414 +#: ../../mod/blocks.php:153 ../../mod/editlayout.php:139 +#: ../../mod/editwebpage.php:178 ../../mod/editpost.php:113 +#: ../../mod/menu.php:103 ../../mod/editblock.php:140 +#: ../../mod/layouts.php:183 +msgid "Edit" +msgstr "" + +#: ../../include/page_widgets.php:39 ../../mod/webpages.php:186 #: ../../mod/blocks.php:159 ../../mod/layouts.php:188 msgid "View" msgstr "" #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677 -#: ../../include/conversation.php:1155 ../../mod/webpages.php:188 -#: ../../mod/events.php:653 ../../mod/photos.php:982 +#: ../../include/conversation.php:1155 ../../mod/webpages.php:187 +#: ../../mod/events.php:653 ../../mod/photos.php:970 #: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150 #: ../../mod/editblock.php:176 msgid "Preview" msgstr "" -#: ../../include/page_widgets.php:41 ../../mod/webpages.php:189 +#: ../../include/page_widgets.php:41 ../../mod/webpages.php:188 msgid "Actions" msgstr "" -#: ../../include/page_widgets.php:42 ../../mod/webpages.php:190 +#: ../../include/page_widgets.php:42 ../../mod/webpages.php:189 msgid "Page Link" msgstr "" @@ -684,13 +753,13 @@ msgstr "" msgid "Title" msgstr "" -#: ../../include/page_widgets.php:44 ../../mod/webpages.php:192 -#: ../../mod/blocks.php:150 ../../mod/menu.php:105 ../../mod/layouts.php:181 +#: ../../include/page_widgets.php:44 ../../mod/webpages.php:191 +#: ../../mod/blocks.php:150 ../../mod/layouts.php:181 msgid "Created" msgstr "" -#: ../../include/page_widgets.php:45 ../../mod/webpages.php:193 -#: ../../mod/blocks.php:151 ../../mod/menu.php:106 ../../mod/layouts.php:182 +#: ../../include/page_widgets.php:45 ../../mod/webpages.php:192 +#: ../../mod/blocks.php:151 ../../mod/layouts.php:182 msgid "Edited" msgstr "" @@ -698,7 +767,7 @@ msgstr "" msgid "Public Timeline" msgstr "" -#: ../../include/comanche.php:34 ../../mod/admin.php:390 +#: ../../include/comanche.php:34 ../../mod/admin.php:386 #: ../../view/theme/apw/php/config.php:185 msgid "Default" msgstr "" @@ -739,21 +808,27 @@ msgstr "" msgid "This Website Only" msgstr "" -#: ../../include/event.php:19 ../../include/bb2diaspora.php:459 +#: ../../include/event.php:19 ../../include/bb2diaspora.php:451 msgid "l F d, Y \\@ g:i A" msgstr "" -#: ../../include/event.php:27 ../../include/bb2diaspora.php:465 +#: ../../include/event.php:27 ../../include/bb2diaspora.php:457 msgid "Starts:" msgstr "" -#: ../../include/event.php:37 ../../include/bb2diaspora.php:473 +#: ../../include/event.php:37 ../../include/bb2diaspora.php:465 msgid "Finishes:" msgstr "" +<<<<<<< HEAD +#: ../../include/event.php:47 ../../include/bb2diaspora.php:473 +#: ../../include/identity.php:875 ../../mod/events.php:647 +#: ../../mod/directory.php:234 +======= #: ../../include/event.php:47 ../../include/bb2diaspora.php:481 #: ../../include/identity.php:879 ../../mod/events.php:647 #: ../../mod/directory.php:295 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Location:" msgstr "" @@ -766,7 +841,7 @@ msgid "Delete this item?" msgstr "" #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667 -#: ../../mod/photos.php:980 ../../mod/photos.php:1098 +#: ../../mod/photos.php:968 ../../mod/photos.php:1086 msgid "Comment" msgstr "" @@ -794,7 +869,7 @@ msgstr "" msgid "Passwords do not match" msgstr "" -#: ../../include/js_strings.php:13 ../../mod/photos.php:40 +#: ../../include/js_strings.php:13 ../../mod/photos.php:39 msgid "everybody" msgstr "" @@ -831,6 +906,27 @@ msgid "Describe (optional)" msgstr "" #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668 +<<<<<<< HEAD +#: ../../mod/settings.php:587 ../../mod/settings.php:689 +#: ../../mod/settings.php:715 ../../mod/settings.php:743 +#: ../../mod/settings.php:766 ../../mod/settings.php:848 +#: ../../mod/settings.php:1044 ../../mod/xchan.php:11 ../../mod/connect.php:93 +#: ../../mod/thing.php:275 ../../mod/thing.php:318 ../../mod/events.php:656 +#: ../../mod/group.php:81 ../../mod/photos.php:565 ../../mod/photos.php:642 +#: ../../mod/photos.php:929 ../../mod/photos.php:969 ../../mod/photos.php:1087 +#: ../../mod/pdledit.php:58 ../../mod/import.php:504 ../../mod/chat.php:177 +#: ../../mod/chat.php:211 ../../mod/rate.php:167 ../../mod/invite.php:142 +#: ../../mod/locs.php:105 ../../mod/sources.php:104 ../../mod/sources.php:138 +#: ../../mod/filestorage.php:156 ../../mod/fsuggest.php:108 +#: ../../mod/poke.php:166 ../../mod/profiles.php:667 ../../mod/setup.php:327 +#: ../../mod/setup.php:367 ../../mod/admin.php:446 ../../mod/admin.php:810 +#: ../../mod/admin.php:977 ../../mod/admin.php:1109 ../../mod/admin.php:1303 +#: ../../mod/admin.php:1388 ../../mod/mitem.php:237 ../../mod/mood.php:134 +#: ../../mod/connedit.php:679 ../../mod/mail.php:355 ../../mod/appman.php:99 +#: ../../mod/poll.php:68 ../../mod/bulksetclose.php:24 +#: ../../view/theme/apw/php/config.php:256 +#: ../../view/theme/redbasic/php/config.php:97 +======= #: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275 #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 #: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941 @@ -851,6 +947,7 @@ msgstr "" #: ../../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 "" @@ -936,7 +1033,7 @@ msgid "timeago.numbers" msgstr "" #: ../../include/RedDAV/RedBrowser.php:107 -#: ../../include/RedDAV/RedBrowser.php:265 +#: ../../include/RedDAV/RedBrowser.php:268 msgid "parent" msgstr "" @@ -962,7 +1059,7 @@ msgstr "" #: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019 #: ../../include/apps.php:336 ../../include/apps.php:387 -#: ../../mod/photos.php:693 ../../mod/photos.php:1131 +#: ../../mod/photos.php:681 ../../mod/photos.php:1119 msgid "Unknown" msgstr "" @@ -991,51 +1088,60 @@ msgid "Shared" msgstr "" #: ../../include/RedDAV/RedBrowser.php:256 -#: ../../include/RedDAV/RedBrowser.php:303 ../../mod/webpages.php:180 -#: ../../mod/blocks.php:152 ../../mod/menu.php:109 -#: ../../mod/new_channel.php:121 ../../mod/layouts.php:175 +#: ../../include/RedDAV/RedBrowser.php:306 ../../mod/webpages.php:179 +#: ../../mod/blocks.php:152 ../../mod/menu.php:107 ../../mod/layouts.php:175 +#: ../../mod/new_channel.php:121 msgid "Create" msgstr "" #: ../../include/RedDAV/RedBrowser.php:257 -#: ../../include/RedDAV/RedBrowser.php:305 ../../mod/profile_photo.php:362 -#: ../../mod/photos.php:718 ../../mod/photos.php:1248 +#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362 +#: ../../mod/photos.php:706 ../../mod/photos.php:1236 msgid "Upload" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:261 ../../mod/admin.php:994 -#: ../../mod/settings.php:590 ../../mod/settings.php:616 +#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/settings.php:589 +#: ../../mod/settings.php:615 ../../mod/admin.php:985 #: ../../mod/sharedwithme.php:95 msgid "Name" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:262 +#: ../../include/RedDAV/RedBrowser.php:265 msgid "Type" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:263 ../../mod/sharedwithme.php:97 +#: ../../include/RedDAV/RedBrowser.php:266 ../../mod/sharedwithme.php:97 msgid "Size" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:264 ../../mod/sharedwithme.php:98 +#: ../../include/RedDAV/RedBrowser.php:267 ../../mod/sharedwithme.php:98 msgid "Last Modified" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:267 ../../include/ItemObject.php:120 +#: ../../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 "" -#: ../../include/RedDAV/RedBrowser.php:302 +#: ../../include/RedDAV/RedBrowser.php:305 msgid "Create new folder" msgstr "" -#: ../../include/RedDAV/RedBrowser.php:304 +#: ../../include/RedDAV/RedBrowser.php:307 msgid "Upload file" msgstr "" @@ -1326,7 +1432,7 @@ msgid "Categories" msgstr "" #: ../../include/widgets.php:91 ../../include/nav.php:163 -#: ../../mod/apps.php:36 +#: ../../mod/apps.php:34 msgid "Apps" msgstr "" @@ -1348,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 "" @@ -1409,10 +1520,17 @@ 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 "" @@ -1466,8 +1584,8 @@ msgid "Premium Channel Settings" msgstr "" #: ../../include/widgets.php:554 ../../include/nav.php:208 -#: ../../include/apps.php:134 ../../mod/admin.php:1079 -#: ../../mod/admin.php:1279 +#: ../../include/apps.php:134 ../../mod/admin.php:1070 +#: ../../mod/admin.php:1270 msgid "Settings" msgstr "" @@ -1512,6 +1630,27 @@ msgstr "" msgid "Public Hubs" msgstr "" +<<<<<<< HEAD +#: ../../include/enotify.php:58 +msgid "$Projectname Notification" +msgstr "" + +#: ../../include/enotify.php:59 ../../include/diaspora.php:2467 +#: ../../include/diaspora.php:2478 ../../mod/p.php:46 +msgid "$projectname" +msgstr "" + +#: ../../include/enotify.php:61 +msgid "Thank You," +msgstr "" + +#: ../../include/enotify.php:63 +#, php-format +msgid "%s Administrator" +msgstr "" + +======= +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../include/enotify.php:96 #, php-format msgid "%s <!item_type!>" @@ -1726,8 +1865,8 @@ msgstr "" msgid "RSS/Atom" msgstr "" -#: ../../include/contact_selectors.php:79 ../../mod/admin.php:822 -#: ../../mod/admin.php:831 ../../mod/id.php:15 ../../mod/id.php:16 +#: ../../include/contact_selectors.php:79 ../../mod/admin.php:813 +#: ../../mod/admin.php:822 ../../mod/id.php:15 ../../mod/id.php:16 #: ../../boot.php:1552 msgid "Email" msgstr "" @@ -1788,23 +1927,19 @@ msgstr "" msgid "Channel was deleted and no longer exists." msgstr "" -#: ../../include/follow.php:135 ../../include/follow.php:206 +#: ../../include/follow.php:135 ../../include/follow.php:197 msgid "Protocol disabled." msgstr "" -#: ../../include/follow.php:144 -msgid "Protocol blocked for this channel." -msgstr "" - -#: ../../include/follow.php:179 +#: ../../include/follow.php:170 msgid "Channel discovery failed." msgstr "" -#: ../../include/follow.php:195 +#: ../../include/follow.php:186 msgid "local account not found." msgstr "" -#: ../../include/follow.php:224 +#: ../../include/follow.php:215 msgid "Cannot connect to yourself." msgstr "" @@ -1845,14 +1980,14 @@ msgid "I abstain" msgstr "" #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 -#: ../../include/conversation.php:1677 ../../mod/photos.php:1015 -#: ../../mod/photos.php:1027 +#: ../../include/conversation.php:1677 ../../mod/photos.php:1003 +#: ../../mod/photos.php:1015 msgid "View all" msgstr "" #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396 -#: ../../include/conversation.php:1701 ../../include/identity.php:1138 -#: ../../mod/photos.php:1019 +#: ../../include/conversation.php:1701 ../../include/identity.php:1134 +#: ../../mod/photos.php:1007 msgctxt "noun" msgid "Like" msgid_plural "Likes" @@ -1860,7 +1995,7 @@ msgstr[0] "" msgstr[1] "" #: ../../include/ItemObject.php:184 ../../include/conversation.php:1704 -#: ../../mod/photos.php:1024 +#: ../../mod/photos.php:1012 msgctxt "noun" msgid "Dislike" msgid_plural "Dislikes" @@ -1895,7 +2030,7 @@ msgstr "" msgid "Add Tag" msgstr "" -#: ../../include/ItemObject.php:254 ../../mod/photos.php:959 +#: ../../include/ItemObject.php:254 ../../mod/photos.php:947 msgid "I like this (toggle)" msgstr "" @@ -1903,7 +2038,7 @@ msgstr "" msgid "like" msgstr "" -#: ../../include/ItemObject.php:255 ../../mod/photos.php:960 +#: ../../include/ItemObject.php:255 ../../mod/photos.php:948 msgid "I don't like this (toggle)" msgstr "" @@ -1974,31 +2109,31 @@ msgstr "" msgid "Mark all seen" msgstr "" -#: ../../include/ItemObject.php:353 ../../mod/photos.php:1145 +#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133 msgctxt "noun" msgid "Likes" msgstr "" -#: ../../include/ItemObject.php:354 ../../mod/photos.php:1146 +#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134 msgctxt "noun" msgid "Dislikes" msgstr "" #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249 -#: ../../mod/photos.php:1151 +#: ../../mod/photos.php:1139 msgid "Close" msgstr "" #: ../../include/ItemObject.php:364 ../../include/conversation.php:737 -#: ../../include/conversation.php:1209 ../../mod/photos.php:962 +#: ../../include/conversation.php:1209 ../../mod/photos.php:950 #: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192 #: ../../mod/editpost.php:130 ../../mod/editblock.php:155 #: ../../mod/mail.php:241 ../../mod/mail.php:356 msgid "Please wait" msgstr "" -#: ../../include/ItemObject.php:665 ../../mod/photos.php:978 -#: ../../mod/photos.php:1096 +#: ../../include/ItemObject.php:665 ../../mod/photos.php:966 +#: ../../mod/photos.php:1084 msgid "This is you" msgstr "" @@ -2057,7 +2192,7 @@ msgstr "" msgid "Open the selected location in a different window or browser tab" msgstr "" -#: ../../include/Contact.php:215 ../../mod/admin.php:739 +#: ../../include/Contact.php:215 ../../mod/admin.php:730 #, php-format msgid "User '%s' deleted" msgstr "" @@ -2066,7 +2201,7 @@ msgstr "" msgid "Attachments:" msgstr "" -#: ../../include/bb2diaspora.php:461 +#: ../../include/bb2diaspora.php:453 msgid "$Projectname event notification:" msgstr "" @@ -2103,7 +2238,7 @@ msgstr "" msgid "Manage/Edit profiles" msgstr "" -#: ../../include/nav.php:95 ../../include/identity.php:851 +#: ../../include/nav.php:95 ../../include/identity.php:847 msgid "Edit Profile" msgstr "" @@ -2142,7 +2277,7 @@ msgid "Your bookmarks" msgstr "" #: ../../include/nav.php:113 ../../include/conversation.php:1645 -#: ../../include/apps.php:136 ../../mod/webpages.php:178 +#: ../../include/apps.php:136 ../../mod/webpages.php:177 msgid "Webpages" msgstr "" @@ -2201,6 +2336,7 @@ msgid "Search site content" msgstr "" #: ../../include/nav.php:168 ../../include/apps.php:141 +#: ../../mod/directory.php:366 msgid "Directory" msgstr "" @@ -2528,6 +2664,12 @@ msgstr "" msgid "channel" msgstr "" +#: ../../include/conversation.php:164 ../../include/diaspora.php:2111 +#: ../../mod/like.php:394 +#, php-format +msgid "%1$s likes %2$s's %3$s" +msgstr "" + #: ../../include/conversation.php:167 ../../mod/like.php:396 #, php-format msgid "%1$s doesn't like %2$s's %3$s" @@ -2549,42 +2691,42 @@ msgctxt "mood" msgid "%1$s is %2$s" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:996 +#: ../../include/conversation.php:572 ../../mod/photos.php:984 msgctxt "title" msgid "Likes" msgstr "" -#: ../../include/conversation.php:572 ../../mod/photos.php:996 +#: ../../include/conversation.php:572 ../../mod/photos.php:984 msgctxt "title" msgid "Dislikes" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Agree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Disagree" msgstr "" -#: ../../include/conversation.php:573 ../../mod/photos.php:997 +#: ../../include/conversation.php:573 ../../mod/photos.php:985 msgctxt "title" msgid "Abstain" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Not attending" msgstr "" -#: ../../include/conversation.php:574 ../../mod/photos.php:998 +#: ../../include/conversation.php:574 ../../mod/photos.php:986 msgctxt "title" msgid "Might attend" msgstr "" @@ -2725,8 +2867,8 @@ msgstr "" msgid "Expires YYYY-MM-DD HH:MM" msgstr "" -#: ../../include/conversation.php:1174 ../../mod/webpages.php:182 -#: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184 +#: ../../include/conversation.php:1174 ../../mod/webpages.php:181 +#: ../../mod/blocks.php:154 ../../mod/photos.php:949 ../../mod/layouts.php:184 msgid "Share" msgstr "" @@ -2852,10 +2994,10 @@ msgstr "" msgid "OK" msgstr "" -#: ../../include/conversation.php:1239 ../../mod/tagrm.php:11 -#: ../../mod/tagrm.php:134 ../../mod/events.php:636 ../../mod/fbrowser.php:82 +#: ../../include/conversation.php:1239 ../../mod/settings.php:588 +#: ../../mod/settings.php:614 ../../mod/tagrm.php:11 ../../mod/tagrm.php:134 +#: ../../mod/events.php:636 ../../mod/fbrowser.php:82 #: ../../mod/fbrowser.php:117 ../../mod/editpost.php:161 -#: ../../mod/settings.php:589 ../../mod/settings.php:615 msgid "Cancel" msgstr "" @@ -2888,7 +3030,7 @@ msgid "Posts that mention or involve you" msgstr "" #: ../../include/conversation.php:1513 ../../mod/connections.php:212 -#: ../../mod/connections.php:225 ../../mod/menu.php:107 +#: ../../mod/connections.php:225 ../../mod/menu.php:105 msgid "New" msgstr "" @@ -2912,7 +3054,7 @@ msgstr "" msgid "Posts flagged as SPAM" msgstr "" -#: ../../include/conversation.php:1579 ../../mod/admin.php:993 +#: ../../include/conversation.php:1579 ../../mod/admin.php:984 msgid "Channel" msgstr "" @@ -2990,16 +3132,35 @@ msgid_plural "Abstains" msgstr[0] "" msgstr[1] "" -#: ../../include/items.php:413 ../../mod/like.php:270 +#: ../../include/items.php:399 ../../mod/like.php:270 #: ../../mod/subthread.php:49 ../../mod/group.php:68 ../../mod/profperm.php:23 #: ../../mod/bulksetclose.php:11 ../../index.php:381 msgid "Permission denied" msgstr "" -#: ../../include/items.php:1035 ../../include/items.php:1081 +#: ../../include/items.php:1020 ../../include/items.php:1066 msgid "(Unknown)" msgstr "" +<<<<<<< HEAD +#: ../../include/items.php:1234 +msgid "Visible to anybody on the internet." +msgstr "" + +#: ../../include/items.php:1236 +msgid "Visible to you only." +msgstr "" + +#: ../../include/items.php:1238 +msgid "Visible to anybody in this network." +msgstr "" + +#: ../../include/items.php:1240 +msgid "Visible to anybody authenticated." +msgstr "" + +#: ../../include/items.php:1242 +======= #: ../../include/items.php:1304 msgid "Visible to anybody on the internet." msgstr "" @@ -3017,10 +3178,26 @@ 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 "" + +#: ../../include/items.php:1246 +msgid "Visible to approved connections." +msgstr "" + +#: ../../include/items.php:1248 +msgid "Visible to specific connections." +msgstr "" + +#: ../../include/items.php:4060 ../../mod/thing.php:74 +======= #: ../../include/items.php:1314 msgid "Visible to all connections." msgstr "" @@ -3034,28 +3211,37 @@ 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:1025 -#: ../../mod/admin.php:1225 +#: ../../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/api.php:26 -#: ../../mod/api.php:31 ../../mod/webpages.php:69 ../../mod/thing.php:241 -#: ../../mod/thing.php:256 ../../mod/thing.php:290 -#: ../../mod/profile_photo.php:264 ../../mod/profile_photo.php:277 -#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178 -#: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/item.php:206 -#: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/network.php:12 -#: ../../mod/common.php:35 ../../mod/connections.php:169 -#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:69 +#: ../../mod/achievements.php:30 ../../mod/manage.php:6 +#: ../../mod/settings.php:569 ../../mod/api.php:26 ../../mod/api.php:31 +#: ../../mod/webpages.php:69 ../../mod/thing.php:241 ../../mod/thing.php:256 +#: ../../mod/thing.php:290 ../../mod/profile_photo.php:264 +#: ../../mod/profile_photo.php:277 ../../mod/block.php:22 +#: ../../mod/block.php:72 ../../mod/like.php:178 ../../mod/events.php:219 +#: ../../mod/group.php:9 ../../mod/common.php:35 ../../mod/connections.php:169 +#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:68 #: ../../mod/pdledit.php:21 ../../mod/authtest.php:13 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 #: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64 @@ -3068,6 +3254,24 @@ 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 +#: ../../mod/message.php:16 ../../mod/mitem.php:115 ../../mod/mood.php:111 +#: ../../mod/connedit.php:331 ../../mod/mail.php:114 +#: ../../mod/notifications.php:66 ../../mod/regmod.php:17 +#: ../../mod/new_channel.php:68 ../../mod/new_channel.php:99 +#: ../../mod/appman.php:66 ../../mod/network.php:12 ../../mod/page.php:28 +#: ../../mod/page.php:82 ../../mod/bookmarks.php:46 ../../mod/channel.php:100 +#: ../../mod/channel.php:219 ../../mod/channel.php:262 +#: ../../mod/suggest.php:26 ../../mod/service_limits.php:7 +#: ../../mod/sharedwithme.php:7 ../../index.php:182 ../../index.php:382 +msgid "Permission denied." +msgstr "" + +#: ../../include/items.php:4535 ../../mod/group.php:38 ../../mod/group.php:140 +======= #: ../../mod/editblock.php:65 ../../mod/register.php:72 #: ../../mod/settings.php:570 ../../mod/id.php:71 ../../mod/message.php:16 #: ../../mod/mitem.php:115 ../../mod/mood.php:111 ../../mod/connedit.php:337 @@ -3084,28 +3288,66 @@ 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 "" +#: ../../include/photos.php:94 +#, php-format +msgid "Image exceeds website size limit of %lu bytes" +msgstr "" + +#: ../../include/photos.php:101 +msgid "Image file is empty." +msgstr "" + +#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 +msgid "Unable to process image" +msgstr "" + +#: ../../include/photos.php:199 +msgid "Photo storage failed." +msgstr "" + +#: ../../include/photos.php:363 +msgid "Upload New Photos" +msgstr "" + #: ../../include/zot.php:666 msgid "Invalid data packet" msgstr "" @@ -3146,7 +3388,7 @@ msgid_plural "%d invitations available" msgstr[0] "" msgstr[1] "" -#: ../../include/contact_widgets.php:19 ../../mod/admin.php:457 +#: ../../include/contact_widgets.php:19 ../../mod/admin.php:450 msgid "Advanced" msgstr "" @@ -3167,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 "" @@ -3212,7 +3462,7 @@ msgid "Don't show" msgstr "" #: ../../include/acl_selectors.php:248 ../../mod/events.php:654 -#: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209 +#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209 #: ../../mod/filestorage.php:147 msgid "Permissions" msgstr "" @@ -3325,193 +3575,205 @@ msgstr "" msgid "Requested profile is not available." msgstr "" -#: ../../include/identity.php:841 ../../mod/profiles.php:774 +#: ../../include/identity.php:837 ../../mod/profiles.php:774 msgid "Change profile photo" msgstr "" -#: ../../include/identity.php:847 +#: ../../include/identity.php:843 msgid "Profiles" msgstr "" -#: ../../include/identity.php:847 +#: ../../include/identity.php:843 msgid "Manage/edit profiles" msgstr "" -#: ../../include/identity.php:848 ../../mod/profiles.php:775 +#: ../../include/identity.php:844 ../../mod/profiles.php:775 msgid "Create New Profile" msgstr "" -#: ../../include/identity.php:863 ../../mod/profiles.php:786 +#: ../../include/identity.php:859 ../../mod/profiles.php:786 msgid "Profile Image" msgstr "" -#: ../../include/identity.php:866 +#: ../../include/identity.php:862 msgid "visible to everybody" msgstr "" -#: ../../include/identity.php:867 ../../mod/profiles.php:669 +#: ../../include/identity.php:863 ../../mod/profiles.php:669 #: ../../mod/profiles.php:790 msgid "Edit visibility" msgstr "" -#: ../../include/identity.php:883 ../../include/identity.php:1122 +#: ../../include/identity.php:879 ../../include/identity.php:1118 msgid "Gender:" msgstr "" -#: ../../include/identity.php:884 ../../include/identity.php:1166 +#: ../../include/identity.php:880 ../../include/identity.php:1162 msgid "Status:" msgstr "" -#: ../../include/identity.php:885 ../../include/identity.php:1177 +#: ../../include/identity.php:881 ../../include/identity.php:1173 msgid "Homepage:" msgstr "" -#: ../../include/identity.php:886 +#: ../../include/identity.php:882 msgid "Online Now" msgstr "" -#: ../../include/identity.php:969 ../../include/identity.php:1047 +#: ../../include/identity.php:965 ../../include/identity.php:1043 #: ../../mod/ping.php:324 msgid "g A l F d" msgstr "" -#: ../../include/identity.php:970 ../../include/identity.php:1048 +#: ../../include/identity.php:966 ../../include/identity.php:1044 msgid "F d" msgstr "" -#: ../../include/identity.php:1015 ../../include/identity.php:1087 +#: ../../include/identity.php:1011 ../../include/identity.php:1083 #: ../../mod/ping.php:346 msgid "[today]" msgstr "" -#: ../../include/identity.php:1026 +#: ../../include/identity.php:1022 msgid "Birthday Reminders" msgstr "" -#: ../../include/identity.php:1027 +#: ../../include/identity.php:1023 msgid "Birthdays this week:" msgstr "" -#: ../../include/identity.php:1080 +#: ../../include/identity.php:1076 msgid "[No description]" msgstr "" -#: ../../include/identity.php:1098 +#: ../../include/identity.php:1094 msgid "Event Reminders" msgstr "" -#: ../../include/identity.php:1099 +#: ../../include/identity.php:1095 msgid "Events this week:" msgstr "" -#: ../../include/identity.php:1112 ../../include/identity.php:1229 +#: ../../include/identity.php:1108 ../../include/identity.php:1225 #: ../../include/apps.php:138 ../../mod/profperm.php:112 msgid "Profile" msgstr "" -#: ../../include/identity.php:1120 ../../mod/settings.php:1056 +#: ../../include/identity.php:1116 ../../mod/settings.php:1050 msgid "Full Name:" msgstr "" -#: ../../include/identity.php:1127 +#: ../../include/identity.php:1123 msgid "Like this channel" msgstr "" -#: ../../include/identity.php:1151 +#: ../../include/identity.php:1147 msgid "j F, Y" msgstr "" -#: ../../include/identity.php:1152 +#: ../../include/identity.php:1148 msgid "j F" msgstr "" -#: ../../include/identity.php:1159 +#: ../../include/identity.php:1155 msgid "Birthday:" msgstr "" +<<<<<<< HEAD +#: ../../include/identity.php:1159 +======= #: ../../include/identity.php:1163 ../../mod/directory.php:290 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Age:" msgstr "" -#: ../../include/identity.php:1172 +#: ../../include/identity.php:1168 #, php-format msgid "for %1$d %2$s" msgstr "" -#: ../../include/identity.php:1175 ../../mod/profiles.php:691 +#: ../../include/identity.php:1171 ../../mod/profiles.php:691 msgid "Sexual Preference:" msgstr "" +<<<<<<< HEAD +#: ../../include/identity.php:1175 ../../mod/profiles.php:693 +======= #: ../../include/identity.php:1179 ../../mod/directory.php:306 #: ../../mod/profiles.php:693 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "Hometown:" msgstr "" -#: ../../include/identity.php:1181 +#: ../../include/identity.php:1177 msgid "Tags:" msgstr "" -#: ../../include/identity.php:1183 ../../mod/profiles.php:694 +#: ../../include/identity.php:1179 ../../mod/profiles.php:694 msgid "Political Views:" msgstr "" -#: ../../include/identity.php:1185 +#: ../../include/identity.php:1181 msgid "Religion:" msgstr "" +<<<<<<< HEAD +#: ../../include/identity.php:1183 +======= #: ../../include/identity.php:1187 ../../mod/directory.php:308 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 msgid "About:" msgstr "" -#: ../../include/identity.php:1189 +#: ../../include/identity.php:1185 msgid "Hobbies/Interests:" msgstr "" -#: ../../include/identity.php:1191 ../../mod/profiles.php:697 +#: ../../include/identity.php:1187 ../../mod/profiles.php:697 msgid "Likes:" msgstr "" -#: ../../include/identity.php:1193 ../../mod/profiles.php:698 +#: ../../include/identity.php:1189 ../../mod/profiles.php:698 msgid "Dislikes:" msgstr "" -#: ../../include/identity.php:1195 +#: ../../include/identity.php:1191 msgid "Contact information and Social Networks:" msgstr "" -#: ../../include/identity.php:1197 +#: ../../include/identity.php:1193 msgid "My other channels:" msgstr "" -#: ../../include/identity.php:1199 +#: ../../include/identity.php:1195 msgid "Musical interests:" msgstr "" -#: ../../include/identity.php:1201 +#: ../../include/identity.php:1197 msgid "Books, literature:" msgstr "" -#: ../../include/identity.php:1203 +#: ../../include/identity.php:1199 msgid "Television:" msgstr "" -#: ../../include/identity.php:1205 +#: ../../include/identity.php:1201 msgid "Film/dance/culture/entertainment:" msgstr "" -#: ../../include/identity.php:1207 +#: ../../include/identity.php:1203 msgid "Love/Romance:" msgstr "" -#: ../../include/identity.php:1209 +#: ../../include/identity.php:1205 msgid "Work/employment:" msgstr "" -#: ../../include/identity.php:1211 +#: ../../include/identity.php:1207 msgid "School/education:" msgstr "" -#: ../../include/identity.php:1231 +#: ../../include/identity.php:1227 msgid "Like this thing" msgstr "" @@ -3797,7 +4059,7 @@ msgid "Profile Photo" msgstr "" #: ../../include/apps.php:247 ../../mod/settings.php:84 -#: ../../mod/settings.php:614 +#: ../../mod/settings.php:613 msgid "Update" msgstr "" @@ -3809,6 +4071,8 @@ 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 @@ -3869,6 +4133,7 @@ msgstr "" msgid "$1 wrote:" msgstr "" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 #: ../../include/chat.php:23 msgid "Missing room name" msgstr "" @@ -3889,25 +4154,20 @@ msgstr "" msgid "Room is full" msgstr "" -#: ../../include/photos.php:94 -#, php-format -msgid "Image exceeds website size limit of %lu bytes" -msgstr "" - -#: ../../include/photos.php:101 -msgid "Image file is empty." +#: ../../include/diaspora.php:2439 +msgid "Please choose" msgstr "" -#: ../../include/photos.php:128 ../../mod/profile_photo.php:217 -msgid "Unable to process image" +#: ../../include/diaspora.php:2441 +msgid "Agree" msgstr "" -#: ../../include/photos.php:199 -msgid "Photo storage failed." +#: ../../include/diaspora.php:2443 +msgid "Disagree" msgstr "" -#: ../../include/photos.php:363 -msgid "Upload New Photos" +#: ../../include/diaspora.php:2445 +msgid "Abstain" msgstr "" #: ../../mod/achievements.php:34 @@ -3953,6 +4213,613 @@ msgstr "" msgid "Delegated Channels" msgstr "" +<<<<<<< HEAD +#: ../../mod/settings.php:76 +msgid "Name is required" +msgstr "" + +#: ../../mod/settings.php:80 +msgid "Key and Secret are required" +msgstr "" + +#: ../../mod/settings.php:129 +msgid "Diaspora Policy Settings updated." +msgstr "" + +#: ../../mod/settings.php:237 +msgid "Passwords do not match. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:241 +msgid "Empty passwords are not allowed. Password unchanged." +msgstr "" + +#: ../../mod/settings.php:255 +msgid "Password changed." +msgstr "" + +#: ../../mod/settings.php:257 +msgid "Password update failed. Please try again." +msgstr "" + +#: ../../mod/settings.php:271 +msgid "Not valid email." +msgstr "" + +#: ../../mod/settings.php:274 +msgid "Protected email address. Cannot change to that email." +msgstr "" + +#: ../../mod/settings.php:283 +msgid "System failure storing new email. Please try again." +msgstr "" + +#: ../../mod/settings.php:522 +msgid "Settings updated." +msgstr "" + +#: ../../mod/settings.php:578 ../../mod/api.php:106 ../../mod/photos.php:556 +#: ../../mod/menu.php:91 ../../mod/filestorage.php:151 +#: ../../mod/filestorage.php:159 ../../mod/admin.php:424 +#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554 +msgid "No" +msgstr "" + +#: ../../mod/settings.php:578 ../../mod/api.php:105 ../../mod/photos.php:556 +#: ../../mod/menu.php:91 ../../mod/filestorage.php:151 +#: ../../mod/filestorage.php:159 ../../mod/admin.php:426 +#: ../../mod/removeme.php:60 ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:127 ../../boot.php:1554 +msgid "Yes" +msgstr "" + +#: ../../mod/settings.php:586 ../../mod/settings.php:612 +#: ../../mod/settings.php:648 +msgid "Add application" +msgstr "" + +#: ../../mod/settings.php:589 +msgid "Name of application" +msgstr "" + +#: ../../mod/settings.php:590 ../../mod/settings.php:616 +msgid "Consumer Key" +msgstr "" + +#: ../../mod/settings.php:590 ../../mod/settings.php:591 +msgid "Automatically generated - change if desired. Max length 20" +======= +#: ../../mod/xchan.php:6 +msgid "Xchan Lookup" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgstr "" + +#: ../../mod/settings.php:591 ../../mod/settings.php:617 +msgid "Consumer Secret" +msgstr "" + +#: ../../mod/settings.php:592 ../../mod/settings.php:618 +msgid "Redirect" +msgstr "" + +#: ../../mod/settings.php:592 +msgid "" +"Redirect URI - leave blank unless your application specifically requires this" +msgstr "" + +#: ../../mod/settings.php:593 ../../mod/settings.php:619 +msgid "Icon url" +msgstr "" + +#: ../../mod/settings.php:593 +msgid "Optional" +msgstr "" + +#: ../../mod/settings.php:604 +msgid "You can't edit this application." +msgstr "" + +#: ../../mod/settings.php:647 +msgid "Connected Apps" +msgstr "" + +#: ../../mod/settings.php:651 +msgid "Client key starts with" +msgstr "" + +#: ../../mod/settings.php:652 +msgid "No name" +msgstr "" + +#: ../../mod/settings.php:653 +msgid "Remove authorization" +msgstr "" + +#: ../../mod/settings.php:667 +msgid "No feature settings configured" +msgstr "" + +#: ../../mod/settings.php:683 +msgid "Feature/Addon Settings" +msgstr "" + +#: ../../mod/settings.php:685 +msgid "Settings for the built-in Diaspora emulator" +msgstr "" + +#: ../../mod/settings.php:686 +msgid "Allow any Diaspora member to comment on your public posts" +msgstr "" + +#: ../../mod/settings.php:687 +msgid "Diaspora Policy Settings" +msgstr "" + +#: ../../mod/settings.php:688 +msgid "Prevent your hashtags from being redirected to other sites" +msgstr "" + +#: ../../mod/settings.php:712 +msgid "Account Settings" +msgstr "" + +#: ../../mod/settings.php:713 +msgid "Enter New Password:" +msgstr "" + +#: ../../mod/settings.php:714 +msgid "Confirm New Password:" +msgstr "" + +#: ../../mod/settings.php:714 +msgid "Leave password fields blank unless changing" +msgstr "" + +#: ../../mod/settings.php:716 ../../mod/settings.php:1051 +msgid "Email Address:" +msgstr "" + +#: ../../mod/settings.php:717 ../../mod/removeaccount.php:61 +msgid "Remove Account" +msgstr "" + +#: ../../mod/settings.php:718 +msgid "Remove this account including all its channels" +msgstr "" + +#: ../../mod/settings.php:734 +msgid "Off" +msgstr "" + +#: ../../mod/settings.php:734 +msgid "On" +msgstr "" + +#: ../../mod/settings.php:741 +msgid "Additional Features" +msgstr "" + +#: ../../mod/settings.php:765 +msgid "Connector Settings" +msgstr "" + +#: ../../mod/settings.php:804 +msgid "No special theme for mobile devices" +msgstr "" + +#: ../../mod/settings.php:807 +#, php-format +msgid "%s - (Experimental)" +msgstr "" + +#: ../../mod/settings.php:810 ../../mod/admin.php:396 +msgid "mobile" +msgstr "" + +#: ../../mod/settings.php:846 +msgid "Display Settings" +msgstr "" + +#: ../../mod/settings.php:852 +msgid "Display Theme:" +msgstr "" + +#: ../../mod/settings.php:853 +msgid "Mobile Theme:" +msgstr "" + +#: ../../mod/settings.php:854 +msgid "Enable user zoom on mobile devices" +msgstr "" + +#: ../../mod/settings.php:855 +msgid "Update browser every xx seconds" +msgstr "" + +#: ../../mod/settings.php:855 +msgid "Minimum of 10 seconds, no maximum" +msgstr "" + +#: ../../mod/settings.php:856 +msgid "Maximum number of conversations to load at any time:" +msgstr "" + +#: ../../mod/settings.php:856 +msgid "Maximum of 100 items" +msgstr "" + +#: ../../mod/settings.php:857 +msgid "Show emoticons (smilies) as images" +msgstr "" + +#: ../../mod/settings.php:858 +msgid "Link post titles to source" +msgstr "" + +#: ../../mod/settings.php:859 +msgid "System Page Layout Editor - (advanced)" +msgstr "" + +#: ../../mod/settings.php:862 +msgid "Use blog/list mode on channel page" +msgstr "" + +#: ../../mod/settings.php:862 ../../mod/settings.php:863 +msgid "(comments displayed separately)" +msgstr "" + +#: ../../mod/settings.php:863 +msgid "Use blog/list mode on matrix page" +msgstr "" + +#: ../../mod/settings.php:864 +msgid "Channel page max height of content (in pixels)" +msgstr "" + +#: ../../mod/settings.php:864 ../../mod/settings.php:865 +msgid "click to expand content exceeding this height" +msgstr "" + +#: ../../mod/settings.php:865 +msgid "Matrix page max height of content (in pixels)" +msgstr "" + +#: ../../mod/settings.php:899 +msgid "Nobody except yourself" +msgstr "" + +#: ../../mod/settings.php:900 +msgid "Only those you specifically allow" +msgstr "" + +#: ../../mod/settings.php:901 +msgid "Approved connections" +msgstr "" + +#: ../../mod/settings.php:902 +msgid "Any connections" +msgstr "" + +#: ../../mod/settings.php:903 +msgid "Anybody on this website" +msgstr "" + +#: ../../mod/settings.php:904 +msgid "Anybody in this network" +msgstr "" + +#: ../../mod/settings.php:905 +msgid "Anybody authenticated" +msgstr "" + +#: ../../mod/settings.php:906 +msgid "Anybody on the internet" +msgstr "" + +#: ../../mod/settings.php:980 +msgid "Publish your default profile in the network directory" +msgstr "" + +#: ../../mod/settings.php:985 +msgid "Allow us to suggest you as a potential friend to new members?" +msgstr "" + +#: ../../mod/settings.php:989 ../../mod/profile_photo.php:366 +msgid "or" +msgstr "" + +#: ../../mod/settings.php:994 +msgid "Your channel address is" +msgstr "" + +#: ../../mod/settings.php:1042 +msgid "Channel Settings" +msgstr "" + +#: ../../mod/settings.php:1049 +msgid "Basic Settings" +msgstr "" + +#: ../../mod/settings.php:1052 +msgid "Your Timezone:" +msgstr "" + +#: ../../mod/settings.php:1053 +msgid "Default Post Location:" +msgstr "" + +#: ../../mod/settings.php:1053 +msgid "Geographical location to display on your posts" +msgstr "" + +#: ../../mod/settings.php:1054 +msgid "Use Browser Location:" +msgstr "" + +#: ../../mod/settings.php:1056 +msgid "Adult Content" +msgstr "" + +#: ../../mod/settings.php:1056 +msgid "" +"This channel frequently or regularly publishes adult content. (Please tag " +"any adult material and/or nudity with #NSFW)" +msgstr "" + +#: ../../mod/settings.php:1058 +msgid "Security and Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:1060 +msgid "Your permissions are already configured. Click to view/adjust" +msgstr "" + +#: ../../mod/settings.php:1062 +msgid "Hide my online presence" +msgstr "" + +#: ../../mod/settings.php:1062 +msgid "Prevents displaying in your profile that you are online" +msgstr "" + +#: ../../mod/settings.php:1064 +msgid "Simple Privacy Settings:" +msgstr "" + +#: ../../mod/settings.php:1065 +msgid "" +"Very Public - <em>extremely permissive (should be used with caution)</em>" +msgstr "" + +#: ../../mod/settings.php:1066 +msgid "" +"Typical - <em>default public, privacy when desired (similar to social " +"network permissions but with improved privacy)</em>" +msgstr "" + +#: ../../mod/settings.php:1067 +msgid "Private - <em>default private, never open or public</em>" +msgstr "" + +#: ../../mod/settings.php:1068 +msgid "Blocked - <em>default blocked to/from everybody</em>" +msgstr "" + +#: ../../mod/settings.php:1070 +msgid "Allow others to tag your posts" +msgstr "" + +#: ../../mod/settings.php:1070 +msgid "" +"Often used by the community to retro-actively flag inappropriate content" +msgstr "" + +#: ../../mod/settings.php:1072 +msgid "Advanced Privacy Settings" +msgstr "" + +#: ../../mod/settings.php:1074 +msgid "Expire other channel content after this many days" +msgstr "" + +#: ../../mod/settings.php:1074 +msgid "0 or blank prevents expiration" +msgstr "" + +#: ../../mod/settings.php:1075 +msgid "Maximum Friend Requests/Day:" +msgstr "" + +#: ../../mod/settings.php:1075 +msgid "May reduce spam activity" +msgstr "" + +#: ../../mod/settings.php:1076 +msgid "Default Post Permissions" +msgstr "" + +#: ../../mod/settings.php:1077 ../../mod/mitem.php:159 ../../mod/mitem.php:229 +msgid "(click to open/close)" +msgstr "" + +#: ../../mod/settings.php:1081 +msgid "Channel permissions category:" +msgstr "" + +#: ../../mod/settings.php:1087 +msgid "Maximum private messages per day from unknown people:" +msgstr "" + +#: ../../mod/settings.php:1087 +msgid "Useful to reduce spamming" +msgstr "" + +#: ../../mod/settings.php:1090 +msgid "Notification Settings" +msgstr "" + +#: ../../mod/settings.php:1091 +msgid "By default post a status message when:" +msgstr "" + +#: ../../mod/settings.php:1092 +msgid "accepting a friend request" +msgstr "" + +#: ../../mod/settings.php:1093 +msgid "joining a forum/community" +msgstr "" + +#: ../../mod/settings.php:1094 +msgid "making an <em>interesting</em> profile change" +msgstr "" + +#: ../../mod/settings.php:1095 +msgid "Send a notification email when:" +msgstr "" + +#: ../../mod/settings.php:1096 +msgid "You receive a connection request" +msgstr "" + +#: ../../mod/settings.php:1097 +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 +msgid "Someone writes a followup comment" +msgstr "" + +#: ../../mod/settings.php:1100 +msgid "You receive a private message" +msgstr "" + +#: ../../mod/settings.php:1101 +msgid "You receive a friend suggestion" +msgstr "" + +#: ../../mod/settings.php:1102 +msgid "You are tagged in a post" +msgstr "" + +#: ../../mod/settings.php:1103 +msgid "You are poked/prodded/etc. in a post" +msgstr "" + +#: ../../mod/settings.php:1106 +msgid "Show visual notifications including:" +msgstr "" + +#: ../../mod/settings.php:1108 +msgid "Unseen matrix activity" +msgstr "" + +#: ../../mod/settings.php:1109 +msgid "Unseen channel activity" +msgstr "" + +#: ../../mod/settings.php:1110 +msgid "Unseen private messages" +msgstr "" + +#: ../../mod/settings.php:1110 ../../mod/settings.php:1115 +#: ../../mod/settings.php:1116 ../../mod/settings.php:1117 +msgid "Recommended" +msgstr "" + +#: ../../mod/settings.php:1111 +msgid "Upcoming events" +msgstr "" + +#: ../../mod/settings.php:1112 +msgid "Events today" +msgstr "" + +#: ../../mod/settings.php:1113 +msgid "Upcoming birthdays" +msgstr "" + +#: ../../mod/settings.php:1113 +msgid "Not available in all themes" +msgstr "" + +#: ../../mod/settings.php:1114 +msgid "System (personal) notifications" +msgstr "" + +#: ../../mod/settings.php:1115 +msgid "System info messages" +msgstr "" + +#: ../../mod/settings.php:1116 +msgid "System critical alerts" +msgstr "" + +#: ../../mod/settings.php:1117 +msgid "New connections" +msgstr "" + +#: ../../mod/settings.php:1118 +msgid "System Registrations" +msgstr "" + +#: ../../mod/settings.php:1119 +msgid "" +"Also show new wall posts, private messages and connections under Notices" +msgstr "" + +#: ../../mod/settings.php:1121 +msgid "Notify me of events this many days in advance" +msgstr "" + +#: ../../mod/settings.php:1121 +msgid "Must be greater than 0" +msgstr "" + +#: ../../mod/settings.php:1123 +msgid "Advanced Account/Page Type Settings" +msgstr "" + +#: ../../mod/settings.php:1124 +msgid "Change the behaviour of this account for special situations" +msgstr "" + +#: ../../mod/settings.php:1127 +msgid "" +"Please enable expert mode (in <a href=\"settings/features\">Settings > " +"Additional features</a>) to adjust!" +msgstr "" + +#: ../../mod/settings.php:1128 +msgid "Miscellaneous Settings" +msgstr "" + +#: ../../mod/settings.php:1130 +msgid "Personal menu to display in your channel pages" +msgstr "" + +#: ../../mod/settings.php:1131 ../../mod/removeme.php:61 +msgid "Remove Channel" +msgstr "" + +#: ../../mod/settings.php:1132 +msgid "Remove this channel." +msgstr "" + #: ../../mod/xchan.php:6 msgid "Xchan Lookup" msgstr "" @@ -3961,7 +4828,7 @@ msgstr "" msgid "Lookup xchan beginning with (or webbie): " msgstr "" -#: ../../mod/xchan.php:37 ../../mod/menu.php:154 ../../mod/mitem.php:120 +#: ../../mod/xchan.php:37 ../../mod/menu.php:152 ../../mod/mitem.php:120 msgid "Not found." msgstr "" @@ -3983,27 +4850,7 @@ msgid "" "and/or create new posts for you?" msgstr "" -#: ../../mod/api.php:105 ../../mod/photos.php:568 ../../mod/menu.php:91 -#: ../../mod/menu.php:145 ../../mod/filestorage.php:151 -#: ../../mod/filestorage.php:159 ../../mod/admin.php:430 -#: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 -#: ../../mod/mitem.php:234 ../../mod/mitem.php:235 ../../mod/removeme.php:60 -#: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 -msgid "Yes" -msgstr "" - -#: ../../mod/api.php:106 ../../mod/photos.php:568 ../../mod/menu.php:91 -#: ../../mod/menu.php:145 ../../mod/filestorage.php:151 -#: ../../mod/filestorage.php:159 ../../mod/admin.php:428 -#: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 -#: ../../mod/mitem.php:234 ../../mod/mitem.php:235 ../../mod/removeme.php:60 -#: ../../view/theme/redbasic/php/config.php:104 -#: ../../view/theme/redbasic/php/config.php:129 ../../boot.php:1554 -msgid "No" -msgstr "" - -#: ../../mod/webpages.php:191 +#: ../../mod/webpages.php:190 msgid "Page Title" msgstr "" @@ -4023,7 +4870,7 @@ msgstr "" msgid "Select a tag to remove: " msgstr "" -#: ../../mod/tagrm.php:133 ../../mod/photos.php:887 +#: ../../mod/tagrm.php:133 ../../mod/photos.php:875 msgid "Remove" msgstr "" @@ -4107,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 @@ -4136,6 +4992,15 @@ msgstr "" msgid "Fetching URL returns error: %1$s" msgstr "" +#: ../../mod/home.php:53 ../../mod/siteinfo.php:155 +msgid "$Projectname" +msgstr "" + +#: ../../mod/home.php:124 +#, php-format +msgid "Welcome to %s" +msgstr "" + #: ../../mod/profile_photo.php:108 msgid "Image uploaded but image cropping failed." msgstr "" @@ -4175,10 +5040,6 @@ msgstr "" msgid "Upload Profile Photo" msgstr "" -#: ../../mod/profile_photo.php:366 ../../mod/settings.php:995 -msgid "or" -msgstr "" - #: ../../mod/profile_photo.php:366 msgid "skip this step" msgstr "" @@ -4199,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 @@ -4212,16 +5139,16 @@ msgstr "" msgid "Image size reduction [%s] failed." msgstr "" -#: ../../mod/block.php:27 ../../mod/page.php:36 +#: ../../mod/block.php:27 ../../mod/page.php:33 msgid "Invalid item." msgstr "" -#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:52 +#: ../../mod/block.php:39 ../../mod/wall_upload.php:29 ../../mod/page.php:49 msgid "Channel not found." msgstr "" -#: ../../mod/block.php:75 ../../mod/display.php:106 ../../mod/help.php:79 -#: ../../mod/page.php:89 ../../index.php:230 +#: ../../mod/block.php:75 ../../mod/help.php:79 ../../mod/display.php:106 +#: ../../mod/page.php:85 ../../index.php:230 msgid "Page not found." msgstr "" @@ -4325,11 +5252,11 @@ msgstr "" msgid "Create New Event" msgstr "" -#: ../../mod/events.php:474 ../../mod/photos.php:839 +#: ../../mod/events.php:474 ../../mod/photos.php:827 msgid "Previous" msgstr "" -#: ../../mod/events.php:475 ../../mod/photos.php:848 ../../mod/setup.php:281 +#: ../../mod/events.php:475 ../../mod/photos.php:836 ../../mod/setup.php:281 msgid "Next" msgstr "" @@ -4379,7 +5306,7 @@ msgid "" "global holidays." msgstr "" -#: ../../mod/events.php:645 ../../mod/directory.php:301 +#: ../../mod/events.php:645 msgid "Description:" msgstr "" @@ -4469,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 "" @@ -4510,10 +5438,6 @@ msgstr "" msgid "No installed plugins/addons/apps" msgstr "" -#: ../../mod/siteinfo.php:155 ../../mod/home.php:58 ../../mod/home.php:64 -msgid "$Projectname" -msgstr "" - #: ../../mod/siteinfo.php:156 msgid "" "This is a hub of $Projectname - a global cooperative network of " @@ -4533,84 +5457,107 @@ 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 "" -"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " -"about $Projectname." +"Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/siteinfo.php:165 -msgid "Bug reports and issues: please visit" +#: ../../mod/import.php:176 +msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/siteinfo.php:167 -msgid "$projectname issues" +#: ../../mod/import.php:186 +msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/siteinfo.php:168 -msgid "" -"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" +#: ../../mod/import.php:516 +msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/siteinfo.php:170 -msgid "Site Administrators" +#: ../../mod/import.php:521 +msgid "Import Channel" msgstr "" -#: ../../mod/item.php:174 -msgid "Unable to locate original post." +#: ../../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/item.php:440 -msgid "Empty post discarded." +#: ../../mod/import.php:523 +msgid "File to Upload" msgstr "" -#: ../../mod/item.php:480 -msgid "Executable content type not permitted to this channel." +#: ../../mod/import.php:524 +msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/item.php:901 -msgid "System error. Post not saved." +#: ../../mod/import.php:525 +msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/item.php:1119 -msgid "Unable to obtain post information from database." +#: ../../mod/import.php:526 +msgid "Your old login email address" msgstr "" -#: ../../mod/item.php:1126 -#, php-format -msgid "You have reached your limit of %1$.0f top level posts." +#: ../../mod/import.php:527 +msgid "Your old login password" msgstr "" -#: ../../mod/item.php:1133 -#, php-format -msgid "You have reached your limit of %1$.0f webpages." +#: ../../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/network.php:91 -msgid "No such group" +#: ../../mod/import.php:529 +msgid "Make this hub my primary location" msgstr "" -#: ../../mod/network.php:129 -msgid "No such channel" +#: ../../mod/import.php:530 +msgid "" +"Import existing posts if possible (experimental - limited by available memory" msgstr "" -#: ../../mod/network.php:143 -msgid "Search Results For:" +#: ../../mod/import.php:531 +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgid "" +"Please visit <a href=\"https://redmatrix.me\">redmatrix.me</a> to learn more " +"about $Projectname." msgstr "" -#: ../../mod/network.php:198 -msgid "Collection is empty" +#: ../../mod/siteinfo.php:165 +msgid "Bug reports and issues: please visit" msgstr "" -#: ../../mod/network.php:207 -msgid "Collection: " +#: ../../mod/siteinfo.php:168 +msgid "" +"Suggestions, praise, etc. - please email \"hubzilla\" at librelist - dot com" msgstr "" -#: ../../mod/network.php:226 -msgid "Connection: " +#: ../../mod/siteinfo.php:170 +msgid "Site Administrators" msgstr "" -#: ../../mod/network.php:233 -msgid "Invalid connection." +#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 +msgid "Help:" +msgstr "" + +#: ../../mod/help.php:76 ../../index.php:227 +msgid "Not Found" msgstr "" #: ../../mod/common.php:10 @@ -4637,11 +5584,11 @@ msgstr "" msgid "Could not locate selected profile." msgstr "" -#: ../../mod/connections.php:94 ../../mod/connedit.php:220 +#: ../../mod/connections.php:94 ../../mod/connedit.php:214 msgid "Connection updated." msgstr "" -#: ../../mod/connections.php:96 ../../mod/connedit.php:222 +#: ../../mod/connections.php:96 ../../mod/connedit.php:216 msgid "Failed to update connection record." msgstr "" @@ -4730,211 +5677,167 @@ msgstr "" msgid "Block Title" 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 +#: ../../mod/tagger.php:96 #, 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)." +msgid "%1$s tagged %2$s's %3$s with %4$s" msgstr "" #: ../../mod/cloud.php:120 msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgstr "" -#: ../../mod/photos.php:78 +#: ../../mod/photos.php:77 msgid "Page owner information could not be retrieved." msgstr "" -#: ../../mod/photos.php:98 +#: ../../mod/photos.php:97 msgid "Album not found." msgstr "" -#: ../../mod/photos.php:120 ../../mod/photos.php:655 +#: ../../mod/photos.php:119 ../../mod/photos.php:643 msgid "Delete Album" msgstr "" -#: ../../mod/photos.php:160 ../../mod/photos.php:942 +<<<<<<< HEAD +#: ../../mod/photos.php:159 ../../mod/photos.php:930 msgid "Delete Photo" msgstr "" -#: ../../mod/photos.php:452 +#: ../../mod/photos.php:429 ../../mod/search.php:13 ../../mod/display.php:13 +#: ../../mod/ratings.php:82 ../../mod/directory.php:47 +#: ../../mod/viewconnections.php:17 +msgid "Public access denied." +======= +#: ../../mod/rate.php:161 ../../mod/connedit.php:669 +msgid "Rating (this information is public)" +msgstr "" + +#: ../../mod/rate.php:162 ../../mod/connedit.php:670 +#: ../../mod/connedit.php:674 +msgid "Optionally explain your rating (this information is public)" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgstr "" + +#: ../../mod/photos.php:440 msgid "No photos selected" msgstr "" -#: ../../mod/photos.php:496 +#: ../../mod/photos.php:484 msgid "Access to this item is restricted." msgstr "" -#: ../../mod/photos.php:535 +#: ../../mod/photos.php:523 #, php-format msgid "%1$.2f MB of %2$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:538 +#: ../../mod/photos.php:526 #, php-format msgid "%1$.2f MB photo storage used." msgstr "" -#: ../../mod/photos.php:562 +#: ../../mod/photos.php:550 msgid "Upload Photos" msgstr "" -#: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927 +#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915 msgid "Enter a new album name" msgstr "" -#: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928 +#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916 msgid "or select an existing one (doubleclick)" msgstr "" -#: ../../mod/photos.php:568 +#: ../../mod/photos.php:556 msgid "Create a status post for this upload" msgstr "" -#: ../../mod/photos.php:596 +#: ../../mod/photos.php:584 msgid "Album name could not be decoded" msgstr "" -#: ../../mod/photos.php:637 ../../mod/photos.php:1169 -#: ../../mod/photos.php:1185 +#: ../../mod/photos.php:625 ../../mod/photos.php:1157 +#: ../../mod/photos.php:1173 msgid "Contact Photos" msgstr "" -#: ../../mod/photos.php:661 +#: ../../mod/photos.php:649 msgid "Show Newest First" msgstr "" -#: ../../mod/photos.php:663 +#: ../../mod/photos.php:651 msgid "Show Oldest First" msgstr "" -#: ../../mod/photos.php:687 ../../mod/photos.php:1217 +#: ../../mod/photos.php:675 ../../mod/photos.php:1205 msgid "View Photo" msgstr "" -#: ../../mod/photos.php:716 +#: ../../mod/photos.php:704 msgid "Edit Album" msgstr "" -#: ../../mod/photos.php:761 +#: ../../mod/photos.php:749 msgid "Permission denied. Access to this item may be restricted." msgstr "" -#: ../../mod/photos.php:763 +#: ../../mod/photos.php:751 msgid "Photo not available" msgstr "" -#: ../../mod/photos.php:821 +#: ../../mod/photos.php:809 msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:828 +#: ../../mod/photos.php:816 msgid "Private Photo" msgstr "" -#: ../../mod/photos.php:843 +#: ../../mod/photos.php:831 msgid "View Full Size" msgstr "" -#: ../../mod/photos.php:921 +#: ../../mod/photos.php:909 msgid "Edit photo" msgstr "" -#: ../../mod/photos.php:923 +#: ../../mod/photos.php:911 msgid "Rotate CW (right)" msgstr "" -#: ../../mod/photos.php:924 +#: ../../mod/photos.php:912 msgid "Rotate CCW (left)" msgstr "" -#: ../../mod/photos.php:931 +#: ../../mod/photos.php:919 msgid "Caption" msgstr "" -#: ../../mod/photos.php:933 +#: ../../mod/photos.php:921 msgid "Add a Tag" msgstr "" -#: ../../mod/photos.php:937 +#: ../../mod/photos.php:925 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgstr "" -#: ../../mod/photos.php:940 +#: ../../mod/photos.php:928 msgid "Flag as adult in album view" msgstr "" -#: ../../mod/photos.php:1132 +#: ../../mod/photos.php:1120 msgid "In This Photo:" msgstr "" -#: ../../mod/photos.php:1137 +#: ../../mod/photos.php:1125 msgid "Map" msgstr "" -#: ../../mod/photos.php:1223 +#: ../../mod/photos.php:1211 msgid "View Album" msgstr "" -#: ../../mod/photos.php:1246 +#: ../../mod/photos.php:1234 msgid "Recent Photos" msgstr "" @@ -5037,76 +5940,76 @@ msgstr "" msgid "Your service plan only allows %d channels." msgstr "" -#: ../../mod/import.php:60 +#: ../../mod/import.php:51 msgid "Nothing to import." msgstr "" -#: ../../mod/import.php:84 +#: ../../mod/import.php:75 msgid "Unable to download data from old server" msgstr "" -#: ../../mod/import.php:90 +#: ../../mod/import.php:81 msgid "Imported file is empty." msgstr "" -#: ../../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 +#: ../../mod/import.php:106 msgid "" "Cannot create a duplicate channel identifier on this system. Import failed." msgstr "" -#: ../../mod/import.php:176 +#: ../../mod/import.php:127 +msgid "Unable to create a unique channel address. Import failed." +msgstr "" + +#: ../../mod/import.php:147 msgid "Channel clone failed. Import failed." msgstr "" -#: ../../mod/import.php:186 +#: ../../mod/import.php:157 msgid "Cloned channel not found. Import failed." msgstr "" -#: ../../mod/import.php:516 +#: ../../mod/import.php:475 +msgid "Import completed." +msgstr "" + +#: ../../mod/import.php:487 msgid "You must be logged in to use this feature." msgstr "" -#: ../../mod/import.php:521 +#: ../../mod/import.php:492 msgid "Import Channel" msgstr "" -#: ../../mod/import.php:522 +#: ../../mod/import.php:493 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." +"provide an export file. Only identity and connections/relationships will be " +"imported. Importation of content is not yet available." msgstr "" -#: ../../mod/import.php:523 +#: ../../mod/import.php:494 msgid "File to Upload" msgstr "" -#: ../../mod/import.php:524 +#: ../../mod/import.php:495 msgid "Or provide the old server/hub details" msgstr "" -#: ../../mod/import.php:525 +#: ../../mod/import.php:496 msgid "Your old identity address (xyz@example.com)" msgstr "" -#: ../../mod/import.php:526 +#: ../../mod/import.php:497 msgid "Your old login email address" msgstr "" -#: ../../mod/import.php:527 +#: ../../mod/import.php:498 msgid "Your old login password" msgstr "" -#: ../../mod/import.php:528 +#: ../../mod/import.php:499 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 " @@ -5114,19 +6017,12 @@ msgid "" "location for files, photos, and media." msgstr "" -#: ../../mod/import.php:529 +#: ../../mod/import.php:500 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 -msgid "" -"This process may take several minutes to complete. Please submit the form " -"only once and leave this page open until finished." +#: ../../mod/import.php:501 +msgid "Import existing posts if possible" msgstr "" #: ../../mod/editlayout.php:76 ../../mod/editwebpage.php:77 @@ -5306,12 +6202,11 @@ msgstr "" msgid "Remote Channel [%s] (not yet known on this site)" msgstr "" -#: ../../mod/rate.php:161 ../../mod/connedit.php:669 +#: ../../mod/rate.php:161 ../../mod/connedit.php:663 msgid "Rating (this information is public)" msgstr "" -#: ../../mod/rate.php:162 ../../mod/connedit.php:670 -#: ../../mod/connedit.php:674 +#: ../../mod/rate.php:162 ../../mod/connedit.php:664 msgid "Optionally explain your rating (this information is public)" msgstr "" @@ -5511,11 +6406,11 @@ msgstr "" msgid "Allow Bookmarks" msgstr "" -#: ../../mod/menu.php:91 ../../mod/menu.php:145 +#: ../../mod/menu.php:91 ../../mod/menu.php:143 msgid "Menu may be used to store saved bookmarks" msgstr "" -#: ../../mod/menu.php:92 ../../mod/menu.php:147 +#: ../../mod/menu.php:92 msgid "Submit and proceed" msgstr "" @@ -5523,58 +6418,62 @@ msgstr "" msgid "Drop" msgstr "" -#: ../../mod/menu.php:108 +#: ../../mod/menu.php:106 msgid "Bookmarks allowed" msgstr "" -#: ../../mod/menu.php:110 +#: ../../mod/menu.php:108 msgid "Delete this menu" msgstr "" -#: ../../mod/menu.php:111 ../../mod/menu.php:142 +#: ../../mod/menu.php:109 ../../mod/menu.php:140 msgid "Edit menu contents" msgstr "" -#: ../../mod/menu.php:112 +#: ../../mod/menu.php:110 msgid "Edit this menu" msgstr "" -#: ../../mod/menu.php:126 +#: ../../mod/menu.php:124 msgid "Menu could not be deleted." msgstr "" -#: ../../mod/menu.php:134 ../../mod/mitem.php:24 +#: ../../mod/menu.php:132 ../../mod/mitem.php:24 msgid "Menu not found." msgstr "" -#: ../../mod/menu.php:139 +#: ../../mod/menu.php:137 msgid "Edit Menu" msgstr "" -#: ../../mod/menu.php:141 +#: ../../mod/menu.php:139 msgid "Add or remove entries to this menu" msgstr "" -#: ../../mod/menu.php:143 +#: ../../mod/menu.php:141 msgid "Menu name" msgstr "" -#: ../../mod/menu.php:143 +#: ../../mod/menu.php:141 msgid "Must be unique, only seen by you" msgstr "" -#: ../../mod/menu.php:144 +#: ../../mod/menu.php:142 msgid "Menu title" msgstr "" -#: ../../mod/menu.php:144 +#: ../../mod/menu.php:142 msgid "Menu title as seen by others" msgstr "" -#: ../../mod/menu.php:145 +#: ../../mod/menu.php:143 msgid "Allow bookmarks" msgstr "" +#: ../../mod/menu.php:145 +msgid "Modify" +msgstr "" + #: ../../mod/filestorage.php:82 msgid "Permission Denied." msgstr "" @@ -5676,12 +6575,16 @@ msgstr "" msgid "Visible To" msgstr "" -#: ../../mod/impel.php:191 +#: ../../mod/impel.php:54 +msgid "menu" +msgstr "" + +#: ../../mod/impel.php:186 #, php-format msgid "%s element installed" msgstr "" -#: ../../mod/impel.php:194 +#: ../../mod/impel.php:189 #, php-format msgid "%s element installation failed" msgstr "" @@ -5759,7 +6662,7 @@ msgstr "" msgid "Interests" msgstr "" -#: ../../mod/profiles.php:447 ../../mod/admin.php:994 +#: ../../mod/profiles.php:447 ../../mod/admin.php:985 msgid "Address" msgstr "" @@ -5815,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 @@ -5927,7 +6840,7 @@ msgstr "" msgid "This is your default profile." msgstr "" -#: ../../mod/profiles.php:728 +#: ../../mod/profiles.php:728 ../../mod/directory.php:218 msgid "Age: " msgstr "" @@ -6382,9 +7295,71 @@ msgstr "" msgid "Welcome %s. Remote authentication successful." msgstr "" -#: ../../mod/tagger.php:96 +#: ../../mod/directory.php:224 #, 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:236 +msgid "Gender: " +msgstr "" + +#: ../../mod/directory.php:238 +msgid "Status: " +msgstr "" + +#: ../../mod/directory.php:240 +msgid "Homepage: " +msgstr "" + +#: ../../mod/directory.php:243 +msgid "Hometown: " +msgstr "" + +#: ../../mod/directory.php:245 +msgid "About: " +msgstr "" + +#: ../../mod/directory.php:303 +msgid "Public Forum:" +msgstr "" + +<<<<<<< HEAD +#: ../../mod/directory.php:306 +msgid "Keywords: " +msgstr "" + +#: ../../mod/directory.php:311 +#, php-format +msgid "Common connections: %s" +======= +#: ../../mod/admin.php:827 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 +msgid "Block" +msgstr "" + +#: ../../mod/admin.php:828 ../../mod/connedit.php:523 +#: ../../mod/connedit.php:729 +msgid "Unblock" +>>>>>>> cbfb94c55cc422359f1cef3c6fe89d86f131a104 +msgstr "" + +#: ../../mod/directory.php:363 +msgid "Finding:" +msgstr "" + +#: ../../mod/directory.php:368 +msgid "next page" +msgstr "" + +#: ../../mod/directory.php:368 +msgid "previous page" +msgstr "" + +#: ../../mod/directory.php:385 +msgid "No entries (some entries may be hidden)." msgstr "" #: ../../mod/uexport.php:33 ../../mod/uexport.php:34 @@ -6428,7 +7403,7 @@ msgstr "" msgid "Theme settings updated." msgstr "" -#: ../../mod/admin.php:93 ../../mod/admin.php:452 +#: ../../mod/admin.php:93 ../../mod/admin.php:445 msgid "Site" msgstr "" @@ -6436,15 +7411,15 @@ msgstr "" msgid "Accounts" msgstr "" -#: ../../mod/admin.php:95 ../../mod/admin.php:985 +#: ../../mod/admin.php:95 ../../mod/admin.php:976 msgid "Channels" msgstr "" -#: ../../mod/admin.php:96 ../../mod/admin.php:1077 ../../mod/admin.php:1117 +#: ../../mod/admin.php:96 ../../mod/admin.php:1068 ../../mod/admin.php:1108 msgid "Plugins" msgstr "" -#: ../../mod/admin.php:97 ../../mod/admin.php:1277 ../../mod/admin.php:1311 +#: ../../mod/admin.php:97 ../../mod/admin.php:1268 ../../mod/admin.php:1302 msgid "Themes" msgstr "" @@ -6460,7 +7435,7 @@ msgstr "" msgid "DB updates" msgstr "" -#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1396 +#: ../../mod/admin.php:115 ../../mod/admin.php:122 ../../mod/admin.php:1387 msgid "Logs" msgstr "" @@ -6504,10 +7479,10 @@ msgstr "" msgid "Message queues" msgstr "" -#: ../../mod/admin.php:240 ../../mod/admin.php:451 ../../mod/admin.php:548 -#: ../../mod/admin.php:817 ../../mod/admin.php:984 ../../mod/admin.php:1076 -#: ../../mod/admin.php:1116 ../../mod/admin.php:1276 ../../mod/admin.php:1310 -#: ../../mod/admin.php:1395 +#: ../../mod/admin.php:240 ../../mod/admin.php:444 ../../mod/admin.php:539 +#: ../../mod/admin.php:808 ../../mod/admin.php:975 ../../mod/admin.php:1067 +#: ../../mod/admin.php:1107 ../../mod/admin.php:1267 ../../mod/admin.php:1301 +#: ../../mod/admin.php:1386 msgid "Administration" msgstr "" @@ -6519,7 +7494,7 @@ msgstr "" msgid "Registered accounts" msgstr "" -#: ../../mod/admin.php:245 ../../mod/admin.php:552 +#: ../../mod/admin.php:245 ../../mod/admin.php:543 msgid "Pending registrations" msgstr "" @@ -6527,7 +7502,7 @@ msgstr "" msgid "Registered channels" msgstr "" -#: ../../mod/admin.php:247 ../../mod/admin.php:553 +#: ../../mod/admin.php:247 ../../mod/admin.php:544 msgid "Active plugins" msgstr "" @@ -6535,677 +7510,654 @@ msgstr "" msgid "Version" msgstr "" -#: ../../mod/admin.php:363 +#: ../../mod/admin.php:359 msgid "Site settings updated." msgstr "" -#: ../../mod/admin.php:400 ../../mod/settings.php:813 -msgid "mobile" -msgstr "" - -#: ../../mod/admin.php:402 +#: ../../mod/admin.php:398 msgid "experimental" msgstr "" -#: ../../mod/admin.php:404 +#: ../../mod/admin.php:400 msgid "unsupported" msgstr "" -#: ../../mod/admin.php:429 +#: ../../mod/admin.php:425 msgid "Yes - with approval" msgstr "" -#: ../../mod/admin.php:435 +#: ../../mod/admin.php:431 msgid "My site is not a public server" msgstr "" -#: ../../mod/admin.php:436 +#: ../../mod/admin.php:432 msgid "My site has paid access only" msgstr "" -#: ../../mod/admin.php:437 +#: ../../mod/admin.php:433 msgid "My site has free access only" msgstr "" -#: ../../mod/admin.php:438 +#: ../../mod/admin.php:434 msgid "My site offers free accounts with optional paid upgrades" msgstr "" -#: ../../mod/admin.php:454 ../../mod/register.php:207 +#: ../../mod/admin.php:447 ../../mod/register.php:207 msgid "Registration" msgstr "" -#: ../../mod/admin.php:455 +#: ../../mod/admin.php:448 msgid "File upload" msgstr "" -#: ../../mod/admin.php:456 +#: ../../mod/admin.php:449 msgid "Policies" msgstr "" -#: ../../mod/admin.php:461 +#: ../../mod/admin.php:454 msgid "Site name" msgstr "" -#: ../../mod/admin.php:462 +#: ../../mod/admin.php:455 msgid "Banner/Logo" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:456 msgid "Administrator Information" msgstr "" -#: ../../mod/admin.php:463 +#: ../../mod/admin.php:456 msgid "" "Contact information for site administrators. Displayed on siteinfo page. " "BBCode can be used here" msgstr "" -#: ../../mod/admin.php:464 +#: ../../mod/admin.php:457 msgid "System language" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:458 msgid "System theme" msgstr "" -#: ../../mod/admin.php:465 +#: ../../mod/admin.php:458 msgid "" "Default system theme - may be over-ridden by user profiles - <a href='#' " "id='cnftheme'>change theme settings</a>" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:459 msgid "Mobile system theme" msgstr "" -#: ../../mod/admin.php:466 +#: ../../mod/admin.php:459 msgid "Theme for mobile devices" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:461 msgid "Enable Diaspora Protocol" msgstr "" -#: ../../mod/admin.php:468 +#: ../../mod/admin.php:461 msgid "Communicate with Diaspora and Friendica - experimental" msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:462 msgid "Allow Feeds as Connections" msgstr "" -#: ../../mod/admin.php:469 +#: ../../mod/admin.php:462 msgid "(Heavy system resource usage)" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:463 msgid "Maximum image size" msgstr "" -#: ../../mod/admin.php:470 +#: ../../mod/admin.php:463 msgid "" "Maximum size in bytes of uploaded images. Default is 0, which means no " "limits." msgstr "" -#: ../../mod/admin.php:471 +#: ../../mod/admin.php:464 msgid "Does this site allow new member registration?" msgstr "" -#: ../../mod/admin.php:472 +#: ../../mod/admin.php:465 msgid "Which best describes the types of account offered by this hub?" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:466 msgid "Register text" msgstr "" -#: ../../mod/admin.php:473 +#: ../../mod/admin.php:466 msgid "Will be displayed prominently on the registration page." msgstr "" -#: ../../mod/admin.php:474 -msgid "Site homepage to show visitors (default: login box)" -msgstr "" - -#: ../../mod/admin.php:474 -msgid "" -"example: 'public' to show public stream, 'page/sys/home' to show a system " -"webpage called 'home' or 'include:home.html' to include a file." -msgstr "" - -#: ../../mod/admin.php:475 -msgid "Preserve site homepage URL" -msgstr "" - -#: ../../mod/admin.php:475 -msgid "" -"Present the site homepage in a frame at the original location instead of " -"redirecting" -msgstr "" - -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:467 msgid "Accounts abandoned after x days" msgstr "" -#: ../../mod/admin.php:476 +#: ../../mod/admin.php:467 msgid "" "Will not waste system resources polling external sites for abandonded " "accounts. Enter 0 for no time limit." msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:468 msgid "Allowed friend domains" msgstr "" -#: ../../mod/admin.php:477 +#: ../../mod/admin.php:468 msgid "" "Comma separated list of domains which are allowed to establish friendships " "with this site. Wildcards are accepted. Empty to allow any domains" msgstr "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:469 msgid "Allowed email domains" msgstr "" -#: ../../mod/admin.php:478 +#: ../../mod/admin.php:469 msgid "" "Comma separated list of domains which are allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains" msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:470 msgid "Not allowed email domains" msgstr "" -#: ../../mod/admin.php:479 +#: ../../mod/admin.php:470 msgid "" "Comma separated list of domains which are not allowed in email addresses for " "registrations to this site. Wildcards are accepted. Empty to allow any " "domains, unless allowed domains have been defined." msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:471 msgid "Block public" msgstr "" -#: ../../mod/admin.php:480 +#: ../../mod/admin.php:471 msgid "" "Check to block public access to all otherwise public personal pages on this " "site unless you are currently logged in." msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:472 msgid "Verify Email Addresses" msgstr "" -#: ../../mod/admin.php:481 +#: ../../mod/admin.php:472 msgid "" "Check to verify email addresses used in account registration (recommended)." msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:473 msgid "Force publish" msgstr "" -#: ../../mod/admin.php:482 +#: ../../mod/admin.php:473 msgid "" "Check to force all profiles on this site to be listed in the site directory." msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:474 msgid "Disable discovery tab" msgstr "" -#: ../../mod/admin.php:483 +#: ../../mod/admin.php:474 msgid "" "Remove the tab in the network view with public content pulled from sources " "chosen for this site." msgstr "" -#: ../../mod/admin.php:484 -msgid "login on Homepage" +#: ../../mod/admin.php:475 +msgid "No login on Homepage" msgstr "" -#: ../../mod/admin.php:484 +#: ../../mod/admin.php:475 msgid "" -"Present a login box to visitors on the home page if no other content has " -"been configured." +"Check to hide the login form from your sites homepage when visitors arrive " +"who are not logged in (e.g. when you put the content of the homepage in via " +"the site channel)." msgstr "" -#: ../../mod/admin.php:486 +#: ../../mod/admin.php:477 msgid "Proxy user" msgstr "" -#: ../../mod/admin.php:487 +#: ../../mod/admin.php:478 msgid "Proxy URL" msgstr "" -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:479 msgid "Network timeout" msgstr "" -#: ../../mod/admin.php:488 +#: ../../mod/admin.php:479 msgid "Value is in seconds. Set to 0 for unlimited (not recommended)." msgstr "" -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:480 msgid "Delivery interval" msgstr "" -#: ../../mod/admin.php:489 +#: ../../mod/admin.php:480 msgid "" "Delay background delivery processes by this many seconds to reduce system " "load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 " "for large dedicated servers." msgstr "" -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:481 msgid "Poll interval" msgstr "" -#: ../../mod/admin.php:490 +#: ../../mod/admin.php:481 msgid "" "Delay background polling processes by this many seconds to reduce system " "load. If 0, use delivery interval." msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:482 msgid "Maximum Load Average" msgstr "" -#: ../../mod/admin.php:491 +#: ../../mod/admin.php:482 msgid "" "Maximum system load before delivery and poll processes are deferred - " "default 50." msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:483 msgid "Expiration period in days for imported (matrix/network) content" msgstr "" -#: ../../mod/admin.php:492 +#: ../../mod/admin.php:483 msgid "0 for no expiration of imported content" msgstr "" -#: ../../mod/admin.php:540 +#: ../../mod/admin.php:531 msgid "No server found" msgstr "" -#: ../../mod/admin.php:547 ../../mod/admin.php:831 +#: ../../mod/admin.php:538 ../../mod/admin.php:822 msgid "ID" msgstr "" -#: ../../mod/admin.php:547 +#: ../../mod/admin.php:538 msgid "for channel" msgstr "" -#: ../../mod/admin.php:547 +#: ../../mod/admin.php:538 msgid "on server" msgstr "" -#: ../../mod/admin.php:547 +#: ../../mod/admin.php:538 msgid "Status" msgstr "" -#: ../../mod/admin.php:549 +#: ../../mod/admin.php:540 msgid "Server" msgstr "" -#: ../../mod/admin.php:566 +#: ../../mod/admin.php:557 msgid "Update has been marked successful" msgstr "" -#: ../../mod/admin.php:576 +#: ../../mod/admin.php:567 #, php-format msgid "Executing %s failed. Check system logs." msgstr "" -#: ../../mod/admin.php:579 +#: ../../mod/admin.php:570 #, php-format msgid "Update %s was successfully applied." msgstr "" -#: ../../mod/admin.php:583 +#: ../../mod/admin.php:574 #, php-format msgid "Update %s did not return a status. Unknown if it succeeded." msgstr "" -#: ../../mod/admin.php:586 +#: ../../mod/admin.php:577 #, php-format msgid "Update function %s could not be found." msgstr "" -#: ../../mod/admin.php:602 +#: ../../mod/admin.php:593 msgid "No failed updates." msgstr "" -#: ../../mod/admin.php:606 +#: ../../mod/admin.php:597 msgid "Failed Updates" msgstr "" -#: ../../mod/admin.php:608 +#: ../../mod/admin.php:599 msgid "Mark success (if update was manually applied)" msgstr "" -#: ../../mod/admin.php:609 +#: ../../mod/admin.php:600 msgid "Attempt to execute this update step automatically" msgstr "" -#: ../../mod/admin.php:641 +#: ../../mod/admin.php:632 msgid "Queue Statistics" msgstr "" -#: ../../mod/admin.php:642 +#: ../../mod/admin.php:633 msgid "Total Entries" msgstr "" -#: ../../mod/admin.php:643 +#: ../../mod/admin.php:634 msgid "Priority" msgstr "" -#: ../../mod/admin.php:644 +#: ../../mod/admin.php:635 msgid "Destination URL" msgstr "" -#: ../../mod/admin.php:645 +#: ../../mod/admin.php:636 msgid "Mark hub permanently offline" msgstr "" -#: ../../mod/admin.php:646 +#: ../../mod/admin.php:637 msgid "Empty queue for this hub" msgstr "" -#: ../../mod/admin.php:647 +#: ../../mod/admin.php:638 msgid "Last known contact" msgstr "" -#: ../../mod/admin.php:683 +#: ../../mod/admin.php:674 #, php-format msgid "%s user blocked/unblocked" msgid_plural "%s users blocked/unblocked" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:691 +#: ../../mod/admin.php:682 #, php-format msgid "%s user deleted" msgid_plural "%s users deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:727 +#: ../../mod/admin.php:718 msgid "Account not found" msgstr "" -#: ../../mod/admin.php:747 +#: ../../mod/admin.php:738 #, php-format msgid "User '%s' blocked" msgstr "" -#: ../../mod/admin.php:755 +#: ../../mod/admin.php:746 #, php-format msgid "User '%s' unblocked" msgstr "" -#: ../../mod/admin.php:818 ../../mod/admin.php:830 +#: ../../mod/admin.php:809 ../../mod/admin.php:821 msgid "Users" msgstr "" -#: ../../mod/admin.php:820 ../../mod/admin.php:987 +#: ../../mod/admin.php:811 ../../mod/admin.php:978 msgid "select all" msgstr "" -#: ../../mod/admin.php:821 +#: ../../mod/admin.php:812 msgid "User registrations waiting for confirm" msgstr "" -#: ../../mod/admin.php:822 +#: ../../mod/admin.php:813 msgid "Request date" msgstr "" -#: ../../mod/admin.php:823 +#: ../../mod/admin.php:814 msgid "No registrations." msgstr "" -#: ../../mod/admin.php:824 +#: ../../mod/admin.php:815 msgid "Approve" msgstr "" -#: ../../mod/admin.php:825 +#: ../../mod/admin.php:816 msgid "Deny" msgstr "" -#: ../../mod/admin.php:827 ../../mod/connedit.php:523 -#: ../../mod/connedit.php:729 +#: ../../mod/admin.php:818 ../../mod/connedit.php:517 +#: ../../mod/connedit.php:720 msgid "Block" msgstr "" -#: ../../mod/admin.php:828 ../../mod/connedit.php:523 -#: ../../mod/connedit.php:729 +#: ../../mod/admin.php:819 ../../mod/connedit.php:517 +#: ../../mod/connedit.php:720 msgid "Unblock" msgstr "" -#: ../../mod/admin.php:831 +#: ../../mod/admin.php:822 msgid "Register date" msgstr "" -#: ../../mod/admin.php:831 +#: ../../mod/admin.php:822 msgid "Last login" msgstr "" -#: ../../mod/admin.php:831 +#: ../../mod/admin.php:822 msgid "Expires" msgstr "" -#: ../../mod/admin.php:831 +#: ../../mod/admin.php:822 msgid "Service Class" msgstr "" -#: ../../mod/admin.php:833 +#: ../../mod/admin.php:824 msgid "" "Selected users will be deleted!\\n\\nEverything these users had posted on " "this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:834 +#: ../../mod/admin.php:825 msgid "" "The user {0} will be deleted!\\n\\nEverything this user has posted on this " "site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:870 +#: ../../mod/admin.php:861 #, php-format msgid "%s channel censored/uncensored" msgid_plural "%s channels censored/uncensored" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:879 +#: ../../mod/admin.php:870 #, php-format msgid "%s channel code allowed/disallowed" msgid_plural "%s channels code allowed/disallowed" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:886 +#: ../../mod/admin.php:877 #, php-format msgid "%s channel deleted" msgid_plural "%s channels deleted" msgstr[0] "" msgstr[1] "" -#: ../../mod/admin.php:906 +#: ../../mod/admin.php:897 msgid "Channel not found" msgstr "" -#: ../../mod/admin.php:917 +#: ../../mod/admin.php:908 #, php-format msgid "Channel '%s' deleted" msgstr "" -#: ../../mod/admin.php:929 +#: ../../mod/admin.php:920 #, php-format msgid "Channel '%s' censored" msgstr "" -#: ../../mod/admin.php:929 +#: ../../mod/admin.php:920 #, php-format msgid "Channel '%s' uncensored" msgstr "" -#: ../../mod/admin.php:940 +#: ../../mod/admin.php:931 #, php-format msgid "Channel '%s' code allowed" msgstr "" -#: ../../mod/admin.php:940 +#: ../../mod/admin.php:931 #, php-format msgid "Channel '%s' code disallowed" msgstr "" -#: ../../mod/admin.php:989 +#: ../../mod/admin.php:980 msgid "Censor" msgstr "" -#: ../../mod/admin.php:990 +#: ../../mod/admin.php:981 msgid "Uncensor" msgstr "" -#: ../../mod/admin.php:991 +#: ../../mod/admin.php:982 msgid "Allow Code" msgstr "" -#: ../../mod/admin.php:992 +#: ../../mod/admin.php:983 msgid "Disallow Code" msgstr "" -#: ../../mod/admin.php:994 +#: ../../mod/admin.php:985 msgid "UID" msgstr "" -#: ../../mod/admin.php:996 +#: ../../mod/admin.php:987 msgid "" "Selected channels will be deleted!\\n\\nEverything that was posted in these " "channels on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:997 +#: ../../mod/admin.php:988 msgid "" "The channel {0} will be deleted!\\n\\nEverything that was posted in this " "channel on this site will be permanently deleted!\\n\\nAre you sure?" msgstr "" -#: ../../mod/admin.php:1037 +#: ../../mod/admin.php:1028 #, php-format msgid "Plugin %s disabled." msgstr "" -#: ../../mod/admin.php:1041 +#: ../../mod/admin.php:1032 #, php-format msgid "Plugin %s enabled." msgstr "" -#: ../../mod/admin.php:1051 ../../mod/admin.php:1249 +#: ../../mod/admin.php:1042 ../../mod/admin.php:1240 msgid "Disable" msgstr "" -#: ../../mod/admin.php:1054 ../../mod/admin.php:1251 +#: ../../mod/admin.php:1045 ../../mod/admin.php:1242 msgid "Enable" msgstr "" -#: ../../mod/admin.php:1078 ../../mod/admin.php:1278 +#: ../../mod/admin.php:1069 ../../mod/admin.php:1269 msgid "Toggle" msgstr "" -#: ../../mod/admin.php:1086 ../../mod/admin.php:1288 +#: ../../mod/admin.php:1077 ../../mod/admin.php:1279 msgid "Author: " msgstr "" -#: ../../mod/admin.php:1087 ../../mod/admin.php:1289 +#: ../../mod/admin.php:1078 ../../mod/admin.php:1280 msgid "Maintainer: " msgstr "" -#: ../../mod/admin.php:1214 +#: ../../mod/admin.php:1205 msgid "No themes found." msgstr "" -#: ../../mod/admin.php:1270 +#: ../../mod/admin.php:1261 msgid "Screenshot" msgstr "" -#: ../../mod/admin.php:1316 +#: ../../mod/admin.php:1307 msgid "[Experimental]" msgstr "" -#: ../../mod/admin.php:1317 +#: ../../mod/admin.php:1308 msgid "[Unsupported]" msgstr "" -#: ../../mod/admin.php:1341 +#: ../../mod/admin.php:1332 msgid "Log settings updated." msgstr "" -#: ../../mod/admin.php:1398 +#: ../../mod/admin.php:1389 msgid "Clear" msgstr "" -#: ../../mod/admin.php:1404 +#: ../../mod/admin.php:1395 msgid "Debugging" msgstr "" -#: ../../mod/admin.php:1405 +#: ../../mod/admin.php:1396 msgid "Log file" msgstr "" -#: ../../mod/admin.php:1405 +#: ../../mod/admin.php:1396 msgid "" "Must be writable by web server. Relative to your Red top-level directory." msgstr "" -#: ../../mod/admin.php:1406 +#: ../../mod/admin.php:1397 msgid "Log level" msgstr "" -#: ../../mod/admin.php:1452 +#: ../../mod/admin.php:1443 msgid "New Profile Field" msgstr "" -#: ../../mod/admin.php:1453 ../../mod/admin.php:1473 +#: ../../mod/admin.php:1444 ../../mod/admin.php:1464 msgid "Field nickname" msgstr "" -#: ../../mod/admin.php:1453 ../../mod/admin.php:1473 +#: ../../mod/admin.php:1444 ../../mod/admin.php:1464 msgid "System name of field" msgstr "" -#: ../../mod/admin.php:1454 ../../mod/admin.php:1474 +#: ../../mod/admin.php:1445 ../../mod/admin.php:1465 msgid "Input type" msgstr "" -#: ../../mod/admin.php:1455 ../../mod/admin.php:1475 +#: ../../mod/admin.php:1446 ../../mod/admin.php:1466 msgid "Field Name" msgstr "" -#: ../../mod/admin.php:1455 ../../mod/admin.php:1475 +#: ../../mod/admin.php:1446 ../../mod/admin.php:1466 msgid "Label on profile pages" msgstr "" -#: ../../mod/admin.php:1456 ../../mod/admin.php:1476 +#: ../../mod/admin.php:1447 ../../mod/admin.php:1467 msgid "Help text" msgstr "" -#: ../../mod/admin.php:1456 ../../mod/admin.php:1476 +#: ../../mod/admin.php:1447 ../../mod/admin.php:1467 msgid "Additional info (optional)" msgstr "" -#: ../../mod/admin.php:1466 +#: ../../mod/admin.php:1457 msgid "Field definition not found" msgstr "" -#: ../../mod/admin.php:1472 +#: ../../mod/admin.php:1463 msgid "Edit Profile Field" msgstr "" @@ -7339,615 +8291,60 @@ msgid "" "removed from the network" msgstr "" -#: ../../mod/removeaccount.php:61 ../../mod/settings.php:720 -msgid "Remove Account" -msgstr "" - -#: ../../mod/help.php:49 ../../mod/help.php:55 ../../mod/help.php:61 -msgid "Help:" -msgstr "" - -#: ../../mod/help.php:76 ../../index.php:227 -msgid "Not Found" -msgstr "" - -#: ../../mod/help.php:100 -msgid "$Projectname Documentation" -msgstr "" - -#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 -#: ../../mod/update_network.php:23 ../../mod/update_search.php:46 -#: ../../mod/update_home.php:21 ../../mod/update_public.php:21 -msgid "[Embedded content - reload page to view]" -msgstr "" - -#: ../../mod/lockview.php:37 -msgid "Remote privacy information not available." -msgstr "" - -#: ../../mod/lockview.php:58 -msgid "Visible to:" -msgstr "" - -#: ../../mod/settings.php:76 -msgid "Name is required" -msgstr "" - -#: ../../mod/settings.php:80 -msgid "Key and Secret are required" -msgstr "" - -#: ../../mod/settings.php:130 -msgid "Diaspora Policy Settings updated." -msgstr "" - -#: ../../mod/settings.php:238 -msgid "Passwords do not match. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:242 -msgid "Empty passwords are not allowed. Password unchanged." -msgstr "" - -#: ../../mod/settings.php:256 -msgid "Password changed." -msgstr "" - -#: ../../mod/settings.php:258 -msgid "Password update failed. Please try again." -msgstr "" - -#: ../../mod/settings.php:272 -msgid "Not valid email." -msgstr "" - -#: ../../mod/settings.php:275 -msgid "Protected email address. Cannot change to that email." -msgstr "" - -#: ../../mod/settings.php:284 -msgid "System failure storing new email. Please try again." -msgstr "" - -#: ../../mod/settings.php:523 -msgid "Settings updated." -msgstr "" - -#: ../../mod/settings.php:587 ../../mod/settings.php:613 -#: ../../mod/settings.php:649 -msgid "Add application" -msgstr "" - -#: ../../mod/settings.php:590 -msgid "Name of application" -msgstr "" - -#: ../../mod/settings.php:591 ../../mod/settings.php:617 -msgid "Consumer Key" -msgstr "" - -#: ../../mod/settings.php:591 ../../mod/settings.php:592 -msgid "Automatically generated - change if desired. Max length 20" -msgstr "" - -#: ../../mod/settings.php:592 ../../mod/settings.php:618 -msgid "Consumer Secret" -msgstr "" - -#: ../../mod/settings.php:593 ../../mod/settings.php:619 -msgid "Redirect" -msgstr "" - -#: ../../mod/settings.php:593 -msgid "" -"Redirect URI - leave blank unless your application specifically requires this" -msgstr "" - -#: ../../mod/settings.php:594 ../../mod/settings.php:620 -msgid "Icon url" -msgstr "" - -#: ../../mod/settings.php:594 -msgid "Optional" -msgstr "" - -#: ../../mod/settings.php:605 -msgid "You can't edit this application." -msgstr "" - -#: ../../mod/settings.php:648 -msgid "Connected Apps" -msgstr "" - -#: ../../mod/settings.php:652 -msgid "Client key starts with" -msgstr "" - -#: ../../mod/settings.php:653 -msgid "No name" -msgstr "" - -#: ../../mod/settings.php:654 -msgid "Remove authorization" -msgstr "" - -#: ../../mod/settings.php:668 -msgid "No feature settings configured" -msgstr "" - -#: ../../mod/settings.php:685 -msgid "Feature/Addon Settings" -msgstr "" - -#: ../../mod/settings.php:687 -msgid "Settings for the built-in Diaspora emulator" -msgstr "" - -#: ../../mod/settings.php:688 -msgid "Allow any Diaspora member to comment on your public posts" -msgstr "" - -#: ../../mod/settings.php:689 -msgid "Enable the Diaspora protocol for this channel" -msgstr "" - -#: ../../mod/settings.php:690 -msgid "Diaspora Policy Settings" -msgstr "" - -#: ../../mod/settings.php:691 -msgid "Prevent your hashtags from being redirected to other sites" -msgstr "" - -#: ../../mod/settings.php:715 -msgid "Account Settings" -msgstr "" - -#: ../../mod/settings.php:716 -msgid "Enter New Password:" -msgstr "" - -#: ../../mod/settings.php:717 -msgid "Confirm New Password:" -msgstr "" - -#: ../../mod/settings.php:717 -msgid "Leave password fields blank unless changing" -msgstr "" - -#: ../../mod/settings.php:719 ../../mod/settings.php:1057 -msgid "Email Address:" -msgstr "" - -#: ../../mod/settings.php:721 -msgid "Remove this account including all its channels" -msgstr "" - -#: ../../mod/settings.php:737 -msgid "Off" +#: ../../mod/item.php:174 +msgid "Unable to locate original post." msgstr "" -#: ../../mod/settings.php:737 -msgid "On" +#: ../../mod/item.php:440 +msgid "Empty post discarded." msgstr "" -#: ../../mod/settings.php:744 -msgid "Additional Features" +#: ../../mod/item.php:480 +msgid "Executable content type not permitted to this channel." msgstr "" -#: ../../mod/settings.php:768 -msgid "Connector Settings" +#: ../../mod/item.php:897 +msgid "System error. Post not saved." msgstr "" -#: ../../mod/settings.php:807 -msgid "No special theme for mobile devices" +#: ../../mod/item.php:1115 +msgid "Unable to obtain post information from database." msgstr "" -#: ../../mod/settings.php:810 +#: ../../mod/item.php:1122 #, php-format -msgid "%s - (Experimental)" -msgstr "" - -#: ../../mod/settings.php:849 -msgid "Display Settings" -msgstr "" - -#: ../../mod/settings.php:850 -msgid "Theme Settings" -msgstr "" - -#: ../../mod/settings.php:851 -msgid "Custom Theme Settings" -msgstr "" - -#: ../../mod/settings.php:852 -msgid "Content Settings" -msgstr "" - -#: ../../mod/settings.php:858 -msgid "Display Theme:" -msgstr "" - -#: ../../mod/settings.php:859 -msgid "Mobile Theme:" -msgstr "" - -#: ../../mod/settings.php:860 -msgid "Enable user zoom on mobile devices" -msgstr "" - -#: ../../mod/settings.php:861 -msgid "Update browser every xx seconds" -msgstr "" - -#: ../../mod/settings.php:861 -msgid "Minimum of 10 seconds, no maximum" -msgstr "" - -#: ../../mod/settings.php:862 -msgid "Maximum number of conversations to load at any time:" -msgstr "" - -#: ../../mod/settings.php:862 -msgid "Maximum of 100 items" -msgstr "" - -#: ../../mod/settings.php:863 -msgid "Show emoticons (smilies) as images" -msgstr "" - -#: ../../mod/settings.php:864 -msgid "Link post titles to source" -msgstr "" - -#: ../../mod/settings.php:865 -msgid "System Page Layout Editor - (advanced)" -msgstr "" - -#: ../../mod/settings.php:868 -msgid "Use blog/list mode on channel page" -msgstr "" - -#: ../../mod/settings.php:868 ../../mod/settings.php:869 -msgid "(comments displayed separately)" -msgstr "" - -#: ../../mod/settings.php:869 -msgid "Use blog/list mode on matrix page" -msgstr "" - -#: ../../mod/settings.php:870 -msgid "Channel page max height of content (in pixels)" -msgstr "" - -#: ../../mod/settings.php:870 ../../mod/settings.php:871 -msgid "click to expand content exceeding this height" -msgstr "" - -#: ../../mod/settings.php:871 -msgid "Matrix page max height of content (in pixels)" -msgstr "" - -#: ../../mod/settings.php:905 -msgid "Nobody except yourself" -msgstr "" - -#: ../../mod/settings.php:906 -msgid "Only those you specifically allow" -msgstr "" - -#: ../../mod/settings.php:907 -msgid "Approved connections" -msgstr "" - -#: ../../mod/settings.php:908 -msgid "Any connections" -msgstr "" - -#: ../../mod/settings.php:909 -msgid "Anybody on this website" -msgstr "" - -#: ../../mod/settings.php:910 -msgid "Anybody in this network" -msgstr "" - -#: ../../mod/settings.php:911 -msgid "Anybody authenticated" -msgstr "" - -#: ../../mod/settings.php:912 -msgid "Anybody on the internet" -msgstr "" - -#: ../../mod/settings.php:986 -msgid "Publish your default profile in the network directory" -msgstr "" - -#: ../../mod/settings.php:991 -msgid "Allow us to suggest you as a potential friend to new members?" -msgstr "" - -#: ../../mod/settings.php:1000 -msgid "Your channel address is" -msgstr "" - -#: ../../mod/settings.php:1048 -msgid "Channel Settings" -msgstr "" - -#: ../../mod/settings.php:1055 -msgid "Basic Settings" -msgstr "" - -#: ../../mod/settings.php:1058 -msgid "Your Timezone:" -msgstr "" - -#: ../../mod/settings.php:1059 -msgid "Default Post Location:" -msgstr "" - -#: ../../mod/settings.php:1059 -msgid "Geographical location to display on your posts" -msgstr "" - -#: ../../mod/settings.php:1060 -msgid "Use Browser Location:" -msgstr "" - -#: ../../mod/settings.php:1062 -msgid "Adult Content" -msgstr "" - -#: ../../mod/settings.php:1062 -msgid "" -"This channel frequently or regularly publishes adult content. (Please tag " -"any adult material and/or nudity with #NSFW)" -msgstr "" - -#: ../../mod/settings.php:1064 -msgid "Security and Privacy Settings" -msgstr "" - -#: ../../mod/settings.php:1066 -msgid "Your permissions are already configured. Click to view/adjust" -msgstr "" - -#: ../../mod/settings.php:1068 -msgid "Hide my online presence" -msgstr "" - -#: ../../mod/settings.php:1068 -msgid "Prevents displaying in your profile that you are online" -msgstr "" - -#: ../../mod/settings.php:1070 -msgid "Simple Privacy Settings:" -msgstr "" - -#: ../../mod/settings.php:1071 -msgid "" -"Very Public - <em>extremely permissive (should be used with caution)</em>" -msgstr "" - -#: ../../mod/settings.php:1072 -msgid "" -"Typical - <em>default public, privacy when desired (similar to social " -"network permissions but with improved privacy)</em>" -msgstr "" - -#: ../../mod/settings.php:1073 -msgid "Private - <em>default private, never open or public</em>" -msgstr "" - -#: ../../mod/settings.php:1074 -msgid "Blocked - <em>default blocked to/from everybody</em>" -msgstr "" - -#: ../../mod/settings.php:1076 -msgid "Allow others to tag your posts" -msgstr "" - -#: ../../mod/settings.php:1076 -msgid "" -"Often used by the community to retro-actively flag inappropriate content" -msgstr "" - -#: ../../mod/settings.php:1078 -msgid "Advanced Privacy Settings" -msgstr "" - -#: ../../mod/settings.php:1080 -msgid "Expire other channel content after this many days" -msgstr "" - -#: ../../mod/settings.php:1080 -msgid "0 or blank prevents expiration" -msgstr "" - -#: ../../mod/settings.php:1081 -msgid "Maximum Friend Requests/Day:" -msgstr "" - -#: ../../mod/settings.php:1081 -msgid "May reduce spam activity" -msgstr "" - -#: ../../mod/settings.php:1082 -msgid "Default Post Permissions" -msgstr "" - -#: ../../mod/settings.php:1083 ../../mod/mitem.php:159 ../../mod/mitem.php:229 -msgid "(click to open/close)" -msgstr "" - -#: ../../mod/settings.php:1087 -msgid "Channel permissions category:" -msgstr "" - -#: ../../mod/settings.php:1093 -msgid "Maximum private messages per day from unknown people:" -msgstr "" - -#: ../../mod/settings.php:1093 -msgid "Useful to reduce spamming" -msgstr "" - -#: ../../mod/settings.php:1096 -msgid "Notification Settings" -msgstr "" - -#: ../../mod/settings.php:1097 -msgid "By default post a status message when:" -msgstr "" - -#: ../../mod/settings.php:1098 -msgid "accepting a friend request" -msgstr "" - -#: ../../mod/settings.php:1099 -msgid "joining a forum/community" -msgstr "" - -#: ../../mod/settings.php:1100 -msgid "making an <em>interesting</em> profile change" -msgstr "" - -#: ../../mod/settings.php:1101 -msgid "Send a notification email when:" -msgstr "" - -#: ../../mod/settings.php:1102 -msgid "You receive a connection request" -msgstr "" - -#: ../../mod/settings.php:1103 -msgid "Your connections are confirmed" -msgstr "" - -#: ../../mod/settings.php:1104 -msgid "Someone writes on your profile wall" -msgstr "" - -#: ../../mod/settings.php:1105 -msgid "Someone writes a followup comment" -msgstr "" - -#: ../../mod/settings.php:1106 -msgid "You receive a private message" -msgstr "" - -#: ../../mod/settings.php:1107 -msgid "You receive a friend suggestion" -msgstr "" - -#: ../../mod/settings.php:1108 -msgid "You are tagged in a post" -msgstr "" - -#: ../../mod/settings.php:1109 -msgid "You are poked/prodded/etc. in a post" -msgstr "" - -#: ../../mod/settings.php:1112 -msgid "Show visual notifications including:" -msgstr "" - -#: ../../mod/settings.php:1114 -msgid "Unseen matrix activity" -msgstr "" - -#: ../../mod/settings.php:1115 -msgid "Unseen channel activity" -msgstr "" - -#: ../../mod/settings.php:1116 -msgid "Unseen private messages" -msgstr "" - -#: ../../mod/settings.php:1116 ../../mod/settings.php:1121 -#: ../../mod/settings.php:1122 ../../mod/settings.php:1123 -msgid "Recommended" -msgstr "" - -#: ../../mod/settings.php:1117 -msgid "Upcoming events" -msgstr "" - -#: ../../mod/settings.php:1118 -msgid "Events today" -msgstr "" - -#: ../../mod/settings.php:1119 -msgid "Upcoming birthdays" -msgstr "" - -#: ../../mod/settings.php:1119 -msgid "Not available in all themes" -msgstr "" - -#: ../../mod/settings.php:1120 -msgid "System (personal) notifications" -msgstr "" - -#: ../../mod/settings.php:1121 -msgid "System info messages" -msgstr "" - -#: ../../mod/settings.php:1122 -msgid "System critical alerts" -msgstr "" - -#: ../../mod/settings.php:1123 -msgid "New connections" -msgstr "" - -#: ../../mod/settings.php:1124 -msgid "System Registrations" -msgstr "" - -#: ../../mod/settings.php:1125 -msgid "" -"Also show new wall posts, private messages and connections under Notices" -msgstr "" - -#: ../../mod/settings.php:1127 -msgid "Notify me of events this many days in advance" -msgstr "" - -#: ../../mod/settings.php:1127 -msgid "Must be greater than 0" +msgid "You have reached your limit of %1$.0f top level posts." msgstr "" -#: ../../mod/settings.php:1129 -msgid "Advanced Account/Page Type Settings" +#: ../../mod/item.php:1129 +#, php-format +msgid "You have reached your limit of %1$.0f webpages." msgstr "" -#: ../../mod/settings.php:1130 -msgid "Change the behaviour of this account for special situations" +#: ../../mod/update_channel.php:43 ../../mod/update_display.php:25 +#: ../../mod/update_network.php:23 ../../mod/update_search.php:46 +#: ../../mod/update_home.php:21 +msgid "[Embedded content - reload page to view]" msgstr "" -#: ../../mod/settings.php:1133 -msgid "" -"Please enable expert mode (in <a href=\"settings/features\">Settings > " -"Additional features</a>) to adjust!" +#: ../../mod/lockview.php:37 +msgid "Remote privacy information not available." msgstr "" -#: ../../mod/settings.php:1134 -msgid "Miscellaneous Settings" +#: ../../mod/lockview.php:58 +msgid "Visible to:" msgstr "" -#: ../../mod/settings.php:1136 -msgid "Personal menu to display in your channel pages" +#: ../../mod/layouts.php:176 +msgid "Comanche page description language help" msgstr "" -#: ../../mod/settings.php:1137 ../../mod/removeme.php:61 -msgid "Remove Channel" +#: ../../mod/layouts.php:180 +msgid "Layout Description" msgstr "" -#: ../../mod/settings.php:1138 -msgid "Remove this channel." +#: ../../mod/layouts.php:185 +msgid "Download PDL file" msgstr "" #: ../../mod/id.php:11 @@ -8720,25 +9117,36 @@ msgstr "" msgid "posted an event" msgstr "" -#: ../../mod/layouts.php:176 -msgid "Comanche page description language help" +#: ../../mod/network.php:91 +msgid "No such group" msgstr "" -#: ../../mod/layouts.php:180 -msgid "Layout Description" +#: ../../mod/network.php:129 +msgid "No such channel" msgstr "" -#: ../../mod/layouts.php:185 -msgid "Download PDL file" +#: ../../mod/network.php:143 +msgid "Search Results For:" msgstr "" -#: ../../mod/home.php:73 -#, php-format -msgid "Welcome to %s" +#: ../../mod/network.php:198 +msgid "Collection is empty" +msgstr "" + +#: ../../mod/network.php:207 +msgid "Collection: " +msgstr "" + +#: ../../mod/network.php:226 +msgid "Connection: " +msgstr "" + +#: ../../mod/network.php:233 +msgid "Invalid connection." msgstr "" -#: ../../mod/page.php:126 -msgid "Lorem Ipsum" +#: ../../mod/page.php:122 +msgid "Ipsum Lorem" msgstr "" #: ../../mod/bookmarks.php:38 @@ -8820,7 +9228,7 @@ msgid "Monospace" msgstr "" #: ../../view/theme/apw/php/config.php:259 -#: ../../view/theme/redbasic/php/config.php:102 +#: ../../view/theme/redbasic/php/config.php:100 msgid "Theme settings" msgstr "" @@ -8829,7 +9237,7 @@ msgid "Set scheme" msgstr "" #: ../../view/theme/apw/php/config.php:261 -#: ../../view/theme/redbasic/php/config.php:124 +#: ../../view/theme/redbasic/php/config.php:122 msgid "Set font-size for posts and comments" msgstr "" @@ -8950,130 +9358,130 @@ msgid "Right offset of the aside element" msgstr "" #: ../../view/theme/redbasic/php/config.php:82 -msgid "Light (Red Matrix default)" +msgid "Light (Hubzilla default)" msgstr "" -#: ../../view/theme/redbasic/php/config.php:103 +#: ../../view/theme/redbasic/php/config.php:101 msgid "Select scheme" msgstr "" -#: ../../view/theme/redbasic/php/config.php:104 +#: ../../view/theme/redbasic/php/config.php:102 msgid "Narrow navbar" msgstr "" -#: ../../view/theme/redbasic/php/config.php:105 +#: ../../view/theme/redbasic/php/config.php:103 msgid "Navigation bar background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:106 +#: ../../view/theme/redbasic/php/config.php:104 msgid "Navigation bar gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:107 +#: ../../view/theme/redbasic/php/config.php:105 msgid "Navigation bar gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:108 +#: ../../view/theme/redbasic/php/config.php:106 msgid "Navigation active button gradient top color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:109 +#: ../../view/theme/redbasic/php/config.php:107 msgid "Navigation active button gradient bottom color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:110 +#: ../../view/theme/redbasic/php/config.php:108 msgid "Navigation bar border color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:111 +#: ../../view/theme/redbasic/php/config.php:109 msgid "Navigation bar icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:112 +#: ../../view/theme/redbasic/php/config.php:110 msgid "Navigation bar active icon color " msgstr "" -#: ../../view/theme/redbasic/php/config.php:113 +#: ../../view/theme/redbasic/php/config.php:111 msgid "link color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:114 +#: ../../view/theme/redbasic/php/config.php:112 msgid "Set font-color for banner" msgstr "" -#: ../../view/theme/redbasic/php/config.php:115 +#: ../../view/theme/redbasic/php/config.php:113 msgid "Set the background color" msgstr "" -#: ../../view/theme/redbasic/php/config.php:116 +#: ../../view/theme/redbasic/php/config.php:114 msgid "Set the background image" msgstr "" -#: ../../view/theme/redbasic/php/config.php:117 +#: ../../view/theme/redbasic/php/config.php:115 msgid "Set the background color of items" msgstr "" -#: ../../view/theme/redbasic/php/config.php:118 +#: ../../view/theme/redbasic/php/config.php:116 msgid "Set the background color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:119 +#: ../../view/theme/redbasic/php/config.php:117 msgid "Set the border color of comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:120 +#: ../../view/theme/redbasic/php/config.php:118 msgid "Set the indent for comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:121 +#: ../../view/theme/redbasic/php/config.php:119 msgid "Set the basic color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:122 +#: ../../view/theme/redbasic/php/config.php:120 msgid "Set the hover color for item icons" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Set font-size for the entire application" msgstr "" -#: ../../view/theme/redbasic/php/config.php:123 +#: ../../view/theme/redbasic/php/config.php:121 msgid "Example: 14px" msgstr "" -#: ../../view/theme/redbasic/php/config.php:125 +#: ../../view/theme/redbasic/php/config.php:123 msgid "Set font-color for posts and comments" msgstr "" -#: ../../view/theme/redbasic/php/config.php:126 +#: ../../view/theme/redbasic/php/config.php:124 msgid "Set radius of corners" msgstr "" -#: ../../view/theme/redbasic/php/config.php:127 +#: ../../view/theme/redbasic/php/config.php:125 msgid "Set shadow depth of photos" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Set maximum width of content region in pixel" msgstr "" -#: ../../view/theme/redbasic/php/config.php:128 +#: ../../view/theme/redbasic/php/config.php:126 msgid "Leave empty for default width" msgstr "" -#: ../../view/theme/redbasic/php/config.php:129 +#: ../../view/theme/redbasic/php/config.php:127 msgid "Center page content" msgstr "" -#: ../../view/theme/redbasic/php/config.php:130 +#: ../../view/theme/redbasic/php/config.php:128 msgid "Set minimum opacity of nav bar - to hide it" msgstr "" -#: ../../view/theme/redbasic/php/config.php:131 +#: ../../view/theme/redbasic/php/config.php:129 msgid "Set size of conversation author photo" msgstr "" -#: ../../view/theme/redbasic/php/config.php:132 +#: ../../view/theme/redbasic/php/config.php:130 msgid "Set size of followup author photos" msgstr "" @@ -9089,7 +9497,7 @@ msgstr "" #: ../../boot.php:1525 msgid "" -"Create an account to access services and applications within the Red Matrix" +"Create an account to access services and applications within the Hubzilla" msgstr "" #: ../../boot.php:1553 |