aboutsummaryrefslogtreecommitdiffstats
path: root/util/messages.po
diff options
context:
space:
mode:
Diffstat (limited to 'util/messages.po')
-rw-r--r--util/messages.po529
1 files changed, 281 insertions, 248 deletions
diff --git a/util/messages.po b/util/messages.po
index 2dcee8d11..6ac283127 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 2.3.1331\n"
+"Project-Id-Version: 2.3.1334\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-03 17:20-0700\n"
+"POT-Creation-Date: 2012-05-06 10:00-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"
@@ -51,12 +51,11 @@ msgstr ""
#: ../../mod/profile_photo.php:163 ../../mod/message.php:38
#: ../../mod/message.php:90 ../../mod/allfriends.php:9
#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
-#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
-#: ../../mod/profiles.php:7 ../../mod/profiles.php:365
-#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
-#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
-#: ../../addon/facebook/facebook.php:485 ../../include/items.php:3187
-#: ../../index.php:306
+#: ../../mod/follow.php:8 ../../mod/display.php:138 ../../mod/profiles.php:7
+#: ../../mod/profiles.php:365 ../../mod/delegate.php:6
+#: ../../mod/suggest.php:28 ../../mod/invite.php:13 ../../mod/invite.php:81
+#: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:495
+#: ../../include/items.php:3192 ../../index.php:306
msgid "Permission denied."
msgstr ""
@@ -86,7 +85,7 @@ msgid "Return to contact editor"
msgstr ""
#: ../../mod/crepair.php:148 ../../mod/settings.php:541
-#: ../../mod/settings.php:567 ../../mod/admin.php:638 ../../mod/admin.php:647
+#: ../../mod/settings.php:567 ../../mod/admin.php:640 ../../mod/admin.php:649
msgid "Name"
msgstr ""
@@ -130,10 +129,10 @@ msgstr ""
#: ../../mod/localtime.php:45 ../../mod/contacts.php:322
#: ../../mod/settings.php:539 ../../mod/settings.php:685
#: ../../mod/settings.php:746 ../../mod/settings.php:940
-#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:400
-#: ../../mod/admin.php:635 ../../mod/admin.php:771 ../../mod/admin.php:970
-#: ../../mod/admin.php:1057 ../../mod/profiles.php:534
-#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:575
+#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:402
+#: ../../mod/admin.php:637 ../../mod/admin.php:773 ../../mod/admin.php:972
+#: ../../mod/admin.php:1059 ../../mod/profiles.php:534
+#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:597
#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
#: ../../addon/uhremotestorage/uhremotestorage.php:89
@@ -158,8 +157,9 @@ msgstr ""
#: ../../addon/twitter/twitter.php:209 ../../addon/twitter/twitter.php:375
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
#: ../../addon/posterous/posterous.php:90
-#: ../../view/theme/cleanzero/config.php:71
-#: ../../view/theme/diabook/config.php:91
+#: ../../view/theme/cleanzero/config.php:80
+#: ../../view/theme/diabook/theme.php:590
+#: ../../view/theme/diabook/config.php:95
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
#: ../../include/conversation.php:555
msgid "Submit"
@@ -215,7 +215,7 @@ msgstr ""
msgid "Edit event"
msgstr ""
-#: ../../mod/events.php:300 ../../include/text.php:1053
+#: ../../mod/events.php:300 ../../include/text.php:1054
msgid "link to source"
msgstr ""
@@ -352,7 +352,7 @@ msgstr ""
#: ../../mod/photos.php:51 ../../mod/photos.php:151 ../../mod/photos.php:879
#: ../../mod/photos.php:950 ../../mod/photos.php:965 ../../mod/photos.php:1382
#: ../../mod/photos.php:1394 ../../addon/communityhome/communityhome.php:110
-#: ../../view/theme/diabook/theme.php:436
+#: ../../view/theme/diabook/theme.php:485
msgid "Contact Photos"
msgstr ""
@@ -375,7 +375,7 @@ msgstr ""
#: ../../mod/profile_photo.php:74 ../../mod/profile_photo.php:174
#: ../../mod/profile_photo.php:252 ../../mod/profile_photo.php:261
#: ../../addon/communityhome/communityhome.php:111
-#: ../../view/theme/diabook/theme.php:437
+#: ../../view/theme/diabook/theme.php:486
msgid "Profile Photos"
msgstr ""
@@ -397,7 +397,7 @@ msgstr ""
#: ../../mod/photos.php:528 ../../mod/like.php:127 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163
-#: ../../view/theme/diabook/theme.php:408 ../../include/text.php:1304
+#: ../../view/theme/diabook/theme.php:457 ../../include/text.php:1305
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
#: ../../include/conversation.php:126
msgid "photo"
@@ -555,7 +555,7 @@ msgid "Preview"
msgstr ""
#: ../../mod/photos.php:1331 ../../mod/settings.php:602
-#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:642
+#: ../../mod/settings.php:683 ../../mod/group.php:168 ../../mod/admin.php:644
#: ../../include/conversation.php:318 ../../include/conversation.php:584
msgid "Delete"
msgstr ""
@@ -1263,7 +1263,7 @@ msgid "if applicable"
msgstr ""
#: ../../mod/notifications.php:157 ../../mod/notifications.php:204
-#: ../../mod/admin.php:640
+#: ../../mod/admin.php:642
msgid "Approve"
msgstr ""
@@ -1452,7 +1452,7 @@ msgstr ""
msgid "Network type: %s"
msgstr ""
-#: ../../mod/contacts.php:280
+#: ../../mod/contacts.php:280 ../../include/contact_widgets.php:183
#, php-format
msgid "%d contact in common"
msgid_plural "%d contacts in common"
@@ -1464,12 +1464,12 @@ msgid "View all contacts"
msgstr ""
#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:644
+#: ../../mod/admin.php:646
msgid "Unblock"
msgstr ""
#: ../../mod/contacts.php:290 ../../mod/contacts.php:347
-#: ../../mod/admin.php:643
+#: ../../mod/admin.php:645
msgid "Block"
msgstr ""
@@ -1562,7 +1562,7 @@ msgstr ""
msgid "Update public posts"
msgstr ""
-#: ../../mod/contacts.php:344 ../../mod/admin.php:1115
+#: ../../mod/contacts.php:344 ../../mod/admin.php:1117
msgid "Update now"
msgstr ""
@@ -1689,8 +1689,8 @@ msgstr ""
#: ../../mod/lostpass.php:45 ../../mod/lostpass.php:107
#: ../../mod/register.php:388 ../../mod/register.php:442
#: ../../mod/regmod.php:54 ../../mod/dfrn_confirm.php:742
-#: ../../addon/facebook/facebook.php:658
-#: ../../addon/facebook/facebook.php:1148
+#: ../../addon/facebook/facebook.php:680
+#: ../../addon/facebook/facebook.php:1170
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2716
#: ../../boot.php:686
msgid "Administrator"
@@ -1774,7 +1774,7 @@ msgstr ""
msgid "Remove account"
msgstr ""
-#: ../../mod/settings.php:88 ../../mod/admin.php:730 ../../mod/admin.php:935
+#: ../../mod/settings.php:88 ../../mod/admin.php:732 ../../mod/admin.php:937
#: ../../addon/mathjax/mathjax.php:36 ../../include/nav.php:137
msgid "Settings"
msgstr ""
@@ -1827,7 +1827,7 @@ msgstr ""
msgid " Cannot change to that email."
msgstr ""
-#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:470
+#: ../../mod/settings.php:468 ../../addon/facebook/facebook.php:480
#: ../../addon/impressum/impressum.php:77
#: ../../addon/openstreetmap/openstreetmap.php:80
#: ../../addon/mathjax/mathjax.php:66 ../../addon/piwik/piwik.php:105
@@ -2001,7 +2001,7 @@ msgstr ""
msgid "Don't show emoticons"
msgstr ""
-#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:616
+#: ../../mod/settings.php:821 ../../mod/admin.php:180 ../../mod/admin.php:618
msgid "Normal Account"
msgstr ""
@@ -2009,7 +2009,7 @@ msgstr ""
msgid "This account is a normal personal profile"
msgstr ""
-#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:617
+#: ../../mod/settings.php:825 ../../mod/admin.php:181 ../../mod/admin.php:619
msgid "Soapbox Account"
msgstr ""
@@ -2017,7 +2017,7 @@ msgstr ""
msgid "Automatically approve all connection/friend requests as read-only fans"
msgstr ""
-#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:618
+#: ../../mod/settings.php:829 ../../mod/admin.php:182 ../../mod/admin.php:620
msgid "Community/Celebrity Account"
msgstr ""
@@ -2025,7 +2025,7 @@ msgstr ""
msgid "Automatically approve all connection/friend requests as read-write fans"
msgstr ""
-#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:619
+#: ../../mod/settings.php:833 ../../mod/admin.php:183 ../../mod/admin.php:621
msgid "Automatic Friend Account"
msgstr ""
@@ -2356,7 +2356,7 @@ msgid "Personal Notes"
msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30
-#: ../../addon/facebook/facebook.php:726
+#: ../../addon/facebook/facebook.php:748
#: ../../addon/privacy_image_cache/privacy_image_cache.php:147
#: ../../include/text.php:652
msgid "Save"
@@ -2751,7 +2751,7 @@ msgstr ""
msgid "Your invitation ID: "
msgstr ""
-#: ../../mod/register.php:553 ../../mod/admin.php:401
+#: ../../mod/register.php:553 ../../mod/admin.php:403
msgid "Registration"
msgstr ""
@@ -2783,19 +2783,19 @@ msgid "People Search"
msgstr ""
#: ../../mod/like.php:127 ../../mod/tagger.php:70
-#: ../../addon/facebook/facebook.php:1542
+#: ../../addon/facebook/facebook.php:1564
#: ../../addon/communityhome/communityhome.php:158
#: ../../addon/communityhome/communityhome.php:167
-#: ../../view/theme/diabook/theme.php:403
-#: ../../view/theme/diabook/theme.php:412 ../../include/diaspora.php:1654
+#: ../../view/theme/diabook/theme.php:452
+#: ../../view/theme/diabook/theme.php:461 ../../include/diaspora.php:1654
#: ../../include/conversation.php:48 ../../include/conversation.php:57
#: ../../include/conversation.php:121 ../../include/conversation.php:130
msgid "status"
msgstr ""
-#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1546
+#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568
#: ../../addon/communityhome/communityhome.php:172
-#: ../../view/theme/diabook/theme.php:417 ../../include/diaspora.php:1670
+#: ../../view/theme/diabook/theme.php:466 ../../include/diaspora.php:1670
#: ../../include/conversation.php:65
#, php-format
msgid "%1$s likes %2$s's %3$s"
@@ -2807,8 +2807,8 @@ msgid "%1$s doesn't like %2$s's %3$s"
msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:156
-#: ../../mod/admin.php:679 ../../mod/admin.php:878 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3099
+#: ../../mod/admin.php:681 ../../mod/admin.php:880 ../../mod/display.php:37
+#: ../../mod/display.php:142 ../../include/items.php:3074
msgid "Item not found."
msgstr ""
@@ -3038,19 +3038,19 @@ msgstr ""
msgid "Theme settings updated."
msgstr ""
-#: ../../mod/admin.php:96 ../../mod/admin.php:399
+#: ../../mod/admin.php:96 ../../mod/admin.php:401
msgid "Site"
msgstr ""
-#: ../../mod/admin.php:97 ../../mod/admin.php:634 ../../mod/admin.php:646
+#: ../../mod/admin.php:97 ../../mod/admin.php:636 ../../mod/admin.php:648
msgid "Users"
msgstr ""
-#: ../../mod/admin.php:98 ../../mod/admin.php:728 ../../mod/admin.php:770
+#: ../../mod/admin.php:98 ../../mod/admin.php:730 ../../mod/admin.php:772
msgid "Plugins"
msgstr ""
-#: ../../mod/admin.php:99 ../../mod/admin.php:933 ../../mod/admin.php:969
+#: ../../mod/admin.php:99 ../../mod/admin.php:935 ../../mod/admin.php:971
msgid "Themes"
msgstr ""
@@ -3062,7 +3062,7 @@ msgstr ""
msgid "Software Update"
msgstr ""
-#: ../../mod/admin.php:115 ../../mod/admin.php:1056
+#: ../../mod/admin.php:115 ../../mod/admin.php:1058
msgid "Logs"
msgstr ""
@@ -3070,9 +3070,9 @@ msgstr ""
msgid "User registrations waiting for confirmation"
msgstr ""
-#: ../../mod/admin.php:195 ../../mod/admin.php:398 ../../mod/admin.php:633
-#: ../../mod/admin.php:727 ../../mod/admin.php:769 ../../mod/admin.php:932
-#: ../../mod/admin.php:968 ../../mod/admin.php:1055
+#: ../../mod/admin.php:195 ../../mod/admin.php:400 ../../mod/admin.php:635
+#: ../../mod/admin.php:729 ../../mod/admin.php:771 ../../mod/admin.php:934
+#: ../../mod/admin.php:970 ../../mod/admin.php:1057
msgid "Administration"
msgstr ""
@@ -3096,483 +3096,493 @@ msgstr ""
msgid "Active plugins"
msgstr ""
-#: ../../mod/admin.php:337
+#: ../../mod/admin.php:339
msgid "Site settings updated."
msgstr ""
-#: ../../mod/admin.php:385
+#: ../../mod/admin.php:387
msgid "Closed"
msgstr ""
-#: ../../mod/admin.php:386
+#: ../../mod/admin.php:388
msgid "Requires approval"
msgstr ""
-#: ../../mod/admin.php:387
+#: ../../mod/admin.php:389
msgid "Open"
msgstr ""
-#: ../../mod/admin.php:391
+#: ../../mod/admin.php:393
msgid "No SSL policy, links will track page SSL state"
msgstr ""
-#: ../../mod/admin.php:392
+#: ../../mod/admin.php:394
msgid "Force all links to use SSL"
msgstr ""
-#: ../../mod/admin.php:393
+#: ../../mod/admin.php:395
msgid "Self-signed certificate, use SSL for local links only (discouraged)"
msgstr ""
-#: ../../mod/admin.php:402
+#: ../../mod/admin.php:404
msgid "File upload"
msgstr ""
-#: ../../mod/admin.php:403
+#: ../../mod/admin.php:405
msgid "Policies"
msgstr ""
-#: ../../mod/admin.php:404
+#: ../../mod/admin.php:406
msgid "Advanced"
msgstr ""
-#: ../../mod/admin.php:408 ../../addon/statusnet/statusnet.php:544
+#: ../../mod/admin.php:410 ../../addon/statusnet/statusnet.php:544
msgid "Site name"
msgstr ""
-#: ../../mod/admin.php:409
+#: ../../mod/admin.php:411
msgid "Banner/Logo"
msgstr ""
-#: ../../mod/admin.php:410
+#: ../../mod/admin.php:412
msgid "System language"
msgstr ""
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:413
msgid "System theme"
msgstr ""
-#: ../../mod/admin.php:411
+#: ../../mod/admin.php:413
msgid ""
"Default system theme - may be over-ridden by user profiles - <a href='#' "
"id='cnftheme'>change theme settings</a>"
msgstr ""
-#: ../../mod/admin.php:412
+#: ../../mod/admin.php:414
msgid "SSL link policy"
msgstr ""
-#: ../../mod/admin.php:412
+#: ../../mod/admin.php:414
msgid "Determines whether generated links should be forced to use SSL"
msgstr ""
-#: ../../mod/admin.php:413
+#: ../../mod/admin.php:415
msgid "Maximum image size"
msgstr ""
-#: ../../mod/admin.php:413
+#: ../../mod/admin.php:415
msgid ""
"Maximum size in bytes of uploaded images. Default is 0, which means no "
"limits."
msgstr ""
-#: ../../mod/admin.php:415
+#: ../../mod/admin.php:417
msgid "Register policy"
msgstr ""
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:418
msgid "Register text"
msgstr ""
-#: ../../mod/admin.php:416
+#: ../../mod/admin.php:418
msgid "Will be displayed prominently on the registration page."
msgstr ""
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:419
msgid "Accounts abandoned after x days"
msgstr ""
-#: ../../mod/admin.php:417
+#: ../../mod/admin.php:419
msgid ""
"Will not waste system resources polling external sites for abandonded "
"accounts. Enter 0 for no time limit."
msgstr ""
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:420
msgid "Allowed friend domains"
msgstr ""
-#: ../../mod/admin.php:418
+#: ../../mod/admin.php:420
msgid ""
"Comma separated list of domains which are allowed to establish friendships "
"with this site. Wildcards are accepted. Empty to allow any domains"
msgstr ""
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:421
msgid "Allowed email domains"
msgstr ""
-#: ../../mod/admin.php:419
+#: ../../mod/admin.php:421
msgid ""
"Comma separated list of domains which are allowed in email addresses for "
"registrations to this site. Wildcards are accepted. Empty to allow any "
"domains"
msgstr ""
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:422
msgid "Block public"
msgstr ""
-#: ../../mod/admin.php:420
+#: ../../mod/admin.php:422
msgid ""
"Check to block public access to all otherwise public personal pages on this "
"site unless you are currently logged in."
msgstr ""
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:423
msgid "Force publish"
msgstr ""
-#: ../../mod/admin.php:421
+#: ../../mod/admin.php:423
msgid ""
"Check to force all profiles on this site to be listed in the site directory."
msgstr ""
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:424
msgid "Global directory update URL"
msgstr ""
-#: ../../mod/admin.php:422
+#: ../../mod/admin.php:424
msgid ""
"URL to update the global directory. If this is not set, the global directory "
"is completely unavailable to the application."
msgstr ""
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:426
msgid "Block multiple registrations"
msgstr ""
-#: ../../mod/admin.php:424
+#: ../../mod/admin.php:426
msgid "Disallow users to register additional accounts for use as pages."
msgstr ""
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:427
msgid "OpenID support"
msgstr ""
-#: ../../mod/admin.php:425
+#: ../../mod/admin.php:427
msgid "OpenID support for registration and logins."
msgstr ""
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:428
msgid "Fullname check"
msgstr ""
-#: ../../mod/admin.php:426
+#: ../../mod/admin.php:428
msgid ""
"Force users to register with a space between firstname and lastname in Full "
"name, as an antispam measure"
msgstr ""
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:429
msgid "UTF-8 Regular expressions"
msgstr ""
-#: ../../mod/admin.php:427
+#: ../../mod/admin.php:429
msgid "Use PHP UTF8 regular expressions"
msgstr ""
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:430
msgid "Show Community Page"
msgstr ""
-#: ../../mod/admin.php:428
+#: ../../mod/admin.php:430
msgid ""
"Display a Community page showing all recent public postings on this site."
msgstr ""
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:431
msgid "Enable OStatus support"
msgstr ""
-#: ../../mod/admin.php:429
+#: ../../mod/admin.php:431
msgid ""
"Provide built-in OStatus (identi.ca, status.net, etc.) compatibility. All "
"communications in OStatus are public, so privacy warnings will be "
"occasionally displayed."
msgstr ""
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:432
msgid "Enable Diaspora support"
msgstr ""
-#: ../../mod/admin.php:430
+#: ../../mod/admin.php:432
msgid "Provide built-in Diaspora network compatibility."
msgstr ""
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:433
msgid "Only allow Friendica contacts"
msgstr ""
-#: ../../mod/admin.php:431
+#: ../../mod/admin.php:433
msgid ""
"All contacts must use Friendica protocols. All other built-in communication "
"protocols disabled."
msgstr ""
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:434
msgid "Verify SSL"
msgstr ""
-#: ../../mod/admin.php:432
+#: ../../mod/admin.php:434
msgid ""
"If you wish, you can turn on strict certificate checking. This will mean you "
"cannot connect (at all) to self-signed SSL sites."
msgstr ""
-#: ../../mod/admin.php:433
+#: ../../mod/admin.php:435
msgid "Proxy user"
msgstr ""
-#: ../../mod/admin.php:434
+#: ../../mod/admin.php:436
msgid "Proxy URL"
msgstr ""
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:437
msgid "Network timeout"
msgstr ""
-#: ../../mod/admin.php:435
+#: ../../mod/admin.php:437
msgid "Value is in seconds. Set to 0 for unlimited (not recommended)."
msgstr ""
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:438
msgid "Delivery interval"
msgstr ""
-#: ../../mod/admin.php:436
+#: ../../mod/admin.php:438
msgid ""
"Delay background delivery processes by this many seconds to reduce system "
"load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 "
"for large dedicated servers."
msgstr ""
-#: ../../mod/admin.php:451
+#: ../../mod/admin.php:439
+msgid "Maximum Load Average"
+msgstr ""
+
+#: ../../mod/admin.php:439
+msgid ""
+"Maximum system load before delivery and poll processes are deferred - "
+"default 50."
+msgstr ""
+
+#: ../../mod/admin.php:453
msgid "Update has been marked successful"
msgstr ""
-#: ../../mod/admin.php:461
+#: ../../mod/admin.php:463
#, php-format
msgid "Executing %s failed. Check system logs."
msgstr ""
-#: ../../mod/admin.php:464
+#: ../../mod/admin.php:466
#, php-format
msgid "Update %s was successfully applied."
msgstr ""
-#: ../../mod/admin.php:468
+#: ../../mod/admin.php:470
#, php-format
msgid "Update %s did not return a status. Unknown if it succeeded."
msgstr ""
-#: ../../mod/admin.php:471
+#: ../../mod/admin.php:473
#, php-format
msgid "Update function %s could not be found."
msgstr ""
-#: ../../mod/admin.php:486
+#: ../../mod/admin.php:488
msgid "No failed updates."
msgstr ""
-#: ../../mod/admin.php:490
+#: ../../mod/admin.php:492
msgid "Failed Updates"
msgstr ""
-#: ../../mod/admin.php:491
+#: ../../mod/admin.php:493
msgid ""
"This does not include updates prior to 1139, which did not return a status."
msgstr ""
-#: ../../mod/admin.php:492
+#: ../../mod/admin.php:494
msgid "Mark success (if update was manually applied)"
msgstr ""
-#: ../../mod/admin.php:493
+#: ../../mod/admin.php:495
msgid "Attempt to execute this update step automatically"
msgstr ""
-#: ../../mod/admin.php:518
+#: ../../mod/admin.php:520
#, php-format
msgid "%s user blocked/unblocked"
msgid_plural "%s users blocked/unblocked"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:525
+#: ../../mod/admin.php:527
#, php-format
msgid "%s user deleted"
msgid_plural "%s users deleted"
msgstr[0] ""
msgstr[1] ""
-#: ../../mod/admin.php:564
+#: ../../mod/admin.php:566
#, php-format
msgid "User '%s' deleted"
msgstr ""
-#: ../../mod/admin.php:572
+#: ../../mod/admin.php:574
#, php-format
msgid "User '%s' unblocked"
msgstr ""
-#: ../../mod/admin.php:572
+#: ../../mod/admin.php:574
#, php-format
msgid "User '%s' blocked"
msgstr ""
-#: ../../mod/admin.php:636
+#: ../../mod/admin.php:638
msgid "select all"
msgstr ""
-#: ../../mod/admin.php:637
+#: ../../mod/admin.php:639
msgid "User registrations waiting for confirm"
msgstr ""
-#: ../../mod/admin.php:638
+#: ../../mod/admin.php:640
msgid "Request date"
msgstr ""
-#: ../../mod/admin.php:638 ../../mod/admin.php:647
+#: ../../mod/admin.php:640 ../../mod/admin.php:649
#: ../../include/contact_selectors.php:79
msgid "Email"
msgstr ""
-#: ../../mod/admin.php:639
+#: ../../mod/admin.php:641
msgid "No registrations."
msgstr ""
-#: ../../mod/admin.php:641
+#: ../../mod/admin.php:643
msgid "Deny"
msgstr ""
-#: ../../mod/admin.php:647
+#: ../../mod/admin.php:649
msgid "Register date"
msgstr ""
-#: ../../mod/admin.php:647
+#: ../../mod/admin.php:649
msgid "Last login"
msgstr ""
-#: ../../mod/admin.php:647
+#: ../../mod/admin.php:649
msgid "Last item"
msgstr ""
-#: ../../mod/admin.php:647
+#: ../../mod/admin.php:649
msgid "Account"
msgstr ""
-#: ../../mod/admin.php:649
+#: ../../mod/admin.php:651
msgid ""
"Selected users will be deleted!\\n\\nEverything these users had posted on "
"this site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:650
+#: ../../mod/admin.php:652
msgid ""
"The user {0} will be deleted!\\n\\nEverything this user has posted on this "
"site will be permanently deleted!\\n\\nAre you sure?"
msgstr ""
-#: ../../mod/admin.php:691
+#: ../../mod/admin.php:693
#, php-format
msgid "Plugin %s disabled."
msgstr ""
-#: ../../mod/admin.php:695
+#: ../../mod/admin.php:697
#, php-format
msgid "Plugin %s enabled."
msgstr ""
-#: ../../mod/admin.php:705 ../../mod/admin.php:903
+#: ../../mod/admin.php:707 ../../mod/admin.php:905
msgid "Disable"
msgstr ""
-#: ../../mod/admin.php:707 ../../mod/admin.php:905
+#: ../../mod/admin.php:709 ../../mod/admin.php:907
msgid "Enable"
msgstr ""
-#: ../../mod/admin.php:729 ../../mod/admin.php:934
+#: ../../mod/admin.php:731 ../../mod/admin.php:936
msgid "Toggle"
msgstr ""
-#: ../../mod/admin.php:737 ../../mod/admin.php:944
+#: ../../mod/admin.php:739 ../../mod/admin.php:946
msgid "Author: "
msgstr ""
-#: ../../mod/admin.php:738 ../../mod/admin.php:945
+#: ../../mod/admin.php:740 ../../mod/admin.php:947
msgid "Maintainer: "
msgstr ""
-#: ../../mod/admin.php:867
+#: ../../mod/admin.php:869
msgid "No themes found."
msgstr ""
-#: ../../mod/admin.php:926
+#: ../../mod/admin.php:928
msgid "Screenshot"
msgstr ""
-#: ../../mod/admin.php:974
+#: ../../mod/admin.php:976
msgid "[Experimental]"
msgstr ""
-#: ../../mod/admin.php:975
+#: ../../mod/admin.php:977
msgid "[Unsupported]"
msgstr ""
-#: ../../mod/admin.php:1002
+#: ../../mod/admin.php:1004
msgid "Log settings updated."
msgstr ""
-#: ../../mod/admin.php:1058
+#: ../../mod/admin.php:1060
msgid "Clear"
msgstr ""
-#: ../../mod/admin.php:1064
+#: ../../mod/admin.php:1066
msgid "Debugging"
msgstr ""
-#: ../../mod/admin.php:1065
+#: ../../mod/admin.php:1067
msgid "Log file"
msgstr ""
-#: ../../mod/admin.php:1065
+#: ../../mod/admin.php:1067
msgid ""
"Must be writable by web server. Relative to your Friendica top-level "
"directory."
msgstr ""
-#: ../../mod/admin.php:1066
+#: ../../mod/admin.php:1068
msgid "Log level"
msgstr ""
-#: ../../mod/admin.php:1116
+#: ../../mod/admin.php:1118 ../../view/theme/diabook/theme.php:599
msgid "Close"
msgstr ""
-#: ../../mod/admin.php:1122
+#: ../../mod/admin.php:1124
msgid "FTP Host"
msgstr ""
-#: ../../mod/admin.php:1123
+#: ../../mod/admin.php:1125
msgid "FTP Path"
msgstr ""
-#: ../../mod/admin.php:1124
+#: ../../mod/admin.php:1126
msgid "FTP User"
msgstr ""
-#: ../../mod/admin.php:1125
+#: ../../mod/admin.php:1127
msgid "FTP Password"
msgstr ""
@@ -3696,12 +3706,12 @@ msgstr ""
msgid "following"
msgstr ""
-#: ../../mod/common.php:34
+#: ../../mod/common.php:42
msgid "Common Friends"
msgstr ""
-#: ../../mod/common.php:42
-msgid "No friends in common."
+#: ../../mod/common.php:78
+msgid "No contacts in common."
msgstr ""
#: ../../mod/display.php:135
@@ -4042,7 +4052,7 @@ msgstr ""
msgid "No entries."
msgstr ""
-#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:464
+#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:513
#: ../../include/contact_widgets.php:34
msgid "Friend Suggestions"
msgstr ""
@@ -4057,7 +4067,7 @@ msgstr ""
msgid "Ignore/Hide"
msgstr ""
-#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:462
+#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:511
msgid "Global Directory"
msgstr ""
@@ -4248,71 +4258,83 @@ msgstr ""
msgid "%1$s has joined %2$s"
msgstr ""
-#: ../../addon/facebook/facebook.php:491
+#: ../../addon/facebook/facebook.php:501
msgid "Facebook disabled"
msgstr ""
-#: ../../addon/facebook/facebook.php:496
+#: ../../addon/facebook/facebook.php:506
msgid "Updating contacts"
msgstr ""
-#: ../../addon/facebook/facebook.php:516
+#: ../../addon/facebook/facebook.php:529
msgid "Facebook API key is missing."
msgstr ""
-#: ../../addon/facebook/facebook.php:523
+#: ../../addon/facebook/facebook.php:536
msgid "Facebook Connect"
msgstr ""
-#: ../../addon/facebook/facebook.php:529
+#: ../../addon/facebook/facebook.php:542
msgid "Install Facebook connector for this account."
msgstr ""
-#: ../../addon/facebook/facebook.php:536
+#: ../../addon/facebook/facebook.php:549
msgid "Remove Facebook connector"
msgstr ""
-#: ../../addon/facebook/facebook.php:541
+#: ../../addon/facebook/facebook.php:554
msgid ""
"Re-authenticate [This is necessary whenever your Facebook password is "
"changed.]"
msgstr ""
-#: ../../addon/facebook/facebook.php:548
+#: ../../addon/facebook/facebook.php:561
msgid "Post to Facebook by default"
msgstr ""
-#: ../../addon/facebook/facebook.php:552
+#: ../../addon/facebook/facebook.php:567
+msgid ""
+"Facebook friend linking has been disabled on this site. The following "
+"settings will have no effect."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:571
+msgid ""
+"Facebook friend linking has been disabled on this site. If you disable it, "
+"you will be unable to re-enable it."
+msgstr ""
+
+#: ../../addon/facebook/facebook.php:574
msgid "Link all your Facebook friends and conversations on this website"
msgstr ""
-#: ../../addon/facebook/facebook.php:554
+#: ../../addon/facebook/facebook.php:576
msgid ""
"Facebook conversations consist of your <em>profile wall</em> and your friend "
"<em>stream</em>."
msgstr ""
-#: ../../addon/facebook/facebook.php:555
+#: ../../addon/facebook/facebook.php:577
msgid "On this website, your Facebook friend stream is only visible to you."
msgstr ""
-#: ../../addon/facebook/facebook.php:556
+#: ../../addon/facebook/facebook.php:578
msgid ""
"The following settings determine the privacy of your Facebook profile wall "
"on this website."
msgstr ""
-#: ../../addon/facebook/facebook.php:560
+#: ../../addon/facebook/facebook.php:582
msgid ""
"On this website your Facebook profile wall conversations will only be "
"visible to you"
msgstr ""
-#: ../../addon/facebook/facebook.php:565
+#: ../../addon/facebook/facebook.php:587
msgid "Do not import your Facebook profile wall conversations"
msgstr ""
-#: ../../addon/facebook/facebook.php:567
+#: ../../addon/facebook/facebook.php:589
msgid ""
"If you choose to link conversations and leave both of these boxes unchecked, "
"your Facebook profile wall will be merged with your profile wall on this "
@@ -4320,120 +4342,120 @@ msgid ""
"who may see the conversations."
msgstr ""
-#: ../../addon/facebook/facebook.php:572
+#: ../../addon/facebook/facebook.php:594
msgid "Comma separated applications to ignore"
msgstr ""
-#: ../../addon/facebook/facebook.php:656
+#: ../../addon/facebook/facebook.php:678
msgid "Problems with Facebook Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:684
+#: ../../addon/facebook/facebook.php:706
#: ../../include/contact_selectors.php:81
msgid "Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:685
+#: ../../addon/facebook/facebook.php:707
msgid "Facebook Connector Settings"
msgstr ""
-#: ../../addon/facebook/facebook.php:700
+#: ../../addon/facebook/facebook.php:722
msgid "Facebook API Key"
msgstr ""
-#: ../../addon/facebook/facebook.php:710
+#: ../../addon/facebook/facebook.php:732
msgid ""
"Error: it appears that you have specified the App-ID and -Secret in your ."
"htconfig.php file. As long as they are specified there, they cannot be set "
"using this form.<br><br>"
msgstr ""
-#: ../../addon/facebook/facebook.php:715
+#: ../../addon/facebook/facebook.php:737
msgid ""
"Error: the given API Key seems to be incorrect (the application access token "
"could not be retrieved)."
msgstr ""
-#: ../../addon/facebook/facebook.php:717
+#: ../../addon/facebook/facebook.php:739
msgid "The given API Key seems to work correctly."
msgstr ""
-#: ../../addon/facebook/facebook.php:719
+#: ../../addon/facebook/facebook.php:741
msgid ""
"The correctness of the API Key could not be detected. Somthing strange's "
"going on."
msgstr ""
-#: ../../addon/facebook/facebook.php:722
+#: ../../addon/facebook/facebook.php:744
msgid "App-ID / API-Key"
msgstr ""
-#: ../../addon/facebook/facebook.php:723
+#: ../../addon/facebook/facebook.php:745
msgid "Application secret"
msgstr ""
-#: ../../addon/facebook/facebook.php:724
+#: ../../addon/facebook/facebook.php:746
#, php-format
msgid "Polling Interval in minutes (minimum %1$s minutes)"
msgstr ""
-#: ../../addon/facebook/facebook.php:725
+#: ../../addon/facebook/facebook.php:747
msgid ""
"Synchronize comments (no comments on Facebook are missed, at the cost of "
"increased system load)"
msgstr ""
-#: ../../addon/facebook/facebook.php:729
+#: ../../addon/facebook/facebook.php:751
msgid "Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:733
+#: ../../addon/facebook/facebook.php:755
msgid "Real-Time Updates are activated."
msgstr ""
-#: ../../addon/facebook/facebook.php:734
+#: ../../addon/facebook/facebook.php:756
msgid "Deactivate Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:736
+#: ../../addon/facebook/facebook.php:758
msgid "Real-Time Updates not activated."
msgstr ""
-#: ../../addon/facebook/facebook.php:736
+#: ../../addon/facebook/facebook.php:758
msgid "Activate Real-Time Updates"
msgstr ""
-#: ../../addon/facebook/facebook.php:755
+#: ../../addon/facebook/facebook.php:777
msgid "The new values have been saved."
msgstr ""
-#: ../../addon/facebook/facebook.php:779
+#: ../../addon/facebook/facebook.php:801
msgid "Post to Facebook"
msgstr ""
-#: ../../addon/facebook/facebook.php:877
+#: ../../addon/facebook/facebook.php:899
msgid ""
"Post to Facebook cancelled because of multi-network access permission "
"conflict."
msgstr ""
-#: ../../addon/facebook/facebook.php:1097
+#: ../../addon/facebook/facebook.php:1119
msgid "View on Friendica"
msgstr ""
-#: ../../addon/facebook/facebook.php:1130
+#: ../../addon/facebook/facebook.php:1152
msgid "Facebook post failed. Queued for retry."
msgstr ""
-#: ../../addon/facebook/facebook.php:1170
+#: ../../addon/facebook/facebook.php:1192
msgid "Your Facebook connection became invalid. Please Re-authenticate."
msgstr ""
-#: ../../addon/facebook/facebook.php:1171
+#: ../../addon/facebook/facebook.php:1193
msgid "Facebook connection became invalid"
msgstr ""
-#: ../../addon/facebook/facebook.php:1172
+#: ../../addon/facebook/facebook.php:1194
#, php-format
msgid ""
"Hi %1$s,\n"
@@ -4585,7 +4607,8 @@ msgid "Forums"
msgstr ""
#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
-#: ../../include/conversation.php:466 ../../boot.php:507
+#: ../../include/contact_widgets.php:187 ../../include/conversation.php:466
+#: ../../boot.php:507
msgid "show more"
msgstr ""
@@ -4629,7 +4652,7 @@ msgid "Latest likes"
msgstr ""
#: ../../addon/communityhome/communityhome.php:155
-#: ../../view/theme/diabook/theme.php:400 ../../include/text.php:1302
+#: ../../view/theme/diabook/theme.php:449 ../../include/text.php:1303
#: ../../include/conversation.php:45 ../../include/conversation.php:118
msgid "event"
msgstr ""
@@ -5524,22 +5547,26 @@ msgstr ""
msgid "Post to Posterous by default"
msgstr ""
-#: ../../view/theme/cleanzero/config.php:73
-#: ../../view/theme/diabook/config.php:93
+#: ../../view/theme/cleanzero/config.php:82
+#: ../../view/theme/diabook/config.php:97
#: ../../view/theme/quattro/config.php:54 ../../view/theme/dispy/config.php:72
msgid "Theme settings"
msgstr ""
-#: ../../view/theme/cleanzero/config.php:74
+#: ../../view/theme/cleanzero/config.php:83
msgid "Set resize level for images in posts and comments (width and height)"
msgstr ""
-#: ../../view/theme/cleanzero/config.php:75
-#: ../../view/theme/diabook/config.php:94 ../../view/theme/dispy/config.php:73
+#: ../../view/theme/cleanzero/config.php:84
+#: ../../view/theme/diabook/config.php:98 ../../view/theme/dispy/config.php:73
msgid "Set font-size for posts and comments"
msgstr ""
-#: ../../view/theme/cleanzero/config.php:76
+#: ../../view/theme/cleanzero/config.php:85
+msgid "Set theme width"
+msgstr ""
+
+#: ../../view/theme/cleanzero/config.php:86
#: ../../view/theme/quattro/config.php:56
msgid "Color scheme"
msgstr ""
@@ -5574,59 +5601,72 @@ msgid "Your personal photos"
msgstr ""
#: ../../view/theme/diabook/theme.php:72
-#: ../../view/theme/diabook/theme.php:481
+#: ../../view/theme/diabook/theme.php:530
msgid "Community Pages"
msgstr ""
-#: ../../view/theme/diabook/theme.php:328
+#: ../../view/theme/diabook/theme.php:377
msgid "Community Profiles"
msgstr ""
-#: ../../view/theme/diabook/theme.php:349
+#: ../../view/theme/diabook/theme.php:398
msgid "Last users"
msgstr ""
-#: ../../view/theme/diabook/theme.php:378
+#: ../../view/theme/diabook/theme.php:427
msgid "Last likes"
msgstr ""
-#: ../../view/theme/diabook/theme.php:423
+#: ../../view/theme/diabook/theme.php:472
msgid "Last photos"
msgstr ""
-#: ../../view/theme/diabook/theme.php:460
+#: ../../view/theme/diabook/theme.php:509
msgid "Find Friends"
msgstr ""
-#: ../../view/theme/diabook/theme.php:461
+#: ../../view/theme/diabook/theme.php:510
msgid "Local Directory"
msgstr ""
-#: ../../view/theme/diabook/theme.php:463 ../../include/contact_widgets.php:35
+#: ../../view/theme/diabook/theme.php:512 ../../include/contact_widgets.php:35
msgid "Similar Interests"
msgstr ""
-#: ../../view/theme/diabook/theme.php:465 ../../include/contact_widgets.php:37
+#: ../../view/theme/diabook/theme.php:514 ../../include/contact_widgets.php:37
msgid "Invite Friends"
msgstr ""
-#: ../../view/theme/diabook/theme.php:515
+#: ../../view/theme/diabook/theme.php:565
+msgid "Earth View"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:573
msgid "Help or @NewHere ?"
msgstr ""
-#: ../../view/theme/diabook/theme.php:522
+#: ../../view/theme/diabook/theme.php:580
msgid "Connect Services"
msgstr ""
-#: ../../view/theme/diabook/config.php:95 ../../view/theme/dispy/config.php:74
+#: ../../view/theme/diabook/theme.php:587
+msgid "Last Tweets"
+msgstr ""
+
+#: ../../view/theme/diabook/theme.php:591
+#: ../../view/theme/diabook/config.php:102
+msgid "Set twitter search term"
+msgstr ""
+
+#: ../../view/theme/diabook/config.php:99 ../../view/theme/dispy/config.php:74
msgid "Set line-height for posts and comments"
msgstr ""
-#: ../../view/theme/diabook/config.php:96
+#: ../../view/theme/diabook/config.php:100
msgid "Set resolution for middle column"
msgstr ""
-#: ../../view/theme/diabook/config.php:97
+#: ../../view/theme/diabook/config.php:101
msgid "Set color scheme"
msgstr ""
@@ -6035,11 +6075,11 @@ msgstr ""
msgid "Finishes:"
msgstr ""
-#: ../../include/delivery.php:434 ../../include/notifier.php:652
+#: ../../include/delivery.php:445 ../../include/notifier.php:652
msgid "(no subject)"
msgstr ""
-#: ../../include/delivery.php:441 ../../include/enotify.php:23
+#: ../../include/delivery.php:452 ../../include/enotify.php:23
#: ../../include/notifier.php:659
msgid "noreply"
msgstr ""
@@ -6155,47 +6195,47 @@ msgstr ""
msgid "bytes"
msgstr ""
-#: ../../include/text.php:936
-msgid "Categories:"
-msgstr ""
-
-#: ../../include/text.php:948
+#: ../../include/text.php:934 ../../include/text.php:949
msgid "remove"
msgstr ""
-#: ../../include/text.php:948
+#: ../../include/text.php:934 ../../include/text.php:949
msgid "[remove]"
msgstr ""
-#: ../../include/text.php:951
+#: ../../include/text.php:937
+msgid "Categories:"
+msgstr ""
+
+#: ../../include/text.php:952
msgid "Filed under:"
msgstr ""
-#: ../../include/text.php:967 ../../include/text.php:979
+#: ../../include/text.php:968 ../../include/text.php:980
msgid "Click to open/close"
msgstr ""
-#: ../../include/text.php:1084
+#: ../../include/text.php:1085
msgid "default"
msgstr ""
-#: ../../include/text.php:1096
+#: ../../include/text.php:1097
msgid "Select an alternate language"
msgstr ""
-#: ../../include/text.php:1306
+#: ../../include/text.php:1307
msgid "activity"
msgstr ""
-#: ../../include/text.php:1308
+#: ../../include/text.php:1309
msgid "comment"
msgstr ""
-#: ../../include/text.php:1309
+#: ../../include/text.php:1310
msgid "post"
msgstr ""
-#: ../../include/text.php:1464
+#: ../../include/text.php:1465
msgid "Item filed"
msgstr ""
@@ -6426,13 +6466,6 @@ msgstr ""
msgid "Categories"
msgstr ""
-#: ../../include/contact_widgets.php:183
-#, php-format
-msgid "%d friend in common"
-msgid_plural "%d friends in common"
-msgstr[0] ""
-msgstr[1] ""
-
#: ../../include/auth.php:29
msgid "Logged out."
msgstr ""