more templates gone

diff --git a/mod/notifications.php b/mod/notifications.php
index 93ca82bb0ccfb0d999096bd94db5f187090368c8..ed0831aabd058f5454efc60c42a39557f1d5cf38 100644 (file)
--- a/mod/notifications.php
+++ b/mod/notifications.php
@@ -65,12 +65,11 @@ function notifications_content(&$a) {
        else
                $sql_extra = " AND `ignore` = 0 ";
 
-
-       $tpl = load_view_file('view/intros-top.tpl');
-       $o .= replace_macros($tpl,array(
-               '$hide_url' => ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ),
-               '$hide_text' => ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests'))
-       )); 
+       $o .= '<h1>' . t('Pending Friend/Connect Notifications') . '</h1>' . "\r\n";
+       
+       $o .= '<div id="notification-show-hide-wrapper" >';
+       $o .= '<a href="' . ((strlen($sql_extra)) ? 'notifications/all' : 'notifications' ) . '" id="notifications-show-hide-link" >'
+               . ((strlen($sql_extra)) ? t('Show Ignored Requests') : t('Hide Ignored Requests')) . '</a></div>' . "\r\n";
 
 
        $r = q("SELECT COUNT(*) AS `total` FROM `intro` 
@@ -141,7 +140,7 @@ function notifications_content(&$a) {
 
        if ($a->config['register_policy'] == REGISTER_APPROVE &&        
                $a->config['admin_email'] === $a->user['email']){
-               $o .= load_view_file('view/registrations-top.tpl');
+               $o .= '<h1>' . t('User registrations waiting for confirm') . '</h1>' . "\r\n";
                
                $r = q("SELECT `register`.*, `contact`.`name`, `user`.`email`
                                 FROM `register`

diff --git a/mod/profile_photo.php b/mod/profile_photo.php
index 68c05625b3e732235d45de1f1fb0b9141802d762..48805fbdd3fa88fc1e342b22c8dc6affeb9ac758 100644 (file)
--- a/mod/profile_photo.php
+++ b/mod/profile_photo.php
@@ -196,9 +196,11 @@ function profile_photo_content(&$a) {
                $o .= replace_macros($tpl,array(
                        '$filename' => $filename,
                        '$resource' => $a->config['imagecrop'] . '-' . $a->config['imagecrop_resolution'],
-                       '$image_url' => $a->get_baseurl() . '/photo/' . $filename
-                       ));
-
+                       '$image_url' => $a->get_baseurl() . '/photo/' . $filename,
+                       '$title' => t('Crop Image'),
+                       '$desc' => t('Please adjust the image cropping for optimum viewing.'),
+                       '$done' => t('Done Editing')
+               ));
                return $o;
        }
 

diff --git a/util/messages.po b/util/messages.po
index beff3e4b64aa23b09179099fd75d81e842b70db7..223541ad8364993a2d01994f77dc198daf3429cf 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,895 +6,769 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.925\n"
+"Project-Id-Version: 2.1.933\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-23 14:03+0100\n"
+"POT-Creation-Date: 2011-03-29 17:14-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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../index.php:194
-msgid "Not Found"
-msgstr ""
-
-#: ../../index.php:195
-msgid "Page not found."
+#: ../../mod/tagrm.php:11 ../../mod/tagrm.php:94
+#: ../../mod/dfrn_request.php:628 ../../addon/js_upload/js_upload.php:41
+msgid "Cancel"
 msgstr ""
 
-#: ../../index.php:250 ../../mod/group.php:88
-msgid "Permission denied"
+#: ../../mod/tagrm.php:41
+msgid "Tag removed"
 msgstr ""
 
-#: ../../index.php:251 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
-#: ../../mod/follow.php:8 ../../mod/profile_photo.php:19
-#: ../../mod/profile_photo.php:133 ../../mod/profile_photo.php:139
-#: ../../mod/profile_photo.php:150 ../../mod/regmod.php:16
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:227
-#: ../../mod/settings.php:14 ../../mod/settings.php:19
-#: ../../mod/settings.php:210 ../../mod/photos.php:85 ../../mod/photos.php:773
-#: ../../mod/display.php:308 ../../mod/editpost.php:10 ../../mod/invite.php:13
-#: ../../mod/invite.php:50 ../../mod/contacts.php:106
-#: ../../mod/register.php:25 ../../mod/install.php:93 ../../mod/network.php:6
-#: ../../mod/notifications.php:56 ../../mod/item.php:57 ../../mod/item.php:668
-#: ../../mod/message.php:8 ../../mod/message.php:116
-#: ../../mod/dfrn_confirm.php:53 ../../mod/viewcontacts.php:13
-#: ../../mod/group.php:19 ../../addon/facebook/facebook.php:110
-msgid "Permission denied."
+#: ../../mod/tagrm.php:79
+msgid "Remove Item Tag"
 msgstr ""
 
-#: ../../boot.php:808
-msgid "Create a New Account"
+#: ../../mod/tagrm.php:81
+msgid "Select a tag to remove: "
 msgstr ""
 
-#: ../../boot.php:809 ../../mod/register.php:445 ../../include/nav.php:61
-msgid "Register"
+#: ../../mod/tagrm.php:93
+msgid "Remove"
 msgstr ""
 
-#: ../../boot.php:815
-msgid "Nickname or Email address: "
+#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
+#, php-format
+msgid "%s welcomes %s"
 msgstr ""
 
-#: ../../boot.php:816
-msgid "Password: "
+#: ../../mod/photos.php:30 ../../wip/photos.php:31
+#: ../../wip/photos-chris.php:41
+msgid "Photo Albums"
 msgstr ""
 
-#: ../../boot.php:817 ../../boot.php:823 ../../include/nav.php:44
-msgid "Login"
+#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781
+#: ../../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
+msgid "Contact Photos"
 msgstr ""
 
-#: ../../boot.php:821
-msgid "Nickname/Email/OpenID: "
+#: ../../mod/photos.php:85 ../../mod/photos.php:773 ../../mod/editpost.php:10
+#: ../../mod/install.php:93 ../../mod/notifications.php:56
+#: ../../mod/contacts.php:106 ../../mod/settings.php:15
+#: ../../mod/settings.php:20 ../../mod/settings.php:211
+#: ../../mod/manage.php:75 ../../mod/network.php:6 ../../mod/group.php:19
+#: ../../mod/viewcontacts.php:13 ../../mod/register.php:25
+#: ../../mod/regmod.php:16 ../../mod/item.php:57 ../../mod/item.php:668
+#: ../../mod/profile_photo.php:19 ../../mod/profile_photo.php:133
+#: ../../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/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
+msgid "Permission denied."
 msgstr ""
 
-#: ../../boot.php:822
-msgid "Password (if not OpenID): "
+#: ../../mod/photos.php:95 ../../wip/photos.php:87
+#: ../../wip/photos-chris.php:107
+msgid "Contact information unavailable"
 msgstr ""
 
-#: ../../boot.php:825
-msgid "Forgot your password?"
+#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
+#: ../../mod/photos.php:865 ../../mod/register.php:285
+#: ../../mod/register.php:292 ../../mod/register.php:299
+#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
+#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
+#: ../../mod/profile_photo.php:227 ../../mod/profile_photo.php:236
+#: ../../wip/photos.php:98 ../../wip/photos.php:493 ../../wip/photos.php:785
+#: ../../wip/photos.php:800 ../../wip/photos-chris.php:118
+#: ../../wip/photos-chris.php:525 ../../wip/photos-chris.php:832
+#: ../../wip/photos-chris.php:847
+msgid "Profile Photos"
 msgstr ""
 
-#: ../../boot.php:826
-msgid "Password Reset"
+#: ../../mod/photos.php:116 ../../wip/photos.php:108
+#: ../../wip/photos-chris.php:128
+msgid "Album not found."
 msgstr ""
 
-#: ../../boot.php:837 ../../include/nav.php:38
-msgid "Logout"
+#: ../../mod/photos.php:134 ../../mod/photos.php:859 ../../wip/photos.php:126
+#: ../../wip/photos.php:794 ../../wip/photos-chris.php:146
+#: ../../wip/photos-chris.php:841
+msgid "Delete Album"
 msgstr ""
 
-#: ../../boot.php:1077
-msgid "prev"
+#: ../../mod/photos.php:197 ../../mod/photos.php:1067 ../../wip/photos.php:192
+#: ../../wip/photos.php:955 ../../wip/photos-chris.php:212
+#: ../../wip/photos-chris.php:1002
+msgid "Delete Photo"
 msgstr ""
 
-#: ../../boot.php:1079
-msgid "first"
+#: ../../mod/photos.php:469 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
+msgid "was tagged in a"
 msgstr ""
 
-#: ../../boot.php:1108
-msgid "last"
+#: ../../mod/photos.php:469 ../../mod/like.php:110 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
+msgid "photo"
 msgstr ""
 
-#: ../../boot.php:1111
-msgid "next"
+#: ../../mod/photos.php:469 ../../wip/photos.php:442
+#: ../../wip/photos-chris.php:462
+msgid "by"
 msgstr ""
 
-#: ../../boot.php:1837
-#, php-format
-msgid "%s likes this."
+#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
+#: ../../wip/photos.php:511 ../../wip/photos-chris.php:555
+msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../boot.php:1837
-#, php-format
-msgid "%s doesn't like this."
+#: ../../mod/photos.php:571 ../../mod/profile_photo.php:118
+#: ../../mod/wall_upload.php:65 ../../wip/photos.php:520
+#: ../../wip/photos-chris.php:567
+msgid "Unable to process image."
 msgstr ""
 
-#: ../../boot.php:1841 ../../test.php:8
-#, php-format
-msgid "<span  %1$s>%2$d people</span> like this."
+#: ../../mod/photos.php:589 ../../mod/profile_photo.php:232
+#: ../../mod/wall_upload.php:82 ../../wip/photos.php:537
+#: ../../wip/photos-chris.php:585
+msgid "Image upload failed."
 msgstr ""
 
-#: ../../boot.php:1843
-#, php-format
-msgid "<span  %1$s>%2$d people</span> don't like this."
+#: ../../mod/photos.php:661 ../../wip/photos.php:611
+#: ../../wip/photos-chris.php:658
+msgid "No photos selected"
 msgstr ""
 
-#: ../../boot.php:1849
-msgid "and"
+#: ../../mod/photos.php:801 ../../mod/photos.php:858 ../../mod/photos.php:1066
+#: ../../mod/install.php:123 ../../mod/manage.php:106 ../../mod/invite.php:64
+#: ../../addon/facebook/facebook.php:151
+#: ../../addon/randplace/randplace.php:179
+#: ../../addon/statusnet/statusnet.php:163
+#: ../../addon/statusnet/statusnet.php:189
+#: ../../addon/statusnet/statusnet.php:207 ../../addon/twitter/twitter.php:156
+#: ../../addon/twitter/twitter.php:175 ../../wip/photos.php:754
+#: ../../wip/photos.php:793 ../../wip/photos.php:954
+#: ../../wip/addon/randplace/randplace.php:178 ../../wip/photos-chris.php:801
+#: ../../wip/photos-chris.php:840 ../../wip/photos-chris.php:1001
+msgid "Submit"
 msgstr ""
 
-#: ../../boot.php:1852
-#, php-format
-msgid ", and %d other people"
+#: ../../mod/photos.php:808 ../../wip/photos.php:742
+#: ../../wip/photos-chris.php:789
+msgid "Upload Photos"
 msgstr ""
 
-#: ../../boot.php:1853
-#, php-format
-msgid "%s like this."
+#: ../../mod/photos.php:811 ../../mod/photos.php:854 ../../wip/photos.php:745
+#: ../../wip/photos.php:789 ../../wip/photos-chris.php:792
+#: ../../wip/photos-chris.php:836
+msgid "New album name: "
 msgstr ""
 
-#: ../../boot.php:1853
-#, php-format
-msgid "%s don't like this."
+#: ../../mod/photos.php:812 ../../wip/photos.php:746
+#: ../../wip/photos-chris.php:793
+msgid "or existing album name: "
 msgstr ""
 
-#: ../../boot.php:2014
-msgid "No contacts"
+#: ../../mod/photos.php:814 ../../mod/photos.php:1062 ../../wip/photos.php:749
+#: ../../wip/photos-chris.php:796
+msgid "Permissions"
 msgstr ""
 
-#: ../../boot.php:2022
-#, php-format
-msgid "%d Contact"
-msgid_plural "%d Contacts"
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../boot.php:2038 ../../mod/viewcontacts.php:17
-msgid "View Contacts"
+#: ../../mod/photos.php:869 ../../wip/photos.php:804
+#: ../../wip/photos-chris.php:851
+msgid "Edit Album"
 msgstr ""
 
-#: ../../boot.php:2055 ../../mod/search.php:17 ../../include/nav.php:67
-msgid "Search"
+#: ../../mod/photos.php:879 ../../mod/photos.php:1263 ../../wip/photos.php:814
+#: ../../wip/photos.php:1141 ../../wip/photos-chris.php:861
+#: ../../wip/photos-chris.php:1188
+msgid "View Photo"
 msgstr ""
 
-#: ../../boot.php:2210 ../../mod/profile.php:8
-msgid "No profile"
+#: ../../mod/photos.php:909 ../../wip/photos.php:843
+#: ../../wip/photos-chris.php:890
+msgid "Photo not available"
 msgstr ""
 
-#: ../../boot.php:2267
-msgid "Connect"
+#: ../../mod/photos.php:956 ../../wip/photos.php:864
+#: ../../wip/photos-chris.php:911
+msgid "Edit photo"
 msgstr ""
 
-#: ../../boot.php:2277
-msgid "Location:"
+#: ../../mod/photos.php:958
+msgid "Use as profile photo"
 msgstr ""
 
-#: ../../boot.php:2281
-msgid ", "
+#: ../../mod/photos.php:962 ../../mod/network.php:431
+#: ../../mod/profile.php:368 ../../mod/display.php:149
+msgid "Private Message"
 msgstr ""
 
-#: ../../boot.php:2289
-msgid "Gender:"
+#: ../../mod/photos.php:969
+msgid "<< Prev"
 msgstr ""
 
-#: ../../boot.php:2293
-msgid "Status:"
+#: ../../mod/photos.php:973 ../../wip/photos.php:870
+#: ../../wip/photos-chris.php:917
+msgid "View Full Size"
 msgstr ""
 
-#: ../../boot.php:2295
-msgid "Homepage:"
+#: ../../mod/photos.php:977
+msgid "Next >>"
 msgstr ""
 
-#: ../../boot.php:2386
-msgid "Monday"
+#: ../../mod/photos.php:1036 ../../wip/photos.php:928
+#: ../../wip/photos-chris.php:975
+msgid "Tags: "
 msgstr ""
 
-#: ../../boot.php:2386
-msgid "Tuesday"
+#: ../../mod/photos.php:1046 ../../wip/photos.php:938
+#: ../../wip/photos-chris.php:985
+msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../boot.php:2386
-msgid "Wednesday"
+#: ../../mod/photos.php:1055
+msgid "New album name"
 msgstr ""
 
-#: ../../boot.php:2386
-msgid "Thursday"
+#: ../../mod/photos.php:1058 ../../wip/photos.php:948
+#: ../../wip/photos-chris.php:995
+msgid "Caption"
 msgstr ""
 
-#: ../../boot.php:2386
-msgid "Friday"
+#: ../../mod/photos.php:1060 ../../wip/photos.php:950
+#: ../../wip/photos-chris.php:997
+msgid "Add a Tag"
 msgstr ""
 
-#: ../../boot.php:2386
-msgid "Saturday"
+#: ../../mod/photos.php:1064 ../../wip/photos.php:952
+#: ../../wip/photos-chris.php:999
+msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../boot.php:2386
-msgid "Sunday"
+#: ../../mod/photos.php:1084 ../../mod/network.php:475
+#: ../../mod/profile.php:375 ../../mod/display.php:156
+msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "January"
+#: ../../mod/photos.php:1085 ../../mod/network.php:476
+#: ../../mod/profile.php:376 ../../mod/display.php:157
+msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "February"
+#: ../../mod/photos.php:1086 ../../mod/network.php:96
+#: ../../mod/network.php:477 ../../mod/profile.php:164
+#: ../../mod/profile.php:377 ../../mod/display.php:158
+msgid "Share"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "March"
+#: ../../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/display.php:159
+msgid "Please wait"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "April"
+#: ../../mod/photos.php:1106 ../../mod/photos.php:1146
+#: ../../mod/photos.php:1175 ../../mod/network.php:491
+#: ../../mod/profile.php:390 ../../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 ""
 
-#: ../../boot.php:2390
-msgid "May"
+#: ../../mod/photos.php:1203 ../../mod/network.php:500 ../../mod/group.php:137
+#: ../../mod/profile.php:436 ../../mod/display.php:238
+msgid "Delete"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "June"
+#: ../../mod/photos.php:1249 ../../wip/photos.php:1127
+#: ../../wip/photos-chris.php:1174
+msgid "Recent Photos"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "July"
+#: ../../mod/photos.php:1253 ../../wip/photos.php:1131
+#: ../../wip/photos-chris.php:1178
+msgid "Upload New Photos"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "August"
+#: ../../mod/photos.php:1269 ../../wip/photos.php:1147
+#: ../../wip/photos-chris.php:1194
+msgid "View Album"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "September"
+#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
+msgid "Item not found"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "October"
+#: ../../mod/editpost.php:32
+msgid "Edit post"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "November"
+#: ../../mod/editpost.php:62 ../../mod/network.php:499
+#: ../../mod/profile.php:414 ../../mod/display.php:222
+msgid "Edit"
 msgstr ""
 
-#: ../../boot.php:2390
-msgid "December"
+#: ../../mod/editpost.php:63 ../../mod/network.php:97
+#: ../../mod/message.php:186 ../../mod/message.php:320
+#: ../../mod/profile.php:165
+msgid "Upload photo"
 msgstr ""
 
-#: ../../boot.php:2424
-msgid "Birthday Reminders"
+#: ../../mod/editpost.php:64 ../../mod/network.php:98
+#: ../../mod/message.php:187 ../../mod/message.php:321
+#: ../../mod/profile.php:166
+msgid "Insert web link"
 msgstr ""
 
-#: ../../boot.php:2425
-msgid "Birthdays this week:"
+#: ../../mod/editpost.php:65 ../../mod/network.php:99
+#: ../../mod/profile.php:167
+msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../boot.php:2426
-msgid "(Adjusted for local time)"
+#: ../../mod/editpost.php:66 ../../mod/network.php:100
+#: ../../mod/profile.php:168
+msgid "Insert Vorbis [.ogg] video"
 msgstr ""
 
-#: ../../boot.php:2437
-msgid "[today]"
+#: ../../mod/editpost.php:67 ../../mod/network.php:101
+#: ../../mod/profile.php:169
+msgid "Insert Vorbis [.ogg] audio"
 msgstr ""
 
-#: ../../boot.php:2634
-msgid "link to source"
+#: ../../mod/editpost.php:68 ../../mod/network.php:102
+#: ../../mod/profile.php:170
+msgid "Set your location"
 msgstr ""
 
-#: ../../mod/manage.php:37
-#, php-format
-msgid "Welcome back %s"
+#: ../../mod/editpost.php:69 ../../mod/network.php:103
+#: ../../mod/profile.php:171
+msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/manage.php:87
-msgid "Manage Identities and/or Pages"
+#: ../../mod/editpost.php:71 ../../mod/network.php:105
+#: ../../mod/profile.php:173
+msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/manage.php:90
-msgid ""
-"(Toggle between different identities or community/group pages which share "
-"your account details.)"
+#: ../../mod/editpost.php:77 ../../mod/network.php:111
+#: ../../mod/profile.php:180
+msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/manage.php:92
-msgid "Select an identity to manage: "
+#: ../../mod/editpost.php:79 ../../mod/network.php:113
+#: ../../mod/profile.php:182
+msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/manage.php:106 ../../mod/photos.php:801 ../../mod/photos.php:858
-#: ../../mod/photos.php:1066 ../../mod/invite.php:64 ../../mod/install.php:123
-#: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
-#: ../../addon/statusnet/statusnet.php:163
-#: ../../addon/statusnet/statusnet.php:189
-#: ../../addon/statusnet/statusnet.php:207
-#: ../../addon/facebook/facebook.php:151
-#: ../../addon/randplace/randplace.php:179
-msgid "Submit"
+#: ../../mod/dfrn_request.php:92
+msgid "This introduction has already been accepted."
 msgstr ""
 
-#: ../../mod/wall_upload.php:56 ../../mod/profile_photo.php:109
-#, php-format
-msgid "Image exceeds size limit of %d"
+#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
+msgid "Profile location is not valid or does not contain profile information."
 msgstr ""
 
-#: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
-#: ../../mod/photos.php:571
-msgid "Unable to process image."
+#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
+msgid "Warning: profile location has no identifiable owner name."
 msgstr ""
 
-#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
-#: ../../mod/wall_upload.php:95 ../../mod/item.php:212
-#: ../../mod/message.php:93
-msgid "Wall Photos"
+#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
+msgid "Warning: profile location has no profile photo."
 msgstr ""
 
-#: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
-#: ../../mod/photos.php:589
-msgid "Image upload failed."
-msgstr ""
+#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
+#, php-format
+msgid "%d required parameter was not found at the given location"
+msgid_plural "%d required parameters were not found at the given location"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../mod/dfrn_notify.php:177 ../../mod/dfrn_notify.php:389
-#: ../../mod/dfrn_notify.php:475 ../../mod/regmod.php:93
-#: ../../mod/register.php:311 ../../mod/register.php:348
-#: ../../mod/dfrn_request.php:545 ../../mod/lostpass.php:39
-#: ../../mod/item.php:475 ../../mod/item.php:498
-#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1373
-msgid "Administrator"
+#: ../../mod/dfrn_request.php:164
+msgid "Introduction complete."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:179
-msgid "noreply"
+#: ../../mod/dfrn_request.php:188
+msgid "Unrecoverable protocol error."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:237
-msgid "New mail received at "
+#: ../../mod/dfrn_request.php:216
+msgid "Profile unavailable."
 msgstr ""
 
-#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
+#: ../../mod/dfrn_request.php:241
 #, php-format
-msgid "%s commented on an item at %s"
+msgid "%s has received too many connection requests today."
 msgstr ""
 
-#: ../../mod/profile.php:102
-msgid "Status"
+#: ../../mod/dfrn_request.php:242
+msgid "Spam protection measures have been invoked."
 msgstr ""
 
-#: ../../mod/profile.php:103
-msgid "Profile"
+#: ../../mod/dfrn_request.php:243
+msgid "Friends are advised to please try again in 24 hours."
 msgstr ""
 
-#: ../../mod/profile.php:104
-msgid "Photos"
+#: ../../mod/dfrn_request.php:273
+msgid "Invalid locator"
 msgstr ""
 
-#: ../../mod/profile.php:137 ../../mod/network.php:69
-#: ../../mod/message.php:172
-msgid "Please enter a link URL:"
+#: ../../mod/dfrn_request.php:292
+msgid "Unable to resolve your name at the provided location."
 msgstr ""
 
-#: ../../mod/profile.php:138 ../../mod/network.php:70
-msgid "Please enter a YouTube link:"
+#: ../../mod/dfrn_request.php:305
+msgid "You have already introduced yourself here."
 msgstr ""
 
-#: ../../mod/profile.php:139 ../../mod/network.php:71
-msgid "Please enter a video(.ogg) link/URL:"
+#: ../../mod/dfrn_request.php:309
+#, php-format
+msgid "Apparently you are already friends with %s."
 msgstr ""
 
-#: ../../mod/profile.php:140 ../../mod/network.php:72
-msgid "Please enter an audio(.ogg) link/URL:"
+#: ../../mod/dfrn_request.php:330
+msgid "Invalid profile URL."
 msgstr ""
 
-#: ../../mod/profile.php:141 ../../mod/network.php:73
-msgid "Where are you right now?"
+#: ../../mod/dfrn_request.php:336
+msgid "Disallowed profile URL."
 msgstr ""
 
-#: ../../mod/profile.php:164 ../../mod/profile.php:325
-#: ../../mod/photos.php:1086 ../../mod/display.php:158
-#: ../../mod/network.php:96 ../../mod/network.php:375
-msgid "Share"
+#: ../../mod/dfrn_request.php:402 ../../mod/contacts.php:90
+msgid "Failed to update contact record."
 msgstr ""
 
-#: ../../mod/profile.php:165 ../../mod/editpost.php:63
-#: ../../mod/network.php:97 ../../mod/message.php:186
-#: ../../mod/message.php:320
-msgid "Upload photo"
+#: ../../mod/dfrn_request.php:423
+msgid "Your introduction has been sent."
 msgstr ""
 
-#: ../../mod/profile.php:166 ../../mod/editpost.php:64
-#: ../../mod/network.php:98 ../../mod/message.php:187
-#: ../../mod/message.php:321
-msgid "Insert web link"
+#: ../../mod/dfrn_request.php:477
+msgid "Please login to confirm introduction."
 msgstr ""
 
-#: ../../mod/profile.php:167 ../../mod/editpost.php:65
-#: ../../mod/network.php:99
-msgid "Insert YouTube video"
+#: ../../mod/dfrn_request.php:491
+msgid ""
+"Incorrect identity currently logged in. Please login to <strong>this</"
+"strong> profile."
 msgstr ""
 
-#: ../../mod/profile.php:168 ../../mod/editpost.php:66
-#: ../../mod/network.php:100
-msgid "Insert Vorbis [.ogg] video"
+#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364
+msgid "[Name Withheld]"
 msgstr ""
 
-#: ../../mod/profile.php:169 ../../mod/editpost.php:67
-#: ../../mod/network.php:101
-msgid "Insert Vorbis [.ogg] audio"
+#: ../../mod/dfrn_request.php:543
+msgid "Introduction received at "
 msgstr ""
 
-#: ../../mod/profile.php:170 ../../mod/editpost.php:68
-#: ../../mod/network.php:102
-msgid "Set your location"
+#: ../../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
+msgid "Administrator"
 msgstr ""
 
-#: ../../mod/profile.php:171 ../../mod/editpost.php:69
-#: ../../mod/network.php:103
-msgid "Clear browser location"
+#: ../../mod/dfrn_request.php:615
+msgid "Friend/Connection Request"
 msgstr ""
 
-#: ../../mod/profile.php:172 ../../mod/profile.php:326
-#: ../../mod/photos.php:1087 ../../mod/display.php:159
-#: ../../mod/editpost.php:70 ../../mod/network.php:104
-#: ../../mod/network.php:376 ../../mod/message.php:188
-#: ../../mod/message.php:322
-msgid "Please wait"
+#: ../../mod/dfrn_request.php:616
+msgid "Please answer the following:"
 msgstr ""
 
-#: ../../mod/profile.php:173 ../../mod/editpost.php:71
-#: ../../mod/network.php:105
-msgid "Permission settings"
+#: ../../mod/dfrn_request.php:617
+msgid "Does $name know you?"
 msgstr ""
 
-#: ../../mod/profile.php:180 ../../mod/editpost.php:77
-#: ../../mod/network.php:111
-msgid "CC: email addresses"
+#: ../../mod/dfrn_request.php:618 ../../mod/register.php:436
+msgid "Yes"
 msgstr ""
 
-#: ../../mod/profile.php:182 ../../mod/editpost.php:79
-#: ../../mod/network.php:113
-msgid "Example: bob@example.com, mary@example.com"
+#: ../../mod/dfrn_request.php:619 ../../mod/register.php:437
+msgid "No"
 msgstr ""
 
-#: ../../mod/profile.php:316 ../../mod/photos.php:962
-#: ../../mod/display.php:149 ../../mod/network.php:329
-msgid "Private Message"
+#: ../../mod/dfrn_request.php:620
+msgid "Add a personal note:"
 msgstr ""
 
-#: ../../mod/profile.php:323 ../../mod/photos.php:1084
-#: ../../mod/display.php:156 ../../mod/network.php:373
-msgid "I like this (toggle)"
+#: ../../mod/dfrn_request.php:621
+msgid ""
+"Please enter your profile address from one of the following supported social "
+"networks:"
 msgstr ""
 
-#: ../../mod/profile.php:324 ../../mod/photos.php:1085
-#: ../../mod/display.php:157 ../../mod/network.php:374
-msgid "I don't like this (toggle)"
+#: ../../mod/dfrn_request.php:622
+msgid "Friendika"
 msgstr ""
 
-#: ../../mod/profile.php:338 ../../mod/photos.php:1106
-#: ../../mod/photos.php:1146 ../../mod/photos.php:1175
-#: ../../mod/display.php:171 ../../mod/network.php:389
-msgid "This is you"
+#: ../../mod/dfrn_request.php:623
+msgid "StatusNet/Federated Social Web"
 msgstr ""
 
-#: ../../mod/profile.php:362 ../../mod/display.php:222
-#: ../../mod/editpost.php:62 ../../mod/network.php:397
-msgid "Edit"
+#: ../../mod/dfrn_request.php:624
+msgid "Private (secure) network"
 msgstr ""
 
-#: ../../mod/profile.php:384 ../../mod/photos.php:1203
-#: ../../mod/display.php:238 ../../mod/network.php:398 ../../mod/group.php:137
-msgid "Delete"
+#: ../../mod/dfrn_request.php:625
+msgid "Public (insecure) network"
 msgstr ""
 
-#: ../../mod/profile.php:405 ../../mod/search.php:116
-#: ../../mod/display.php:262 ../../mod/network.php:280
-#: ../../mod/network.php:446
-msgid "View $name's profile"
+#: ../../mod/dfrn_request.php:626
+msgid "Your profile address:"
 msgstr ""
 
-#: ../../mod/profile.php:438 ../../mod/display.php:317
-#: ../../mod/register.php:424 ../../mod/network.php:484
-msgid ""
-"Shared content is covered by the <a href=\"http://creativecommons.org/"
-"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
+#: ../../mod/dfrn_request.php:627
+msgid "Submit Request"
 msgstr ""
 
-#: ../../mod/follow.php:173
-msgid "The profile address specified does not provide adequate information."
+#: ../../mod/install.php:33
+msgid "Could not create/connect to database."
 msgstr ""
 
-#: ../../mod/follow.php:179
-msgid ""
-"Limited profile. This person will be unable to receive direct/personal "
-"notifications from you."
+#: ../../mod/install.php:38
+msgid "Connected to database."
 msgstr ""
 
-#: ../../mod/follow.php:230
-msgid "Unable to retrieve contact information."
+#: ../../mod/install.php:72
+msgid "Proceed with Installation"
 msgstr ""
 
-#: ../../mod/follow.php:276
-msgid "following"
+#: ../../mod/install.php:74
+msgid "Your Friendika site database has been installed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:28
-msgid "Image uploaded but image cropping failed."
+#: ../../mod/install.php:75
+msgid ""
+"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
 msgstr ""
 
-#: ../../mod/profile_photo.php:58 ../../mod/profile_photo.php:65
-#: ../../mod/profile_photo.php:72 ../../mod/profile_photo.php:155
-#: ../../mod/profile_photo.php:225 ../../mod/profile_photo.php:234
-#: ../../mod/photos.php:106 ../../mod/photos.php:531 ../../mod/photos.php:850
-#: ../../mod/photos.php:865 ../../mod/register.php:267
-#: ../../mod/register.php:274 ../../mod/register.php:281
-msgid "Profile Photos"
+#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
+msgid "Please see the file \"INSTALL.txt\"."
 msgstr ""
 
-#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
-#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:237
-#, php-format
-msgid "Image size reduction [%s] failed."
+#: ../../mod/install.php:78
+msgid "Proceed to registration"
 msgstr ""
 
-#: ../../mod/profile_photo.php:95
-msgid "Unable to process image"
+#: ../../mod/install.php:84
+msgid "Database import failed."
 msgstr ""
 
-#: ../../mod/profile_photo.php:228
-msgid "Image uploaded successfully."
+#: ../../mod/install.php:85
+msgid ""
+"You may need to import the file \"database.sql\" manually using phpmyadmin "
+"or mysql."
 msgstr ""
 
-#: ../../mod/home.php:23
-#, php-format
-msgid "Welcome to %s"
+#: ../../mod/install.php:98
+msgid "Welcome to Friendika."
 msgstr ""
 
-#: ../../mod/regmod.php:10
-msgid "Please login."
+#: ../../mod/install.php:138
+msgid "Could not find a command line version of PHP in the web server PATH."
 msgstr ""
 
-#: ../../mod/regmod.php:54
-#, php-format
-msgid "Registration revoked for %s"
+#: ../../mod/install.php:139
+msgid ""
+"This is required. Please adjust the configuration file .htconfig.php "
+"accordingly."
 msgstr ""
 
-#: ../../mod/regmod.php:92 ../../mod/register.php:310
-#, php-format
-msgid "Registration details for %s"
+#: ../../mod/install.php:146
+msgid ""
+"The command line version of PHP on your system does not have "
+"\"register_argc_argv\" enabled."
 msgstr ""
 
-#: ../../mod/regmod.php:96
-msgid "Account approved."
+#: ../../mod/install.php:147
+msgid "This is required for message delivery to work."
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
-#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
-msgid "Profile not found."
+#: ../../mod/install.php:169
+msgid ""
+"Error: the \"openssl_pkey_new\" function on this system is not able to "
+"generate encryption keys"
 msgstr ""
 
-#: ../../mod/profiles.php:28
-msgid "Profile Name is required."
+#: ../../mod/install.php:170
+msgid ""
+"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
+"installation.php\"."
 msgstr ""
 
-#: ../../mod/profiles.php:199
-msgid "Profile updated."
+#: ../../mod/install.php:179
+msgid ""
+"Error: Apache webserver mod-rewrite module is required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:254
-msgid "Profile deleted."
+#: ../../mod/install.php:181
+msgid "Error: libCURL PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
-msgid "Profile-"
+#: ../../mod/install.php:183
+msgid ""
+"Error: GD graphics PHP module with JPEG support required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
-msgid "New profile created."
+#: ../../mod/install.php:185
+msgid "Error: openssl PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:307
-msgid "Profile unavailable to clone."
+#: ../../mod/install.php:187
+msgid "Error: mysqli PHP module required but not installed."
 msgstr ""
 
-#: ../../mod/profiles.php:370
+#: ../../mod/install.php:198
 msgid ""
-"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
-"be visible to anybody using the internet."
+"The web installer needs to be able to create a file called \".htconfig.php\" "
+"in the top folder of your web server and it is unable to do so."
 msgstr ""
 
-#: ../../mod/profiles.php:380
-msgid "Age: "
+#: ../../mod/install.php:199
+msgid ""
+"This is most often a permission setting, as the web server may not be able "
+"to write files in your folder - even if you can."
 msgstr ""
 
-#: ../../mod/profiles.php:422
-msgid "Profile Image"
+#: ../../mod/install.php:200
+msgid ""
+"Please check with your site documentation or support people to see if this "
+"situation can be corrected."
 msgstr ""
 
-#: ../../mod/settings.php:37
-msgid "Passwords do not match. Password unchanged."
+#: ../../mod/install.php:201
+msgid ""
+"If not, you may be required to perform a manual installation. Please see the "
+"file \"INSTALL.txt\" for instructions."
 msgstr ""
 
-#: ../../mod/settings.php:42
-msgid "Empty passwords are not allowed. Password unchanged."
+#: ../../mod/install.php:210
+msgid ""
+"The database configuration file \".htconfig.php\" could not be written. "
+"Please use the enclosed text to create a configuration file in your web "
+"server root."
 msgstr ""
 
-#: ../../mod/settings.php:53
-msgid "Password changed."
+#: ../../mod/install.php:225
+msgid "Errors encountered creating database tables."
 msgstr ""
 
-#: ../../mod/settings.php:55
-msgid "Password update failed. Please try again."
+#: ../../mod/match.php:10
+msgid "Profile Match"
 msgstr ""
 
-#: ../../mod/settings.php:97
-msgid " Please use a shorter name."
+#: ../../mod/match.php:50
+msgid "No matches"
 msgstr ""
 
-#: ../../mod/settings.php:99
-msgid " Name too short."
+#: ../../mod/lockview.php:39
+msgid "Remote privacy information not available."
 msgstr ""
 
-#: ../../mod/settings.php:105
-msgid " Not valid email."
+#: ../../mod/lockview.php:43
+msgid "Visible to:"
 msgstr ""
 
-#: ../../mod/settings.php:107
-msgid " Cannot change to that email."
+#: ../../mod/home.php:23
+#, php-format
+msgid "Welcome to %s"
 msgstr ""
 
-#: ../../mod/settings.php:165
-msgid "Settings updated."
+#: ../../mod/notifications.php:28
+msgid "Invalid request identifier."
 msgstr ""
 
-#: ../../mod/settings.php:215
-msgid "Plugin Settings"
+#: ../../mod/notifications.php:31 ../../mod/notifications.php:133
+msgid "Discard"
 msgstr ""
 
-#: ../../mod/settings.php:216
-msgid "Account Settings"
+#: ../../mod/notifications.php:41 ../../mod/notifications.php:132
+msgid "Ignore"
 msgstr ""
 
-#: ../../mod/settings.php:222
-msgid "No Plugin settings configured"
+#: ../../mod/notifications.php:68
+msgid "Pending Friend/Connect Notifications"
 msgstr ""
 
-#: ../../mod/settings.php:269
-msgid "OpenID: "
+#: ../../mod/notifications.php:72
+msgid "Show Ignored Requests"
 msgstr ""
 
-#: ../../mod/settings.php:269
-msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
+#: ../../mod/notifications.php:72
+msgid "Hide Ignored Requests"
 msgstr ""
 
-#: ../../mod/settings.php:301
-msgid "Profile is <strong>not published</strong>."
+#: ../../mod/notifications.php:104
+msgid "Claims to be known to you: "
 msgstr ""
 
-#: ../../mod/settings.php:358
-msgid "Default Post Permissions"
+#: ../../mod/notifications.php:104
+msgid "yes"
 msgstr ""
 
-#: ../../mod/search.php:54
-msgid "No results."
+#: ../../mod/notifications.php:104
+msgid "no"
 msgstr ""
 
-#: ../../mod/search.php:131 ../../mod/network.php:295
-msgid "View in context"
+#: ../../mod/notifications.php:110
+msgid "Approve as: "
 msgstr ""
 
-#: ../../mod/photos.php:30
-msgid "Photo Albums"
+#: ../../mod/notifications.php:111
+msgid "Friend"
 msgstr ""
 
-#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:781
-#: ../../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
-msgid "Contact Photos"
+#: ../../mod/notifications.php:112
+msgid "Fan/Admirer"
 msgstr ""
 
-#: ../../mod/photos.php:95
-msgid "Contact information unavailable"
+#: ../../mod/notifications.php:119
+msgid "Notification type: "
 msgstr ""
 
-#: ../../mod/photos.php:116
-msgid "Album not found."
+#: ../../mod/notifications.php:120
+msgid "Friend/Connect Request"
 msgstr ""
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:859
-msgid "Delete Album"
+#: ../../mod/notifications.php:120
+msgid "New Follower"
 msgstr ""
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1067
-msgid "Delete Photo"
+#: ../../mod/notifications.php:130
+msgid "Approve"
 msgstr ""
 
-#: ../../mod/photos.php:469
-msgid "was tagged in a"
+#: ../../mod/notifications.php:139
+msgid "No notifications."
 msgstr ""
 
-#: ../../mod/photos.php:469 ../../mod/like.php:110
-msgid "photo"
-msgstr ""
-
-#: ../../mod/photos.php:469
-msgid "by"
-msgstr ""
-
-#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
-msgid "Image exceeds size limit of "
-msgstr ""
-
-#: ../../mod/photos.php:661
-msgid "No photos selected"
-msgstr ""
-
-#: ../../mod/photos.php:808
-msgid "Upload Photos"
-msgstr ""
-
-#: ../../mod/photos.php:811 ../../mod/photos.php:854
-msgid "New album name: "
-msgstr ""
-
-#: ../../mod/photos.php:812
-msgid "or existing album name: "
-msgstr ""
-
-#: ../../mod/photos.php:814 ../../mod/photos.php:1062
-msgid "Permissions"
-msgstr ""
-
-#: ../../mod/photos.php:869
-msgid "Edit Album"
-msgstr ""
-
-#: ../../mod/photos.php:879 ../../mod/photos.php:1263
-msgid "View Photo"
-msgstr ""
-
-#: ../../mod/photos.php:909
-msgid "Photo not available"
-msgstr ""
-
-#: ../../mod/photos.php:956
-msgid "Edit photo"
-msgstr ""
-
-#: ../../mod/photos.php:958
-msgid "Use as profile photo"
-msgstr ""
-
-#: ../../mod/photos.php:969
-msgid "<< Prev"
-msgstr ""
-
-#: ../../mod/photos.php:973
-msgid "View Full Size"
-msgstr ""
-
-#: ../../mod/photos.php:977
-msgid "Next >>"
-msgstr ""
-
-#: ../../mod/photos.php:1036
-msgid "Tags: "
-msgstr ""
-
-#: ../../mod/photos.php:1046
-msgid "[Remove any tag]"
-msgstr ""
-
-#: ../../mod/photos.php:1055
-msgid "New album name"
-msgstr ""
-
-#: ../../mod/photos.php:1058
-msgid "Caption"
-msgstr ""
-
-#: ../../mod/photos.php:1060
-msgid "Add a Tag"
-msgstr ""
-
-#: ../../mod/photos.php:1064
-msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
-msgstr ""
-
-#: ../../mod/photos.php:1249
-msgid "Recent Photos"
-msgstr ""
-
-#: ../../mod/photos.php:1253
-msgid "Upload New Photos"
-msgstr ""
-
-#: ../../mod/photos.php:1269
-msgid "View Album"
-msgstr ""
-
-#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598
-msgid "Item not found."
-msgstr ""
-
-#: ../../mod/display.php:263 ../../mod/network.php:447
-msgid "View $owner_name's profile"
-msgstr ""
-
-#: ../../mod/display.php:264 ../../mod/network.php:448
-msgid "to"
-msgstr ""
-
-#: ../../mod/display.php:265 ../../mod/network.php:449
-msgid "Wall-to-Wall"
-msgstr ""
-
-#: ../../mod/display.php:266 ../../mod/network.php:450
-msgid "via Wall-To-Wall:"
-msgstr ""
-
-#: ../../mod/display.php:305
-msgid "Item has been removed."
-msgstr ""
-
-#: ../../mod/editpost.php:17 ../../mod/editpost.php:27
-msgid "Item not found"
-msgstr ""
-
-#: ../../mod/editpost.php:32
-msgid "Edit post"
-msgstr ""
-
-#: ../../mod/invite.php:28
-#, php-format
-msgid "%s : Not a valid email address."
-msgstr ""
-
-#: ../../mod/invite.php:32
-#, php-format
-msgid "Please join my network on %s"
-msgstr ""
-
-#: ../../mod/invite.php:38
-#, php-format
-msgid "%s : Message delivery failed."
-msgstr ""
-
-#: ../../mod/invite.php:42
-#, php-format
-msgid "%d message sent."
-msgid_plural "%d messages sent."
-msgstr[0] ""
-msgstr[1] ""
-
-#: ../../mod/invite.php:57
-msgid "Send invitations"
-msgstr ""
-
-#: ../../mod/invite.php:58
-msgid "Enter email addresses, one per line:"
-msgstr ""
-
-#: ../../mod/invite.php:59 ../../mod/message.php:183 ../../mod/message.php:317
-msgid "Your message:"
-msgstr ""
-
-#: ../../mod/invite.php:60
-#, php-format
-msgid "Please join my social network on %s"
-msgstr ""
-
-#: ../../mod/invite.php:61
-msgid "To accept this invitation, please visit:"
+#: ../../mod/notifications.php:143
+msgid "User registrations waiting for confirm"
 msgstr ""
 
-#: ../../mod/invite.php:62
-msgid ""
-"Once you have registered, please connect with me via my profile page at:"
+#: ../../mod/notifications.php:163
+msgid "No registrations."
 msgstr ""
 
 #: ../../mod/contacts.php:12
@@ -929,10 +803,6 @@ msgstr ""
 msgid "Contact updated."
 msgstr ""
 
-#: ../../mod/contacts.php:90 ../../mod/dfrn_request.php:402
-msgid "Failed to update contact record."
-msgstr ""
-
 #: ../../mod/contacts.php:146
 msgid "Contact has been blocked"
 msgstr ""
@@ -1049,8 +919,8 @@ msgstr ""
 msgid "Currently ignored"
 msgstr ""
 
-#: ../../mod/contacts.php:311 ../../include/acl_selectors.php:140
-#: ../../include/acl_selectors.php:155 ../../include/nav.php:111
+#: ../../mod/contacts.php:311 ../../include/nav.php:111
+#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
 msgid "Contacts"
 msgstr ""
 
@@ -1078,524 +948,501 @@ msgstr ""
 msgid "Edit contact"
 msgstr ""
 
-#: ../../mod/lockview.php:39
-msgid "Remote privacy information not available."
+#: ../../mod/lostpass.php:38
+#, php-format
+msgid "Password reset requested at %s"
 msgstr ""
 
-#: ../../mod/lockview.php:43
-msgid "Visible to:"
+#: ../../mod/settings.php:38
+msgid "Passwords do not match. Password unchanged."
 msgstr ""
 
-#: ../../mod/register.php:47
-msgid "Invalid OpenID url"
+#: ../../mod/settings.php:43
+msgid "Empty passwords are not allowed. Password unchanged."
 msgstr ""
 
-#: ../../mod/register.php:62
-msgid "Please enter the required information."
+#: ../../mod/settings.php:54
+msgid "Password changed."
 msgstr ""
 
-#: ../../mod/register.php:74
-msgid "Please use a shorter name."
+#: ../../mod/settings.php:56
+msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/register.php:76
-msgid "Name too short."
+#: ../../mod/settings.php:98
+msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/register.php:89
-msgid "That doesn\\'t appear to be your full (First Last) name."
+#: ../../mod/settings.php:100
+msgid " Name too short."
 msgstr ""
 
-#: ../../mod/register.php:92
-msgid "Your email domain is not among those allowed on this site."
+#: ../../mod/settings.php:106
+msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/register.php:95
-msgid "Not a valid email address."
+#: ../../mod/settings.php:108
+msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/register.php:101
-msgid "Cannot use that email."
+#: ../../mod/settings.php:166
+msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/register.php:106
-msgid ""
-"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
-"must also begin with a letter."
+#: ../../mod/settings.php:216
+msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/register.php:112
-msgid "Nickname is already registered. Please choose another."
+#: ../../mod/settings.php:217
+msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/register.php:131
-msgid "SERIOUS ERROR: Generation of security keys failed."
+#: ../../mod/settings.php:223
+msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/register.php:198
-msgid "An error occurred during registration. Please try again."
+#: ../../mod/settings.php:270
+msgid "OpenID: "
 msgstr ""
 
-#: ../../mod/register.php:216
-msgid "An error occurred creating your default profile. Please try again."
+#: ../../mod/settings.php:270
+msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/register.php:315
-msgid ""
-"Registration successful. Please check your email for further instructions."
+#: ../../mod/settings.php:302
+msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/register.php:319
-msgid "Failed to send email message. Here is the message that failed."
+#: ../../mod/settings.php:345
+msgid "Export Personal Data"
 msgstr ""
 
-#: ../../mod/register.php:324
-msgid "Your registration can not be processed."
+#: ../../mod/settings.php:363
+msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/register.php:347
+#: ../../mod/manage.php:37
 #, php-format
-msgid "Registration request at %s"
+msgid "Welcome back %s"
 msgstr ""
 
-#: ../../mod/register.php:351
-msgid "Your registration is pending approval by the site owner."
+#: ../../mod/manage.php:87
+msgid "Manage Identities and/or Pages"
 msgstr ""
 
-#: ../../mod/register.php:399
+#: ../../mod/manage.php:90
 msgid ""
-"You may (optionally) fill in this form via OpenID by supplying your OpenID "
-"and clicking 'Register'."
+"(Toggle between different identities or community/group pages which share "
+"your account details.)"
 msgstr ""
 
-#: ../../mod/register.php:400
-msgid ""
-"If you are not familiar with OpenID, please leave that field blank and fill "
-"in the rest of the items."
+#: ../../mod/manage.php:92
+msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/register.php:401
-msgid "Your OpenID (optional): "
+#: ../../mod/network.php:18
+msgid "Normal View"
 msgstr ""
 
-#: ../../mod/register.php:415
-msgid "Include your profile in member directory?"
+#: ../../mod/network.php:20
+msgid "New Item View"
 msgstr ""
 
-#: ../../mod/register.php:418 ../../mod/dfrn_request.php:618
-msgid "Yes"
+#: ../../mod/network.php:69 ../../mod/message.php:172
+#: ../../mod/profile.php:137
+msgid "Please enter a link URL:"
 msgstr ""
 
-#: ../../mod/register.php:419 ../../mod/dfrn_request.php:619
-msgid "No"
+#: ../../mod/network.php:70 ../../mod/profile.php:138
+msgid "Please enter a YouTube link:"
 msgstr ""
 
-#: ../../mod/register.php:431
-msgid "Registration"
+#: ../../mod/network.php:71 ../../mod/profile.php:139
+msgid "Please enter a video(.ogg) link/URL:"
 msgstr ""
 
-#: ../../mod/register.php:439
-msgid "Your Full Name (e.g. Joe Smith): "
+#: ../../mod/network.php:72 ../../mod/profile.php:140
+msgid "Please enter an audio(.ogg) link/URL:"
 msgstr ""
 
-#: ../../mod/register.php:440
-msgid "Your Email Address: "
+#: ../../mod/network.php:73 ../../mod/profile.php:141
+msgid "Where are you right now?"
 msgstr ""
 
-#: ../../mod/register.php:441
-msgid ""
-"Choose a profile nickname. This must begin with a text character. Your "
-"profile address on this site will then be '<strong>nickname@$sitename</"
-"strong>'."
+#: ../../mod/network.php:156
+msgid "No such group"
 msgstr ""
 
-#: ../../mod/register.php:442
-msgid "Choose a nickname: "
+#: ../../mod/network.php:167
+msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/install.php:33
-msgid "Could not create/connect to database."
+#: ../../mod/network.php:171
+msgid "Group: "
 msgstr ""
 
-#: ../../mod/install.php:38
-msgid "Connected to database."
+#: ../../mod/network.php:319 ../../mod/network.php:548
+#: ../../mod/profile.php:457 ../../mod/display.php:262
+#: ../../mod/search.php:116
+msgid "View $name's profile"
 msgstr ""
 
-#: ../../mod/install.php:72
-msgid "Proceed with Installation"
-msgstr ""
-
-#: ../../mod/install.php:74
-msgid "Your Friendika site database has been installed."
-msgstr ""
-
-#: ../../mod/install.php:75
-msgid ""
-"IMPORTANT: You will need to [manually] setup a scheduled task for the poller."
+#: ../../mod/network.php:334 ../../mod/search.php:131
+msgid "View in context"
 msgstr ""
 
-#: ../../mod/install.php:76 ../../mod/install.php:86 ../../mod/install.php:189
-msgid "Please see the file \"INSTALL.txt\"."
+#: ../../mod/network.php:397
+msgid "See more posts like this"
 msgstr ""
 
-#: ../../mod/install.php:78
-msgid "Proceed to registration"
+#: ../../mod/network.php:416 ../../mod/profile.php:357
+#, php-format
+msgid "See all %d comments"
 msgstr ""
 
-#: ../../mod/install.php:84
-msgid "Database import failed."
+#: ../../mod/network.php:549 ../../mod/display.php:263
+msgid "View $owner_name's profile"
 msgstr ""
 
-#: ../../mod/install.php:85
-msgid ""
-"You may need to import the file \"database.sql\" manually using phpmyadmin "
-"or mysql."
+#: ../../mod/network.php:550 ../../mod/display.php:264
+msgid "to"
 msgstr ""
 
-#: ../../mod/install.php:98
-msgid "Welcome to Friendika."
+#: ../../mod/network.php:551 ../../mod/display.php:265
+msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/install.php:138
-msgid "Could not find a command line version of PHP in the web server PATH."
+#: ../../mod/network.php:552 ../../mod/display.php:266
+msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/install.php:139
+#: ../../mod/network.php:593 ../../mod/register.php:442
+#: ../../mod/profile.php:490 ../../mod/display.php:317
 msgid ""
-"This is required. Please adjust the configuration file .htconfig.php "
-"accordingly."
+"Shared content is covered by the <a href=\"http://creativecommons.org/"
+"licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
 msgstr ""
 
-#: ../../mod/install.php:146
-msgid ""
-"The command line version of PHP on your system does not have "
-"\"register_argc_argv\" enabled."
+#: ../../mod/group.php:27
+msgid "Group created."
 msgstr ""
 
-#: ../../mod/install.php:147
-msgid "This is required for message delivery to work."
+#: ../../mod/group.php:33
+msgid "Could not create group."
 msgstr ""
 
-#: ../../mod/install.php:169
-msgid ""
-"Error: the \"openssl_pkey_new\" function on this system is not able to "
-"generate encryption keys"
+#: ../../mod/group.php:43 ../../mod/group.php:123
+msgid "Group not found."
 msgstr ""
 
-#: ../../mod/install.php:170
-msgid ""
-"If running under Windows, please see \"http://www.php.net/manual/en/openssl."
-"installation.php\"."
+#: ../../mod/group.php:56
+msgid "Group name changed."
 msgstr ""
 
-#: ../../mod/install.php:179
-msgid ""
-"Error: Apache webserver mod-rewrite module is required but not installed."
+#: ../../mod/group.php:79
+msgid "Membership list updated."
 msgstr ""
 
-#: ../../mod/install.php:181
-msgid "Error: libCURL PHP module required but not installed."
+#: ../../mod/group.php:88 ../../index.php:250
+msgid "Permission denied"
 msgstr ""
 
-#: ../../mod/install.php:183
-msgid ""
-"Error: GD graphics PHP module with JPEG support required but not installed."
+#: ../../mod/group.php:107
+msgid "Group removed."
 msgstr ""
 
-#: ../../mod/install.php:185
-msgid "Error: openssl PHP module required but not installed."
+#: ../../mod/group.php:109
+msgid "Unable to remove group."
 msgstr ""
 
-#: ../../mod/install.php:187
-msgid "Error: mysqli PHP module required but not installed."
+#: ../../mod/viewcontacts.php:17 ../../boot.php:2041
+msgid "View Contacts"
 msgstr ""
 
-#: ../../mod/install.php:198
-msgid ""
-"The web installer needs to be able to create a file called \".htconfig.php\" "
-"in the top folder of your web server and it is unable to do so."
+#: ../../mod/viewcontacts.php:32
+msgid "No contacts."
 msgstr ""
 
-#: ../../mod/install.php:199
-msgid ""
-"This is most often a permission setting, as the web server may not be able "
-"to write files in your folder - even if you can."
+#: ../../mod/register.php:47
+msgid "Invalid OpenID url"
 msgstr ""
 
-#: ../../mod/install.php:200
-msgid ""
-"Please check with your site documentation or support people to see if this "
-"situation can be corrected."
+#: ../../mod/register.php:62
+msgid "Please enter the required information."
 msgstr ""
 
-#: ../../mod/install.php:201
-msgid ""
-"If not, you may be required to perform a manual installation. Please see the "
-"file \"INSTALL.txt\" for instructions."
+#: ../../mod/register.php:74
+msgid "Please use a shorter name."
 msgstr ""
 
-#: ../../mod/install.php:210
-msgid ""
-"The database configuration file \".htconfig.php\" could not be written. "
-"Please use the enclosed text to create a configuration file in your web "
-"server root."
+#: ../../mod/register.php:76
+msgid "Name too short."
 msgstr ""
 
-#: ../../mod/install.php:225
-msgid "Errors encountered creating database tables."
+#: ../../mod/register.php:89
+msgid "That doesn\\'t appear to be your full (First Last) name."
 msgstr ""
 
-#: ../../mod/network.php:18
-msgid "Normal View"
+#: ../../mod/register.php:92
+msgid "Your email domain is not among those allowed on this site."
 msgstr ""
 
-#: ../../mod/network.php:20
-msgid "New Item View"
+#: ../../mod/register.php:95
+msgid "Not a valid email address."
 msgstr ""
 
-#: ../../mod/network.php:156
-msgid "No such group"
+#: ../../mod/register.php:101
+msgid "Cannot use that email."
 msgstr ""
 
-#: ../../mod/network.php:167
-msgid "Group is empty"
+#: ../../mod/register.php:106
+msgid ""
+"Your \"nickname\" can only contain \"a-z\", \"0-9\", \"-\", and \"_\", and "
+"must also begin with a letter."
 msgstr ""
 
-#: ../../mod/network.php:171
-msgid "Group: "
+#: ../../mod/register.php:112 ../../mod/register.php:212
+msgid "Nickname is already registered. Please choose another."
 msgstr ""
 
-#: ../../mod/notifications.php:28
-msgid "Invalid request identifier."
+#: ../../mod/register.php:131
+msgid "SERIOUS ERROR: Generation of security keys failed."
 msgstr ""
 
-#: ../../mod/notifications.php:31 ../../mod/notifications.php:134
-msgid "Discard"
+#: ../../mod/register.php:198
+msgid "An error occurred during registration. Please try again."
 msgstr ""
 
-#: ../../mod/notifications.php:41 ../../mod/notifications.php:133
-msgid "Ignore"
+#: ../../mod/register.php:234
+msgid "An error occurred creating your default profile. Please try again."
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Show Ignored Requests"
+#: ../../mod/register.php:328 ../../mod/regmod.php:92
+#, php-format
+msgid "Registration details for %s"
 msgstr ""
 
-#: ../../mod/notifications.php:72
-msgid "Hide Ignored Requests"
+#: ../../mod/register.php:333
+msgid ""
+"Registration successful. Please check your email for further instructions."
 msgstr ""
 
-#: ../../mod/notifications.php:105
-msgid "Claims to be known to you: "
+#: ../../mod/register.php:337
+msgid "Failed to send email message. Here is the message that failed."
 msgstr ""
 
-#: ../../mod/notifications.php:105
-msgid "yes"
+#: ../../mod/register.php:342
+msgid "Your registration can not be processed."
 msgstr ""
 
-#: ../../mod/notifications.php:105
-msgid "no"
+#: ../../mod/register.php:365
+#, php-format
+msgid "Registration request at %s"
 msgstr ""
 
-#: ../../mod/notifications.php:111
-msgid "Approve as: "
+#: ../../mod/register.php:369
+msgid "Your registration is pending approval by the site owner."
 msgstr ""
 
-#: ../../mod/notifications.php:112
-msgid "Friend"
+#: ../../mod/register.php:417
+msgid ""
+"You may (optionally) fill in this form via OpenID by supplying your OpenID "
+"and clicking 'Register'."
 msgstr ""
 
-#: ../../mod/notifications.php:113
-msgid "Fan/Admirer"
+#: ../../mod/register.php:418
+msgid ""
+"If you are not familiar with OpenID, please leave that field blank and fill "
+"in the rest of the items."
 msgstr ""
 
-#: ../../mod/notifications.php:120
-msgid "Notification type: "
+#: ../../mod/register.php:419
+msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/notifications.php:121
-msgid "Friend/Connect Request"
+#: ../../mod/register.php:433
+msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/notifications.php:121
-msgid "New Follower"
+#: ../../mod/register.php:449
+msgid "Registration"
 msgstr ""
 
-#: ../../mod/notifications.php:131
-msgid "Approve"
+#: ../../mod/register.php:457
+msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/notifications.php:140
-msgid "No notifications."
+#: ../../mod/register.php:458
+msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/notifications.php:164
-msgid "No registrations."
+#: ../../mod/register.php:459
+msgid ""
+"Choose a profile nickname. This must begin with a text character. Your "
+"profile address on this site will then be '<strong>nickname@$sitename</"
+"strong>'."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:92
-msgid "This introduction has already been accepted."
+#: ../../mod/register.php:460
+msgid "Choose a nickname: "
 msgstr ""
 
-#: ../../mod/dfrn_request.php:116 ../../mod/dfrn_request.php:347
-msgid "Profile location is not valid or does not contain profile information."
+#: ../../mod/register.php:463 ../../include/nav.php:61 ../../boot.php:811
+msgid "Register"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:121 ../../mod/dfrn_request.php:352
-msgid "Warning: profile location has no identifiable owner name."
+#: ../../mod/like.php:110
+msgid "status"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:123 ../../mod/dfrn_request.php:354
-msgid "Warning: profile location has no profile photo."
+#: ../../mod/like.php:127
+#, php-format
+msgid "%1$s likes %2$s's %3$s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:126 ../../mod/dfrn_request.php:357
+#: ../../mod/like.php:129
 #, php-format
-msgid "%d required parameter was not found at the given location"
-msgid_plural "%d required parameters were not found at the given location"
-msgstr[0] ""
-msgstr[1] ""
+msgid "%1$s doesn't like %2$s's %3$s"
+msgstr ""
 
-#: ../../mod/dfrn_request.php:164
-msgid "Introduction complete."
+#: ../../mod/friendika.php:12 ../../wip/friendika.php:12
+msgid "This is Friendika version"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:188
-msgid "Unrecoverable protocol error."
+#: ../../mod/friendika.php:13 ../../wip/friendika.php:13
+msgid "running at web location"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:216
-msgid "Profile unavailable."
+#: ../../mod/friendika.php:15
+msgid ""
+"Shared content within the Friendika network is provided under the <a href="
+"\"http://creativecommons.org/licenses/by/3.0/\">Creative Commons Attribution "
+"3.0 license</a>"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:241
-#, php-format
-msgid "%s has received too many connection requests today."
+#: ../../mod/friendika.php:17
+msgid ""
+"Please visit <a href=\"http://project.friendika.com\">Project.Friendika.com</"
+"a> to learn more about the Friendika project."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:242
-msgid "Spam protection measures have been invoked."
+#: ../../mod/friendika.php:19 ../../wip/friendika.php:15
+msgid "Bug reports and issues: please visit"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:243
-msgid "Friends are advised to please try again in 24 hours."
+#: ../../mod/friendika.php:20 ../../wip/friendika.php:16
+msgid ""
+"Suggestions, praise, donations, etc. - please email \"Info\" at Friendika - "
+"dot com"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:273
-msgid "Invalid locator"
+#: ../../mod/friendika.php:25
+msgid "Installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:292
-msgid "Unable to resolve your name at the provided location."
+#: ../../mod/friendika.php:33
+msgid "No installed plugins/addons/apps"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:305
-msgid "You have already introduced yourself here."
+#: ../../mod/regmod.php:10
+msgid "Please login."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:309
+#: ../../mod/regmod.php:54
 #, php-format
-msgid "Apparently you are already friends with %s."
+msgid "Registration revoked for %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:330
-msgid "Invalid profile URL."
+#: ../../mod/regmod.php:96
+msgid "Account approved."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:336
-msgid "Disallowed profile URL."
+#: ../../mod/item.php:37
+msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:423
-msgid "Your introduction has been sent."
+#: ../../mod/item.php:126
+msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:477
-msgid "Please login to confirm introduction."
+#: ../../mod/item.php:212 ../../mod/message.php:93
+#: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
+#: ../../mod/wall_upload.php:95
+msgid "Wall Photos"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:491
-msgid ""
-"Incorrect identity currently logged in. Please login to <strong>this</"
-"strong> profile."
-msgstr ""
-
-#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364
-msgid "[Name Withheld]"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:543
-msgid "Introduction received at "
+#: ../../mod/item.php:474
+#, php-format
+msgid "%s commented on your item at %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:615
-msgid "Friend/Connection Request"
+#: ../../mod/item.php:497
+#, php-format
+msgid "%s posted on your profile wall at %s"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:616
-msgid "Please answer the following:"
+#: ../../mod/item.php:523
+msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:617
-msgid "Does $name know you?"
+#: ../../mod/item.php:541
+#, php-format
+msgid ""
+"This message was sent to you by %s, a member of the Friendika social network."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:620
-msgid "Add a personal note:"
+#: ../../mod/item.php:543
+msgid "You may visit them online at"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:621
+#: ../../mod/item.php:545
 msgid ""
-"Please enter your profile address from one of the following supported social "
-"networks:"
-msgstr ""
-
-#: ../../mod/dfrn_request.php:622
-msgid "Friendika"
+"Please contact the sender by replying to this post if you do not wish to "
+"receive these messages."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:623
-msgid "StatusNet/Federated Social Web"
+#: ../../mod/item.php:547
+#, php-format
+msgid "%s posted an update."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:624
-msgid "Private (secure) network"
+#: ../../mod/item.php:598 ../../mod/display.php:15 ../../mod/display.php:312
+msgid "Item not found."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:625
-msgid "Public (insecure) network"
+#: ../../mod/profile_photo.php:28
+msgid "Image uploaded but image cropping failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:626
-msgid "Your profile address:"
+#: ../../mod/profile_photo.php:61 ../../mod/profile_photo.php:68
+#: ../../mod/profile_photo.php:75 ../../mod/profile_photo.php:239
+#, php-format
+msgid "Image size reduction [%s] failed."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:627
-msgid "Submit Request"
+#: ../../mod/profile_photo.php:95
+msgid "Unable to process image"
 msgstr ""
 
-#: ../../mod/dfrn_request.php:628 ../../mod/tagrm.php:11
-#: ../../mod/tagrm.php:94 ../../addon/js_upload/js_upload.php:41
-msgid "Cancel"
+#: ../../mod/profile_photo.php:109 ../../mod/wall_upload.php:56
+#, php-format
+msgid "Image exceeds size limit of %d"
 msgstr ""
 
-#: ../../mod/like.php:110
-msgid "status"
+#: ../../mod/profile_photo.php:200
+msgid "Crop Image"
 msgstr ""
 
-#: ../../mod/like.php:127
-#, php-format
-msgid "%1$s likes %2$s's %3$s"
+#: ../../mod/profile_photo.php:201
+msgid "Please adjust the image cropping for optimum viewing."
 msgstr ""
 
-#: ../../mod/like.php:129
-#, php-format
-msgid "%1$s doesn't like %2$s's %3$s"
+#: ../../mod/profile_photo.php:202
+msgid "Done Editing"
 msgstr ""
 
-#: ../../mod/lostpass.php:38
-#, php-format
-msgid "Password reset requested at %s"
+#: ../../mod/profile_photo.php:230
+msgid "Image uploaded successfully."
 msgstr ""
 
 #: ../../mod/removeme.php:42 ../../mod/removeme.php:45
@@ -1612,73 +1459,6 @@ msgstr ""
 msgid "Please enter your password for verification:"
 msgstr ""
 
-#: ../../mod/apps.php:6
-msgid "Applications"
-msgstr ""
-
-#: ../../mod/directory.php:32
-msgid "Global Directory"
-msgstr ""
-
-#: ../../mod/item.php:37
-msgid "Unable to locate original post."
-msgstr ""
-
-#: ../../mod/item.php:126
-msgid "Empty post discarded."
-msgstr ""
-
-#: ../../mod/item.php:474
-#, php-format
-msgid "%s commented on your item at %s"
-msgstr ""
-
-#: ../../mod/item.php:497
-#, php-format
-msgid "%s posted on your profile wall at %s"
-msgstr ""
-
-#: ../../mod/item.php:523
-msgid "System error. Post not saved."
-msgstr ""
-
-#: ../../mod/item.php:541
-#, php-format
-msgid ""
-"This message was sent to you by %s, a member of the Friendika social network."
-msgstr ""
-
-#: ../../mod/item.php:543
-msgid "You may visit them online at"
-msgstr ""
-
-#: ../../mod/item.php:545
-msgid ""
-"Please contact the sender by replying to this post if you do not wish to "
-"receive these messages."
-msgstr ""
-
-#: ../../mod/item.php:547
-#, php-format
-msgid "%s posted an update."
-msgstr ""
-
-#: ../../mod/tagrm.php:41
-msgid "Tag removed"
-msgstr ""
-
-#: ../../mod/tagrm.php:79
-msgid "Remove Item Tag"
-msgstr ""
-
-#: ../../mod/tagrm.php:81
-msgid "Select a tag to remove: "
-msgstr ""
-
-#: ../../mod/tagrm.php:93
-msgid "Remove"
-msgstr ""
-
 #: ../../mod/message.php:18
 msgid "No recipient selected."
 msgstr ""
@@ -1735,6 +1515,10 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
+#: ../../mod/message.php:183 ../../mod/message.php:317 ../../mod/invite.php:59
+msgid "Your message:"
+msgstr ""
+
 #: ../../mod/message.php:222
 msgid "No messages."
 msgstr ""
@@ -1755,231 +1539,284 @@ msgstr ""
 msgid "Send Reply"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:231
-msgid "Response from remote site was not understood."
+#: ../../mod/profile.php:8 ../../boot.php:2213
+msgid "No profile"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:240
-msgid "Unexpected response from remote site: "
+#: ../../mod/profile.php:102
+msgid "Status"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:248
-msgid "Confirmation completed successfully."
+#: ../../mod/profile.php:103
+msgid "Profile"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
-#: ../../mod/dfrn_confirm.php:271
-msgid "Remote site reported: "
+#: ../../mod/profile.php:104
+msgid "Photos"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:262
-msgid "Temporary failure. Please wait and try again."
+#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
+#: ../../include/auth.php:130 ../../include/auth.php:183
+msgid "Login failed."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:269
-msgid "Introduction failed or was revoked."
+#: ../../mod/openid.php:73 ../../include/auth.php:194
+msgid "Welcome back "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:387
-msgid "Unable to set contact photo."
+#: ../../mod/follow.php:173
+msgid "The profile address specified does not provide adequate information."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:426
-msgid "is now friends with"
+#: ../../mod/follow.php:179
+msgid ""
+"Limited profile. This person will be unable to receive direct/personal "
+"notifications from you."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:494
-#, php-format
-msgid "No user record found for '%s' "
+#: ../../mod/follow.php:230
+msgid "Unable to retrieve contact information."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:504
-msgid "Our site encryption key is apparently messed up."
+#: ../../mod/follow.php:276
+msgid "following"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:515
-msgid "Empty site URL was provided or URL could not be decrypted by us."
+#: ../../mod/display.php:305
+msgid "Item has been removed."
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:527
-msgid "Contact record was not found for you on our site."
+#: ../../mod/dfrn_notify.php:179
+msgid "noreply"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:555
-msgid ""
-"The ID provided by your system is a duplicate on our system. It should work "
-"if you try again."
+#: ../../mod/dfrn_notify.php:237
+msgid "New mail received at "
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:566
-msgid "Unable to set your contact credentials on our system."
+#: ../../mod/dfrn_notify.php:388 ../../mod/dfrn_notify.php:474
+#, php-format
+msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:619
-msgid "Unable to update your contact profile details on our system"
+#: ../../mod/apps.php:6
+msgid "Applications"
 msgstr ""
 
-#: ../../mod/dfrn_confirm.php:648
-#, php-format
-msgid "Connection accepted at %s"
+#: ../../mod/search.php:17 ../../include/nav.php:67 ../../boot.php:2058
+msgid "Search"
 msgstr ""
 
-#: ../../mod/openid.php:62 ../../mod/openid.php:109 ../../include/auth.php:105
-#: ../../include/auth.php:130 ../../include/auth.php:183
-msgid "Login failed."
+#: ../../mod/search.php:54
+msgid "No results."
 msgstr ""
 
-#: ../../mod/openid.php:73 ../../include/auth.php:194
-msgid "Welcome back "
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
+#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
+msgid "Profile not found."
 msgstr ""
 
-#: ../../mod/dfrn_poll.php:78 ../../mod/dfrn_poll.php:392
-#, php-format
-msgid "%s welcomes %s"
+#: ../../mod/profiles.php:28
+msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/viewcontacts.php:32
-msgid "No contacts."
+#: ../../mod/profiles.php:199
+msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/group.php:27
-msgid "Group created."
+#: ../../mod/profiles.php:254
+msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/group.php:33
-msgid "Could not create group."
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
+msgid "Profile-"
 msgstr ""
 
-#: ../../mod/group.php:43 ../../mod/group.php:123
-msgid "Group not found."
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
+msgid "New profile created."
 msgstr ""
 
-#: ../../mod/group.php:56
-msgid "Group name changed."
+#: ../../mod/profiles.php:307
+msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/group.php:79
-msgid "Membership list updated."
-msgstr ""
+#: ../../mod/profiles.php:370
+msgid ""
+"This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
+"be visible to anybody using the internet."
+msgstr ""
 
-#: ../../mod/group.php:107
-msgid "Group removed."
+#: ../../mod/profiles.php:380 ../../mod/directory.php:89
+msgid "Age: "
 msgstr ""
 
-#: ../../mod/group.php:109
-msgid "Unable to remove group."
+#: ../../mod/profiles.php:422
+msgid "Profile Image"
 msgstr ""
 
-#: ../../mod/match.php:10
-msgid "Profile Match"
+#: ../../mod/directory.php:32
+msgid "Global Directory"
 msgstr ""
 
-#: ../../mod/match.php:49
-msgid "No matches"
+#: ../../mod/directory.php:92
+msgid "Gender: "
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:64
-msgid "Post to Twitter"
+#: ../../mod/directory.php:118
+msgid "No entries (some entries may be hidden)."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:122
-msgid "Twitter Posting Settings"
+#: ../../mod/invite.php:28
+#, php-format
+msgid "%s : Not a valid email address."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:129
-msgid ""
-"No consumer key pair for Twitter found. Please contact your site "
-"administrator."
+#: ../../mod/invite.php:32
+#, php-format
+msgid "Please join my network on %s"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:148
-msgid ""
-"At this Friendika instance the Twitter plugin was enabled but you have not "
-"yet connected your account to your Twitter account. To do so click the "
-"button below to get a PIN from Twitter which you have to copy into the input "
-"box below and submit the form. Only your <strong>public</strong> posts will "
-"be posted to Twitter."
+#: ../../mod/invite.php:38
+#, php-format
+msgid "%s : Message delivery failed."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:149
-msgid "Log in with Twitter"
+#: ../../mod/invite.php:42
+#, php-format
+msgid "%d message sent."
+msgid_plural "%d messages sent."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../../mod/invite.php:57
+msgid "Send invitations"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:151
-msgid "Copy the PIN from Twitter here"
+#: ../../mod/invite.php:58
+msgid "Enter email addresses, one per line:"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:165 ../../addon/statusnet/statusnet.php:197
-msgid "Currently connected to: "
+#: ../../mod/invite.php:60
+#, php-format
+msgid "Please join my social network on %s"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:166
+#: ../../mod/invite.php:61
+msgid "To accept this invitation, please visit:"
+msgstr ""
+
+#: ../../mod/invite.php:62
 msgid ""
-"If enabled all your <strong>public</strong> postings will be posted to the "
-"associated Twitter account as well."
+"Once you have registered, please connect with me via my profile page at:"
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:168
-msgid "Send public postings to Twitter"
+#: ../../mod/dfrn_confirm.php:231
+msgid "Response from remote site was not understood."
 msgstr ""
 
-#: ../../addon/twitter/twitter.php:172 ../../addon/statusnet/statusnet.php:204
-msgid "Clear OAuth configuration"
+#: ../../mod/dfrn_confirm.php:240
+msgid "Unexpected response from remote site: "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:78
-msgid "Post to StatusNet"
+#: ../../mod/dfrn_confirm.php:248
+msgid "Confirmation completed successfully."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:146
-msgid "StatusNet Posting Settings"
+#: ../../mod/dfrn_confirm.php:250 ../../mod/dfrn_confirm.php:264
+#: ../../mod/dfrn_confirm.php:271
+msgid "Remote site reported: "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:152
-msgid ""
-"No consumer key pair for StatusNet found. Register your Friendika Account as "
-"an desktop client on your StatusNet account, copy the consumer key pair here "
-"and enter the API base root.<br />Before you register your own OAuth key "
-"pair ask the administrator if there is already a key pair for this Friendika "
-"installation at your favorited StatusNet installation."
+#: ../../mod/dfrn_confirm.php:262
+msgid "Temporary failure. Please wait and try again."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:154
-msgid "OAuth Consumer Key"
+#: ../../mod/dfrn_confirm.php:269
+msgid "Introduction failed or was revoked."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:157
-msgid "OAuth Consumer Secret"
+#: ../../mod/dfrn_confirm.php:387
+msgid "Unable to set contact photo."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:160
-msgid "Base API Path (remember the trailing /)"
+#: ../../mod/dfrn_confirm.php:426
+msgid "is now friends with"
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:181
-msgid ""
-"To connect to your StatusNet account click the button below to get a "
-"security code from StatusNet which you have to copy into the input box below "
-"and submit the form. Only your <strong>public</strong> posts will be posted "
-"to StatusNet."
+#: ../../mod/dfrn_confirm.php:494
+#, php-format
+msgid "No user record found for '%s' "
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:182
-msgid "Log in with StatusNet"
+#: ../../mod/dfrn_confirm.php:504
+msgid "Our site encryption key is apparently messed up."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:184
-msgid "Copy the security code from StatusNet here"
+#: ../../mod/dfrn_confirm.php:515
+msgid "Empty site URL was provided or URL could not be decrypted by us."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:198
+#: ../../mod/dfrn_confirm.php:527
+msgid "Contact record was not found for you on our site."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:555
 msgid ""
-"If enabled all your <strong>public</strong> postings will be posted to the "
-"associated StatusNet account as well."
+"The ID provided by your system is a duplicate on our system. It should work "
+"if you try again."
 msgstr ""
 
-#: ../../addon/statusnet/statusnet.php:200
-msgid "Send public postings to StatusNet"
+#: ../../mod/dfrn_confirm.php:566
+msgid "Unable to set your contact credentials on our system."
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:619
+msgid "Unable to update your contact profile details on our system"
+msgstr ""
+
+#: ../../mod/dfrn_confirm.php:648
+#, php-format
+msgid "Connection accepted at %s"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:116
+msgid "Facebook disabled"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:124
+msgid "Facebook API key is missing."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:131
+msgid "Facebook Connect"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:137
+msgid "Install Facebook post connector"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:144
+msgid "Remove Facebook post connector"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:150
+msgid "Post to Facebook by default"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:174
+msgid "Facebook"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:175
+msgid "Facebook Connector Settings"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:189
+msgid "Post to Facebook"
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:230
+msgid "Image: "
 msgstr ""
 
 #: ../../addon/tictac/tictac.php:14
@@ -2036,63 +1873,27 @@ msgstr ""
 msgid "I won!"
 msgstr ""
 
-#: ../../addon/java_upload/java_upload.php:33
-msgid "Select files to upload: "
-msgstr ""
-
-#: ../../addon/java_upload/java_upload.php:35
-msgid ""
-"Use the following controls only if the Java uploader [above] fails to launch."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:116
-msgid "Facebook disabled"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:124
-msgid "Facebook API key is missing."
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:131
-msgid "Facebook Connect"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:137
-msgid "Install Facebook post connector"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:144
-msgid "Remove Facebook post connector"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:150
-msgid "Post to Facebook by default"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:174
-msgid "Facebook"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:175
-msgid "Facebook Connector Settings"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:189
-msgid "Post to Facebook"
-msgstr ""
-
-#: ../../addon/facebook/facebook.php:230
-msgid "Image: "
-msgstr ""
-
 #: ../../addon/randplace/randplace.php:171
+#: ../../wip/addon/randplace/randplace.php:170
 msgid "Randplace Settings"
 msgstr ""
 
 #: ../../addon/randplace/randplace.php:173
+#: ../../wip/addon/randplace/randplace.php:172
 msgid "Enable Randplace Plugin"
 msgstr ""
 
+#: ../../addon/java_upload/java_upload.php:33 ../../wip/photos.php:747
+#: ../../wip/photos-chris.php:794
+msgid "Select files to upload: "
+msgstr ""
+
+#: ../../addon/java_upload/java_upload.php:35 ../../wip/photos.php:752
+#: ../../wip/photos-chris.php:799
+msgid ""
+"Use the following controls only if the Java uploader [above] fails to launch."
+msgstr ""
+
 #: ../../addon/js_upload/js_upload.php:39
 msgid "Upload a file"
 msgstr ""
@@ -2125,20 +1926,124 @@ msgstr ""
 msgid "Upload was cancelled, or server error encountered"
 msgstr ""
 
-#: ../../include/contact_selectors.php:32
-msgid "Unknown | Not categorised"
-msgstr ""
-
-#: ../../include/contact_selectors.php:33
-msgid "Block immediately"
-msgstr ""
-
-#: ../../include/contact_selectors.php:34
-msgid "Shady, spammer, self-marketer"
+#: ../../addon/statusnet/statusnet.php:78
+msgid "Post to StatusNet"
 msgstr ""
 
-#: ../../include/contact_selectors.php:35
-msgid "Known to me, but no opinion"
+#: ../../addon/statusnet/statusnet.php:146
+msgid "StatusNet Posting Settings"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:152
+msgid ""
+"No consumer key pair for StatusNet found. Register your Friendika Account as "
+"an desktop client on your StatusNet account, copy the consumer key pair here "
+"and enter the API base root.<br />Before you register your own OAuth key "
+"pair ask the administrator if there is already a key pair for this Friendika "
+"installation at your favorited StatusNet installation."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:154
+msgid "OAuth Consumer Key"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:157
+msgid "OAuth Consumer Secret"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:160
+msgid "Base API Path (remember the trailing /)"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:181
+msgid ""
+"To connect to your StatusNet account click the button below to get a "
+"security code from StatusNet which you have to copy into the input box below "
+"and submit the form. Only your <strong>public</strong> posts will be posted "
+"to StatusNet."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:182
+msgid "Log in with StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:184
+msgid "Copy the security code from StatusNet here"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:197 ../../addon/twitter/twitter.php:165
+msgid "Currently connected to: "
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:198
+msgid ""
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated StatusNet account as well."
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:200
+msgid "Send public postings to StatusNet"
+msgstr ""
+
+#: ../../addon/statusnet/statusnet.php:204 ../../addon/twitter/twitter.php:172
+msgid "Clear OAuth configuration"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:64
+msgid "Post to Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:122
+msgid "Twitter Posting Settings"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:129
+msgid ""
+"No consumer key pair for Twitter found. Please contact your site "
+"administrator."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:148
+msgid ""
+"At this Friendika instance the Twitter plugin was enabled but you have not "
+"yet connected your account to your Twitter account. To do so click the "
+"button below to get a PIN from Twitter which you have to copy into the input "
+"box below and submit the form. Only your <strong>public</strong> posts will "
+"be posted to Twitter."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:149
+msgid "Log in with Twitter"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:151
+msgid "Copy the PIN from Twitter here"
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:166
+msgid ""
+"If enabled all your <strong>public</strong> postings will be posted to the "
+"associated Twitter account as well."
+msgstr ""
+
+#: ../../addon/twitter/twitter.php:168
+msgid "Send public postings to Twitter"
+msgstr ""
+
+#: ../../include/contact_selectors.php:32
+msgid "Unknown | Not categorised"
+msgstr ""
+
+#: ../../include/contact_selectors.php:33
+msgid "Block immediately"
+msgstr ""
+
+#: ../../include/contact_selectors.php:34
+msgid "Shady, spammer, self-marketer"
+msgstr ""
+
+#: ../../include/contact_selectors.php:35
+msgid "Known to me, but no opinion"
 msgstr ""
 
 #: ../../include/contact_selectors.php:36
@@ -2221,307 +2126,565 @@ msgstr ""
 msgid "Non-specific"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Other"
+#: ../../include/profile_selectors.php:6
+msgid "Other"
+msgstr ""
+
+#: ../../include/profile_selectors.php:6
+msgid "Undecided"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Males"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Females"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Gay"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Lesbian"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "No Preference"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Bisexual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Autosexual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Abstinent"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Virgin"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Deviant"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Fetish"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Oodles"
+msgstr ""
+
+#: ../../include/profile_selectors.php:19
+msgid "Nonsexual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Single"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Lonely"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Available"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Unavailable"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Dating"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Unfaithful"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Sex Addict"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Friends/Benefits"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Casual"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Engaged"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Married"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Partners"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Cohabiting"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Happy"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Not Looking"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Swinger"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Betrayed"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Separated"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Unstable"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Divorced"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Widowed"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Uncertain"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Complicated"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Don't care"
+msgstr ""
+
+#: ../../include/profile_selectors.php:33
+msgid "Ask me"
+msgstr ""
+
+#: ../../include/oembed.php:57
+msgid "Embedding disabled"
+msgstr ""
+
+#: ../../include/group.php:130
+msgid "Create a new group"
+msgstr ""
+
+#: ../../include/group.php:131
+msgid "Everybody"
+msgstr ""
+
+#: ../../include/nav.php:38 ../../boot.php:839
+msgid "Logout"
+msgstr ""
+
+#: ../../include/nav.php:44 ../../boot.php:819 ../../boot.php:825
+msgid "Login"
+msgstr ""
+
+#: ../../include/nav.php:56 ../../include/nav.php:91
+msgid "Home"
+msgstr ""
+
+#: ../../include/nav.php:64
+msgid "Apps"
+msgstr ""
+
+#: ../../include/nav.php:77
+msgid "Directory"
+msgstr ""
+
+#: ../../include/nav.php:87
+msgid "Network"
+msgstr ""
+
+#: ../../include/nav.php:96
+msgid "Notifications"
+msgstr ""
+
+#: ../../include/nav.php:104
+msgid "Manage"
+msgstr ""
+
+#: ../../include/nav.php:107
+msgid "Settings"
+msgstr ""
+
+#: ../../include/nav.php:109
+msgid "Profiles"
+msgstr ""
+
+#: ../../include/auth.php:27
+msgid "Logged out."
+msgstr ""
+
+#: ../../include/datetime.php:44 ../../include/datetime.php:46
+msgid "Miscellaneous"
+msgstr ""
+
+#: ../../include/datetime.php:148
+msgid "less than a second ago"
+msgstr ""
+
+#: ../../include/datetime.php:151
+msgid "year"
+msgstr ""
+
+#: ../../include/datetime.php:151
+msgid "years"
+msgstr ""
+
+#: ../../include/datetime.php:152
+msgid "month"
+msgstr ""
+
+#: ../../include/datetime.php:152
+msgid "months"
+msgstr ""
+
+#: ../../include/datetime.php:153
+msgid "week"
+msgstr ""
+
+#: ../../include/datetime.php:153
+msgid "weeks"
 msgstr ""
 
-#: ../../include/profile_selectors.php:6
-msgid "Undecided"
+#: ../../include/datetime.php:154
+msgid "day"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Males"
+#: ../../include/datetime.php:154
+msgid "days"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Females"
+#: ../../include/datetime.php:155
+msgid "hour"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Gay"
+#: ../../include/datetime.php:155
+msgid "hours"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Lesbian"
+#: ../../include/datetime.php:156
+msgid "minute"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "No Preference"
+#: ../../include/datetime.php:156
+msgid "minutes"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Bisexual"
+#: ../../include/datetime.php:157
+msgid "second"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Autosexual"
+#: ../../include/datetime.php:157
+msgid "seconds"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Abstinent"
+#: ../../include/datetime.php:164
+msgid " ago"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Virgin"
+#: ../../include/dba.php:31
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Deviant"
+#: ../../include/acl_selectors.php:132
+msgid "Visible To:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Fetish"
+#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
+msgid "Groups"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Oodles"
+#: ../../include/acl_selectors.php:147
+msgid "Except For:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:19
-msgid "Nonsexual"
+#: ../../include/items.php:1027
+msgid "Birthday:"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Single"
+#: ../../include/items.php:1371
+msgid "You have a new follower at "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Lonely"
+#: ../../boot.php:359
+msgid "Delete this item?"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Available"
+#: ../../boot.php:360
+msgid "Comment"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Unavailable"
+#: ../../boot.php:810
+msgid "Create a New Account"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Dating"
+#: ../../boot.php:817
+msgid "Nickname or Email address: "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Unfaithful"
+#: ../../boot.php:818
+msgid "Password: "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Sex Addict"
+#: ../../boot.php:823
+msgid "Nickname/Email/OpenID: "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Friends"
+#: ../../boot.php:824
+msgid "Password (if not OpenID): "
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Friends/Benefits"
+#: ../../boot.php:827
+msgid "Forgot your password?"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Casual"
+#: ../../boot.php:828
+msgid "Password Reset"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Engaged"
+#: ../../boot.php:1080
+msgid "prev"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Married"
+#: ../../boot.php:1082
+msgid "first"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Partners"
+#: ../../boot.php:1111
+msgid "last"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Cohabiting"
+#: ../../boot.php:1114
+msgid "next"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Happy"
+#: ../../boot.php:1840
+#, php-format
+msgid "%s likes this."
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Not Looking"
+#: ../../boot.php:1840
+#, php-format
+msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Swinger"
+#: ../../boot.php:1844
+#, php-format
+msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Betrayed"
+#: ../../boot.php:1846
+#, php-format
+msgid "<span  %1$s>%2$d people</span> don't like this."
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Separated"
+#: ../../boot.php:1852
+msgid "and"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Unstable"
+#: ../../boot.php:1855
+#, php-format
+msgid ", and %d other people"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Divorced"
+#: ../../boot.php:1856
+#, php-format
+msgid "%s like this."
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Widowed"
+#: ../../boot.php:1856
+#, php-format
+msgid "%s don't like this."
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Uncertain"
+#: ../../boot.php:2017
+msgid "No contacts"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Complicated"
-msgstr ""
+#: ../../boot.php:2025
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Don't care"
+#: ../../boot.php:2270
+msgid "Connect"
 msgstr ""
 
-#: ../../include/profile_selectors.php:33
-msgid "Ask me"
+#: ../../boot.php:2280
+msgid "Location:"
 msgstr ""
 
-#: ../../include/acl_selectors.php:132
-msgid "Visible To:"
+#: ../../boot.php:2284
+msgid ", "
 msgstr ""
 
-#: ../../include/acl_selectors.php:136 ../../include/acl_selectors.php:151
-msgid "Groups"
+#: ../../boot.php:2292
+msgid "Gender:"
 msgstr ""
 
-#: ../../include/acl_selectors.php:147
-msgid "Except For:"
+#: ../../boot.php:2296
+msgid "Status:"
 msgstr ""
 
-#: ../../include/auth.php:27
-msgid "Logged out."
+#: ../../boot.php:2298
+msgid "Homepage:"
 msgstr ""
 
-#: ../../include/datetime.php:44 ../../include/datetime.php:46
-msgid "Miscellaneous"
+#: ../../boot.php:2389
+msgid "Monday"
 msgstr ""
 
-#: ../../include/datetime.php:148
-msgid "less than a second ago"
+#: ../../boot.php:2389
+msgid "Tuesday"
 msgstr ""
 
-#: ../../include/datetime.php:151
-msgid "year"
+#: ../../boot.php:2389
+msgid "Wednesday"
 msgstr ""
 
-#: ../../include/datetime.php:151
-msgid "years"
+#: ../../boot.php:2389
+msgid "Thursday"
 msgstr ""
 
-#: ../../include/datetime.php:152
-msgid "month"
+#: ../../boot.php:2389
+msgid "Friday"
 msgstr ""
 
-#: ../../include/datetime.php:152
-msgid "months"
+#: ../../boot.php:2389
+msgid "Saturday"
 msgstr ""
 
-#: ../../include/datetime.php:153
-msgid "week"
+#: ../../boot.php:2389
+msgid "Sunday"
 msgstr ""
 
-#: ../../include/datetime.php:153
-msgid "weeks"
+#: ../../boot.php:2393
+msgid "January"
 msgstr ""
 
-#: ../../include/datetime.php:154
-msgid "day"
+#: ../../boot.php:2393
+msgid "February"
 msgstr ""
 
-#: ../../include/datetime.php:154
-msgid "days"
+#: ../../boot.php:2393
+msgid "March"
 msgstr ""
 
-#: ../../include/datetime.php:155
-msgid "hour"
+#: ../../boot.php:2393
+msgid "April"
 msgstr ""
 
-#: ../../include/datetime.php:155
-msgid "hours"
+#: ../../boot.php:2393
+msgid "May"
 msgstr ""
 
-#: ../../include/datetime.php:156
-msgid "minute"
+#: ../../boot.php:2393
+msgid "June"
 msgstr ""
 
-#: ../../include/datetime.php:156
-msgid "minutes"
+#: ../../boot.php:2393
+msgid "July"
 msgstr ""
 
-#: ../../include/datetime.php:157
-msgid "second"
+#: ../../boot.php:2393
+msgid "August"
 msgstr ""
 
-#: ../../include/datetime.php:157
-msgid "seconds"
+#: ../../boot.php:2393
+msgid "September"
 msgstr ""
 
-#: ../../include/datetime.php:164
-msgid " ago"
+#: ../../boot.php:2393
+msgid "October"
 msgstr ""
 
-#: ../../include/nav.php:56 ../../include/nav.php:91
-msgid "Home"
+#: ../../boot.php:2393
+msgid "November"
 msgstr ""
 
-#: ../../include/nav.php:64
-msgid "Apps"
+#: ../../boot.php:2393
+msgid "December"
 msgstr ""
 
-#: ../../include/nav.php:77
-msgid "Directory"
+#: ../../boot.php:2427
+msgid "Birthday Reminders"
 msgstr ""
 
-#: ../../include/nav.php:87
-msgid "Network"
+#: ../../boot.php:2428
+msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../include/nav.php:96
-msgid "Notifications"
+#: ../../boot.php:2429
+msgid "(Adjusted for local time)"
 msgstr ""
 
-#: ../../include/nav.php:104
-msgid "Manage"
+#: ../../boot.php:2440
+msgid "[today]"
 msgstr ""
 
-#: ../../include/nav.php:107
-msgid "Settings"
+#: ../../boot.php:2637
+msgid "link to source"
 msgstr ""
 
-#: ../../include/nav.php:109
-msgid "Profiles"
+#: ../../wip/dfrn_poll2.php:72 ../../wip/dfrn_poll2.php:376
+msgid " welcomes "
 msgstr ""
 
-#: ../../include/dba.php:31
-#, php-format
-msgid "Cannot locate DNS info for database server '%s'"
+#: ../../wip/addon/facebook/facebook.php:54
+msgid "Facebook status update failed."
 msgstr ""
 
-#: ../../include/items.php:1027
-msgid "Birthday:"
+#: ../../wip/addon/js_upload/js_upload.php:213
+msgid "Could not save uploaded file."
 msgstr ""
 
-#: ../../include/items.php:1371
-msgid "You have a new follower at "
+#: ../../wip/addon/js_upload/js_upload.php:214
+msgid "The upload was cancelled, or server error encountered"
 msgstr ""
 
-#: ../../include/group.php:130
-msgid "Create a new group"
+#: ../../wip/addon/js_upload/js_upload.php:167
+msgid "Server error. Upload directory isn"
 msgstr ""
 
-#: ../../include/group.php:131
-msgid "Everybody"
+#: ../../index.php:194
+msgid "Not Found"
 msgstr ""
 
-#: ../../include/oembed.php:57
-msgid "Embedding disabled"
+#: ../../index.php:195
+msgid "Page not found."
 msgstr ""

diff --git a/util/strings.php b/util/strings.php
index 6326938361cbddce3d3ff42084c206dc3a0a4206..ee6ec4b1c66dcc39f012b2fef6ec333a2be2a304 100644 (file)
--- a/util/strings.php
+++ b/util/strings.php
@@ -321,6 +321,7 @@ $a->strings['See all %d comments'] = 'See all %d comments';
 $a->strings['Invalid request identifier.'] = 'Invalid request identifier.';
 $a->strings['Discard'] = 'Discard';
 $a->strings['Ignore'] = 'Ignore';
+$a->strings['Pending Friend/Connect Notifications'] = 'Pending Friend/Connect Notifications';
 $a->strings['Show Ignored Requests'] = 'Show Ignored Requests';
 $a->strings['Hide Ignored Requests'] = 'Hide Ignored Requests';
 $a->strings['Claims to be known to you: '] = 'Claims to be known to you: ';
@@ -334,6 +335,7 @@ $a->strings['Friend/Connect Request'] = 'Friend/Connect Request';
 $a->strings['New Follower'] = 'New Follower';
 $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['Login failed.'] = 'Login failed.';
 $a->strings["Welcome back "] = "Welcome back ";
@@ -375,6 +377,9 @@ $a->strings['Profile'] = 'Profile';
 $a->strings['Photos'] = 'Photos';
 $a->strings['Image uploaded but image cropping failed.'] = 'Image uploaded but image cropping failed.';
 $a->strings['Unable to process image'] = 'Unable to process image';
+$a->strings['Crop Image'] = 'Crop Image';
+$a->strings['Please adjust the image cropping for optimum viewing.'] = 'Please adjust the image cropping for optimum viewing.';
+$a->strings['Done Editing'] = 'Done Editing';
 $a->strings['Image uploaded successfully.'] = 'Image uploaded successfully.';
 $a->strings['Profile Name is required.'] = 'Profile Name is required.';
 $a->strings['Profile updated.'] = 'Profile updated.';

diff --git a/view/cropbody.tpl b/view/cropbody.tpl
new file mode 100644 (file)
index 0000000..c9c0f84
--- /dev/null
+++ b/view/cropbody.tpl
@@ -0,0 +1,56 @@
+<h1>$title</h1>
+<p id="cropimage-desc">
+$desc
+</p>
+<div id="cropimage-wrapper">
+<img src="$image_url" id="croppa" class="imgCrop" alt="$title" />
+</div>
+<div id="cropimage-preview-wrapper" >
+<div id="previewWrap" ></div>
+</div>
+
+<script type="text/javascript" language="javascript">
+
+       function onEndCrop( coords, dimensions ) {
+               $( 'x1' ).value = coords.x1;
+               $( 'y1' ).value = coords.y1;
+               $( 'x2' ).value = coords.x2;
+               $( 'y2' ).value = coords.y2;
+               $( 'width' ).value = dimensions.width;
+               $( 'height' ).value = dimensions.height;
+       }
+
+       Event.observe( window, 'load', function() {
+               new Cropper.ImgWithPreview(
+               'croppa',
+               {
+                       previewWrap: 'previewWrap',
+                       minWidth: 175,
+                       minHeight: 175,
+                       maxWidth: 640,
+                       maxHeight: 640,
+                       ratioDim: { x: 100, y:100 },
+                       displayOnInit: true,
+                       onEndCrop: onEndCrop
+               }
+               );
+       }
+       );
+
+</script>
+
+<form action="profile_photo/$resource" id="crop-image-form" method="post" />
+
+<input type="hidden" name="cropfinal" value="1" />
+<input type="hidden" name="xstart" id="x1" />
+<input type="hidden" name="ystart" id="y1" />
+<input type="hidden" name="xfinal" id="x2" />
+<input type="hidden" name="yfinal" id="y2" />
+<input type="hidden" name="height" id="height" />
+<input type="hidden" name="width"  id="width" />
+
+<div id="crop-image-submit-wrapper" >
+<input type="submit" name="submit" value="$done" />
+</div>
+
+</form>

diff --git a/view/de/cropbody.tpl b/view/de/cropbody.tpl
deleted file mode 100644 (file)
index 0211fe3..0000000
--- a/view/de/cropbody.tpl
+++ /dev/null
@@ -1,58 +0,0 @@
-<h1>Bild zuschneiden</h1>
-<p id="cropimage-desc">
-Zur optimalen Darstellung des Bildes kann es nun auf einen Bereich
-zugeschnitten werden. Bitte wähle diesen Bereich.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-       function onEndCrop( coords, dimensions ) {
-               $( 'x1' ).value = coords.x1;
-               $( 'y1' ).value = coords.y1;
-               $( 'x2' ).value = coords.x2;
-               $( 'y2' ).value = coords.y2;
-               $( 'width' ).value = dimensions.width;
-               $( 'height' ).value = dimensions.height;
-       }
-
-       Event.observe( window, 'load', function() {
-               new Cropper.ImgWithPreview(
-               'croppa',
-               {
-                       previewWrap: 'previewWrap',
-                       minWidth: 175,
-                       minHeight: 175,
-                       maxWidth: 640,
-                       maxHeight: 640,
-                       ratioDim: { x: 100, y:100 },
-                       displayOnInit: true,
-                       onEndCrop: onEndCrop
-               }
-               );
-       }
-       );
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
-</div>
-
-</form>

diff --git a/view/de/intros-top.tpl b/view/de/intros-top.tpl
deleted file mode 100644 (file)
index e65da1a..0000000
--- a/view/de/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Schwebende Freundschafts/Kontakt Benachrichtigungen</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-

diff --git a/view/de/registrations-top.tpl b/view/de/registrations-top.tpl
deleted file mode 100644 (file)
index d788b51..0000000
--- a/view/de/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Schwebende Neuanmeldungen</h1>
-
-

diff --git a/view/de/settings_nick_unset.tpl b/view/de/settings_nick_unset.tpl
deleted file mode 100644 (file)
index 2a56fda..0000000
--- a/view/de/settings_nick_unset.tpl
+++ /dev/null
@@ -1,16 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Deine Profil URL ist im Moment <strong>'$baseurl/profile/$uid'</strong>.
-Wenn du einen Spitznamen wählst kann man diese URL freundlicher ausdrücken
-z.B. <strong>'spitzname@$basepath'</strong>.
-<br />
-Einmal gewählt kann der Spitzname nicht mehr geändert werden. Er
-<strong>muss</strong> mit einem Buchstaben beginnen. Es sind ausschließlich
-Buchstaben, Zahlen sowie Binde- und Unterstriche erlaubt.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Spitzname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-

diff --git a/view/en/cropbody.tpl b/view/en/cropbody.tpl
deleted file mode 100644 (file)
index 39395af..0000000
--- a/view/en/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Crop Image</h1>
-<p id="cropimage-desc">
-Please adjust the image cropping for optimum viewing.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-       function onEndCrop( coords, dimensions ) {
-               $( 'x1' ).value = coords.x1;
-               $( 'y1' ).value = coords.y1;
-               $( 'x2' ).value = coords.x2;
-               $( 'y2' ).value = coords.y2;
-               $( 'width' ).value = dimensions.width;
-               $( 'height' ).value = dimensions.height;
-       }
-
-       Event.observe( window, 'load', function() {
-               new Cropper.ImgWithPreview(
-               'croppa',
-               {
-                       previewWrap: 'previewWrap',
-                       minWidth: 175,
-                       minHeight: 175,
-                       maxWidth: 640,
-                       maxHeight: 640,
-                       ratioDim: { x: 100, y:100 },
-                       displayOnInit: true,
-                       onEndCrop: onEndCrop
-               }
-               );
-       }
-       );
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Done Editing" />
-</div>
-
-</form>

diff --git a/view/en/intros-top.tpl b/view/en/intros-top.tpl
deleted file mode 100644 (file)
index d8b7394..0000000
--- a/view/en/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Pending Friend/Connect Notifications</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-

diff --git a/view/en/registrations-top.tpl b/view/en/registrations-top.tpl
deleted file mode 100644 (file)
index d8faf34..0000000
--- a/view/en/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>User registrations waiting for confirm</h1>
-
-

diff --git a/view/en/settings_nick_unset.tpl b/view/en/settings_nick_unset.tpl
deleted file mode 100644 (file)
index 903768b..0000000
--- a/view/en/settings_nick_unset.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Your profile URL is currently <strong>'$baseurl/profile/$uid'</strong>.
-Setting a nickname will allow a friendly profile URL such as
-<strong>'nickname@$basepath'</strong>.
-<br />
-Once set, it can never be changed. The nickname <strong>must</strong> start with a letter; and only letters, numbers, dashes, and underscores are allowed.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Nickname: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-

diff --git a/view/fr/cropbody.tpl b/view/fr/cropbody.tpl
deleted file mode 100644 (file)
index 6c509ce..0000000
--- a/view/fr/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Crop Image</h1>
-<p id="cropimage-desc">
-Merci d'ajuster le cadre de l'image pour un affichage optimal.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-       function onEndCrop( coords, dimensions ) {
-               $( 'x1' ).value = coords.x1;
-               $( 'y1' ).value = coords.y1;
-               $( 'x2' ).value = coords.x2;
-               $( 'y2' ).value = coords.y2;
-               $( 'width' ).value = dimensions.width;
-               $( 'height' ).value = dimensions.height;
-       }
-
-       Event.observe( window, 'load', function() {
-               new Cropper.ImgWithPreview(
-               'croppa',
-               {
-                       previewWrap: 'previewWrap',
-                       minWidth: 175,
-                       minHeight: 175,
-                       maxWidth: 640,
-                       maxHeight: 640,
-                       ratioDim: { x: 100, y:100 },
-                       displayOnInit: true,
-                       onEndCrop: onEndCrop
-               }
-               );
-       }
-       );
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Edition terminée" />
-</div>
-
-</form>

diff --git a/view/fr/intros-top.tpl b/view/fr/intros-top.tpl
deleted file mode 100644 (file)
index 85dd628..0000000
--- a/view/fr/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Demandes d'amitié/mise en relation en attente</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-

diff --git a/view/fr/registrations-top.tpl b/view/fr/registrations-top.tpl
deleted file mode 100644 (file)
index 3988f78..0000000
--- a/view/fr/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Inscriptions d'utilisateurs en attente de confirmation</h1>
-
-

diff --git a/view/fr/settings_nick_unset.tpl b/view/fr/settings_nick_unset.tpl
deleted file mode 100644 (file)
index 60c7a4a..0000000
--- a/view/fr/settings_nick_unset.tpl
+++ /dev/null
@@ -1,14 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Votre adresse (URL) de profil est actuellement <strong>'$baseurl/profile/$uid'</strong>.
-Choisir un pseudo vous donnera une URL plus simple à retenir, comme 
-<strong>'nickname@$basepath'</strong>.
-<br />
-Une fois défini, il ne pourra plus changer. Le pseudo <strong>doit</strong> débuter par une lettre; et seuls lettres, nombres, tirets et sous-tirets (_) sont autorisés.
-</p>
-<label id="settings-nick-label" for="settings-nick" >Pseudo: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-

diff --git a/view/it/cropbody.tpl b/view/it/cropbody.tpl
deleted file mode 100644 (file)
index fe072f0..0000000
--- a/view/it/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Ritaglia Immagine</h1>
-<p id="cropimage-desc">
-Sistema il ritaglio dell'immagine per una visualizzazione ottimale.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-       function onEndCrop( coords, dimensions ) {
-               $( 'x1' ).value = coords.x1;
-               $( 'y1' ).value = coords.y1;
-               $( 'x2' ).value = coords.x2;
-               $( 'y2' ).value = coords.y2;
-               $( 'width' ).value = dimensions.width;
-               $( 'height' ).value = dimensions.height;
-       }
-
-       Event.observe( window, 'load', function() {
-               new Cropper.ImgWithPreview(
-               'croppa',
-               {
-                       previewWrap: 'previewWrap',
-                       minWidth: 175,
-                       minHeight: 175,
-                       maxWidth: 640,
-                       maxHeight: 640,
-                       ratioDim: { x: 100, y:100 },
-                       displayOnInit: true,
-                       onEndCrop: onEndCrop
-               }
-               );
-       }
-       );
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Fatto" />
-</div>
-
-</form>

diff --git a/view/it/intros-top.tpl b/view/it/intros-top.tpl
deleted file mode 100644 (file)
index d096dcf..0000000
--- a/view/it/intros-top.tpl
+++ /dev/null
@@ -1,7 +0,0 @@
-<h1>Notifiche di Amicizia/Collegamento in Attesa</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-
-

diff --git a/view/it/registrations-top.tpl b/view/it/registrations-top.tpl
deleted file mode 100644 (file)
index 8134aa2..0000000
--- a/view/it/registrations-top.tpl
+++ /dev/null
@@ -1,3 +0,0 @@
-<h1>Registrazioni in attesa di conferma</h1>
-
-

diff --git a/view/it/settings_nick_unset.tpl b/view/it/settings_nick_unset.tpl
deleted file mode 100644 (file)
index 8f4cba4..0000000
--- a/view/it/settings_nick_unset.tpl
+++ /dev/null
@@ -1,15 +0,0 @@
-
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-L'URL del tuo profilo &egrave; <strong>'$baseurl/profile/$uid'</strong>.
-Impostare un soprannome permetter&agrave; di avere un URL più aimchevole, come
-<strong>'soprannome@$basepath'</strong>.
-<br />
-Una volta impostato, non potr&agreve; pi&ugrave; essere cambiato. Il soprannome <strong>deve</strong>
-cominciare con una lettera; nel soprannome sono permessi solo lettere, numeri, trattini (-) e underscore (_).
-</p>
-<label id="settings-nick-label" for="settings-nick" >Soprannome: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>
-

diff --git a/view/sv/cropbody.tpl b/view/sv/cropbody.tpl
deleted file mode 100644 (file)
index a91a7ea..0000000
--- a/view/sv/cropbody.tpl
+++ /dev/null
@@ -1,57 +0,0 @@
-<h1>Besk&auml;r bilden</h1>
-<p id="cropimage-desc">
-V&auml;lj hur du vill att bilden ska besk&auml;ras.
-</p>
-<div id="cropimage-wrapper">
-<img src="$image_url" id="croppa" class="imgCrop" alt="" />
-</div>
-<div id="cropimage-preview-wrapper" >
-<div id="previewWrap" ></div>
-</div>
-
-<script type="text/javascript" language="javascript">
-
-       function onEndCrop( coords, dimensions ) {
-               $( 'x1' ).value = coords.x1;
-               $( 'y1' ).value = coords.y1;
-               $( 'x2' ).value = coords.x2;
-               $( 'y2' ).value = coords.y2;
-               $( 'width' ).value = dimensions.width;
-               $( 'height' ).value = dimensions.height;
-       }
-
-       Event.observe( window, 'load', function() {
-               new Cropper.ImgWithPreview(
-               'croppa',
-               {
-                       previewWrap: 'previewWrap',
-                       minWidth: 175,
-                       minHeight: 175,
-                       maxWidth: 640,
-                       maxHeight: 640,
-                       ratioDim: { x: 100, y:100 },
-                       displayOnInit: true,
-                       onEndCrop: onEndCrop
-               }
-               );
-       }
-       );
-
-</script>
-
-<form action="profile_photo/$resource" id="crop-image-form" method="post" />
-
-<input type="hidden" name="imagename" value="$hash" />
-<input type="hidden" name="cropfinal" value="1" />
-<input type="hidden" name="xstart" id="x1" />
-<input type="hidden" name="ystart" id="y1" />
-<input type="hidden" name="xfinal" id="x2" />
-<input type="hidden" name="yfinal" id="y2" />
-<input type="hidden" name="height" id="height" />
-<input type="hidden" name="width"  id="width" />
-
-<div id="crop-image-submit-wrapper" >
-<input type="submit" name="submit" value="Spara" />
-</div>
-
-</form>
\ No newline at end of file

diff --git a/view/sv/intros-top.tpl b/view/sv/intros-top.tpl
deleted file mode 100644 (file)
index 0aa01c5..0000000
--- a/view/sv/intros-top.tpl
+++ /dev/null
@@ -1,6 +0,0 @@
-<h1>V&auml;ntande f&ouml;rfr&aring;gningar om v&auml;nskap/kontakt</h1>
-
-<div id="notification-show-hide-wrapper" >
-<a href="$hide_url" id="notification-show-hide-link">$hide_text</a>
-</div>
-

diff --git a/view/sv/registrations-top.tpl b/view/sv/registrations-top.tpl
deleted file mode 100644 (file)
index 24e13ab..0000000
--- a/view/sv/registrations-top.tpl
+++ /dev/null
@@ -1 +0,0 @@
-<h1>Registreringar från användare som inv&auml;ntar godk&auml;nnande</h1>

diff --git a/view/sv/settings_nick_unset.tpl b/view/sv/settings_nick_unset.tpl
deleted file mode 100644 (file)
index 5e115ff..0000000
--- a/view/sv/settings_nick_unset.tpl
+++ /dev/null
@@ -1,12 +0,0 @@
-<div id="settings-nick-wrapper" >
-<p id="settings-nickname-desc">
-Din profiladress &auml;r f&ouml;r n&auml;rvarande<strong>'$baseurl/profile/$uid'</strong>.
-Genom att ange ett smeknamn/nick kan din adress bli enklare, s&aring; h&auml;r:
-<strong>'nickname@$basepath'</strong>.
-<br />
-N&auml;r smeknamn/nick har angetts kan det <strong>inte</strong> &auml;ndras. Det <strong>m&aring;ste</strong> inledas med en bokstav, och bara bokst&auml;ver, siffror, bindestreck och understrykningstecken f&aring;r anv&auml;ndas.
-</p>
-<label id="settings-nick-label" for="settings-nick" >URL Smeknamn/nick: </label>
-<input type="text" name="nick" id="settings-nick" value="$nickname" />
-</div>
-<div id="settings-nick-end" ></div>