Added plural string for contact block

diff --git a/boot.php b/boot.php
index 3636288b282e2576df84d07af0def2a9725d1f91..211cbb0082e900195c31b930fc7c53151e665205 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -2013,7 +2013,7 @@ function contact_block() {
                        intval($shown)
        );
        if(count($r)) {
-               $o .= '<h4 class="contact-h4">' . $total . ' ' . t('Contacts') . '</h4><div id="contact-block">';
+               $o .= '<h4 class="contact-h4">' .  sprintf(tt('%d Contact','%d Contacts', $total),$total) . '</h4><div id="contact-block">';
                foreach($r as $rr) {
                        $redirect_url = $a->get_baseurl() . '/redir/' . $rr['id'];
                        if(local_user() && ($rr['uid'] == local_user())
@@ -2659,4 +2659,4 @@ function extract_item_authors($arr,$uid) {
                }
        }
        return array();         
-}}
\ No newline at end of file
+}}

diff --git a/util/messages.po b/util/messages.po
index 44638bd9caec2ed52f2c3ce1b588d585d77724b2..e083c2a4c65a878d695f288da640c0161509d208 100644 (file)
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.913\n"
+"Project-Id-Version: 2.1.921\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-18 11:02+0100\n"
+"POT-Creation-Date: 2011-03-23 13:47+0100\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"
@@ -18,32 +18,32 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../../index.php:187
+#: ../../index.php:194
 msgid "Not Found"
 msgstr ""
 
-#: ../../index.php:188
+#: ../../index.php:195
 msgid "Page not found."
 msgstr ""
 
-#: ../../index.php:243 ../../mod/group.php:88
+#: ../../index.php:250 ../../mod/group.php:88
 msgid "Permission denied"
 msgstr ""
 
-#: ../../index.php:244 ../../mod/manage.php:75 ../../mod/wall_upload.php:42
+#: ../../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:224
+#: ../../mod/profiles.php:7 ../../mod/profiles.php:227
 #: ../../mod/settings.php:14 ../../mod/settings.php:19
-#: ../../mod/settings.php:206 ../../mod/photos.php:85 ../../mod/photos.php:772
-#: ../../mod/display.php:303 ../../mod/invite.php:13 ../../mod/invite.php:50
-#: ../../mod/contacts.php:101 ../../mod/register.php:25
-#: ../../mod/network.php:6 ../../mod/notifications.php:56
-#: ../../mod/item.php:57 ../../mod/item.php:616 ../../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
+#: ../../mod/settings.php:208 ../../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:101
+#: ../../mod/register.php:25 ../../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."
 msgstr ""
 
@@ -51,7 +51,7 @@ msgstr ""
 msgid "Create a New Account"
 msgstr ""
 
-#: ../../boot.php:809 ../../mod/register.php:443 ../../include/nav.php:61
+#: ../../boot.php:809 ../../mod/register.php:445 ../../include/nav.php:61
 msgid "Register"
 msgstr ""
 
@@ -113,7 +113,7 @@ msgstr ""
 msgid "%s doesn't like this."
 msgstr ""
 
-#: ../../boot.php:1835
+#: ../../boot.php:1835 ../../test.php:8
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr ""
@@ -146,11 +146,12 @@ msgstr ""
 msgid "No contacts"
 msgstr ""
 
-#: ../../boot.php:2016 ../../mod/contacts.php:303
-#: ../../include/acl_selectors.php:140 ../../include/acl_selectors.php:155
-#: ../../include/nav.php:111
-msgid "Contacts"
-msgstr ""
+#: ../../boot.php:2016
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] ""
+msgstr[1] ""
 
 #: ../../boot.php:2032 ../../mod/viewcontacts.php:17
 msgid "View Contacts"
@@ -264,19 +265,23 @@ msgstr ""
 msgid "December"
 msgstr ""
 
-#: ../../boot.php:2413
+#: ../../boot.php:2418
+msgid "Birthday Reminders"
+msgstr ""
+
+#: ../../boot.php:2419
 msgid "Birthdays this week:"
 msgstr ""
 
-#: ../../boot.php:2414
+#: ../../boot.php:2420
 msgid "(Adjusted for local time)"
 msgstr ""
 
-#: ../../boot.php:2423
+#: ../../boot.php:2431
 msgid "[today]"
 msgstr ""
 
-#: ../../boot.php:2620
+#: ../../boot.php:2628
 msgid "link to source"
 msgstr ""
 
@@ -299,8 +304,8 @@ msgstr ""
 msgid "Select an identity to manage: "
 msgstr ""
 
-#: ../../mod/manage.php:106 ../../mod/photos.php:800 ../../mod/photos.php:857
-#: ../../mod/photos.php:1032 ../../mod/invite.php:64 ../../mod/install.php:109
+#: ../../mod/manage.php:106 ../../mod/photos.php:801 ../../mod/photos.php:858
+#: ../../mod/photos.php:1066 ../../mod/invite.php:64 ../../mod/install.php:109
 #: ../../addon/twitter/twitter.php:156 ../../addon/twitter/twitter.php:175
 #: ../../addon/statusnet/statusnet.php:163
 #: ../../addon/statusnet/statusnet.php:189
@@ -316,18 +321,18 @@ msgid "Image exceeds size limit of %d"
 msgstr ""
 
 #: ../../mod/wall_upload.php:65 ../../mod/profile_photo.php:118
-#: ../../mod/photos.php:570
+#: ../../mod/photos.php:571
 msgid "Unable to process image."
 msgstr ""
 
 #: ../../mod/wall_upload.php:79 ../../mod/wall_upload.php:88
-#: ../../mod/wall_upload.php:95 ../../mod/item.php:184
+#: ../../mod/wall_upload.php:95 ../../mod/item.php:212
 #: ../../mod/message.php:93
 msgid "Wall Photos"
 msgstr ""
 
 #: ../../mod/wall_upload.php:82 ../../mod/profile_photo.php:230
-#: ../../mod/photos.php:588
+#: ../../mod/photos.php:589
 msgid "Image upload failed."
 msgstr ""
 
@@ -335,8 +340,8 @@ msgstr ""
 #: ../../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:423 ../../mod/item.php:446
-#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1350
+#: ../../mod/item.php:475 ../../mod/item.php:498
+#: ../../mod/dfrn_confirm.php:649 ../../include/items.php:1373
 msgid "Administrator"
 msgstr ""
 
@@ -353,85 +358,111 @@ msgstr ""
 msgid "%s commented on an item at %s"
 msgstr ""
 
-#: ../../mod/profile.php:151 ../../mod/network.php:91
+#: ../../mod/profile.php:156 ../../mod/profile.php:317
+#: ../../mod/photos.php:1086 ../../mod/display.php:158
+#: ../../mod/network.php:91 ../../mod/network.php:370
 msgid "Share"
 msgstr ""
 
-#: ../../mod/profile.php:152 ../../mod/network.php:92
-#: ../../mod/message.php:185 ../../mod/message.php:319
+#: ../../mod/profile.php:157 ../../mod/editpost.php:63
+#: ../../mod/network.php:92 ../../mod/message.php:185
+#: ../../mod/message.php:319
 msgid "Upload photo"
 msgstr ""
 
-#: ../../mod/profile.php:153 ../../mod/network.php:93
-#: ../../mod/message.php:186 ../../mod/message.php:320
+#: ../../mod/profile.php:158 ../../mod/editpost.php:64
+#: ../../mod/network.php:93 ../../mod/message.php:186
+#: ../../mod/message.php:320
 msgid "Insert web link"
 msgstr ""
 
-#: ../../mod/profile.php:154 ../../mod/network.php:94
+#: ../../mod/profile.php:159 ../../mod/editpost.php:65
+#: ../../mod/network.php:94
 msgid "Insert YouTube video"
 msgstr ""
 
-#: ../../mod/profile.php:155 ../../mod/network.php:95
+#: ../../mod/profile.php:160 ../../mod/editpost.php:66
+#: ../../mod/network.php:95
+msgid "Insert Vorbis [.ogg] video"
+msgstr ""
+
+#: ../../mod/profile.php:161 ../../mod/editpost.php:67
+#: ../../mod/network.php:96
+msgid "Insert Vorbis [.ogg] audio"
+msgstr ""
+
+#: ../../mod/profile.php:162 ../../mod/editpost.php:68
+#: ../../mod/network.php:97
 msgid "Set your location"
 msgstr ""
 
-#: ../../mod/profile.php:156 ../../mod/network.php:96
+#: ../../mod/profile.php:163 ../../mod/editpost.php:69
+#: ../../mod/network.php:98
 msgid "Clear browser location"
 msgstr ""
 
-#: ../../mod/profile.php:157 ../../mod/profile.php:309
-#: ../../mod/photos.php:1052 ../../mod/display.php:158
-#: ../../mod/network.php:97 ../../mod/network.php:367
-#: ../../mod/message.php:187 ../../mod/message.php:321
+#: ../../mod/profile.php:164 ../../mod/profile.php:318
+#: ../../mod/photos.php:1087 ../../mod/display.php:159
+#: ../../mod/editpost.php:70 ../../mod/network.php:99
+#: ../../mod/network.php:371 ../../mod/message.php:187
+#: ../../mod/message.php:321
 msgid "Please wait"
 msgstr ""
 
-#: ../../mod/profile.php:158 ../../mod/network.php:98
+#: ../../mod/profile.php:165 ../../mod/editpost.php:71
+#: ../../mod/network.php:100
 msgid "Permission settings"
 msgstr ""
 
-#: ../../mod/profile.php:165 ../../mod/network.php:104
+#: ../../mod/profile.php:172 ../../mod/editpost.php:77
+#: ../../mod/network.php:106
 msgid "CC: email addresses"
 msgstr ""
 
-#: ../../mod/profile.php:167 ../../mod/network.php:106
+#: ../../mod/profile.php:174 ../../mod/editpost.php:79
+#: ../../mod/network.php:108
 msgid "Example: bob@example.com, mary@example.com"
 msgstr ""
 
-#: ../../mod/profile.php:300 ../../mod/photos.php:935
-#: ../../mod/display.php:149 ../../mod/network.php:321
+#: ../../mod/profile.php:308 ../../mod/photos.php:962
+#: ../../mod/display.php:149 ../../mod/network.php:324
 msgid "Private Message"
 msgstr ""
 
-#: ../../mod/profile.php:307 ../../mod/photos.php:1050
-#: ../../mod/display.php:156 ../../mod/network.php:365
+#: ../../mod/profile.php:315 ../../mod/photos.php:1084
+#: ../../mod/display.php:156 ../../mod/network.php:368
 msgid "I like this (toggle)"
 msgstr ""
 
-#: ../../mod/profile.php:308 ../../mod/photos.php:1051
-#: ../../mod/display.php:157 ../../mod/network.php:366
+#: ../../mod/profile.php:316 ../../mod/photos.php:1085
+#: ../../mod/display.php:157 ../../mod/network.php:369
 msgid "I don't like this (toggle)"
 msgstr ""
 
-#: ../../mod/profile.php:321 ../../mod/photos.php:1071
-#: ../../mod/photos.php:1111 ../../mod/photos.php:1140
-#: ../../mod/display.php:170 ../../mod/network.php:380
+#: ../../mod/profile.php:330 ../../mod/photos.php:1106
+#: ../../mod/photos.php:1146 ../../mod/photos.php:1175
+#: ../../mod/display.php:171 ../../mod/network.php:384
 msgid "This is you"
 msgstr ""
 
-#: ../../mod/profile.php:361 ../../mod/photos.php:1168
-#: ../../mod/display.php:234 ../../mod/network.php:386 ../../mod/group.php:137
+#: ../../mod/profile.php:354 ../../mod/display.php:222
+#: ../../mod/editpost.php:62 ../../mod/network.php:392
+msgid "Edit"
+msgstr ""
+
+#: ../../mod/profile.php:376 ../../mod/photos.php:1203
+#: ../../mod/display.php:238 ../../mod/network.php:393 ../../mod/group.php:137
 msgid "Delete"
 msgstr ""
 
-#: ../../mod/profile.php:382 ../../mod/search.php:116
-#: ../../mod/display.php:258 ../../mod/network.php:272
-#: ../../mod/network.php:434
+#: ../../mod/profile.php:397 ../../mod/search.php:116
+#: ../../mod/display.php:262 ../../mod/network.php:275
+#: ../../mod/network.php:441
 msgid "View $name's profile"
 msgstr ""
 
-#: ../../mod/profile.php:414 ../../mod/display.php:312
-#: ../../mod/register.php:422 ../../mod/network.php:471
+#: ../../mod/profile.php:430 ../../mod/display.php:317
+#: ../../mod/register.php:424 ../../mod/network.php:479
 msgid ""
 "Shared content is covered by the <a href=\"http://creativecommons.org/"
 "licenses/by/3.0/\">Creative Commons Attribution 3.0</a> license."
@@ -462,8 +493,8 @@ 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:530 ../../mod/photos.php:849
-#: ../../mod/photos.php:864 ../../mod/register.php:267
+#: ../../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"
 msgstr ""
@@ -505,8 +536,8 @@ msgstr ""
 msgid "Account approved."
 msgstr ""
 
-#: ../../mod/profiles.php:21 ../../mod/profiles.php:234
-#: ../../mod/profiles.php:339 ../../mod/dfrn_confirm.php:62
+#: ../../mod/profiles.php:21 ../../mod/profiles.php:237
+#: ../../mod/profiles.php:342 ../../mod/dfrn_confirm.php:62
 msgid "Profile not found."
 msgstr ""
 
@@ -514,37 +545,37 @@ msgstr ""
 msgid "Profile Name is required."
 msgstr ""
 
-#: ../../mod/profiles.php:196
+#: ../../mod/profiles.php:199
 msgid "Profile updated."
 msgstr ""
 
-#: ../../mod/profiles.php:251
+#: ../../mod/profiles.php:254
 msgid "Profile deleted."
 msgstr ""
 
-#: ../../mod/profiles.php:267 ../../mod/profiles.php:298
+#: ../../mod/profiles.php:270 ../../mod/profiles.php:301
 msgid "Profile-"
 msgstr ""
 
-#: ../../mod/profiles.php:286 ../../mod/profiles.php:325
+#: ../../mod/profiles.php:289 ../../mod/profiles.php:328
 msgid "New profile created."
 msgstr ""
 
-#: ../../mod/profiles.php:304
+#: ../../mod/profiles.php:307
 msgid "Profile unavailable to clone."
 msgstr ""
 
-#: ../../mod/profiles.php:367
+#: ../../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/profiles.php:377
+#: ../../mod/profiles.php:380
 msgid "Age: "
 msgstr ""
 
-#: ../../mod/profiles.php:418
+#: ../../mod/profiles.php:422
 msgid "Profile Image"
 msgstr ""
 
@@ -564,55 +595,59 @@ msgstr ""
 msgid "Password update failed. Please try again."
 msgstr ""
 
-#: ../../mod/settings.php:95
+#: ../../mod/settings.php:96
 msgid " Please use a shorter name."
 msgstr ""
 
-#: ../../mod/settings.php:97
+#: ../../mod/settings.php:98
 msgid " Name too short."
 msgstr ""
 
-#: ../../mod/settings.php:103
+#: ../../mod/settings.php:104
 msgid " Not valid email."
 msgstr ""
 
-#: ../../mod/settings.php:105
+#: ../../mod/settings.php:106
 msgid " Cannot change to that email."
 msgstr ""
 
-#: ../../mod/settings.php:161
+#: ../../mod/settings.php:163
 msgid "Settings updated."
 msgstr ""
 
-#: ../../mod/settings.php:211
+#: ../../mod/settings.php:213
 msgid "Plugin Settings"
 msgstr ""
 
-#: ../../mod/settings.php:212
+#: ../../mod/settings.php:214
 msgid "Account Settings"
 msgstr ""
 
-#: ../../mod/settings.php:218
+#: ../../mod/settings.php:220
 msgid "No Plugin settings configured"
 msgstr ""
 
-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:266
 msgid "OpenID: "
 msgstr ""
 
-#: ../../mod/settings.php:263
+#: ../../mod/settings.php:266
 msgid "&nbsp;(Optional) Allow this OpenID to login to this account."
 msgstr ""
 
-#: ../../mod/settings.php:295
+#: ../../mod/settings.php:298
 msgid "Profile is <strong>not published</strong>."
 msgstr ""
 
-#: ../../mod/settings.php:352
+#: ../../mod/settings.php:355
 msgid "Default Post Permissions"
 msgstr ""
 
-#: ../../mod/search.php:131 ../../mod/network.php:287
+#: ../../mod/search.php:54
+msgid "No results."
+msgstr ""
+
+#: ../../mod/search.php:131 ../../mod/network.php:290
 msgid "View in context"
 msgstr ""
 
@@ -620,12 +655,12 @@ msgstr ""
 msgid "Photo Albums"
 msgstr ""
 
-#: ../../mod/photos.php:34 ../../mod/photos.php:106 ../../mod/photos.php:780
-#: ../../mod/photos.php:849 ../../mod/photos.php:864 ../../mod/photos.php:1198
-#: ../../mod/photos.php:1209 ../../include/Photo.php:225
+#: ../../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:959 ../../include/items.php:962
-#: ../../include/items.php:965
+#: ../../include/items.php:982 ../../include/items.php:985
+#: ../../include/items.php:988
 msgid "Contact Photos"
 msgstr ""
 
@@ -637,134 +672,150 @@ msgstr ""
 msgid "Album not found."
 msgstr ""
 
-#: ../../mod/photos.php:134 ../../mod/photos.php:858
+#: ../../mod/photos.php:134 ../../mod/photos.php:859
 msgid "Delete Album"
 msgstr ""
 
-#: ../../mod/photos.php:197 ../../mod/photos.php:1033
+#: ../../mod/photos.php:197 ../../mod/photos.php:1067
 msgid "Delete Photo"
 msgstr ""
 
-#: ../../mod/photos.php:468
+#: ../../mod/photos.php:469
 msgid "was tagged in a"
 msgstr ""
 
-#: ../../mod/photos.php:468 ../../mod/like.php:110
+#: ../../mod/photos.php:469 ../../mod/like.php:110
 msgid "photo"
 msgstr ""
 
-#: ../../mod/photos.php:468
+#: ../../mod/photos.php:469
 msgid "by"
 msgstr ""
 
-#: ../../mod/photos.php:558 ../../addon/js_upload/js_upload.php:306
+#: ../../mod/photos.php:559 ../../addon/js_upload/js_upload.php:306
 msgid "Image exceeds size limit of "
 msgstr ""
 
-#: ../../mod/photos.php:660
+#: ../../mod/photos.php:661
 msgid "No photos selected"
 msgstr ""
 
-#: ../../mod/photos.php:807
+#: ../../mod/photos.php:808
 msgid "Upload Photos"
 msgstr ""
 
-#: ../../mod/photos.php:810 ../../mod/photos.php:853
+#: ../../mod/photos.php:811 ../../mod/photos.php:854
 msgid "New album name: "
 msgstr ""
 
-#: ../../mod/photos.php:811
+#: ../../mod/photos.php:812
 msgid "or existing album name: "
 msgstr ""
 
-#: ../../mod/photos.php:813 ../../mod/photos.php:1028
+#: ../../mod/photos.php:814 ../../mod/photos.php:1062
 msgid "Permissions"
 msgstr ""
 
-#: ../../mod/photos.php:868
+#: ../../mod/photos.php:869
 msgid "Edit Album"
 msgstr ""
 
-#: ../../mod/photos.php:878 ../../mod/photos.php:1228
+#: ../../mod/photos.php:879 ../../mod/photos.php:1263
 msgid "View Photo"
 msgstr ""
 
-#: ../../mod/photos.php:908
+#: ../../mod/photos.php:909
 msgid "Photo not available"
 msgstr ""
 
-#: ../../mod/photos.php:929
+#: ../../mod/photos.php:956
 msgid "Edit photo"
 msgstr ""
 
-#: ../../mod/photos.php:931
+#: ../../mod/photos.php:958
 msgid "Use as profile photo"
 msgstr ""
 
-#: ../../mod/photos.php:944
+#: ../../mod/photos.php:969
+msgid "<< Prev"
+msgstr ""
+
+#: ../../mod/photos.php:973
 msgid "View Full Size"
 msgstr ""
 
-#: ../../mod/photos.php:1002
+#: ../../mod/photos.php:977
+msgid "Next >>"
+msgstr ""
+
+#: ../../mod/photos.php:1036
 msgid "Tags: "
 msgstr ""
 
-#: ../../mod/photos.php:1012
+#: ../../mod/photos.php:1046
 msgid "[Remove any tag]"
 msgstr ""
 
-#: ../../mod/photos.php:1021
+#: ../../mod/photos.php:1055
 msgid "New album name"
 msgstr ""
 
-#: ../../mod/photos.php:1024
+#: ../../mod/photos.php:1058
 msgid "Caption"
 msgstr ""
 
-#: ../../mod/photos.php:1026
+#: ../../mod/photos.php:1060
 msgid "Add a Tag"
 msgstr ""
 
-#: ../../mod/photos.php:1030
+#: ../../mod/photos.php:1064
 msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
 msgstr ""
 
-#: ../../mod/photos.php:1214
+#: ../../mod/photos.php:1249
 msgid "Recent Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1218
+#: ../../mod/photos.php:1253
 msgid "Upload New Photos"
 msgstr ""
 
-#: ../../mod/photos.php:1234
+#: ../../mod/photos.php:1269
 msgid "View Album"
 msgstr ""
 
-#: ../../mod/display.php:15 ../../mod/display.php:307 ../../mod/item.php:546
+#: ../../mod/display.php:15 ../../mod/display.php:312 ../../mod/item.php:598
 msgid "Item not found."
 msgstr ""
 
-#: ../../mod/display.php:259 ../../mod/network.php:435
+#: ../../mod/display.php:263 ../../mod/network.php:442
 msgid "View $owner_name's profile"
 msgstr ""
 
-#: ../../mod/display.php:260 ../../mod/network.php:436
+#: ../../mod/display.php:264 ../../mod/network.php:443
 msgid "to"
 msgstr ""
 
-#: ../../mod/display.php:261 ../../mod/network.php:437
+#: ../../mod/display.php:265 ../../mod/network.php:444
 msgid "Wall-to-Wall"
 msgstr ""
 
-#: ../../mod/display.php:262 ../../mod/network.php:438
+#: ../../mod/display.php:266 ../../mod/network.php:445
 msgid "via Wall-To-Wall:"
 msgstr ""
 
-#: ../../mod/display.php:300
+#: ../../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."
@@ -953,6 +1004,11 @@ msgstr ""
 msgid "Currently ignored"
 msgstr ""
 
+#: ../../mod/contacts.php:303 ../../include/acl_selectors.php:140
+#: ../../include/acl_selectors.php:155 ../../include/nav.php:111
+msgid "Contacts"
+msgstr ""
+
 #: ../../mod/contacts.php:305
 msgid "Show Blocked Connections"
 msgstr ""
@@ -1077,44 +1133,38 @@ msgstr ""
 msgid "Your OpenID (optional): "
 msgstr ""
 
-#: ../../mod/register.php:404
-msgid ""
-"Members of this network prefer to communicate with real people who use their "
-"real names."
-msgstr ""
-
-#: ../../mod/register.php:413
+#: ../../mod/register.php:415
 msgid "Include your profile in member directory?"
 msgstr ""
 
-#: ../../mod/register.php:416 ../../mod/dfrn_request.php:618
+#: ../../mod/register.php:418 ../../mod/dfrn_request.php:618
 msgid "Yes"
 msgstr ""
 
-#: ../../mod/register.php:417 ../../mod/dfrn_request.php:619
+#: ../../mod/register.php:419 ../../mod/dfrn_request.php:619
 msgid "No"
 msgstr ""
 
-#: ../../mod/register.php:429
+#: ../../mod/register.php:431
 msgid "Registration"
 msgstr ""
 
-#: ../../mod/register.php:437
+#: ../../mod/register.php:439
 msgid "Your Full Name (e.g. Joe Smith): "
 msgstr ""
 
-#: ../../mod/register.php:438
+#: ../../mod/register.php:440
 msgid "Your Email Address: "
 msgstr ""
 
-#: ../../mod/register.php:439
+#: ../../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>'."
 msgstr ""
 
-#: ../../mod/register.php:440
+#: ../../mod/register.php:442
 msgid "Choose a nickname: "
 msgstr ""
 
@@ -1250,15 +1300,15 @@ msgstr ""
 msgid "New Item View"
 msgstr ""
 
-#: ../../mod/network.php:149
+#: ../../mod/network.php:151
 msgid "No such group"
 msgstr ""
 
-#: ../../mod/network.php:160
+#: ../../mod/network.php:162
 msgid "Group is empty"
 msgstr ""
 
-#: ../../mod/network.php:164
+#: ../../mod/network.php:166
 msgid "Group: "
 msgstr ""
 
@@ -1417,7 +1467,7 @@ msgid ""
 "strong> profile."
 msgstr ""
 
-#: ../../mod/dfrn_request.php:536 ../../include/items.php:1341
+#: ../../mod/dfrn_request.php:536 ../../include/items.php:1364
 msgid "[Name Withheld]"
 msgstr ""
 
@@ -1521,41 +1571,41 @@ msgstr ""
 msgid "Unable to locate original post."
 msgstr ""
 
-#: ../../mod/item.php:98
+#: ../../mod/item.php:126
 msgid "Empty post discarded."
 msgstr ""
 
-#: ../../mod/item.php:422
+#: ../../mod/item.php:474
 #, php-format
 msgid "%s commented on your item at %s"
 msgstr ""
 
-#: ../../mod/item.php:445
+#: ../../mod/item.php:497
 #, php-format
 msgid "%s posted on your profile wall at %s"
 msgstr ""
 
-#: ../../mod/item.php:471
+#: ../../mod/item.php:523
 msgid "System error. Post not saved."
 msgstr ""
 
-#: ../../mod/item.php:489
+#: ../../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:491
+#: ../../mod/item.php:543
 msgid "You may visit them online at"
 msgstr ""
 
-#: ../../mod/item.php:493
+#: ../../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:495
+#: ../../mod/item.php:547
 #, php-format
 msgid "%s posted an update."
 msgstr ""
@@ -2390,11 +2440,16 @@ msgstr ""
 msgid "Profiles"
 msgstr ""
 
-#: ../../include/items.php:1004
+#: ../../include/dba.php:31
+#, php-format
+msgid "Cannot locate DNS info for database server '%s'"
+msgstr ""
+
+#: ../../include/items.php:1027
 msgid "Birthday:"
 msgstr ""
 
-#: ../../include/items.php:1348
+#: ../../include/items.php:1371
 msgid "You have a new follower at "
 msgstr ""
 

diff --git a/util/strings.php b/util/strings.php
index 395901b06122dc9ffb2857acc13bcfbf969115c4..903e61e9e11216fb9addebb0cf9ce2cb4b418ece 100644 (file)
--- a/util/strings.php
+++ b/util/strings.php
@@ -22,18 +22,15 @@ $a->strings['prev'] = 'prev';
 $a->strings['first'] = 'first';
 $a->strings['last'] = 'last';
 $a->strings['next'] = 'next';
-$a->strings[' likes this.'] = ' likes this.';
-$a->strings[' doesn\'t like this.'] = ' doesn\'t like this.';
-$a->strings['people'] = 'people';
-$a->strings['like this.'] = 'like this.';
-$a->strings['don\'t like this.'] = 'don\'t like this.';
+$a->strings['%s likes this.'] = '%s likes this.';
+$a->strings['%s doesn\'t like this.'] = '%s doesn\'t like this.';
+$a->strings['<span  %1$s>%2$d people</span> like this.'] = '<span  %1$s>%2$d people</span> like this.';
+$a->strings['<span  %1$s>%2$d people</span> don\'t like this.'] = '<span  %1$s>%2$d people</span> don\'t like this.';
 $a->strings['and'] = 'and';
-$a->strings[', and '] = ', and ';
-$a->strings[' other people'] = ' other people';
-$a->strings[' like this.'] = ' like this.';
-$a->strings[' don\'t like this.'] = ' don\'t like this.';
+$a->strings[', and %d other people'] = ', and %d other people';
+$a->strings['%s like this.'] = '%s like this.';
+$a->strings['%s don\'t like this.'] = '%s don\'t like this.';
 $a->strings['No contacts'] = 'No contacts';
-$a->strings['Contacts'] = 'Contacts';
 $a->strings['View Contacts'] = 'View Contacts';
 $a->strings['Search'] = 'Search';
 $a->strings['No profile'] = 'No profile';
@@ -62,6 +59,7 @@ $a->strings['September'] = 'September';
 $a->strings['October'] = 'October';
 $a->strings['November'] = 'November';
 $a->strings['December'] = 'December';
+$a->strings['Birthday Reminders'] = 'Birthday Reminders';
 $a->strings['Birthdays this week:'] = 'Birthdays this week:';
 $a->strings["\x28Adjusted for local time\x29"] = "\x28Adjusted for local time\x29";
 $a->strings['[today]'] = '[today]';
@@ -105,6 +103,7 @@ $a->strings['Unignore this contact'] = 'Unignore this contact';
 $a->strings['Ignore this contact'] = 'Ignore this contact';
 $a->strings['Currently blocked'] = 'Currently blocked';
 $a->strings['Currently ignored'] = 'Currently ignored';
+$a->strings['Contacts'] = 'Contacts';
 $a->strings['Show Blocked Connections'] = 'Show Blocked Connections';
 $a->strings['Hide Blocked Connections'] = 'Hide Blocked Connections';
 $a->strings['Finding: '] = 'Finding: ';
@@ -126,11 +125,10 @@ $a->strings['Contact record was not found for you on our site.'] = 'Contact reco
 $a->strings['The ID provided by your system is a duplicate on our system. It should work if you try again.'] = 'The ID provided by your system is a duplicate on our system. It should work if you try again.';
 $a->strings['Unable to set your contact credentials on our system.'] = 'Unable to set your contact credentials on our system.';
 $a->strings['Unable to update your contact profile details on our system'] = 'Unable to update your contact profile details on our system';
+$a->strings["Connection accepted at %s"] = "Connection accepted at %s";
 $a->strings['Administrator'] = 'Administrator';
 $a->strings['noreply'] = 'noreply';
 $a->strings["%s commented on an item at %s"] = "%s commented on an item at %s";
-$a->strings["From: Administrator@"] = "From: Administrator@";
-$a->strings['%s welcomes %s'] = '%s welcomes %s';
 $a->strings["This introduction has already been accepted."] = "This introduction has already been accepted.";
 $a->strings['Profile location is not valid or does not contain profile information.'] = 'Profile location is not valid or does not contain profile information.';
 $a->strings['Warning: profile location has no identifiable owner name.'] = 'Warning: profile location has no identifiable owner name.';
@@ -175,8 +173,10 @@ $a->strings['Item not found.'] = 'Item not found.';
 $a->strings['Private Message'] = 'Private Message';
 $a->strings["I like this \x28toggle\x29"] = "I like this \x28toggle\x29";
 $a->strings["I don't like this \x28toggle\x29"] = "I don't like this \x28toggle\x29";
+$a->strings['Share'] = 'Share';
 $a->strings['Please wait'] = 'Please wait';
 $a->strings['This is you'] = 'This is you';
+$a->strings['Edit'] = 'Edit';
 $a->strings['Delete'] = 'Delete';
 $a->strings['View $name\'s profile'] = 'View $name\'s profile';
 $a->strings['View $owner_name\'s profile'] = 'View $owner_name\'s profile';
@@ -185,6 +185,18 @@ $a->strings['Wall-to-Wall'] = 'Wall-to-Wall';
 $a->strings['via Wall-To-Wall:'] = 'via Wall-To-Wall:';
 $a->strings['Item has been removed.'] = 'Item has been removed.';
 $a->strings['Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.'] = 'Shared content is covered by the <a href="http://creativecommons.org/licenses/by/3.0/">Creative Commons Attribution 3.0</a> license.';
+$a->strings['Item not found'] = 'Item not found';
+$a->strings['Edit post'] = 'Edit post';
+$a->strings['Upload photo'] = 'Upload photo';
+$a->strings['Insert web link'] = 'Insert web link';
+$a->strings['Insert YouTube video'] = 'Insert YouTube video';
+$a->strings['Insert Vorbis [.ogg] video'] = 'Insert Vorbis [.ogg] video';
+$a->strings['Insert Vorbis [.ogg] audio'] = 'Insert Vorbis [.ogg] audio';
+$a->strings['Set your location'] = 'Set your location';
+$a->strings['Clear browser location'] = 'Clear browser location';
+$a->strings['Permission settings'] = 'Permission settings';
+$a->strings['CC: email addresses'] = 'CC: email addresses';
+$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
 $a->strings['The profile address specified does not provide adequate information.'] = 'The profile address specified does not provide adequate information.';
 $a->strings['Limited profile. This person will be unable to receive direct/personal notifications from you.'] = 'Limited profile. This person will be unable to receive direct/personal notifications from you.';
 $a->strings['Unable to retrieve contact information.'] = 'Unable to retrieve contact information.';
@@ -240,16 +252,14 @@ $a->strings['Wall Photos'] = 'Wall Photos';
 $a->strings["%s commented on your item at %s"] = "%s commented on your item at %s";
 $a->strings["Administrator"] = "Administrator";
 $a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s";
-$a->strings["Administrator@"] = "Administrator@";
 $a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
 $a->strings['You may visit them online at'] = 'You may visit them online at';
 $a->strings['Please contact the sender by replying to this post if you do not wish to receive these messages.'] = 'Please contact the sender by replying to this post if you do not wish to receive these messages.';
 $a->strings['%s posted an update.'] = '%s posted an update.';
 $a->strings['photo'] = 'photo';
 $a->strings['status'] = 'status';
-$a->strings['likes'] = 'likes';
-$a->strings['doesn\'t like'] = 'doesn\'t like';
-$a->strings["%s's"] = "%s's";
+$a->strings['%1$s likes %2$s\'s %3$s'] = '%1$s likes %2$s\'s %3$s';
+$a->strings['%1$s doesn\'t like %2$s\'s %3$s'] = '%1$s doesn\'t like %2$s\'s %3$s';
 $a->strings['Remote privacy information not available.'] = 'Remote privacy information not available.';
 $a->strings['Visible to:'] = 'Visible to:';
 $a->strings["Welcome back %s"] = "Welcome back %s";
@@ -270,8 +280,6 @@ $a->strings['Conversation removed.'] = 'Conversation removed.';
 $a->strings['Send Private Message'] = 'Send Private Message';
 $a->strings['To:'] = 'To:';
 $a->strings['Subject:'] = 'Subject:';
-$a->strings['Upload photo'] = 'Upload photo';
-$a->strings['Insert web link'] = 'Insert web link';
 $a->strings['No messages.'] = 'No messages.';
 $a->strings['Delete conversation'] = 'Delete conversation';
 $a->strings['Message not available.'] = 'Message not available.';
@@ -279,13 +287,6 @@ $a->strings['Delete message'] = 'Delete message';
 $a->strings['Send Reply'] = 'Send Reply';
 $a->strings['Normal View'] = 'Normal View';
 $a->strings['New Item View'] = 'New Item View';
-$a->strings['Share'] = 'Share';
-$a->strings['Insert YouTube video'] = 'Insert YouTube video';
-$a->strings['Set your location'] = 'Set your location';
-$a->strings['Clear browser location'] = 'Clear browser location';
-$a->strings['Permission settings'] = 'Permission settings';
-$a->strings['CC: email addresses'] = 'CC: email addresses';
-$a->strings['Example: bob@example.com, mary@example.com'] = 'Example: bob@example.com, mary@example.com';
 $a->strings['No such group'] = 'No such group';
 $a->strings['Group is empty'] = 'Group is empty';
 $a->strings['Group: '] = 'Group: ';
@@ -330,7 +331,9 @@ $a->strings['Edit Album'] = 'Edit Album';
 $a->strings['View Photo'] = 'View Photo';
 $a->strings['Photo not available'] = 'Photo not available';
 $a->strings['Edit photo'] = 'Edit photo';
+$a->strings['<< Prev'] = '<< Prev';
 $a->strings['View Full Size'] = 'View Full Size';
+$a->strings['Next >>'] = 'Next >>';
 $a->strings['Tags: '] = 'Tags: ';
 $a->strings['[Remove any tag]'] = '[Remove any tag]';
 $a->strings['New album name'] = 'New album name';
@@ -384,6 +387,7 @@ $a->strings['Account approved.'] = 'Account approved.';
 $a->strings['Remove My Account'] = 'Remove My Account';
 $a->strings['This will completely remove your account. Once this has been done it is not recoverable.'] = 'This will completely remove your account. Once this has been done it is not recoverable.';
 $a->strings['Please enter your password for verification:'] = 'Please enter your password for verification:';
+$a->strings['No results.'] = 'No results.';
 $a->strings['Passwords do not match. Password unchanged.'] = 'Passwords do not match. Password unchanged.';
 $a->strings['Empty passwords are not allowed. Password unchanged.'] = 'Empty passwords are not allowed. Password unchanged.';
 $a->strings['Password changed.'] = 'Password changed.';
@@ -438,6 +442,7 @@ $a->strings['minutes'] = 'minutes';
 $a->strings['second'] = 'second';
 $a->strings['seconds'] = 'seconds';
 $a->strings[' ago'] = ' ago';
+$a->strings['Cannot locate DNS info for database server \'%s\'',$server] = 'Cannot locate DNS info for database server \'%s\'',$server;
 $a->strings['Create a new group'] = 'Create a new group';
 $a->strings['Everybody'] = 'Everybody';
 $a->strings['Birthday:'] = 'Birthday:';
@@ -623,7 +628,9 @@ $a->strings['America/Argentina/Jujuy'] = 'America/Argentina/Jujuy';
 $a->strings['America/Argentina/La_Rioja'] = 'America/Argentina/La_Rioja';
 $a->strings['America/Argentina/Mendoza'] = 'America/Argentina/Mendoza';
 $a->strings['America/Argentina/Rio_Gallegos'] = 'America/Argentina/Rio_Gallegos';
+$a->strings['America/Argentina/Salta'] = 'America/Argentina/Salta';
 $a->strings['America/Argentina/San_Juan'] = 'America/Argentina/San_Juan';
+$a->strings['America/Argentina/San_Luis'] = 'America/Argentina/San_Luis';
 $a->strings['America/Argentina/Tucuman'] = 'America/Argentina/Tucuman';
 $a->strings['America/Argentina/Ushuaia'] = 'America/Argentina/Ushuaia';
 $a->strings['America/Aruba'] = 'America/Aruba';
@@ -701,6 +708,7 @@ $a->strings['America/Louisville'] = 'America/Louisville';
 $a->strings['America/Maceio'] = 'America/Maceio';
 $a->strings['America/Managua'] = 'America/Managua';
 $a->strings['America/Manaus'] = 'America/Manaus';
+$a->strings['America/Marigot'] = 'America/Marigot';
 $a->strings['America/Martinique'] = 'America/Martinique';
 $a->strings['America/Mazatlan'] = 'America/Mazatlan';
 $a->strings['America/Mendoza'] = 'America/Mendoza';
@@ -736,11 +744,13 @@ $a->strings['America/Regina'] = 'America/Regina';
 $a->strings['America/Resolute'] = 'America/Resolute';
 $a->strings['America/Rio_Branco'] = 'America/Rio_Branco';
 $a->strings['America/Rosario'] = 'America/Rosario';
+$a->strings['America/Santarem'] = 'America/Santarem';
 $a->strings['America/Santiago'] = 'America/Santiago';
 $a->strings['America/Santo_Domingo'] = 'America/Santo_Domingo';
 $a->strings['America/Sao_Paulo'] = 'America/Sao_Paulo';
 $a->strings['America/Scoresbysund'] = 'America/Scoresbysund';
 $a->strings['America/Shiprock'] = 'America/Shiprock';
+$a->strings['America/St_Barthelemy'] = 'America/St_Barthelemy';
 $a->strings['America/St_Johns'] = 'America/St_Johns';
 $a->strings['America/St_Kitts'] = 'America/St_Kitts';
 $a->strings['America/St_Lucia'] = 'America/St_Lucia';
@@ -798,6 +808,7 @@ $a->strings['Asia/Dubai'] = 'Asia/Dubai';
 $a->strings['Asia/Dushanbe'] = 'Asia/Dushanbe';
 $a->strings['Asia/Gaza'] = 'Asia/Gaza';
 $a->strings['Asia/Harbin'] = 'Asia/Harbin';
+$a->strings['Asia/Ho_Chi_Minh'] = 'Asia/Ho_Chi_Minh';
 $a->strings['Asia/Hong_Kong'] = 'Asia/Hong_Kong';
 $a->strings['Asia/Hovd'] = 'Asia/Hovd';
 $a->strings['Asia/Irkutsk'] = 'Asia/Irkutsk';
@@ -809,7 +820,9 @@ $a->strings['Asia/Kabul'] = 'Asia/Kabul';
 $a->strings['Asia/Kamchatka'] = 'Asia/Kamchatka';
 $a->strings['Asia/Karachi'] = 'Asia/Karachi';
 $a->strings['Asia/Kashgar'] = 'Asia/Kashgar';
+$a->strings['Asia/Kathmandu'] = 'Asia/Kathmandu';
 $a->strings['Asia/Katmandu'] = 'Asia/Katmandu';
+$a->strings['Asia/Kolkata'] = 'Asia/Kolkata';
 $a->strings['Asia/Krasnoyarsk'] = 'Asia/Krasnoyarsk';
 $a->strings['Asia/Kuala_Lumpur'] = 'Asia/Kuala_Lumpur';
 $a->strings['Asia/Kuching'] = 'Asia/Kuching';

diff --git a/view/it/messages.po b/view/it/messages.po
index 73ee9e3ad1d5a3eb10170830e4cb9885f76f0cac..11813a3d837f79da7bf4791305e524e9b54c4e47 100644 (file)
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -6,13 +6,13 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: 2.1.913\n"
+"Project-Id-Version: 2.1.921\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-03-18 10:32+0100\n"
+"POT-Creation-Date: 2011-03-23 13:48+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Fabio Comuni <fabrix.xm@gmail.com>\n"
 "Language-Team: Italian <fabrix.xm@gmail.com>\n"
-"Language: it-IT\n"
+"Language: It\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -118,7 +118,7 @@ msgstr "Piace a %s."
 msgid "%s doesn't like this."
 msgstr "Non piace a %s."
 
-#: ../../boot.php:1835
+#: ../../boot.php:1835 ../../test.php:8
 #, php-format
 msgid "<span  %1$s>%2$d people</span> like this."
 msgstr "Piace a <span %1$s>%2$d persone</span>."
@@ -2598,3 +2598,10 @@ msgstr "Modifica messaggio"
 #, php-format
 msgid "Cannot locate DNS info for database server '%s'"
 msgstr "Non trovo le informazioni DNS per il database server '%s'"
+
+#: ../../boot.php:2016
+#, php-format
+msgid "%d Contact"
+msgid_plural "%d Contacts"
+msgstr[0] "%d Contatto"
+msgstr[1] "%d Contatti"

diff --git a/view/it/strings.php b/view/it/strings.php
index 68cf11793a92fdc9294e2dc657ac6a8a12a1293c..1312f0013534d3c8904d85e37c8ca4032f330dbd 100644 (file)
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -573,3 +573,7 @@ $a->strings["Next >>"] = "Succ >>";
 $a->strings["Item not found"] = "Elemento non trovato";
 $a->strings["Edit post"] = "Modifica messaggio";
 $a->strings["Cannot locate DNS info for database server '%s'"] = "Non trovo le informazioni DNS per il database server '%s'";
+$a->strings["%d Contact"] = array(
+       0 => "%d Contatto",
+       1 => "%d Contatti",
+);