diff options
25 files changed, 356 insertions, 544 deletions
diff --git a/mod/directory.php b/mod/directory.php index 72c30fb31..a02a4a4a5 100644 --- a/mod/directory.php +++ b/mod/directory.php @@ -35,7 +35,9 @@ function directory_content(&$a) { $o .= replace_macros($tpl, array( '$search' => $search, '$globaldir' => $globaldir, - '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : "") + '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""), + '$sitedir' => t('Site Directory'), + '$submit' => t('Find') )); if($search) diff --git a/mod/group.php b/mod/group.php index fcdc6a758..3ee14dd85 100644 --- a/mod/group.php +++ b/mod/group.php @@ -91,7 +91,11 @@ function group_content(&$a) { if(($a->argc == 2) && ($a->argv[1] === 'new')) { $tpl = load_view_file('view/group_new.tpl'); - $o .= replace_macros($tpl,array()); + $o .= replace_macros($tpl,array( + '$desc' => t('Create a group of contacts/friends.'), + '$name' => t('Group Name: '), + '$submit' => t('Submit') + )); return $o; } @@ -144,7 +148,11 @@ function group_content(&$a) { '$gid' => $group['id'], '$name' => $group['name'], '$drop' => $drop_txt, - '$selector' => contact_select('group_members_select','group_members_select',$preselected,25,false,$celeb) + '$selector' => contact_select('group_members_select','group_members_select',$preselected,25,false,$celeb), + '$title' => t('Group Editor'), + '$gname' => t('Group Name: '), + '$members' => t('Members:'), + '$submit' => t('Submit') )); } diff --git a/mod/settings.php b/mod/settings.php index b20f4d11b..72b627d41 100644 --- a/mod/settings.php +++ b/mod/settings.php @@ -258,7 +258,15 @@ function settings_content(&$a) { '$page_normal' => PAGE_NORMAL, '$page_soapbox' => PAGE_SOAPBOX, '$page_community' => PAGE_COMMUNITY, - '$page_freelove' => PAGE_FREELOVE + '$page_freelove' => PAGE_FREELOVE, + '$n_l' => t('Normal Account'), + '$n_d' => t('This account is a normal personal profile'), + '$s_l' => t('Soapbox Account'), + '$s_d' => t('Automatically approve all connection/friend requests as read-only fans'), + '$c_l' => t('Community/Celebrity Account'), + '$c_d' => t('Automatically approve all connection/friend requests as read-write fans'), + '$f_l' => t('Automatic Friend Account'), + '$f_d' => t('Automatically approve all connection/friend requests as friends') )); $noid = get_config('system','no_openid'); diff --git a/util/messages.po b/util/messages.po index c7e0a240d..e88f79f53 100644 --- a/util/messages.po +++ b/util/messages.po @@ -1,4 +1,4 @@ -# FRIENDIKA Distribuited Social Network +# FRIENDIKA Distributed Social Network # Copyright (C) 2010, 2011 Mike Macgirvin # This file is distributed under the same license as the Friendika package. # Mike Macgirvin, 2010 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2.1.933\n" +"Project-Id-Version: 2.1.941\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-03-29 17:14-0700\n" +"POT-Creation-Date: 2011-04-06 22:40-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL@li.org>\n" @@ -17,6 +17,10 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n" +#: ../../mod/oexchange.php:27 +msgid "Post successful." +msgstr "" + #: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94 #: ../../mod/dfrn_request.php:628 ../../addon/js_upload/js_upload.php:41 msgid "Cancel" @@ -38,7 +42,7 @@ msgstr "" msgid "Remove" msgstr "" -#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392 +#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:483 #, php-format msgid "%s welcomes %s" msgstr "" @@ -52,14 +56,14 @@ msgstr "" #: ../../mod/photos.php:850 ../../mod/photos.php:865 ../../mod/photos.php:1233 #: ../../mod/photos.php:1244 ../../include/Photo.php:225 #: ../../include/Photo.php:232 ../../include/Photo.php:239 -#: ../../include/items.php:982 ../../include/items.php:985 -#: ../../include/items.php:988 ../../wip/photos.php:35 ../../wip/photos.php:98 -#: ../../wip/photos.php:731 ../../wip/photos.php:785 ../../wip/photos.php:800 -#: ../../wip/photos.php:1111 ../../wip/photos.php:1122 -#: ../../wip/photos-chris.php:45 ../../wip/photos-chris.php:118 -#: ../../wip/photos-chris.php:778 ../../wip/photos-chris.php:832 -#: ../../wip/photos-chris.php:847 ../../wip/photos-chris.php:1158 -#: ../../wip/photos-chris.php:1169 +#: ../../include/items.php:1028 ../../include/items.php:1031 +#: ../../include/items.php:1034 ../../wip/photos.php:35 +#: ../../wip/photos.php:98 ../../wip/photos.php:731 ../../wip/photos.php:785 +#: ../../wip/photos.php:800 ../../wip/photos.php:1111 +#: ../../wip/photos.php:1122 ../../wip/photos-chris.php:45 +#: ../../wip/photos-chris.php:118 ../../wip/photos-chris.php:778 +#: ../../wip/photos-chris.php:832 ../../wip/photos-chris.php:847 +#: ../../wip/photos-chris.php:1158 ../../wip/photos-chris.php:1169 msgid "Contact Photos" msgstr "" @@ -74,12 +78,12 @@ msgstr "" #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 #: ../../mod/message.php:8 ../../mod/message.php:116 #: ../../mod/wall_upload.php:42 ../../mod/follow.php:8 -#: ../../mod/display.php:308 ../../mod/profiles.php:7 +#: ../../mod/display.php:309 ../../mod/profiles.php:7 #: ../../mod/profiles.php:227 ../../mod/invite.php:13 ../../mod/invite.php:50 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:110 #: ../../wip/photos.php:77 ../../wip/photos.php:723 #: ../../wip/photos-chris.php:97 ../../wip/photos-chris.php:770 -#: ../../index.php:251 +#: ../../index.php:265 msgid "Permission denied." msgstr "" @@ -156,7 +160,8 @@ msgid "No photos selected" msgstr "" #: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066 -#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../mod/invite.php:64 +#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../mod/group.php:97 +#: ../../mod/group.php:155 ../../mod/invite.php:64 #: ../../addon/facebook/facebook.php:151 #: ../../addon/randplace/randplace.php:179 #: ../../addon/statusnet/statusnet.php:163 @@ -215,8 +220,8 @@ msgstr "" msgid "Use as profile photo" msgstr "" -#: ../../mod/photos.php:962 ../../mod/network.php:431 -#: ../../mod/profile.php:368 ../../mod/display.php:149 +#: ../../mod/photos.php:962 ../../mod/network.php:443 +#: ../../mod/profile.php:370 ../../mod/display.php:149 msgid "Private Message" msgstr "" @@ -262,41 +267,41 @@ msgstr "" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping" msgstr "" -#: ../../mod/photos.php:1084 ../../mod/network.php:475 -#: ../../mod/profile.php:375 ../../mod/display.php:156 +#: ../../mod/photos.php:1084 ../../mod/network.php:487 +#: ../../mod/profile.php:377 ../../mod/display.php:156 msgid "I like this (toggle)" msgstr "" -#: ../../mod/photos.php:1085 ../../mod/network.php:476 -#: ../../mod/profile.php:376 ../../mod/display.php:157 +#: ../../mod/photos.php:1085 ../../mod/network.php:488 +#: ../../mod/profile.php:378 ../../mod/display.php:157 msgid "I don't like this (toggle)" msgstr "" -#: ../../mod/photos.php:1086 ../../mod/network.php:96 -#: ../../mod/network.php:477 ../../mod/profile.php:164 -#: ../../mod/profile.php:377 ../../mod/display.php:158 +#: ../../mod/photos.php:1086 ../../mod/network.php:105 +#: ../../mod/network.php:489 ../../mod/profile.php:165 +#: ../../mod/profile.php:379 ../../mod/display.php:158 msgid "Share" msgstr "" #: ../../mod/photos.php:1087 ../../mod/editpost.php:70 -#: ../../mod/network.php:104 ../../mod/network.php:478 -#: ../../mod/message.php:188 ../../mod/message.php:322 -#: ../../mod/profile.php:172 ../../mod/profile.php:378 +#: ../../mod/network.php:114 ../../mod/network.php:490 +#: ../../mod/message.php:190 ../../mod/message.php:324 +#: ../../mod/profile.php:174 ../../mod/profile.php:380 #: ../../mod/display.php:159 msgid "Please wait" msgstr "" #: ../../mod/photos.php:1106 ../../mod/photos.php:1146 -#: ../../mod/photos.php:1175 ../../mod/network.php:491 -#: ../../mod/profile.php:390 ../../mod/display.php:171 +#: ../../mod/photos.php:1175 ../../mod/network.php:503 +#: ../../mod/profile.php:392 ../../mod/display.php:171 #: ../../wip/photos.php:986 ../../wip/photos.php:1025 #: ../../wip/photos.php:1053 ../../wip/photos-chris.php:1033 #: ../../wip/photos-chris.php:1072 ../../wip/photos-chris.php:1100 msgid "This is you" msgstr "" -#: ../../mod/photos.php:1203 ../../mod/network.php:500 ../../mod/group.php:137 -#: ../../mod/profile.php:436 ../../mod/display.php:238 +#: ../../mod/photos.php:1203 ../../mod/network.php:512 ../../mod/group.php:141 +#: ../../mod/profile.php:438 ../../mod/display.php:238 msgid "Delete" msgstr "" @@ -323,60 +328,60 @@ msgstr "" msgid "Edit post" msgstr "" -#: ../../mod/editpost.php:62 ../../mod/network.php:499 -#: ../../mod/profile.php:414 ../../mod/display.php:222 +#: ../../mod/editpost.php:62 ../../mod/network.php:511 +#: ../../mod/profile.php:416 ../../mod/display.php:222 msgid "Edit" msgstr "" -#: ../../mod/editpost.php:63 ../../mod/network.php:97 -#: ../../mod/message.php:186 ../../mod/message.php:320 -#: ../../mod/profile.php:165 +#: ../../mod/editpost.php:63 ../../mod/network.php:106 +#: ../../mod/message.php:188 ../../mod/message.php:322 +#: ../../mod/profile.php:166 msgid "Upload photo" msgstr "" -#: ../../mod/editpost.php:64 ../../mod/network.php:98 -#: ../../mod/message.php:187 ../../mod/message.php:321 -#: ../../mod/profile.php:166 +#: ../../mod/editpost.php:64 ../../mod/network.php:107 +#: ../../mod/message.php:189 ../../mod/message.php:323 +#: ../../mod/profile.php:167 msgid "Insert web link" msgstr "" -#: ../../mod/editpost.php:65 ../../mod/network.php:99 -#: ../../mod/profile.php:167 +#: ../../mod/editpost.php:65 ../../mod/network.php:108 +#: ../../mod/profile.php:168 msgid "Insert YouTube video" msgstr "" -#: ../../mod/editpost.php:66 ../../mod/network.php:100 -#: ../../mod/profile.php:168 +#: ../../mod/editpost.php:66 ../../mod/network.php:109 +#: ../../mod/profile.php:169 msgid "Insert Vorbis [.ogg] video" msgstr "" -#: ../../mod/editpost.php:67 ../../mod/network.php:101 -#: ../../mod/profile.php:169 +#: ../../mod/editpost.php:67 ../../mod/network.php:110 +#: ../../mod/profile.php:170 msgid "Insert Vorbis [.ogg] audio" msgstr "" -#: ../../mod/editpost.php:68 ../../mod/network.php:102 -#: ../../mod/profile.php:170 +#: ../../mod/editpost.php:68 ../../mod/network.php:111 +#: ../../mod/profile.php:171 msgid "Set your location" msgstr "" -#: ../../mod/editpost.php:69 ../../mod/network.php:103 -#: ../../mod/profile.php:171 +#: ../../mod/editpost.php:69 ../../mod/network.php:112 +#: ../../mod/profile.php:172 msgid "Clear browser location" msgstr "" -#: ../../mod/editpost.php:71 ../../mod/network.php:105 -#: ../../mod/profile.php:173 +#: ../../mod/editpost.php:71 ../../mod/network.php:115 +#: ../../mod/profile.php:175 msgid "Permission settings" msgstr "" -#: ../../mod/editpost.php:77 ../../mod/network.php:111 -#: ../../mod/profile.php:180 +#: ../../mod/editpost.php:77 ../../mod/network.php:121 +#: ../../mod/profile.php:182 msgid "CC: email addresses" msgstr "" -#: ../../mod/editpost.php:79 ../../mod/network.php:113 -#: ../../mod/profile.php:182 +#: ../../mod/editpost.php:79 ../../mod/network.php:123 +#: ../../mod/profile.php:184 msgid "Example: bob@example.com, mary@example.com" msgstr "" @@ -471,7 +476,7 @@ msgid "" "strong> profile." msgstr "" -#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364 +#: ../../mod/dfrn_request.php:536 ../../include/items.php:1411 msgid "[Name Withheld]" msgstr "" @@ -482,9 +487,9 @@ msgstr "" #: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39 #: ../../mod/register.php:329 ../../mod/register.php:366 #: ../../mod/regmod.php:93 ../../mod/item.php:475 ../../mod/item.php:498 -#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389 -#: ../../mod/dfrn_notify.php:475 ../../mod/dfrn_confirm.php:649 -#: ../../include/items.php:1373 +#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:392 +#: ../../mod/dfrn_notify.php:478 ../../mod/dfrn_confirm.php:649 +#: ../../include/items.php:1420 msgid "Administrator" msgstr "" @@ -919,7 +924,7 @@ msgstr "" msgid "Currently ignored" msgstr "" -#: ../../mod/contacts.php:311 ../../include/nav.php:111 +#: ../../mod/contacts.php:311 ../../include/nav.php:112 #: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155 msgid "Contacts" msgstr "" @@ -936,7 +941,7 @@ msgstr "" msgid "Finding: " msgstr "" -#: ../../mod/contacts.php:316 +#: ../../mod/contacts.php:316 ../../mod/directory.php:40 msgid "Find" msgstr "" @@ -944,7 +949,7 @@ msgstr "" msgid "Visit $username's profile" msgstr "" -#: ../../mod/contacts.php:377 +#: ../../mod/contacts.php:377 ../../boot.php:2732 msgid "Edit contact" msgstr "" @@ -1001,23 +1006,55 @@ msgstr "" msgid "No Plugin settings configured" msgstr "" -#: ../../mod/settings.php:270 +#: ../../mod/settings.php:262 +msgid "Normal Account" +msgstr "" + +#: ../../mod/settings.php:263 +msgid "This account is a normal personal profile" +msgstr "" + +#: ../../mod/settings.php:264 +msgid "Soapbox Account" +msgstr "" + +#: ../../mod/settings.php:265 +msgid "Automatically approve all connection/friend requests as read-only fans" +msgstr "" + +#: ../../mod/settings.php:266 +msgid "Community/Celebrity Account" +msgstr "" + +#: ../../mod/settings.php:267 +msgid "Automatically approve all connection/friend requests as read-write fans" +msgstr "" + +#: ../../mod/settings.php:268 +msgid "Automatic Friend Account" +msgstr "" + +#: ../../mod/settings.php:269 +msgid "Automatically approve all connection/friend requests as friends" +msgstr "" + +#: ../../mod/settings.php:278 msgid "OpenID: " msgstr "" -#: ../../mod/settings.php:270 +#: ../../mod/settings.php:278 msgid " (Optional) Allow this OpenID to login to this account." msgstr "" -#: ../../mod/settings.php:302 +#: ../../mod/settings.php:310 msgid "Profile is <strong>not published</strong>." msgstr "" -#: ../../mod/settings.php:345 +#: ../../mod/settings.php:353 msgid "Export Personal Data" msgstr "" -#: ../../mod/settings.php:363 +#: ../../mod/settings.php:371 msgid "Default Post Permissions" msgstr "" @@ -1048,76 +1085,100 @@ msgstr "" msgid "New Item View" msgstr "" -#: ../../mod/network.php:69 ../../mod/message.php:172 +#: ../../mod/network.php:59 +#, php-format +msgid "%d member" +msgid_plural "%d members" +msgstr[0] "" +msgstr[1] "" + +#: ../../mod/network.php:60 +#, php-format +msgid "Warning: This group contains %s from an insecure network." +msgstr "" + +#: ../../mod/network.php:61 +msgid "Private messages to this group are at risk of public disclosure." +msgstr "" + +#: ../../mod/network.php:77 ../../mod/message.php:172 #: ../../mod/profile.php:137 msgid "Please enter a link URL:" msgstr "" -#: ../../mod/network.php:70 ../../mod/profile.php:138 +#: ../../mod/network.php:78 ../../mod/profile.php:138 msgid "Please enter a YouTube link:" msgstr "" -#: ../../mod/network.php:71 ../../mod/profile.php:139 +#: ../../mod/network.php:79 ../../mod/profile.php:139 msgid "Please enter a video(.ogg) link/URL:" msgstr "" -#: ../../mod/network.php:72 ../../mod/profile.php:140 +#: ../../mod/network.php:80 ../../mod/profile.php:140 msgid "Please enter an audio(.ogg) link/URL:" msgstr "" -#: ../../mod/network.php:73 ../../mod/profile.php:141 +#: ../../mod/network.php:81 ../../mod/profile.php:141 msgid "Where are you right now?" msgstr "" -#: ../../mod/network.php:156 +#: ../../mod/network.php:82 ../../mod/profile.php:142 +msgid "Enter a title for this item" +msgstr "" + +#: ../../mod/network.php:113 ../../mod/profile.php:173 +msgid "Set title" +msgstr "" + +#: ../../mod/network.php:166 msgid "No such group" msgstr "" -#: ../../mod/network.php:167 +#: ../../mod/network.php:177 msgid "Group is empty" msgstr "" -#: ../../mod/network.php:171 +#: ../../mod/network.php:181 msgid "Group: " msgstr "" -#: ../../mod/network.php:319 ../../mod/network.php:548 -#: ../../mod/profile.php:457 ../../mod/display.php:262 -#: ../../mod/search.php:116 +#: ../../mod/network.php:330 ../../mod/network.php:561 +#: ../../mod/profile.php:460 ../../mod/display.php:262 +#: ../../mod/search.php:124 msgid "View $name's profile" msgstr "" -#: ../../mod/network.php:334 ../../mod/search.php:131 +#: ../../mod/network.php:346 ../../mod/search.php:140 msgid "View in context" msgstr "" -#: ../../mod/network.php:397 +#: ../../mod/network.php:409 msgid "See more posts like this" msgstr "" -#: ../../mod/network.php:416 ../../mod/profile.php:357 +#: ../../mod/network.php:428 ../../mod/profile.php:359 #, php-format msgid "See all %d comments" msgstr "" -#: ../../mod/network.php:549 ../../mod/display.php:263 +#: ../../mod/network.php:562 ../../mod/display.php:263 msgid "View $owner_name's profile" msgstr "" -#: ../../mod/network.php:550 ../../mod/display.php:264 +#: ../../mod/network.php:563 ../../mod/display.php:264 msgid "to" msgstr "" -#: ../../mod/network.php:551 ../../mod/display.php:265 +#: ../../mod/network.php:564 ../../mod/display.php:265 msgid "Wall-to-Wall" msgstr "" -#: ../../mod/network.php:552 ../../mod/display.php:266 +#: ../../mod/network.php:565 ../../mod/display.php:266 msgid "via Wall-To-Wall:" msgstr "" -#: ../../mod/network.php:593 ../../mod/register.php:442 -#: ../../mod/profile.php:490 ../../mod/display.php:317 +#: ../../mod/network.php:607 ../../mod/register.php:442 +#: ../../mod/profile.php:494 ../../mod/display.php:318 msgid "" "Shared content is covered by the <a href=\"http://creativecommons.org/" "licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license." @@ -1131,7 +1192,7 @@ msgstr "" msgid "Could not create group." msgstr "" -#: ../../mod/group.php:43 ../../mod/group.php:123 +#: ../../mod/group.php:43 ../../mod/group.php:127 msgid "Group not found." msgstr "" @@ -1143,19 +1204,35 @@ msgstr "" msgid "Membership list updated." msgstr "" -#: ../../mod/group.php:88 ../../index.php:250 +#: ../../mod/group.php:88 ../../index.php:264 msgid "Permission denied" msgstr "" -#: ../../mod/group.php:107 +#: ../../mod/group.php:95 +msgid "Create a group of contacts/friends." +msgstr "" + +#: ../../mod/group.php:96 ../../mod/group.php:153 +msgid "Group Name: " +msgstr "" + +#: ../../mod/group.php:111 msgid "Group removed." msgstr "" -#: ../../mod/group.php:109 +#: ../../mod/group.php:113 msgid "Unable to remove group." msgstr "" -#: ../../mod/viewcontacts.php:17 ../../boot.php:2041 +#: ../../mod/group.php:152 +msgid "Group Editor" +msgstr "" + +#: ../../mod/group.php:154 +msgid "Members:" +msgstr "" + +#: ../../mod/viewcontacts.php:17 ../../boot.php:2049 msgid "View Contacts" msgstr "" @@ -1287,7 +1364,7 @@ msgstr "" msgid "Choose a nickname: " msgstr "" -#: ../../mod/register.php:463 ../../include/nav.php:61 ../../boot.php:811 +#: ../../mod/register.php:463 ../../include/nav.php:62 ../../boot.php:814 msgid "Register" msgstr "" @@ -1406,7 +1483,7 @@ msgstr "" msgid "%s posted an update." msgstr "" -#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:312 +#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:313 msgid "Item not found." msgstr "" @@ -1479,7 +1556,7 @@ msgstr "" msgid "Message could not be sent." msgstr "" -#: ../../mod/message.php:125 ../../include/nav.php:100 +#: ../../mod/message.php:125 ../../include/nav.php:101 msgid "Messages" msgstr "" @@ -1503,43 +1580,47 @@ msgstr "" msgid "Conversation removed." msgstr "" -#: ../../mod/message.php:178 +#: ../../mod/message.php:180 msgid "Send Private Message" msgstr "" -#: ../../mod/message.php:179 ../../mod/message.php:313 +#: ../../mod/message.php:181 ../../mod/message.php:315 msgid "To:" msgstr "" -#: ../../mod/message.php:180 ../../mod/message.php:314 +#: ../../mod/message.php:182 ../../mod/message.php:316 msgid "Subject:" msgstr "" -#: ../../mod/message.php:183 ../../mod/message.php:317 ../../mod/invite.php:59 +#: ../../mod/message.php:185 ../../mod/message.php:319 ../../mod/invite.php:59 msgid "Your message:" msgstr "" -#: ../../mod/message.php:222 +#: ../../mod/message.php:224 msgid "No messages." msgstr "" -#: ../../mod/message.php:235 +#: ../../mod/message.php:237 msgid "Delete conversation" msgstr "" -#: ../../mod/message.php:265 +#: ../../mod/message.php:240 +msgid "D, d M Y - g:i A" +msgstr "" + +#: ../../mod/message.php:267 msgid "Message not available." msgstr "" -#: ../../mod/message.php:302 +#: ../../mod/message.php:304 msgid "Delete message" msgstr "" -#: ../../mod/message.php:312 +#: ../../mod/message.php:314 msgid "Send Reply" msgstr "" -#: ../../mod/profile.php:8 ../../boot.php:2213 +#: ../../mod/profile.php:8 ../../boot.php:2221 msgid "No profile" msgstr "" @@ -1564,25 +1645,25 @@ msgstr "" msgid "Welcome back " msgstr "" -#: ../../mod/follow.php:173 +#: ../../mod/follow.php:186 msgid "The profile address specified does not provide adequate information." msgstr "" -#: ../../mod/follow.php:179 +#: ../../mod/follow.php:192 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: ../../mod/follow.php:230 +#: ../../mod/follow.php:243 msgid "Unable to retrieve contact information." msgstr "" -#: ../../mod/follow.php:276 +#: ../../mod/follow.php:289 msgid "following" msgstr "" -#: ../../mod/display.php:305 +#: ../../mod/display.php:306 msgid "Item has been removed." msgstr "" @@ -1594,7 +1675,7 @@ msgstr "" msgid "New mail received at " msgstr "" -#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474 +#: ../../mod/dfrn_notify.php:391 ../../mod/dfrn_notify.php:477 #, php-format msgid "%s commented on an item at %s" msgstr "" @@ -1603,11 +1684,11 @@ msgstr "" msgid "Applications" msgstr "" -#: ../../mod/search.php:17 ../../include/nav.php:67 ../../boot.php:2058 +#: ../../mod/search.php:17 ../../include/nav.php:68 ../../boot.php:2066 msgid "Search" msgstr "" -#: ../../mod/search.php:54 +#: ../../mod/search.php:62 msgid "No results." msgstr "" @@ -1646,7 +1727,7 @@ msgid "" "be visible to anybody using the internet." msgstr "" -#: ../../mod/profiles.php:380 ../../mod/directory.php:89 +#: ../../mod/profiles.php:380 ../../mod/directory.php:91 msgid "Age: " msgstr "" @@ -1658,11 +1739,15 @@ msgstr "" msgid "Global Directory" msgstr "" -#: ../../mod/directory.php:92 +#: ../../mod/directory.php:39 +msgid "Site Directory" +msgstr "" + +#: ../../mod/directory.php:94 msgid "Gender: " msgstr "" -#: ../../mod/directory.php:118 +#: ../../mod/directory.php:120 msgid "No entries (some entries may be hidden)." msgstr "" @@ -2294,51 +2379,51 @@ msgstr "" msgid "Embedding disabled" msgstr "" -#: ../../include/group.php:130 +#: ../../include/group.php:145 msgid "Create a new group" msgstr "" -#: ../../include/group.php:131 +#: ../../include/group.php:146 msgid "Everybody" msgstr "" -#: ../../include/nav.php:38 ../../boot.php:839 +#: ../../include/nav.php:39 ../../boot.php:842 msgid "Logout" msgstr "" -#: ../../include/nav.php:44 ../../boot.php:819 ../../boot.php:825 +#: ../../include/nav.php:45 ../../boot.php:822 ../../boot.php:828 msgid "Login" msgstr "" -#: ../../include/nav.php:56 ../../include/nav.php:91 +#: ../../include/nav.php:57 ../../include/nav.php:92 msgid "Home" msgstr "" -#: ../../include/nav.php:64 +#: ../../include/nav.php:65 msgid "Apps" msgstr "" -#: ../../include/nav.php:77 +#: ../../include/nav.php:78 msgid "Directory" msgstr "" -#: ../../include/nav.php:87 +#: ../../include/nav.php:88 msgid "Network" msgstr "" -#: ../../include/nav.php:96 +#: ../../include/nav.php:97 msgid "Notifications" msgstr "" -#: ../../include/nav.php:104 +#: ../../include/nav.php:105 msgid "Manage" msgstr "" -#: ../../include/nav.php:107 +#: ../../include/nav.php:108 msgid "Settings" msgstr "" -#: ../../include/nav.php:109 +#: ../../include/nav.php:110 msgid "Profiles" msgstr "" @@ -2431,11 +2516,11 @@ msgstr "" msgid "Except For:" msgstr "" -#: ../../include/items.php:1027 +#: ../../include/items.php:1073 msgid "Birthday:" msgstr "" -#: ../../include/items.php:1371 +#: ../../include/items.php:1418 msgid "You have a new follower at " msgstr "" @@ -2447,220 +2532,240 @@ msgstr "" msgid "Comment" msgstr "" -#: ../../boot.php:810 +#: ../../boot.php:813 msgid "Create a New Account" msgstr "" -#: ../../boot.php:817 +#: ../../boot.php:820 msgid "Nickname or Email address: " msgstr "" -#: ../../boot.php:818 +#: ../../boot.php:821 msgid "Password: " msgstr "" -#: ../../boot.php:823 +#: ../../boot.php:826 msgid "Nickname/Email/OpenID: " msgstr "" -#: ../../boot.php:824 +#: ../../boot.php:827 msgid "Password (if not OpenID): " msgstr "" -#: ../../boot.php:827 +#: ../../boot.php:830 msgid "Forgot your password?" msgstr "" -#: ../../boot.php:828 +#: ../../boot.php:831 msgid "Password Reset" msgstr "" -#: ../../boot.php:1080 +#: ../../boot.php:1083 msgid "prev" msgstr "" -#: ../../boot.php:1082 +#: ../../boot.php:1085 msgid "first" msgstr "" -#: ../../boot.php:1111 +#: ../../boot.php:1114 msgid "last" msgstr "" -#: ../../boot.php:1114 +#: ../../boot.php:1117 msgid "next" msgstr "" -#: ../../boot.php:1840 +#: ../../boot.php:1848 #, php-format msgid "%s likes this." msgstr "" -#: ../../boot.php:1840 +#: ../../boot.php:1848 #, php-format msgid "%s doesn't like this." msgstr "" -#: ../../boot.php:1844 +#: ../../boot.php:1852 #, php-format msgid "<span %1$s>%2$d people</span> like this." msgstr "" -#: ../../boot.php:1846 +#: ../../boot.php:1854 #, php-format msgid "<span %1$s>%2$d people</span> don't like this." msgstr "" -#: ../../boot.php:1852 +#: ../../boot.php:1860 msgid "and" msgstr "" -#: ../../boot.php:1855 +#: ../../boot.php:1863 #, php-format msgid ", and %d other people" msgstr "" -#: ../../boot.php:1856 +#: ../../boot.php:1864 #, php-format msgid "%s like this." msgstr "" -#: ../../boot.php:1856 +#: ../../boot.php:1864 #, php-format msgid "%s don't like this." msgstr "" -#: ../../boot.php:2017 +#: ../../boot.php:2025 msgid "No contacts" msgstr "" -#: ../../boot.php:2025 +#: ../../boot.php:2033 #, php-format msgid "%d Contact" msgid_plural "%d Contacts" msgstr[0] "" msgstr[1] "" -#: ../../boot.php:2270 +#: ../../boot.php:2278 msgid "Connect" msgstr "" -#: ../../boot.php:2280 +#: ../../boot.php:2288 msgid "Location:" msgstr "" -#: ../../boot.php:2284 +#: ../../boot.php:2292 msgid ", " msgstr "" -#: ../../boot.php:2292 +#: ../../boot.php:2300 msgid "Gender:" msgstr "" -#: ../../boot.php:2296 +#: ../../boot.php:2304 msgid "Status:" msgstr "" -#: ../../boot.php:2298 +#: ../../boot.php:2306 msgid "Homepage:" msgstr "" -#: ../../boot.php:2389 +#: ../../boot.php:2397 msgid "Monday" msgstr "" -#: ../../boot.php:2389 +#: ../../boot.php:2397 msgid "Tuesday" msgstr "" -#: ../../boot.php:2389 +#: ../../boot.php:2397 msgid "Wednesday" msgstr "" -#: ../../boot.php:2389 +#: ../../boot.php:2397 msgid "Thursday" msgstr "" -#: ../../boot.php:2389 +#: ../../boot.php:2397 msgid "Friday" msgstr "" -#: ../../boot.php:2389 +#: ../../boot.php:2397 msgid "Saturday" msgstr "" -#: ../../boot.php:2389 +#: ../../boot.php:2397 msgid "Sunday" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "January" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "February" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "March" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "April" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "May" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "June" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "July" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "August" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "September" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "October" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "November" msgstr "" -#: ../../boot.php:2393 +#: ../../boot.php:2401 msgid "December" msgstr "" -#: ../../boot.php:2427 +#: ../../boot.php:2416 +msgid "g A l F d" +msgstr "" + +#: ../../boot.php:2433 msgid "Birthday Reminders" msgstr "" -#: ../../boot.php:2428 +#: ../../boot.php:2434 msgid "Birthdays this week:" msgstr "" -#: ../../boot.php:2429 +#: ../../boot.php:2435 msgid "(Adjusted for local time)" msgstr "" -#: ../../boot.php:2440 +#: ../../boot.php:2446 msgid "[today]" msgstr "" -#: ../../boot.php:2637 +#: ../../boot.php:2643 msgid "link to source" msgstr "" +#: ../../boot.php:2729 +msgid "View status" +msgstr "" + +#: ../../boot.php:2730 +msgid "View profile" +msgstr "" + +#: ../../boot.php:2731 +msgid "View photos" +msgstr "" + +#: ../../boot.php:2733 +msgid "Send PM" +msgstr "" + #: ../../wip/dfrn_poll2.php:72 ../../wip/dfrn_poll2.php:376 msgid " welcomes " msgstr "" @@ -2681,10 +2786,10 @@ msgstr "" msgid "Server error. Upload directory isn" msgstr "" -#: ../../index.php:194 +#: ../../index.php:208 msgid "Not Found" msgstr "" -#: ../../index.php:195 +#: ../../index.php:209 msgid "Page not found." msgstr "" diff --git a/util/strings.php b/util/strings.php index d43d7c262..fcdd6974b 100644 --- a/util/strings.php +++ b/util/strings.php @@ -61,11 +61,16 @@ $a->strings['September'] = 'September'; $a->strings['October'] = 'October'; $a->strings['November'] = 'November'; $a->strings['December'] = 'December'; +$a->strings['g A l F d'] = 'g A l F d'; $a->strings['Birthday Reminders'] = 'Birthday Reminders'; $a->strings['Birthdays this week:'] = 'Birthdays this week:'; $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29"; $a->strings['[today]'] = '[today]'; $a->strings['link to source'] = 'link to source'; +$a->strings['%d Contact'] = array( + 0 => '%d Contact', + 1 => '%d Contacts', +); $a->strings['Applications'] = 'Applications'; $a->strings["Invite Friends"] = "Invite Friends"; $a->strings['Find People With Shared Interests'] = 'Find People With Shared Interests'; @@ -174,6 +179,7 @@ $a->strings["%d required parameter was not found at the given location"] = array 1 => "%d required parameters were not found at the given location", ); $a->strings['Global Directory'] = 'Global Directory'; +$a->strings['Site Directory'] = 'Site Directory'; $a->strings['Age: '] = 'Age: '; $a->strings['Gender: '] = 'Gender: '; $a->strings["No entries \x28some entries may be hidden\x29."] = "No entries \x28some entries may be hidden\x29."; @@ -222,8 +228,13 @@ $a->strings['Could not create group.'] = 'Could not create group.'; $a->strings['Group not found.'] = 'Group not found.'; $a->strings['Group name changed.'] = 'Group name changed.'; $a->strings['Membership list updated.'] = 'Membership list updated.'; +$a->strings['Create a group of contacts/friends.'] = 'Create a group of contacts/friends.'; +$a->strings['Group Name: '] = 'Group Name: '; +$a->strings['Submit'] = 'Submit'; $a->strings['Group removed.'] = 'Group removed.'; $a->strings['Unable to remove group.'] = 'Unable to remove group.'; +$a->strings['Group Editor'] = 'Group Editor'; +$a->strings['Members:'] = 'Members:'; $a->strings["Welcome to %s"] = "Welcome to %s"; $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.'; $a->strings['Connected to database.'] = 'Connected to database.'; @@ -235,7 +246,6 @@ $a->strings['Proceed to registration'] = 'Proceed to registration'; $a->strings['Database import failed.'] = 'Database import failed.'; $a->strings['You may need to import the file "database.sql" manually using phpmyadmin or mysql.'] = 'You may need to import the file "database.sql" manually using phpmyadmin or mysql.'; $a->strings['Welcome to Friendika.'] = 'Welcome to Friendika.'; -$a->strings['Submit'] = 'Submit'; $a->strings['Could not find a command line version of PHP in the web server PATH.'] = 'Could not find a command line version of PHP in the web server PATH.'; $a->strings['This is required. Please adjust the configuration file .htconfig.php accordingly.'] = 'This is required. Please adjust the configuration file .htconfig.php accordingly.'; $a->strings['The command line version of PHP on your system does not have "register_argc_argv" enabled.'] = 'The command line version of PHP on your system does not have "register_argc_argv" enabled.'; @@ -303,21 +313,30 @@ $a->strings['To:'] = 'To:'; $a->strings['Subject:'] = 'Subject:'; $a->strings['No messages.'] = 'No messages.'; $a->strings['Delete conversation'] = 'Delete conversation'; +$a->strings['D, d M Y - g:i A'] = 'D, d M Y - g:i A'; $a->strings['Message not available.'] = 'Message not available.'; $a->strings['Delete message'] = 'Delete message'; $a->strings['Send Reply'] = 'Send Reply'; $a->strings['Normal View'] = 'Normal View'; $a->strings['New Item View'] = 'New Item View'; +$a->strings['Warning: This group contains %s from an insecure network.'] = 'Warning: This group contains %s from an insecure network.'; +$a->strings['Private messages to this group are at risk of public disclosure.'] = 'Private messages to this group are at risk of public disclosure.'; $a->strings['Please enter a YouTube link:'] = 'Please enter a YouTube link:'; $a->strings["Please enter a video\x28.ogg\x29 link/URL:"] = "Please enter a video\x28.ogg\x29 link/URL:"; $a->strings["Please enter an audio\x28.ogg\x29 link/URL:"] = "Please enter an audio\x28.ogg\x29 link/URL:"; $a->strings['Where are you right now?'] = 'Where are you right now?'; +$a->strings['Enter a title for this item'] = 'Enter a title for this item'; +$a->strings['Set title'] = 'Set title'; $a->strings['No such group'] = 'No such group'; $a->strings['Group is empty'] = 'Group is empty'; $a->strings['Group: '] = 'Group: '; $a->strings['View in context'] = 'View in context'; $a->strings['See more posts like this'] = 'See more posts like this'; $a->strings['See all %d comments'] = 'See all %d comments'; +$a->strings['%d member'] = array( + 0 => '%d member', + 1 => '%d members', +); $a->strings['Invalid request identifier.'] = 'Invalid request identifier.'; $a->strings['Discard'] = 'Discard'; $a->strings['Ignore'] = 'Ignore'; @@ -337,6 +356,7 @@ $a->strings['Approve'] = 'Approve'; $a->strings['No notifications.'] = 'No notifications.'; $a->strings['User registrations waiting for confirm'] = 'User registrations waiting for confirm'; $a->strings['No registrations.'] = 'No registrations.'; +$a->strings['Post successful.'] = 'Post successful.'; $a->strings['Login failed.'] = 'Login failed.'; $a->strings["Welcome back "] = "Welcome back "; $a->strings['Photo Albums'] = 'Photo Albums'; @@ -434,6 +454,14 @@ $a->strings['Settings updated.'] = 'Settings updated.'; $a->strings['Plugin Settings'] = 'Plugin Settings'; $a->strings['Account Settings'] = 'Account Settings'; $a->strings['No Plugin settings configured'] = 'No Plugin settings configured'; +$a->strings['Normal Account'] = 'Normal Account'; +$a->strings['This account is a normal personal profile'] = 'This account is a normal personal profile'; +$a->strings['Soapbox Account'] = 'Soapbox Account'; +$a->strings['Automatically approve all connection/friend requests as read-only fans'] = 'Automatically approve all connection/friend requests as read-only fans'; +$a->strings['Community/Celebrity Account'] = 'Community/Celebrity Account'; +$a->strings['Automatically approve all connection/friend requests as read-write fans'] = 'Automatically approve all connection/friend requests as read-write fans'; +$a->strings['Automatic Friend Account'] = 'Automatic Friend Account'; +$a->strings['Automatically approve all connection/friend requests as friends'] = 'Automatically approve all connection/friend requests as friends'; $a->strings['OpenID: '] = 'OpenID: '; $a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."] = " \x28Optional\x29 Allow this OpenID to login to this account."; $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.'; diff --git a/view/de/directory_header.tpl b/view/de/directory_header.tpl deleted file mode 100644 index cda2f4914..000000000 --- a/view/de/directory_header.tpl +++ /dev/null @@ -1,14 +0,0 @@ -<h1>Verzeichnis dieser Seite</h1> - -$globaldir - -$finding - -<div id="directory-search-wrapper"> -<form id="directory-search-form" action="directory" method="get" > -<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" /> -<input type="submit" name="submit" id="directory-search-submit" value="Find" /> -</form> -</div> -<div id="directory-search-end"></div> - diff --git a/view/de/group_edit.tpl b/view/de/group_edit.tpl deleted file mode 100644 index 1dea97f4d..000000000 --- a/view/de/group_edit.tpl +++ /dev/null @@ -1,24 +0,0 @@ -<h2>Gruppen Editor</h2> - - -<div id="group-edit-wrapper" > -<form action="group/$gid" id="group-edit-form" method="post" > -<div id="group-edit-name-wrapper" > -<label id="group-edit-name-label" for="group-edit-name" >Gruppen Name: </label> -<input type="text" id="group-edit-name" name="groupname" value="$name" /> -</div> -<div id="group-edit-name-end"></div> -<div id="group-edit-select-wrapper" > -<label id="group_members_select_label" for="group_members_select" >Mitglieder:</label> -$selector - -</div> -$drop -<div id="group_members_select_end"></div> -<div id="group-edit-submit-wrapper" > -<input type="submit" name="submit" value="Submit" > -</div> - -<div id="group-edit-select-end" ></div> -</form> -</div> diff --git a/view/de/group_new.tpl b/view/de/group_new.tpl deleted file mode 100644 index 639eab8a8..000000000 --- a/view/de/group_new.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - -<div id="group-new-wrapper" > -<form action="group/new" method="post"> - -<div id="group-new-text"> -<p> -Erstelle eine neue Gruppe für Freunde/Kontakte. - -<div id="group-new-input-wrapper"> -<label id="group-new-label" for="group-new-name" >Gruppen Name: </label> -<input name="groupname" id="group-new-name" /> -</div> -<div id="group-new-input-end" ></div> - -<div id="group-new-submit-wrapper" > -<input type="submit" name="submit" value="Submit" /> -</form> -</div> -<div id="group-new-end"></div> - - diff --git a/view/de/pagetypes.tpl b/view/de/pagetypes.tpl deleted file mode 100644 index 56be7c2ad..000000000 --- a/view/de/pagetypes.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - <div id="settings-normal-wrapper"> - <label id="settings-normal-label" for="settings-normal">Normales Profil</label> - <input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" /> - <span id="settings-normal-desc">Dieser Account ist ein normaler persönlicher Account</span> - </div> - <div id="settings-normal-break" ></div> - <div id="settings-soapbox-wrapper"> - <label id="settings-soapbox-label" for="settings-soapbox">Sandkasten Profil</label> - <input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" /> - <span id="settings-soapbox-desc">Alle Kontakt/Freundschaftsanfragen werden automatisch als Nur-Lese Fans akzepdiert</span> - </div> - <div id="settings-soapbox-break" ></div> - <div id="settings-community-wrapper"> - <label id="settings-community-label" for="settings-community">Gemeindschafts/Prominenten Profil</label> - <input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" /> - <span id="settings-community-desc">Alle Kontakt/Freundschaftsanfragen werden automatisch als Lese-und-Schreiben Fans akzepdiert</span> - </div> - <div id="settings-community-break" ></div> - <div id="settings-freelove-wrapper"> - <label id="settings-freelove-label" for="settings-freelove">Automatisches Freundschafts-Profil</label> - <input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" /> - <span id="settings-freelove-desc">Alle Kontakt/Freundschaftsanfragen werden automatisch als Freund akzepdiert</span> - </div> - <div id="settings-freelove-break" ></div> diff --git a/view/en/directory_header.tpl b/view/directory_header.tpl index 03eed62b3..490868cc9 100644 --- a/view/en/directory_header.tpl +++ b/view/directory_header.tpl @@ -1,4 +1,4 @@ -<h1>Site Directory</h1> +<h1>$sitedir</h1> $globaldir @@ -7,7 +7,7 @@ $finding <div id="directory-search-wrapper"> <form id="directory-search-form" action="directory" method="get" > <input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" /> -<input type="submit" name="submit" id="directory-search-submit" value="Find" /> +<input type="submit" name="submit" id="directory-search-submit" value="$submit" /> </form> </div> <div id="directory-search-end"></div> diff --git a/view/fr/directory_header.tpl b/view/fr/directory_header.tpl deleted file mode 100644 index cb9276e46..000000000 --- a/view/fr/directory_header.tpl +++ /dev/null @@ -1,14 +0,0 @@ -<h1>Annuaire local</h1> - -$globaldir - -$finding - -<div id="directory-search-wrapper"> -<form id="directory-search-form" action="directory" method="get" > -<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" /> -<input type="submit" name="submit" id="directory-search-submit" value="Chercher" /> -</form> -</div> -<div id="directory-search-end"></div> - diff --git a/view/fr/group_edit.tpl b/view/fr/group_edit.tpl deleted file mode 100644 index 75863eb6d..000000000 --- a/view/fr/group_edit.tpl +++ /dev/null @@ -1,24 +0,0 @@ -<h2>Editeur de groupe</h2> - - -<div id="group-edit-wrapper" > -<form action="group/$gid" id="group-edit-form" method="post" > -<div id="group-edit-name-wrapper" > -<label id="group-edit-name-label" for="group-edit-name" >Nom du groupe: </label> -<input type="text" id="group-edit-name" name="groupname" value="$name" /> -</div> -<div id="group-edit-name-end"></div> -<div id="group-edit-select-wrapper" > -<label id="group_members_select_label" for="group_members_select" >Membres:</label> -$selector - -</div> -$drop -<div id="group_members_select_end"></div> -<div id="group-edit-submit-wrapper" > -<input type="submit" name="submit" value="Appliquer" > -</div> - -<div id="group-edit-select-end" ></div> -</form> -</div> diff --git a/view/fr/group_new.tpl b/view/fr/group_new.tpl deleted file mode 100644 index 205404c56..000000000 --- a/view/fr/group_new.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - -<div id="group-new-wrapper" > -<form action="group/new" method="post"> - -<div id="group-new-text"> -<p> -Créez un groupe de contacts/amis. - -<div id="group-new-input-wrapper"> -<label id="group-new-label" for="group-new-name" >Nom du groupe: </label> -<input name="groupname" id="group-new-name" /> -</div> -<div id="group-new-input-end" ></div> - -<div id="group-new-submit-wrapper" > -<input type="submit" name="submit" value="Appliquer" /> -</form> -</div> -<div id="group-new-end"></div> - - diff --git a/view/fr/pagetypes.tpl b/view/fr/pagetypes.tpl deleted file mode 100644 index c655d353f..000000000 --- a/view/fr/pagetypes.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - <div id="settings-normal-wrapper"> - <label id="settings-normal-label" for="settings-normal">Profil normal</label> - <input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" /> - <span id="settings-normal-desc">Ce compte est un profil personnel normal</span> - </div> - <div id="settings-normal-break" ></div> - <div id="settings-soapbox-wrapper"> - <label id="settings-soapbox-label" for="settings-soapbox">Profil 'page de réclame'</label> - <input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" /> - <span id="settings-soapbox-desc">Approbation automatique de toutes les requêtes de connexion comme étant des fans en lecture seule</span> - </div> - <div id="settings-soapbox-break" ></div> - <div id="settings-community-wrapper"> - <label id="settings-community-label" for="settings-community">Profil de communauté/célébrité</label> - <input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" /> - <span id="settings-community-desc">Approbation automatique de toutes les requêtes de connexion comme étant des fans en lecture-écriture</span> - </div> - <div id="settings-community-break" ></div> - <div id="settings-freelove-wrapper"> - <label id="settings-freelove-label" for="settings-freelove">Profil 'amitié automatique'</label> - <input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" /> - <span id="settings-freelove-desc">Approbation automatique de toutes les requêtes de connexion comme étant des amis</span> - </div> - <div id="settings-freelove-break" ></div> diff --git a/view/en/group_edit.tpl b/view/group_edit.tpl index e6c7afb49..a955d50f9 100644 --- a/view/en/group_edit.tpl +++ b/view/group_edit.tpl @@ -1,22 +1,22 @@ -<h2>Group Editor</h2> +<h2>$title</h2> <div id="group-edit-wrapper" > <form action="group/$gid" id="group-edit-form" method="post" > <div id="group-edit-name-wrapper" > -<label id="group-edit-name-label" for="group-edit-name" >Group Name: </label> +<label id="group-edit-name-label" for="group-edit-name" >$gname</label> <input type="text" id="group-edit-name" name="groupname" value="$name" /> </div> <div id="group-edit-name-end"></div> <div id="group-edit-select-wrapper" > -<label id="group_members_select_label" for="group_members_select" >Members:</label> +<label id="group_members_select_label" for="group_members_select" >$members</label> $selector </div> $drop <div id="group_members_select_end"></div> <div id="group-edit-submit-wrapper" > -<input type="submit" name="submit" value="Submit" > +<input type="submit" name="submit" value="$submit" > </div> <div id="group-edit-select-end" ></div> diff --git a/view/en/group_new.tpl b/view/group_new.tpl index a1efa7717..735b51634 100644 --- a/view/en/group_new.tpl +++ b/view/group_new.tpl @@ -6,16 +6,16 @@ <div id="group-new-text"> <p> -Create a group of contacts/friends. +$desc <div id="group-new-input-wrapper"> -<label id="group-new-label" for="group-new-name" >Group Name: </label> +<label id="group-new-label" for="group-new-name" >$name</label> <input name="groupname" id="group-new-name" /> </div> <div id="group-new-input-end" ></div> <div id="group-new-submit-wrapper" > -<input type="submit" name="submit" value="Submit" /> +<input type="submit" name="submit" value="$submit" /> </form> </div> <div id="group-new-end"></div> diff --git a/view/it/directory_header.tpl b/view/it/directory_header.tpl deleted file mode 100644 index 9ab9009e9..000000000 --- a/view/it/directory_header.tpl +++ /dev/null @@ -1,14 +0,0 @@ -<h1>Elenco del Sito</h1> - -$globaldir - -$finding - -<div id="directory-search-wrapper"> -<form id="directory-search-form" action="directory" method="get" > -<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" /> -<input type="submit" name="submit" id="directory-search-submit" value="Trova" /> -</form> -</div> -<div id="directory-search-end"></div> - diff --git a/view/it/group_edit.tpl b/view/it/group_edit.tpl deleted file mode 100644 index 00942a6c0..000000000 --- a/view/it/group_edit.tpl +++ /dev/null @@ -1,24 +0,0 @@ -<h2>Modifica Gruppo</h2> - - -<div id="group-edit-wrapper" > -<form action="group/$gid" id="group-edit-form" method="post" > -<div id="group-edit-name-wrapper" > -<label id="group-edit-name-label" for="group-edit-name" >Nome Gruppo: </label> -<input type="text" id="group-edit-name" name="groupname" value="$name" /> -</div> -<div id="group-edit-name-end"></div> -<div id="group-edit-select-wrapper" > -<label id="group_members_select_label" for="group_members_select" >Membri:</label> -$selector - -</div> -$drop -<div id="group_members_select_end"></div> -<div id="group-edit-submit-wrapper" > -<input type="submit" name="submit" value="Aggiorna" > -</div> - -<div id="group-edit-select-end" ></div> -</form> -</div> diff --git a/view/it/group_new.tpl b/view/it/group_new.tpl deleted file mode 100644 index 4686ac4d2..000000000 --- a/view/it/group_new.tpl +++ /dev/null @@ -1,23 +0,0 @@ - - - -<div id="group-new-wrapper" > -<form action="group/new" method="post"> - -<div id="group-new-text"> -<p> -Crea un gruppo di contatti/amici. - -<div id="group-new-input-wrapper"> -<label id="group-new-label" for="group-new-name" >Nome Gruppo: </label> -<input name="groupname" id="group-new-name" /> -</div> -<div id="group-new-input-end" ></div> - -<div id="group-new-submit-wrapper" > -<input type="submit" name="submit" value="Aggiorna" /> -</form> -</div> -<div id="group-new-end"></div> - - diff --git a/view/it/pagetypes.tpl b/view/it/pagetypes.tpl deleted file mode 100644 index 4cb0ec64c..000000000 --- a/view/it/pagetypes.tpl +++ /dev/null @@ -1,25 +0,0 @@ - - <div id="settings-normal-wrapper"> - <label id="settings-normal-label" for="settings-normal">Profilo Normale</label> - <input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" /> - <span id="settings-normal-desc">Questo account è un nomale profilo personale</span> - </div> - <div id="settings-normal-break" ></div> - <div id="settings-soapbox-wrapper"> - <label id="settings-soapbox-label" for="settings-soapbox">Profilo Palcoscenico</label> - <input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" /> - <span id="settings-soapbox-desc">Automatiacmente approva tutte le richieste di connessione/amicizia come Fan in sola lettura</span> - </div> - <div id="settings-soapbox-break" ></div> - <div id="settings-community-wrapper"> - <label id="settings-community-label" for="settings-community">Profilo Community/Celebrità</label> - <input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" /> - <span id="settings-community-desc">Automaticamente approva tutte le richieste di connessione/amicizia come Fan in lettura/scrittura</span> - </div> - <div id="settings-community-break" ></div> - <div id="settings-freelove-wrapper"> - <label id="settings-freelove-label" for="settings-freelove">Profilo Amico Automatico</label> - <input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" /> - <span id="settings-freelove-desc">Automaticamente approva tutte le richieste di connessione/amicizia come amici</span> - </div> - <div id="settings-freelove-break" ></div> diff --git a/view/en/pagetypes.tpl b/view/pagetypes.tpl index 2036614ab..b27025579 100644 --- a/view/en/pagetypes.tpl +++ b/view/pagetypes.tpl @@ -1,25 +1,25 @@ <div id="settings-normal-wrapper"> - <label id="settings-normal-label" for="settings-normal">Normal Profile</label> + <label id="settings-normal-label" for="settings-normal">$n_l</label> <input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" /> - <span id="settings-normal-desc">This account is a normal personal profile</span> + <span id="settings-normal-desc">$n_d</span> </div> <div id="settings-normal-break" ></div> <div id="settings-soapbox-wrapper"> - <label id="settings-soapbox-label" for="settings-soapbox">Soapbox Profile</label> + <label id="settings-soapbox-label" for="settings-soapbox">$s_l</label> <input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" /> - <span id="settings-soapbox-desc">Automatically approve all connection/friend requests as read-only fans</span> + <span id="settings-soapbox-desc">$s_d</span> </div> <div id="settings-soapbox-break" ></div> <div id="settings-community-wrapper"> - <label id="settings-community-label" for="settings-community">Community/Celebrity Profile</label> + <label id="settings-community-label" for="settings-community">$c_l</label> <input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" /> - <span id="settings-community-desc">Automatically approve all connection/friend requests as read-write fans</span> + <span id="settings-community-desc">$c_d</span> </div> <div id="settings-community-break" ></div> <div id="settings-freelove-wrapper"> - <label id="settings-freelove-label" for="settings-freelove">Automatic Friend Profile</label> + <label id="settings-freelove-label" for="settings-freelove">$f_l</label> <input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" /> - <span id="settings-freelove-desc">Automatically approve all connection/friend requests as friends</span> + <span id="settings-freelove-desc">$f_d</span> </div> <div id="settings-freelove-break" ></div> diff --git a/view/sv/directory_header.tpl b/view/sv/directory_header.tpl deleted file mode 100644 index 0623a21b0..000000000 --- a/view/sv/directory_header.tpl +++ /dev/null @@ -1,13 +0,0 @@ -<h1>Medlemskatalog för denna webbplats (ej global)</h1> - -$globaldir - -$finding - -<div id="directory-search-wrapper"> -<form id="directory-search-form" action="directory" method="get" > -<input type="text" name="search" id="directory-search" class="search-input" onfocus="this.select();" value="$search" /> -<input type="submit" name="submit" id="directory-search-submit" value="Sök" /> -</form> -</div> -<div id="directory-search-end"></div> diff --git a/view/sv/group_edit.tpl b/view/sv/group_edit.tpl deleted file mode 100644 index 12e650597..000000000 --- a/view/sv/group_edit.tpl +++ /dev/null @@ -1,24 +0,0 @@ -<h2>Gruppredigering</h2> - - -<div id="group-edit-wrapper" > -<form action="group/$gid" id="group-edit-form" method="post" > -<div id="group-edit-name-wrapper" > -<label id="group-edit-name-label" for="group-edit-name" >Gruppnamn: </label> -<input type="text" id="group-edit-name" name="groupname" value="$name" /> -</div> -<div id="group-edit-name-end"></div> -<div id="group-edit-select-wrapper" > -<label id="group_members_select_label" for="group_members_select" >Medlemmar:</label> -$selector - -</div> -$drop -<div id="group_members_select_end"></div> -<div id="group-edit-submit-wrapper" > -<input type="submit" name="submit" value="Spara" > -</div> - -<div id="group-edit-select-end" ></div> -</form> -</div> diff --git a/view/sv/group_new.tpl b/view/sv/group_new.tpl deleted file mode 100644 index cda937ede..000000000 --- a/view/sv/group_new.tpl +++ /dev/null @@ -1,20 +0,0 @@ - - -<div id="group-new-wrapper" > -<form action="group/new" method="post"> - -<div id="group-new-text"> -<p> -Skapa en grupp med kontakter/vänner. - -<div id="group-new-input-wrapper"> -<label id="group-new-label" for="group-new-name" >Gruppnamn: </label> -<input name="groupname" id="group-new-name" /> -</div> -<div id="group-new-input-end" ></div> - -<div id="group-new-submit-wrapper" > -<input type="submit" name="submit" value="Spara" /> -</form> -</div> -<div id="group-new-end"></div> diff --git a/view/sv/pagetypes.tpl b/view/sv/pagetypes.tpl deleted file mode 100644 index 83cc66f73..000000000 --- a/view/sv/pagetypes.tpl +++ /dev/null @@ -1,24 +0,0 @@ - <div id="settings-normal-wrapper"> - <label id="settings-normal-label" for="settings-normal">Normalt konto</label> - <input type="radio" name="page-flags" id="settings-normal" $normal_selected value="$page_normal" /> - <span id="settings-normal-desc">Detta är ett vanligt personligt konto</span> - </div> - <div id="settings-normal-break" ></div> - <div id="settings-soapbox-wrapper"> - <label id="settings-soapbox-label" for="settings-soapbox">Soapbox-konto</label> - <input type="radio" name="page-flags" id="settings-soapbox" $soapbox_selected value="$page_soapbox" /> - <span id="settings-soapbox-desc">Godkänn automatiskt alla kontaktförfrågningar som fans med läsrättigheter</span> - </div> - <div id="settings-soapbox-break" ></div> - <div id="settings-community-wrapper"> - <label id="settings-community-label" for="settings-community">Gemenskap/Kändis-konto</label> - <input type="radio" name="page-flags" id="settings-community" $community_selected value="$page_community" /> - <span id="settings-community-desc">Godkänn automatiskt alla kontaktförfrågningar som fans med läs- och skrivrättigheter</span> - </div> - <div id="settings-community-break" ></div> - <div id="settings-freelove-wrapper"> - <label id="settings-freelove-label" for="settings-freelove">Vännerkonto med automatik</label> - <input type="radio" name="page-flags" id="settings-freelove" $freelove_selected value="$page_freelove" /> - <span id="settings-freelove-desc">Godkänn automatiskt alla kontaktförfrågningar som vänner</span> - </div> - <div id="settings-freelove-break" ></div>
\ No newline at end of file |