Merge remote branch 'upstream/master'

This commit is contained in:
zottel 2012-06-07 01:07:33 +02:00
commit 3b5b216cad
3 changed files with 339 additions and 123 deletions

View File

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1365' ); define ( 'FRIENDICA_VERSION', '3.0.1366' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1148 ); define ( 'DB_UPDATE_VERSION', 1148 );

View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1365\n" "Project-Id-Version: 3.0.1366\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-06-05 10:00-0700\n" "POT-Creation-Date: 2012-06-06 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
@ -38,7 +38,7 @@ msgstr ""
#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26 #: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
#: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920 #: ../../mod/api.php:31 ../../mod/photos.php:130 ../../mod/photos.php:920
#: ../../mod/editpost.php:10 ../../mod/install.php:151 #: ../../mod/editpost.php:10 ../../mod/install.php:151
#: ../../mod/notifications.php:66 ../../mod/contacts.php:125 #: ../../mod/notifications.php:66 ../../mod/contacts.php:145
#: ../../mod/settings.php:106 ../../mod/settings.php:537 #: ../../mod/settings.php:106 ../../mod/settings.php:537
#: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6 #: ../../mod/settings.php:542 ../../mod/manage.php:86 ../../mod/network.php:6
#: ../../mod/notes.php:20 ../../mod/wallmessage.php:9 #: ../../mod/notes.php:20 ../../mod/wallmessage.php:9
@ -48,14 +48,15 @@ msgstr ""
#: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124 #: ../../mod/register.php:38 ../../mod/regmod.php:116 ../../mod/item.php:124
#: ../../mod/item.php:140 ../../mod/profile_photo.php:19 #: ../../mod/item.php:140 ../../mod/profile_photo.php:19
#: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150 #: ../../mod/profile_photo.php:139 ../../mod/profile_photo.php:150
#: ../../mod/profile_photo.php:163 ../../mod/message.php:44 #: ../../mod/profile_photo.php:163 ../../mod/message.php:45
#: ../../mod/message.php:96 ../../mod/allfriends.php:9 #: ../../mod/message.php:97 ../../mod/allfriends.php:9
#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
#: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7 #: ../../mod/follow.php:9 ../../mod/display.php:138 ../../mod/profiles.php:7
#: ../../mod/profiles.php:385 ../../mod/delegate.php:6 #: ../../mod/profiles.php:385 ../../mod/delegate.php:6
#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81 #: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:503
#: ../../include/items.php:3332 ../../index.php:306 #: ../../addon/dav/layout.fnk.php:387 ../../include/items.php:3332
#: ../../index.php:306
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -126,10 +127,10 @@ msgstr ""
#: ../../mod/photos.php:1256 ../../mod/photos.php:1296 #: ../../mod/photos.php:1256 ../../mod/photos.php:1296
#: ../../mod/photos.php:1336 ../../mod/photos.php:1367 #: ../../mod/photos.php:1336 ../../mod/photos.php:1367
#: ../../mod/install.php:246 ../../mod/install.php:284 #: ../../mod/install.php:246 ../../mod/install.php:284
#: ../../mod/localtime.php:45 ../../mod/contacts.php:322 #: ../../mod/localtime.php:45 ../../mod/contacts.php:342
#: ../../mod/settings.php:555 ../../mod/settings.php:701 #: ../../mod/settings.php:555 ../../mod/settings.php:701
#: ../../mod/settings.php:762 ../../mod/settings.php:969 #: ../../mod/settings.php:762 ../../mod/settings.php:969
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:215 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/message.php:216
#: ../../mod/admin.php:417 ../../mod/admin.php:653 ../../mod/admin.php:789 #: ../../mod/admin.php:417 ../../mod/admin.php:653 ../../mod/admin.php:789
#: ../../mod/admin.php:988 ../../mod/admin.php:1075 ../../mod/profiles.php:554 #: ../../mod/admin.php:988 ../../mod/admin.php:1075 ../../mod/profiles.php:554
#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605 #: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:605
@ -142,8 +143,9 @@ msgstr ""
#: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57 #: ../../addon/impressum/impressum.php:82 ../../addon/blockem/blockem.php:57
#: ../../addon/qcomment/qcomment.php:61 #: ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70 #: ../../addon/openstreetmap/openstreetmap.php:70
#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84 #: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42
#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:86 #: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
#: ../../addon/gravatar/gravatar.php:86
#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93 #: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
#: ../../addon/jappixmini/jappixmini.php:302 #: ../../addon/jappixmini/jappixmini.php:302
#: ../../addon/statusnet/statusnet.php:278 #: ../../addon/statusnet/statusnet.php:278
@ -170,7 +172,8 @@ msgstr ""
msgid "Help:" msgid "Help:"
msgstr "" msgstr ""
#: ../../mod/help.php:34 ../../include/nav.php:86 #: ../../mod/help.php:34 ../../addon/dav/layout.fnk.php:112
#: ../../include/nav.php:86
msgid "Help" msgid "Help"
msgstr "" msgstr ""
@ -229,11 +232,12 @@ msgstr ""
msgid "Create New Event" msgid "Create New Event"
msgstr "" msgstr ""
#: ../../mod/events.php:326 #: ../../mod/events.php:326 ../../addon/dav/layout.fnk.php:147
msgid "Previous" msgid "Previous"
msgstr "" msgstr ""
#: ../../mod/events.php:327 ../../mod/install.php:205 #: ../../mod/events.php:327 ../../mod/install.php:205
#: ../../addon/dav/layout.fnk.php:150
msgid "Next" msgid "Next"
msgstr "" msgstr ""
@ -540,8 +544,8 @@ msgid "Share"
msgstr "" msgstr ""
#: ../../mod/photos.php:1277 ../../mod/editpost.php:104 #: ../../mod/photos.php:1277 ../../mod/editpost.php:104
#: ../../mod/wallmessage.php:145 ../../mod/message.php:214 #: ../../mod/wallmessage.php:145 ../../mod/message.php:215
#: ../../mod/message.php:409 ../../include/conversation.php:371 #: ../../mod/message.php:410 ../../include/conversation.php:371
#: ../../include/conversation.php:731 ../../include/conversation.php:1008 #: ../../include/conversation.php:731 ../../include/conversation.php:1008
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
@ -639,7 +643,7 @@ msgid "Edit"
msgstr "" msgstr ""
#: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143 #: ../../mod/editpost.php:96 ../../mod/wallmessage.php:143
#: ../../mod/message.php:212 ../../mod/message.php:407 #: ../../mod/message.php:213 ../../mod/message.php:408
#: ../../include/conversation.php:990 #: ../../include/conversation.php:990
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
@ -649,7 +653,7 @@ msgid "Attach file"
msgstr "" msgstr ""
#: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144 #: ../../mod/editpost.php:98 ../../mod/wallmessage.php:144
#: ../../mod/message.php:213 ../../mod/message.php:408 #: ../../mod/message.php:214 ../../mod/message.php:409
#: ../../include/conversation.php:994 #: ../../include/conversation.php:994
msgid "Insert web link" msgid "Insert web link"
msgstr "" msgstr ""
@ -779,7 +783,7 @@ msgstr ""
msgid "Disallowed profile URL." msgid "Disallowed profile URL."
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:102 #: ../../mod/dfrn_request.php:555 ../../mod/contacts.php:122
msgid "Failed to update contact record." msgid "Failed to update contact record."
msgstr "" msgstr ""
@ -1218,8 +1222,8 @@ msgid "Discard"
msgstr "" msgstr ""
#: ../../mod/notifications.php:51 ../../mod/notifications.php:160 #: ../../mod/notifications.php:51 ../../mod/notifications.php:160
#: ../../mod/notifications.php:206 ../../mod/contacts.php:296 #: ../../mod/notifications.php:206 ../../mod/contacts.php:316
#: ../../mod/contacts.php:348 #: ../../mod/contacts.php:368
msgid "Ignore" msgid "Ignore"
msgstr "" msgstr ""
@ -1244,7 +1248,7 @@ msgstr ""
msgid "Introductions" msgid "Introductions"
msgstr "" msgstr ""
#: ../../mod/notifications.php:100 ../../mod/message.php:104 #: ../../mod/notifications.php:100 ../../mod/message.php:105
#: ../../include/nav.php:128 #: ../../include/nav.php:128
msgid "Messages" msgid "Messages"
msgstr "" msgstr ""
@ -1271,7 +1275,7 @@ msgid "suggested by %s"
msgstr "" msgstr ""
#: ../../mod/notifications.php:153 ../../mod/notifications.php:200 #: ../../mod/notifications.php:153 ../../mod/notifications.php:200
#: ../../mod/contacts.php:354 #: ../../mod/contacts.php:374
msgid "Hide this contact from others" msgid "Hide this contact from others"
msgstr "" msgstr ""
@ -1393,303 +1397,303 @@ msgstr ""
msgid "Home Notifications" msgid "Home Notifications"
msgstr "" msgstr ""
#: ../../mod/contacts.php:63 ../../mod/contacts.php:143 #: ../../mod/contacts.php:83 ../../mod/contacts.php:163
msgid "Could not access contact record." msgid "Could not access contact record."
msgstr "" msgstr ""
#: ../../mod/contacts.php:77 #: ../../mod/contacts.php:97
msgid "Could not locate selected profile." msgid "Could not locate selected profile."
msgstr "" msgstr ""
#: ../../mod/contacts.php:100 #: ../../mod/contacts.php:120
msgid "Contact updated." msgid "Contact updated."
msgstr "" msgstr ""
#: ../../mod/contacts.php:165 #: ../../mod/contacts.php:185
msgid "Contact has been blocked" msgid "Contact has been blocked"
msgstr "" msgstr ""
#: ../../mod/contacts.php:165 #: ../../mod/contacts.php:185
msgid "Contact has been unblocked" msgid "Contact has been unblocked"
msgstr "" msgstr ""
#: ../../mod/contacts.php:179 #: ../../mod/contacts.php:199
msgid "Contact has been ignored" msgid "Contact has been ignored"
msgstr "" msgstr ""
#: ../../mod/contacts.php:179 #: ../../mod/contacts.php:199
msgid "Contact has been unignored" msgid "Contact has been unignored"
msgstr "" msgstr ""
#: ../../mod/contacts.php:195 #: ../../mod/contacts.php:215
msgid "Contact has been archived" msgid "Contact has been archived"
msgstr "" msgstr ""
#: ../../mod/contacts.php:195 #: ../../mod/contacts.php:215
msgid "Contact has been unarchived" msgid "Contact has been unarchived"
msgstr "" msgstr ""
#: ../../mod/contacts.php:208 #: ../../mod/contacts.php:228
msgid "Contact has been removed." msgid "Contact has been removed."
msgstr "" msgstr ""
#: ../../mod/contacts.php:238 #: ../../mod/contacts.php:258
#, php-format #, php-format
msgid "You are mutual friends with %s" msgid "You are mutual friends with %s"
msgstr "" msgstr ""
#: ../../mod/contacts.php:242 #: ../../mod/contacts.php:262
#, php-format #, php-format
msgid "You are sharing with %s" msgid "You are sharing with %s"
msgstr "" msgstr ""
#: ../../mod/contacts.php:247 #: ../../mod/contacts.php:267
#, php-format #, php-format
msgid "%s is sharing with you" msgid "%s is sharing with you"
msgstr "" msgstr ""
#: ../../mod/contacts.php:264 #: ../../mod/contacts.php:284
msgid "Private communications are not available for this contact." msgid "Private communications are not available for this contact."
msgstr "" msgstr ""
#: ../../mod/contacts.php:267 #: ../../mod/contacts.php:287
msgid "Never" msgid "Never"
msgstr "" msgstr ""
#: ../../mod/contacts.php:271 #: ../../mod/contacts.php:291
msgid "(Update was successful)" msgid "(Update was successful)"
msgstr "" msgstr ""
#: ../../mod/contacts.php:271 #: ../../mod/contacts.php:291
msgid "(Update was not successful)" msgid "(Update was not successful)"
msgstr "" msgstr ""
#: ../../mod/contacts.php:273 #: ../../mod/contacts.php:293
msgid "Suggest friends" msgid "Suggest friends"
msgstr "" msgstr ""
#: ../../mod/contacts.php:277 #: ../../mod/contacts.php:297
#, php-format #, php-format
msgid "Network type: %s" msgid "Network type: %s"
msgstr "" msgstr ""
#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183 #: ../../mod/contacts.php:300 ../../include/contact_widgets.php:183
#, php-format #, php-format
msgid "%d contact in common" msgid "%d contact in common"
msgid_plural "%d contacts in common" msgid_plural "%d contacts in common"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/contacts.php:285 #: ../../mod/contacts.php:305
msgid "View all contacts" msgid "View all contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 #: ../../mod/contacts.php:310 ../../mod/contacts.php:367
#: ../../mod/admin.php:662 #: ../../mod/admin.php:662
msgid "Unblock" msgid "Unblock"
msgstr "" msgstr ""
#: ../../mod/contacts.php:290 ../../mod/contacts.php:347 #: ../../mod/contacts.php:310 ../../mod/contacts.php:367
#: ../../mod/admin.php:661 #: ../../mod/admin.php:661
msgid "Block" msgid "Block"
msgstr "" msgstr ""
#: ../../mod/contacts.php:293 #: ../../mod/contacts.php:313
msgid "Toggle Blocked status" msgid "Toggle Blocked status"
msgstr "" msgstr ""
#: ../../mod/contacts.php:296 ../../mod/contacts.php:348 #: ../../mod/contacts.php:316 ../../mod/contacts.php:368
msgid "Unignore" msgid "Unignore"
msgstr "" msgstr ""
#: ../../mod/contacts.php:299 #: ../../mod/contacts.php:319
msgid "Toggle Ignored status" msgid "Toggle Ignored status"
msgstr "" msgstr ""
#: ../../mod/contacts.php:303 #: ../../mod/contacts.php:323
msgid "Unarchive" msgid "Unarchive"
msgstr "" msgstr ""
#: ../../mod/contacts.php:303 #: ../../mod/contacts.php:323
msgid "Archive" msgid "Archive"
msgstr "" msgstr ""
#: ../../mod/contacts.php:306 #: ../../mod/contacts.php:326
msgid "Toggle Archive status" msgid "Toggle Archive status"
msgstr "" msgstr ""
#: ../../mod/contacts.php:309 #: ../../mod/contacts.php:329
msgid "Repair" msgid "Repair"
msgstr "" msgstr ""
#: ../../mod/contacts.php:312 #: ../../mod/contacts.php:332
msgid "Advanced Contact Settings" msgid "Advanced Contact Settings"
msgstr "" msgstr ""
#: ../../mod/contacts.php:320 #: ../../mod/contacts.php:340
msgid "Contact Editor" msgid "Contact Editor"
msgstr "" msgstr ""
#: ../../mod/contacts.php:323 #: ../../mod/contacts.php:343
msgid "Profile Visibility" msgid "Profile Visibility"
msgstr "" msgstr ""
#: ../../mod/contacts.php:324 #: ../../mod/contacts.php:344
#, php-format #, php-format
msgid "" msgid ""
"Please choose the profile you would like to display to %s when viewing your " "Please choose the profile you would like to display to %s when viewing your "
"profile securely." "profile securely."
msgstr "" msgstr ""
#: ../../mod/contacts.php:325 #: ../../mod/contacts.php:345
msgid "Contact Information / Notes" msgid "Contact Information / Notes"
msgstr "" msgstr ""
#: ../../mod/contacts.php:326 #: ../../mod/contacts.php:346
msgid "Edit contact notes" msgid "Edit contact notes"
msgstr "" msgstr ""
#: ../../mod/contacts.php:331 ../../mod/contacts.php:522 #: ../../mod/contacts.php:351 ../../mod/contacts.php:542
#: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40 #: ../../mod/viewcontacts.php:62 ../../mod/nogroup.php:40
#, php-format #, php-format
msgid "Visit %s's profile [%s]" msgid "Visit %s's profile [%s]"
msgstr "" msgstr ""
#: ../../mod/contacts.php:332 #: ../../mod/contacts.php:352
msgid "Block/Unblock contact" msgid "Block/Unblock contact"
msgstr "" msgstr ""
#: ../../mod/contacts.php:333 #: ../../mod/contacts.php:353
msgid "Ignore contact" msgid "Ignore contact"
msgstr "" msgstr ""
#: ../../mod/contacts.php:334 #: ../../mod/contacts.php:354
msgid "Repair URL settings" msgid "Repair URL settings"
msgstr "" msgstr ""
#: ../../mod/contacts.php:335 #: ../../mod/contacts.php:355
msgid "View conversations" msgid "View conversations"
msgstr "" msgstr ""
#: ../../mod/contacts.php:337 #: ../../mod/contacts.php:357
msgid "Delete contact" msgid "Delete contact"
msgstr "" msgstr ""
#: ../../mod/contacts.php:341 #: ../../mod/contacts.php:361
msgid "Last update:" msgid "Last update:"
msgstr "" msgstr ""
#: ../../mod/contacts.php:342 #: ../../mod/contacts.php:362
msgid "Update public posts" msgid "Update public posts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:344 ../../mod/admin.php:1133 #: ../../mod/contacts.php:364 ../../mod/admin.php:1133
msgid "Update now" msgid "Update now"
msgstr "" msgstr ""
#: ../../mod/contacts.php:351 #: ../../mod/contacts.php:371
msgid "Currently blocked" msgid "Currently blocked"
msgstr "" msgstr ""
#: ../../mod/contacts.php:352 #: ../../mod/contacts.php:372
msgid "Currently ignored" msgid "Currently ignored"
msgstr "" msgstr ""
#: ../../mod/contacts.php:353 #: ../../mod/contacts.php:373
msgid "Currently archived" msgid "Currently archived"
msgstr "" msgstr ""
#: ../../mod/contacts.php:354 #: ../../mod/contacts.php:374
msgid "" msgid ""
"Replies/likes to your public posts <strong>may</strong> still be visible" "Replies/likes to your public posts <strong>may</strong> still be visible"
msgstr "" msgstr ""
#: ../../mod/contacts.php:407 #: ../../mod/contacts.php:427
msgid "Suggestions" msgid "Suggestions"
msgstr "" msgstr ""
#: ../../mod/contacts.php:410 #: ../../mod/contacts.php:430
msgid "Suggest potential friends" msgid "Suggest potential friends"
msgstr "" msgstr ""
#: ../../mod/contacts.php:413 ../../mod/group.php:191 #: ../../mod/contacts.php:433 ../../mod/group.php:191
msgid "All Contacts" msgid "All Contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:416 #: ../../mod/contacts.php:436
msgid "Show all contacts" msgid "Show all contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:419 #: ../../mod/contacts.php:439
msgid "Unblocked" msgid "Unblocked"
msgstr "" msgstr ""
#: ../../mod/contacts.php:422 #: ../../mod/contacts.php:442
msgid "Only show unblocked contacts" msgid "Only show unblocked contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:426 #: ../../mod/contacts.php:446
msgid "Blocked" msgid "Blocked"
msgstr "" msgstr ""
#: ../../mod/contacts.php:429 #: ../../mod/contacts.php:449
msgid "Only show blocked contacts" msgid "Only show blocked contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:433 #: ../../mod/contacts.php:453
msgid "Ignored" msgid "Ignored"
msgstr "" msgstr ""
#: ../../mod/contacts.php:436 #: ../../mod/contacts.php:456
msgid "Only show ignored contacts" msgid "Only show ignored contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:440 #: ../../mod/contacts.php:460
msgid "Archived" msgid "Archived"
msgstr "" msgstr ""
#: ../../mod/contacts.php:443 #: ../../mod/contacts.php:463
msgid "Only show archived contacts" msgid "Only show archived contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:447 #: ../../mod/contacts.php:467
msgid "Hidden" msgid "Hidden"
msgstr "" msgstr ""
#: ../../mod/contacts.php:450 #: ../../mod/contacts.php:470
msgid "Only show hidden contacts" msgid "Only show hidden contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:498 #: ../../mod/contacts.php:518
msgid "Mutual Friendship" msgid "Mutual Friendship"
msgstr "" msgstr ""
#: ../../mod/contacts.php:502 #: ../../mod/contacts.php:522
msgid "is a fan of yours" msgid "is a fan of yours"
msgstr "" msgstr ""
#: ../../mod/contacts.php:506 #: ../../mod/contacts.php:526
msgid "you are a fan of" msgid "you are a fan of"
msgstr "" msgstr ""
#: ../../mod/contacts.php:523 ../../mod/nogroup.php:41 #: ../../mod/contacts.php:543 ../../mod/nogroup.php:41
msgid "Edit contact" msgid "Edit contact"
msgstr "" msgstr ""
#: ../../mod/contacts.php:544 ../../view/theme/diabook/theme.php:129 #: ../../mod/contacts.php:564 ../../view/theme/diabook/theme.php:129
#: ../../include/nav.php:139 #: ../../include/nav.php:139
msgid "Contacts" msgid "Contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:548 #: ../../mod/contacts.php:568
msgid "Search your contacts" msgid "Search your contacts"
msgstr "" msgstr ""
#: ../../mod/contacts.php:549 ../../mod/directory.php:57 #: ../../mod/contacts.php:569 ../../mod/directory.php:57
msgid "Finding: " msgid "Finding: "
msgstr "" msgstr ""
#: ../../mod/contacts.php:550 ../../mod/directory.php:59 #: ../../mod/contacts.php:570 ../../mod/directory.php:59
#: ../../include/contact_widgets.php:33 #: ../../include/contact_widgets.php:33
msgid "Find" msgid "Find"
msgstr "" msgstr ""
@ -1797,7 +1801,8 @@ msgid "Remove account"
msgstr "" msgstr ""
#: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953 #: ../../mod/settings.php:89 ../../mod/admin.php:748 ../../mod/admin.php:953
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:643 #: ../../addon/dav/layout.fnk.php:112 ../../addon/mathjax/mathjax.php:36
#: ../../view/theme/diabook/theme.php:643
#: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137 #: ../../view/theme/diabook/theme.php:773 ../../include/nav.php:137
msgid "Settings" msgid "Settings"
msgstr "" msgstr ""
@ -2405,7 +2410,7 @@ msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30 #: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:756 #: ../../addon/facebook/facebook.php:756
#: ../../addon/privacy_image_cache/privacy_image_cache.php:150 #: ../../addon/privacy_image_cache/privacy_image_cache.php:150
#: ../../include/text.php:652 #: ../../addon/dav/layout.fnk.php:418 ../../include/text.php:652
msgid "Save" msgid "Save"
msgstr "" msgstr ""
@ -2414,7 +2419,7 @@ msgstr ""
msgid "Number of daily wall messages for %s exceeded. Message failed." msgid "Number of daily wall messages for %s exceeded. Message failed."
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:56 ../../mod/message.php:65 #: ../../mod/wallmessage.php:56 ../../mod/message.php:66
msgid "No recipient selected." msgid "No recipient selected."
msgstr "" msgstr ""
@ -2422,15 +2427,15 @@ msgstr ""
msgid "Unable to check your home location." msgid "Unable to check your home location."
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:62 ../../mod/message.php:72 #: ../../mod/wallmessage.php:62 ../../mod/message.php:73
msgid "Message could not be sent." msgid "Message could not be sent."
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:65 ../../mod/message.php:75 #: ../../mod/wallmessage.php:65 ../../mod/message.php:76
msgid "Message collection failure." msgid "Message collection failure."
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:68 ../../mod/message.php:78 #: ../../mod/wallmessage.php:68 ../../mod/message.php:79
msgid "Message sent." msgid "Message sent."
msgstr "" msgstr ""
@ -2438,12 +2443,12 @@ msgstr ""
msgid "No recipient." msgid "No recipient."
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:124 ../../mod/message.php:171 #: ../../mod/wallmessage.php:124 ../../mod/message.php:172
#: ../../include/conversation.php:943 #: ../../include/conversation.php:943
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:131 ../../mod/message.php:199 #: ../../mod/wallmessage.php:131 ../../mod/message.php:200
msgid "Send Private Message" msgid "Send Private Message"
msgstr "" msgstr ""
@ -2454,18 +2459,18 @@ msgid ""
"your site allow private mail from unknown senders." "your site allow private mail from unknown senders."
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:133 ../../mod/message.php:200 #: ../../mod/wallmessage.php:133 ../../mod/message.php:201
#: ../../mod/message.php:398 #: ../../mod/message.php:399
msgid "To:" msgid "To:"
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:134 ../../mod/message.php:205 #: ../../mod/wallmessage.php:134 ../../mod/message.php:206
#: ../../mod/message.php:400 #: ../../mod/message.php:401
msgid "Subject:" msgid "Subject:"
msgstr "" msgstr ""
#: ../../mod/wallmessage.php:140 ../../mod/message.php:209 #: ../../mod/wallmessage.php:140 ../../mod/message.php:210
#: ../../mod/message.php:403 ../../mod/invite.php:113 #: ../../mod/message.php:404 ../../mod/invite.php:113
msgid "Your message:" msgid "Your message:"
msgstr "" msgstr ""
@ -2940,67 +2945,67 @@ msgstr ""
msgid "New Message" msgid "New Message"
msgstr "" msgstr ""
#: ../../mod/message.php:69 #: ../../mod/message.php:70
msgid "Unable to locate contact information." msgid "Unable to locate contact information."
msgstr "" msgstr ""
#: ../../mod/message.php:119 #: ../../mod/message.php:120
msgid "Message deleted." msgid "Message deleted."
msgstr "" msgstr ""
#: ../../mod/message.php:149 #: ../../mod/message.php:150
msgid "Conversation removed." msgid "Conversation removed."
msgstr "" msgstr ""
#: ../../mod/message.php:246 #: ../../mod/message.php:247
msgid "No messages." msgid "No messages."
msgstr "" msgstr ""
#: ../../mod/message.php:253 #: ../../mod/message.php:254
#, php-format #, php-format
msgid "Unknown sender - %s" msgid "Unknown sender - %s"
msgstr "" msgstr ""
#: ../../mod/message.php:256 #: ../../mod/message.php:257
#, php-format #, php-format
msgid "You and %s" msgid "You and %s"
msgstr "" msgstr ""
#: ../../mod/message.php:259 #: ../../mod/message.php:260
#, php-format #, php-format
msgid "%s and You" msgid "%s and You"
msgstr "" msgstr ""
#: ../../mod/message.php:269 ../../mod/message.php:391 #: ../../mod/message.php:270 ../../mod/message.php:392
msgid "Delete conversation" msgid "Delete conversation"
msgstr "" msgstr ""
#: ../../mod/message.php:272 #: ../../mod/message.php:273
msgid "D, d M Y - g:i A" msgid "D, d M Y - g:i A"
msgstr "" msgstr ""
#: ../../mod/message.php:274 #: ../../mod/message.php:275
#, php-format #, php-format
msgid "%d message" msgid "%d message"
msgid_plural "%d messages" msgid_plural "%d messages"
msgstr[0] "" msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../mod/message.php:309 #: ../../mod/message.php:310
msgid "Message not available." msgid "Message not available."
msgstr "" msgstr ""
#: ../../mod/message.php:374 #: ../../mod/message.php:375
msgid "Delete message" msgid "Delete message"
msgstr "" msgstr ""
#: ../../mod/message.php:393 #: ../../mod/message.php:394
msgid "" msgid ""
"No secure communications available. You <strong>may</strong> be able to " "No secure communications available. You <strong>may</strong> be able to "
"respond from the sender's profile page." "respond from the sender's profile page."
msgstr "" msgstr ""
#: ../../mod/message.php:397 #: ../../mod/message.php:398
msgid "Send Reply" msgid "Send Reply"
msgstr "" msgstr ""
@ -4407,7 +4412,7 @@ msgstr ""
msgid "Activate Real-Time Updates" msgid "Activate Real-Time Updates"
msgstr "" msgstr ""
#: ../../addon/facebook/facebook.php:785 #: ../../addon/facebook/facebook.php:785 ../../addon/dav/layout.fnk.php:394
msgid "The new values have been saved." msgid "The new values have been saved."
msgstr "" msgstr ""
@ -4639,6 +4644,185 @@ msgstr ""
msgid "event" msgid "event"
msgstr "" msgstr ""
#: ../../addon/dav/common/wdcal_configuration.php:126
msgid "U.S. Time Format (mm/dd/YYYY)"
msgstr ""
#: ../../addon/dav/common/wdcal_configuration.php:205
msgid "German Time Format (dd.mm.YYYY)"
msgstr ""
#: ../../addon/dav/common/calendar.fnk.php:507
#: ../../addon/dav/common/calendar.fnk.php:576
#: ../../addon/dav/common/calendar.fnk.php:603
#: ../../addon/dav/layout.fnk.php:266
msgid "No access"
msgstr ""
#: ../../addon/dav/layout.fnk.php:116
msgid "Today"
msgstr ""
#: ../../addon/dav/layout.fnk.php:132
msgid "Week"
msgstr ""
#: ../../addon/dav/layout.fnk.php:139
msgid "Month"
msgstr ""
#: ../../addon/dav/layout.fnk.php:144
msgid "Reload"
msgstr ""
#: ../../addon/dav/layout.fnk.php:155
msgid "Date"
msgstr ""
#: ../../addon/dav/layout.fnk.php:193 ../../addon/dav/layout.fnk.php:237
msgid "Error"
msgstr ""
#: ../../addon/dav/layout.fnk.php:259
msgid "Not found"
msgstr ""
#: ../../addon/dav/layout.fnk.php:326 ../../addon/dav/layout.fnk.php:399
msgid "Go back to the calendar"
msgstr ""
#: ../../addon/dav/layout.fnk.php:346
msgid "Description"
msgstr ""
#: ../../addon/dav/layout.fnk.php:349
msgid "Notification"
msgstr ""
#: ../../addon/dav/layout.fnk.php:358
msgid "Minutes"
msgstr ""
#: ../../addon/dav/layout.fnk.php:361
msgid "Hours"
msgstr ""
#: ../../addon/dav/layout.fnk.php:364
msgid "Days"
msgstr ""
#: ../../addon/dav/layout.fnk.php:365
msgid "before"
msgstr ""
#: ../../addon/dav/layout.fnk.php:401
msgid "Calendar Settings"
msgstr ""
#: ../../addon/dav/layout.fnk.php:407
msgid "Date format"
msgstr ""
#: ../../addon/dav/layout.fnk.php:416
msgid "Time zone"
msgstr ""
#: ../../addon/dav/layout.fnk.php:421
msgid "Limitations"
msgstr ""
#: ../../addon/dav/layout.fnk.php:425
msgid "Warning"
msgstr ""
#: ../../addon/dav/layout.fnk.php:429
msgid "Synchronization (iPhone, Thunderbird Lightning, Android, ...)"
msgstr ""
#: ../../addon/dav/layout.fnk.php:436
msgid "Synchronizing this calendar with the iPhone"
msgstr ""
#: ../../addon/dav/layout.fnk.php:447
msgid "Synchronizing your Friendica-Contacts with the iPhone"
msgstr ""
#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:37
msgid "Friendica-Contacts"
msgstr ""
#: ../../addon/dav/dav_carddav_backend_friendica_community.inc.php:38
msgid "Your Friendica-Contacts"
msgstr ""
#: ../../addon/dav/main.php:223
msgid "Calendar"
msgstr ""
#: ../../addon/dav/main.php:226
msgid "Extended calendar with CalDAV-support"
msgstr ""
#: ../../addon/dav/main.php:242
msgid "The database tables have been installed."
msgstr ""
#: ../../addon/dav/main.php:243
msgid "An error occurred during the installation."
msgstr ""
#: ../../addon/dav/main.php:259
msgid "No system-wide settings yet."
msgstr ""
#: ../../addon/dav/main.php:262
msgid "Database status"
msgstr ""
#: ../../addon/dav/main.php:265
msgid "Installed"
msgstr ""
#: ../../addon/dav/main.php:268
msgid "Upgrade needed"
msgstr ""
#: ../../addon/dav/main.php:268
msgid "Upgrade"
msgstr ""
#: ../../addon/dav/main.php:271
msgid "Not installed"
msgstr ""
#: ../../addon/dav/main.php:271
msgid "Install"
msgstr ""
#: ../../addon/dav/main.php:276
msgid "Troubleshooting"
msgstr ""
#: ../../addon/dav/main.php:277
msgid "Manual creation of the database tables:"
msgstr ""
#: ../../addon/dav/main.php:278
msgid "Show SQL-statements"
msgstr ""
#: ../../addon/dav/calendar.friendica.fnk.php:128
msgid "Private Calendar"
msgstr ""
#: ../../addon/dav/calendar.friendica.fnk.php:135
msgid "Friendica Events: Mine"
msgstr ""
#: ../../addon/dav/calendar.friendica.fnk.php:138
msgid "Friendica Events: Contacts"
msgstr ""
#: ../../addon/uhremotestorage/uhremotestorage.php:84 #: ../../addon/uhremotestorage/uhremotestorage.php:84
#, php-format #, php-format
msgid "" msgid ""
@ -4786,7 +4970,7 @@ msgid "Post to Drupal by default"
msgstr "" msgstr ""
#: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198 #: ../../addon/drpost/drpost.php:184 ../../addon/wppost/wppost.php:198
#: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:192 #: ../../addon/blogger/blogger.php:172 ../../addon/posterous/posterous.php:189
msgid "Post from Friendica" msgid "Post from Friendica"
msgstr "" msgstr ""
@ -5019,6 +5203,30 @@ msgstr ""
msgid "The default zoom level. (1:world, 18:highest)" msgid "The default zoom level. (1:world, 18:highest)"
msgstr "" msgstr ""
#: ../../addon/libertree/libertree.php:36
msgid "Post to libertree"
msgstr ""
#: ../../addon/libertree/libertree.php:67
msgid "libertree Post Settings"
msgstr ""
#: ../../addon/libertree/libertree.php:69
msgid "Enable Libertree Post Plugin"
msgstr ""
#: ../../addon/libertree/libertree.php:74
msgid "Libertree API token"
msgstr ""
#: ../../addon/libertree/libertree.php:79
msgid "Libertree site URL"
msgstr ""
#: ../../addon/libertree/libertree.php:84
msgid "Post to Libertree by default"
msgstr ""
#: ../../addon/mathjax/mathjax.php:37 #: ../../addon/mathjax/mathjax.php:37
msgid "" msgid ""
"The MathJax addon renders mathematical formulae written using the LaTeX " "The MathJax addon renders mathematical formulae written using the LaTeX "
@ -5270,6 +5478,10 @@ msgstr ""
msgid "API URL" msgid "API URL"
msgstr "" msgstr ""
#: ../../addon/infiniteimprobabilitydrive/infiniteimprobabilitydrive.php:19
msgid "Infinite Improbability Drive"
msgstr ""
#: ../../addon/tumblr/tumblr.php:36 #: ../../addon/tumblr/tumblr.php:36
msgid "Post to Tumblr" msgid "Post to Tumblr"
msgstr "" msgstr ""

View File

@ -13,6 +13,10 @@
background: none; background: none;
} }
.widget {
/* box-shadow: 4px 4px 3px 0 #444444; */
}
.comment-edit-text-empty, .comment-edit-text-full { .comment-edit-text-empty, .comment-edit-text-full {
border: none; border: none;
border-left: 1px solid #EEE; border-left: 1px solid #EEE;