Merge remote branch 'upstream/master'
This commit is contained in:
commit
e9aeafbe13
4 changed files with 63 additions and 49 deletions
2
boot.php
2
boot.php
|
@ -9,7 +9,7 @@ require_once('include/nav.php');
|
|||
require_once('include/cache.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1341' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1342' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1143 );
|
||||
|
||||
|
|
|
@ -209,7 +209,7 @@ function contact_photo_menu($contact) {
|
|||
);
|
||||
|
||||
|
||||
$args = array('contact' => $contact, 'menu' => $menu);
|
||||
$args = array('contact' => $contact, 'menu' => &$menu);
|
||||
|
||||
call_hooks('contact_photo_menu', $args);
|
||||
|
||||
|
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1341\n"
|
||||
"Project-Id-Version: 3.0.1342\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-05-13 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-05-14 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"
|
||||
|
@ -158,7 +158,7 @@ msgstr ""
|
|||
#: ../../addon/irc/irc.php:55 ../../addon/blogger/blogger.php:102
|
||||
#: ../../addon/posterous/posterous.php:103
|
||||
#: ../../view/theme/cleanzero/config.php:80
|
||||
#: ../../view/theme/diabook/theme.php:753
|
||||
#: ../../view/theme/diabook/theme.php:752
|
||||
#: ../../view/theme/diabook/config.php:190
|
||||
#: ../../view/theme/quattro/config.php:52 ../../view/theme/dispy/config.php:70
|
||||
#: ../../include/conversation.php:558
|
||||
|
@ -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:594
|
||||
#: ../../view/theme/diabook/theme.php:593
|
||||
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:595
|
||||
#: ../../view/theme/diabook/theme.php:594
|
||||
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:566 ../../include/text.php:1305
|
||||
#: ../../view/theme/diabook/theme.php:565 ../../include/text.php:1305
|
||||
#: ../../include/diaspora.php:1654 ../../include/conversation.php:53
|
||||
#: ../../include/conversation.php:126
|
||||
msgid "photo"
|
||||
|
@ -1775,8 +1775,8 @@ msgid "Remove account"
|
|||
msgstr ""
|
||||
|
||||
#: ../../mod/settings.php:88 ../../mod/admin.php:735 ../../mod/admin.php:940
|
||||
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:639
|
||||
#: ../../view/theme/diabook/theme.php:769 ../../include/nav.php:137
|
||||
#: ../../addon/mathjax/mathjax.php:36 ../../view/theme/diabook/theme.php:638
|
||||
#: ../../view/theme/diabook/theme.php:768 ../../include/nav.php:137
|
||||
msgid "Settings"
|
||||
msgstr ""
|
||||
|
||||
|
@ -2787,8 +2787,8 @@ msgstr ""
|
|||
#: ../../addon/facebook/facebook.php:1564
|
||||
#: ../../addon/communityhome/communityhome.php:158
|
||||
#: ../../addon/communityhome/communityhome.php:167
|
||||
#: ../../view/theme/diabook/theme.php:561
|
||||
#: ../../view/theme/diabook/theme.php:570 ../../include/diaspora.php:1654
|
||||
#: ../../view/theme/diabook/theme.php:560
|
||||
#: ../../view/theme/diabook/theme.php:569 ../../include/diaspora.php:1654
|
||||
#: ../../include/conversation.php:48 ../../include/conversation.php:57
|
||||
#: ../../include/conversation.php:121 ../../include/conversation.php:130
|
||||
msgid "status"
|
||||
|
@ -2796,7 +2796,7 @@ msgstr ""
|
|||
|
||||
#: ../../mod/like.php:144 ../../addon/facebook/facebook.php:1568
|
||||
#: ../../addon/communityhome/communityhome.php:172
|
||||
#: ../../view/theme/diabook/theme.php:575 ../../include/diaspora.php:1670
|
||||
#: ../../view/theme/diabook/theme.php:574 ../../include/diaspora.php:1670
|
||||
#: ../../include/conversation.php:65
|
||||
#, php-format
|
||||
msgid "%1$s likes %2$s's %3$s"
|
||||
|
@ -4073,7 +4073,7 @@ msgstr ""
|
|||
msgid "No entries."
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:622
|
||||
#: ../../mod/suggest.php:38 ../../view/theme/diabook/theme.php:621
|
||||
#: ../../include/contact_widgets.php:34
|
||||
msgid "Friend Suggestions"
|
||||
msgstr ""
|
||||
|
@ -4088,7 +4088,7 @@ msgstr ""
|
|||
msgid "Ignore/Hide"
|
||||
msgstr ""
|
||||
|
||||
#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:620
|
||||
#: ../../mod/directory.php:47 ../../view/theme/diabook/theme.php:619
|
||||
msgid "Global Directory"
|
||||
msgstr ""
|
||||
|
||||
|
@ -4673,7 +4673,7 @@ msgid "Latest likes"
|
|||
msgstr ""
|
||||
|
||||
#: ../../addon/communityhome/communityhome.php:155
|
||||
#: ../../view/theme/diabook/theme.php:558 ../../include/text.php:1303
|
||||
#: ../../view/theme/diabook/theme.php:557 ../../include/text.php:1303
|
||||
#: ../../include/conversation.php:45 ../../include/conversation.php:118
|
||||
msgid "event"
|
||||
msgstr ""
|
||||
|
@ -5631,96 +5631,97 @@ msgid "Your personal photos"
|
|||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:129
|
||||
#: ../../view/theme/diabook/theme.php:639
|
||||
#: ../../view/theme/diabook/theme.php:743
|
||||
#: ../../view/theme/diabook/theme.php:638
|
||||
#: ../../view/theme/diabook/theme.php:742
|
||||
#: ../../view/theme/diabook/config.php:201
|
||||
msgid "Community Pages"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:486
|
||||
#: ../../view/theme/diabook/theme.php:745
|
||||
#: ../../view/theme/diabook/theme.php:485
|
||||
#: ../../view/theme/diabook/theme.php:744
|
||||
#: ../../view/theme/diabook/config.php:203
|
||||
msgid "Community Profiles"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:507
|
||||
#: ../../view/theme/diabook/theme.php:750
|
||||
#: ../../view/theme/diabook/theme.php:506
|
||||
#: ../../view/theme/diabook/theme.php:749
|
||||
#: ../../view/theme/diabook/config.php:208
|
||||
msgid "Last users"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:536
|
||||
#: ../../view/theme/diabook/theme.php:752
|
||||
#: ../../view/theme/diabook/theme.php:535
|
||||
#: ../../view/theme/diabook/theme.php:751
|
||||
#: ../../view/theme/diabook/config.php:210
|
||||
msgid "Last likes"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:581
|
||||
#: ../../view/theme/diabook/theme.php:751
|
||||
#: ../../view/theme/diabook/theme.php:580
|
||||
#: ../../view/theme/diabook/theme.php:750
|
||||
#: ../../view/theme/diabook/config.php:209
|
||||
msgid "Last photos"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:618
|
||||
#: ../../view/theme/diabook/theme.php:748
|
||||
#: ../../view/theme/diabook/theme.php:617
|
||||
#: ../../view/theme/diabook/theme.php:747
|
||||
#: ../../view/theme/diabook/config.php:206
|
||||
msgid "Find Friends"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:619
|
||||
#: ../../view/theme/diabook/theme.php:618
|
||||
msgid "Local Directory"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:621 ../../include/contact_widgets.php:35
|
||||
#: ../../view/theme/diabook/theme.php:620 ../../include/contact_widgets.php:35
|
||||
msgid "Similar Interests"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:623 ../../include/contact_widgets.php:37
|
||||
#: ../../view/theme/diabook/theme.php:622 ../../include/contact_widgets.php:37
|
||||
msgid "Invite Friends"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:674
|
||||
#: ../../view/theme/diabook/theme.php:744
|
||||
#: ../../view/theme/diabook/theme.php:673
|
||||
#: ../../view/theme/diabook/theme.php:743
|
||||
#: ../../view/theme/diabook/config.php:202
|
||||
msgid "Earth Layers"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:679
|
||||
#: ../../view/theme/diabook/theme.php:678
|
||||
msgid "Set zoomfactor for Earth Layers"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:680
|
||||
#: ../../view/theme/diabook/theme.php:679
|
||||
#: ../../view/theme/diabook/config.php:199
|
||||
msgid "Set longitude (X) for Earth Layers"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:681
|
||||
#: ../../view/theme/diabook/theme.php:680
|
||||
#: ../../view/theme/diabook/config.php:200
|
||||
msgid "Set latitude (Y) for Earth Layers"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:694
|
||||
#: ../../view/theme/diabook/theme.php:746
|
||||
#: ../../view/theme/diabook/theme.php:693
|
||||
#: ../../view/theme/diabook/theme.php:745
|
||||
#: ../../view/theme/diabook/config.php:204
|
||||
msgid "Help or @NewHere ?"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:701
|
||||
#: ../../view/theme/diabook/theme.php:747
|
||||
#: ../../view/theme/diabook/theme.php:700
|
||||
#: ../../view/theme/diabook/theme.php:746
|
||||
#: ../../view/theme/diabook/config.php:205
|
||||
msgid "Connect Services"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:708
|
||||
#: ../../view/theme/diabook/theme.php:749
|
||||
#: ../../view/theme/diabook/theme.php:707
|
||||
#: ../../view/theme/diabook/theme.php:748
|
||||
msgid "Last Tweets"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:711
|
||||
#: ../../view/theme/diabook/theme.php:710
|
||||
#: ../../view/theme/diabook/config.php:197
|
||||
msgid "Set twitter search term"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:730
|
||||
#: ../../view/theme/diabook/theme.php:731
|
||||
#: ../../view/theme/diabook/theme.php:732
|
||||
#: ../../view/theme/diabook/theme.php:733
|
||||
|
@ -5729,11 +5730,11 @@ msgstr ""
|
|||
#: ../../view/theme/diabook/theme.php:736
|
||||
#: ../../view/theme/diabook/theme.php:737
|
||||
#: ../../view/theme/diabook/theme.php:738
|
||||
#: ../../view/theme/diabook/theme.php:739
|
||||
#: ../../view/theme/diabook/theme.php:740 ../../include/acl_selectors.php:288
|
||||
#: ../../view/theme/diabook/theme.php:739 ../../include/acl_selectors.php:288
|
||||
msgid "don't show"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:730
|
||||
#: ../../view/theme/diabook/theme.php:731
|
||||
#: ../../view/theme/diabook/theme.php:732
|
||||
#: ../../view/theme/diabook/theme.php:733
|
||||
|
@ -5742,12 +5743,11 @@ msgstr ""
|
|||
#: ../../view/theme/diabook/theme.php:736
|
||||
#: ../../view/theme/diabook/theme.php:737
|
||||
#: ../../view/theme/diabook/theme.php:738
|
||||
#: ../../view/theme/diabook/theme.php:739
|
||||
#: ../../view/theme/diabook/theme.php:740 ../../include/acl_selectors.php:287
|
||||
#: ../../view/theme/diabook/theme.php:739 ../../include/acl_selectors.php:287
|
||||
msgid "show"
|
||||
msgstr ""
|
||||
|
||||
#: ../../view/theme/diabook/theme.php:741
|
||||
#: ../../view/theme/diabook/theme.php:740
|
||||
msgid "Show/hide boxes at right-hand column:"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
@ -44,4 +44,18 @@ nav #site-location {
|
|||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
box-shadow: 3px 3px 10px 0 #000000;
|
||||
}
|
||||
}
|
||||
|
||||
#sidebar-page-list img {
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
box-shadow: 3px 3px 10px -2px #000000;
|
||||
}
|
||||
|
||||
.contact-entry-photo img, .profile-match-photo img, #photo-photo img, .directory-photo-img {
|
||||
border-radius: 3px;
|
||||
-moz-border-radius: 3px;
|
||||
box-shadow: 3px 3px 10px 0 #000000;
|
||||
}
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue