MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master:
  rev update
  Frost-mobile: media query in css for tablets
  expire issue
  rev update
This commit is contained in:
Simon L'nu 2012-08-06 13:18:00 -04:00
commit 76e1e07571
4 changed files with 4053 additions and 4038 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -11,7 +11,7 @@ require_once('include/cache.php');
require_once('library/Mobile_Detect/Mobile_Detect.php'); require_once('library/Mobile_Detect/Mobile_Detect.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1424' ); define ( 'FRIENDICA_VERSION', '3.0.1426' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1154 ); define ( 'DB_UPDATE_VERSION', 1154 );

3
include/items.php
View file

@ -3699,8 +3699,9 @@ function drop_item($id,$interactive = true) {
// check if logged in user is either the author or owner of this item // check if logged in user is either the author or owner of this item
if((local_user() == $item['uid']) || (remote_user() == $item['contact-id'])) { if((local_user() == $item['uid']) || (remote_user() == $item['contact-id']) || (! $interactive)) {
logger('delete item: ' . $item['id'], LOGGER_DEBUG);
// delete the item // delete the item
$r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1", $r = q("UPDATE `item` SET `deleted` = 1, `title` = '', `body` = '', `edited` = '%s', `changed` = '%s' WHERE `id` = %d LIMIT 1",

294
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 3.0.1424\n" "Project-Id-Version: 3.0.1426\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-08-03 10:00-0700\n" "POT-Creation-Date: 2012-08-05 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"
@ -56,7 +56,7 @@ msgstr ""
#: ../../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:510 #: ../../mod/dfrn_confirm.php:53 ../../addon/facebook/facebook.php:510
#: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354 #: ../../addon/facebook/facebook.php:516 ../../addon/dav/layout.fnk.php:354
#: ../../include/items.php:3813 ../../index.php:315 #: ../../include/items.php:3814 ../../index.php:315
msgid "Permission denied." msgid "Permission denied."
msgstr "" msgstr ""
@ -125,7 +125,7 @@ msgstr ""
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107 #: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
#: ../../mod/events.php:439 ../../mod/photos.php:971 ../../mod/photos.php:1042 #: ../../mod/events.php:439 ../../mod/photos.php:971 ../../mod/photos.php:1042
#: ../../mod/photos.php:1285 ../../mod/photos.php:1325 #: ../../mod/photos.php:1285 ../../mod/photos.php:1325
#: ../../mod/photos.php:1365 ../../mod/photos.php:1396 #: ../../mod/photos.php:1366 ../../mod/photos.php:1398
#: ../../mod/install.php:246 ../../mod/install.php:284 #: ../../mod/install.php:246 ../../mod/install.php:284
#: ../../mod/localtime.php:45 ../../mod/poke.php:199 ../../mod/content.php:691 #: ../../mod/localtime.php:45 ../../mod/poke.php:199 ../../mod/content.php:691
#: ../../mod/contacts.php:341 ../../mod/settings.php:537 #: ../../mod/contacts.php:341 ../../mod/settings.php:537
@ -232,7 +232,7 @@ msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131 #: ../../mod/events.php:331 ../../view/theme/diabook/theme.php:131
#: ../../include/nav.php:52 ../../boot.php:1634 #: ../../include/nav.php:52 ../../boot.php:1635
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -288,7 +288,7 @@ msgstr ""
#: ../../mod/events.php:432 ../../mod/directory.php:132 #: ../../mod/events.php:432 ../../mod/directory.php:132
#: ../../include/event.php:40 ../../include/bb2diaspora.php:447 #: ../../include/event.php:40 ../../include/bb2diaspora.php:447
#: ../../boot.php:1186 #: ../../boot.php:1187
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -370,19 +370,19 @@ msgstr ""
msgid "No" msgid "No"
msgstr "" msgstr ""
#: ../../mod/photos.php:46 ../../boot.php:1627 #: ../../mod/photos.php:46 ../../boot.php:1628
msgid "Photo Albums" msgid "Photo Albums"
msgstr "" msgstr ""
#: ../../mod/photos.php:54 ../../mod/photos.php:137 ../../mod/photos.php:952 #: ../../mod/photos.php:54 ../../mod/photos.php:137 ../../mod/photos.php:952
#: ../../mod/photos.php:1034 ../../mod/photos.php:1049 #: ../../mod/photos.php:1034 ../../mod/photos.php:1049
#: ../../mod/photos.php:1474 ../../mod/photos.php:1486 #: ../../mod/photos.php:1477 ../../mod/photos.php:1489
#: ../../addon/communityhome/communityhome.php:110 #: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:598 #: ../../view/theme/diabook/theme.php:598
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1524 #: ../../mod/photos.php:61 ../../mod/photos.php:1059 ../../mod/photos.php:1527
msgid "Upload New Photos" msgid "Upload New Photos"
msgstr "" msgstr ""
@ -499,7 +499,7 @@ msgstr ""
msgid "Edit Album" msgid "Edit Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:1077 ../../mod/photos.php:1507 #: ../../mod/photos.php:1077 ../../mod/photos.php:1510
msgid "View Photo" msgid "View Photo"
msgstr "" msgstr ""
@ -574,48 +574,48 @@ msgstr ""
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
#: ../../mod/photos.php:1305 ../../include/conversation.php:1128 #: ../../mod/photos.php:1305 ../../include/conversation.php:1129
msgid "Share" msgid "Share"
msgstr "" msgstr ""
#: ../../mod/photos.php:1306 ../../mod/editpost.php:112 #: ../../mod/photos.php:1306 ../../mod/editpost.php:112
#: ../../mod/content.php:482 ../../mod/content.php:842 #: ../../mod/content.php:482 ../../mod/content.php:843
#: ../../mod/wallmessage.php:152 ../../mod/message.php:293 #: ../../mod/wallmessage.php:152 ../../mod/message.php:293
#: ../../mod/message.php:479 ../../include/conversation.php:487 #: ../../mod/message.php:479 ../../include/conversation.php:487
#: ../../include/conversation.php:847 ../../include/conversation.php:1147 #: ../../include/conversation.php:848 ../../include/conversation.php:1148
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
#: ../../mod/photos.php:1322 ../../mod/photos.php:1362 #: ../../mod/photos.php:1322 ../../mod/photos.php:1363
#: ../../mod/photos.php:1393 ../../mod/content.php:688 #: ../../mod/photos.php:1395 ../../mod/content.php:688
#: ../../include/conversation.php:693 #: ../../include/conversation.php:693
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
#: ../../mod/photos.php:1324 ../../mod/photos.php:1364 #: ../../mod/photos.php:1324 ../../mod/photos.php:1365
#: ../../mod/photos.php:1395 ../../mod/content.php:690 #: ../../mod/photos.php:1397 ../../mod/content.php:690
#: ../../include/conversation.php:695 ../../boot.php:569 #: ../../include/conversation.php:695 ../../boot.php:570
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
#: ../../mod/photos.php:1326 ../../mod/editpost.php:133 #: ../../mod/photos.php:1326 ../../mod/editpost.php:133
#: ../../mod/content.php:700 ../../include/conversation.php:705 #: ../../mod/content.php:700 ../../include/conversation.php:705
#: ../../include/conversation.php:1165 #: ../../include/conversation.php:1166
msgid "Preview" msgid "Preview"
msgstr "" msgstr ""
#: ../../mod/photos.php:1423 ../../mod/content.php:439 #: ../../mod/photos.php:1426 ../../mod/content.php:439
#: ../../mod/content.php:720 ../../mod/settings.php:600 #: ../../mod/content.php:721 ../../mod/settings.php:600
#: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:668 #: ../../mod/settings.php:689 ../../mod/group.php:168 ../../mod/admin.php:668
#: ../../include/conversation.php:444 ../../include/conversation.php:725 #: ../../include/conversation.php:444 ../../include/conversation.php:726
msgid "Delete" msgid "Delete"
msgstr "" msgstr ""
#: ../../mod/photos.php:1513 #: ../../mod/photos.php:1516
msgid "View Album" msgid "View Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:1522 #: ../../mod/photos.php:1525
msgid "Recent Photos" msgid "Recent Photos"
msgstr "" msgstr ""
@ -673,28 +673,28 @@ msgstr ""
msgid "Edit post" msgid "Edit post"
msgstr "" msgstr ""
#: ../../mod/editpost.php:88 ../../include/conversation.php:1114 #: ../../mod/editpost.php:88 ../../include/conversation.php:1115
msgid "Post to Email" msgid "Post to Email"
msgstr "" msgstr ""
#: ../../mod/editpost.php:103 ../../mod/content.php:707 #: ../../mod/editpost.php:103 ../../mod/content.php:708
#: ../../mod/settings.php:599 ../../include/conversation.php:712 #: ../../mod/settings.php:599 ../../include/conversation.php:713
msgid "Edit" msgid "Edit"
msgstr "" msgstr ""
#: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150 #: ../../mod/editpost.php:104 ../../mod/wallmessage.php:150
#: ../../mod/message.php:291 ../../mod/message.php:476 #: ../../mod/message.php:291 ../../mod/message.php:476
#: ../../include/conversation.php:1129 #: ../../include/conversation.php:1130
msgid "Upload photo" msgid "Upload photo"
msgstr "" msgstr ""
#: ../../mod/editpost.php:105 ../../include/conversation.php:1131 #: ../../mod/editpost.php:105 ../../include/conversation.php:1132
msgid "Attach file" msgid "Attach file"
msgstr "" msgstr ""
#: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151 #: ../../mod/editpost.php:106 ../../mod/wallmessage.php:151
#: ../../mod/message.php:292 ../../mod/message.php:477 #: ../../mod/message.php:292 ../../mod/message.php:477
#: ../../include/conversation.php:1133 #: ../../include/conversation.php:1134
msgid "Insert web link" msgid "Insert web link"
msgstr "" msgstr ""
@ -710,42 +710,38 @@ msgstr ""
msgid "Insert Vorbis [.ogg] audio" msgid "Insert Vorbis [.ogg] audio"
msgstr "" msgstr ""
#: ../../mod/editpost.php:110 ../../include/conversation.php:1139 #: ../../mod/editpost.php:110 ../../include/conversation.php:1140
msgid "Set your location" msgid "Set your location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:111 ../../include/conversation.php:1141 #: ../../mod/editpost.php:111 ../../include/conversation.php:1142
msgid "Clear browser location" msgid "Clear browser location"
msgstr "" msgstr ""
#: ../../mod/editpost.php:113 ../../include/conversation.php:1148 #: ../../mod/editpost.php:113 ../../include/conversation.php:1149
msgid "Permission settings" msgid "Permission settings"
msgstr "" msgstr ""
#: ../../mod/editpost.php:121 ../../include/conversation.php:1157 #: ../../mod/editpost.php:121 ../../include/conversation.php:1158
msgid "CC: email addresses" msgid "CC: email addresses"
msgstr "" msgstr ""
#: ../../mod/editpost.php:122 ../../include/conversation.php:1158 #: ../../mod/editpost.php:122 ../../include/conversation.php:1159
msgid "Public post" msgid "Public post"
msgstr "" msgstr ""
#: ../../mod/editpost.php:125 ../../include/conversation.php:1144 #: ../../mod/editpost.php:125 ../../include/conversation.php:1145
msgid "Set title" msgid "Set title"
msgstr "" msgstr ""
#: ../../mod/editpost.php:127 ../../include/conversation.php:1146 #: ../../mod/editpost.php:127 ../../include/conversation.php:1147
msgid "Categories (comma-separated list)" msgid "Categories (comma-separated list)"
msgstr "" msgstr ""
#: ../../mod/editpost.php:128 ../../include/conversation.php:1160 #: ../../mod/editpost.php:128 ../../include/conversation.php:1161
msgid "Example: bob@example.com, mary@example.com" msgid "Example: bob@example.com, mary@example.com"
msgstr "" msgstr ""
#: ../../mod/editpost.php:135 ../../include/conversation.php:1166
msgid "Friendica mobile web"
msgstr ""
#: ../../mod/dfrn_request.php:93 #: ../../mod/dfrn_request.php:93
msgid "This introduction has already been accepted." msgid "This introduction has already been accepted."
msgstr "" msgstr ""
@ -863,7 +859,7 @@ msgstr ""
msgid "Confirm" msgid "Confirm"
msgstr "" msgstr ""
#: ../../mod/dfrn_request.php:715 ../../include/items.php:3204 #: ../../mod/dfrn_request.php:715 ../../include/items.php:3205
msgid "[Name Withheld]" msgid "[Name Withheld]"
msgstr "" msgstr ""
@ -1255,7 +1251,7 @@ msgid "is interested in:"
msgstr "" msgstr ""
#: ../../mod/match.php:58 ../../mod/suggest.php:59 #: ../../mod/match.php:58 ../../mod/suggest.php:59
#: ../../include/contact_widgets.php:9 ../../boot.php:1130 #: ../../include/contact_widgets.php:9 ../../boot.php:1131
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1283,20 +1279,20 @@ msgstr ""
msgid "Group: " msgid "Group: "
msgstr "" msgstr ""
#: ../../mod/content.php:438 ../../mod/content.php:719 #: ../../mod/content.php:438 ../../mod/content.php:720
#: ../../include/conversation.php:443 ../../include/conversation.php:724 #: ../../include/conversation.php:443 ../../include/conversation.php:725
msgid "Select" msgid "Select"
msgstr "" msgstr ""
#: ../../mod/content.php:455 ../../mod/content.php:812 #: ../../mod/content.php:455 ../../mod/content.php:813
#: ../../mod/content.php:813 ../../include/conversation.php:460 #: ../../mod/content.php:814 ../../include/conversation.php:460
#: ../../include/conversation.php:817 ../../include/conversation.php:818 #: ../../include/conversation.php:818 ../../include/conversation.php:819
#, php-format #, php-format
msgid "View %s's profile @ %s" msgid "View %s's profile @ %s"
msgstr "" msgstr ""
#: ../../mod/content.php:465 ../../mod/content.php:824 #: ../../mod/content.php:465 ../../mod/content.php:825
#: ../../include/conversation.php:470 ../../include/conversation.php:829 #: ../../include/conversation.php:470 ../../include/conversation.php:830
#, php-format #, php-format
msgid "%s from %s" msgid "%s from %s"
msgstr "" msgstr ""
@ -1315,7 +1311,7 @@ msgstr[1] ""
#: ../../mod/content.php:587 ../../addon/page/page.php:76 #: ../../mod/content.php:587 ../../addon/page/page.php:76
#: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119 #: ../../addon/page/page.php:110 ../../addon/showmore/showmore.php:119
#: ../../include/contact_widgets.php:188 ../../include/conversation.php:592 #: ../../include/contact_widgets.php:188 ../../include/conversation.php:592
#: ../../boot.php:570 #: ../../boot.php:571
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -1367,39 +1363,39 @@ msgstr ""
msgid "Video" msgid "Video"
msgstr "" msgstr ""
#: ../../mod/content.php:732 ../../include/conversation.php:737 #: ../../mod/content.php:733 ../../include/conversation.php:738
msgid "add star" msgid "add star"
msgstr "" msgstr ""
#: ../../mod/content.php:733 ../../include/conversation.php:738 #: ../../mod/content.php:734 ../../include/conversation.php:739
msgid "remove star" msgid "remove star"
msgstr "" msgstr ""
#: ../../mod/content.php:734 ../../include/conversation.php:739 #: ../../mod/content.php:735 ../../include/conversation.php:740
msgid "toggle star status" msgid "toggle star status"
msgstr "" msgstr ""
#: ../../mod/content.php:737 ../../include/conversation.php:742 #: ../../mod/content.php:738 ../../include/conversation.php:743
msgid "starred" msgid "starred"
msgstr "" msgstr ""
#: ../../mod/content.php:738 ../../include/conversation.php:743 #: ../../mod/content.php:739 ../../include/conversation.php:744
msgid "add tag" msgid "add tag"
msgstr "" msgstr ""
#: ../../mod/content.php:742 ../../include/conversation.php:747 #: ../../mod/content.php:743 ../../include/conversation.php:748
msgid "save to folder" msgid "save to folder"
msgstr "" msgstr ""
#: ../../mod/content.php:814 ../../include/conversation.php:819 #: ../../mod/content.php:815 ../../include/conversation.php:820
msgid "to" msgid "to"
msgstr "" msgstr ""
#: ../../mod/content.php:815 ../../include/conversation.php:820 #: ../../mod/content.php:816 ../../include/conversation.php:821
msgid "Wall-to-Wall" msgid "Wall-to-Wall"
msgstr "" msgstr ""
#: ../../mod/content.php:816 ../../include/conversation.php:821 #: ../../mod/content.php:817 ../../include/conversation.php:822
msgid "via Wall-To-Wall:" msgid "via Wall-To-Wall:"
msgstr "" msgstr ""
@ -1917,8 +1913,8 @@ msgstr ""
#: ../../addon/facebook/facebook.php:702 #: ../../addon/facebook/facebook.php:702
#: ../../addon/facebook/facebook.php:1200 #: ../../addon/facebook/facebook.php:1200
#: ../../addon/public_server/public_server.php:62 #: ../../addon/public_server/public_server.php:62
#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3213 #: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:3214
#: ../../boot.php:779 #: ../../boot.php:780
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1928,7 +1924,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:912 #: ../../mod/lostpass.php:83 ../../boot.php:913
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -2596,7 +2592,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1641 #: ../../mod/notes.php:44 ../../boot.php:1642
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2639,7 +2635,7 @@ msgstr ""
#: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131 #: ../../mod/wallmessage.php:123 ../../mod/wallmessage.php:131
#: ../../mod/message.php:242 ../../mod/message.php:250 #: ../../mod/message.php:242 ../../mod/message.php:250
#: ../../include/conversation.php:1065 ../../include/conversation.php:1082 #: ../../include/conversation.php:1066 ../../include/conversation.php:1083
msgid "Please enter a link URL:" msgid "Please enter a link URL:"
msgstr "" msgstr ""
@ -2849,7 +2845,7 @@ msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:128
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:84
#: ../../include/nav.php:50 ../../boot.php:1617 #: ../../include/nav.php:50 ../../boot.php:1618
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2953,7 +2949,7 @@ msgstr ""
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:878 #: ../../mod/register.php:269 ../../include/nav.php:81 ../../boot.php:879
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -2996,7 +2992,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130 #: ../../mod/fbrowser.php:25 ../../view/theme/diabook/theme.php:130
#: ../../include/nav.php:51 ../../boot.php:1624 #: ../../include/nav.php:51 ../../boot.php:1625
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -3031,28 +3027,28 @@ msgstr ""
msgid "Wall Photos" msgid "Wall Photos"
msgstr "" msgstr ""
#: ../../mod/item.php:800 #: ../../mod/item.php:803
msgid "System error. Post not saved." msgid "System error. Post not saved."
msgstr "" msgstr ""
#: ../../mod/item.php:825 #: ../../mod/item.php:828
#, php-format #, php-format
msgid "" msgid ""
"This message was sent to you by %s, a member of the Friendica social network." "This message was sent to you by %s, a member of the Friendica social network."
msgstr "" msgstr ""
#: ../../mod/item.php:827 #: ../../mod/item.php:830
#, php-format #, php-format
msgid "You may visit them online at %s" msgid "You may visit them online at %s"
msgstr "" msgstr ""
#: ../../mod/item.php:828 #: ../../mod/item.php:831
msgid "" msgid ""
"Please contact the sender by replying to this post if you do not wish to " "Please contact the sender by replying to this post if you do not wish to "
"receive these messages." "receive these messages."
msgstr "" msgstr ""
#: ../../mod/item.php:830 #: ../../mod/item.php:833
#, php-format #, php-format
msgid "%s posted an update." msgid "%s posted an update."
msgstr "" msgstr ""
@ -3807,7 +3803,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:1043 #: ../../mod/profile.php:21 ../../boot.php:1044
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -4202,28 +4198,28 @@ msgstr ""
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:673 ../../boot.php:1152 #: ../../mod/profiles.php:673 ../../boot.php:1153
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:674 ../../boot.php:1153 #: ../../mod/profiles.php:674 ../../boot.php:1154
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:685 ../../boot.php:1163 #: ../../mod/profiles.php:685 ../../boot.php:1164
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:687 ../../boot.php:1166 #: ../../mod/profiles.php:687 ../../boot.php:1167
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:688 ../../boot.php:1167 #: ../../mod/profiles.php:688 ../../boot.php:1168
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
#: ../../mod/filer.php:29 ../../include/conversation.php:1069 #: ../../mod/filer.php:29 ../../include/conversation.php:1070
#: ../../include/conversation.php:1086 #: ../../include/conversation.php:1087
msgid "Save to Folder:" msgid "Save to Folder:"
msgstr "" msgstr ""
@ -4347,17 +4343,17 @@ msgid "Gender: "
msgstr "" msgstr ""
#: ../../mod/directory.php:134 ../../include/profile_advanced.php:17 #: ../../mod/directory.php:134 ../../include/profile_advanced.php:17
#: ../../boot.php:1188 #: ../../boot.php:1189
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
#: ../../mod/directory.php:136 ../../include/profile_advanced.php:37 #: ../../mod/directory.php:136 ../../include/profile_advanced.php:37
#: ../../boot.php:1191 #: ../../boot.php:1192
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../mod/directory.php:138 ../../include/profile_advanced.php:48 #: ../../mod/directory.php:138 ../../include/profile_advanced.php:48
#: ../../boot.php:1193 #: ../../boot.php:1194
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -5115,7 +5111,7 @@ msgstr ""
#: ../../addon/communityhome/communityhome.php:34 #: ../../addon/communityhome/communityhome.php:34
#: ../../addon/communityhome/twillingham/communityhome.php:28 #: ../../addon/communityhome/twillingham/communityhome.php:28
#: ../../addon/communityhome/twillingham/communityhome.php:34 #: ../../addon/communityhome/twillingham/communityhome.php:34
#: ../../include/nav.php:64 ../../boot.php:899 #: ../../include/nav.php:64 ../../boot.php:900
msgid "Login" msgid "Login"
msgstr "" msgstr ""
@ -7551,7 +7547,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:898 #: ../../include/nav.php:46 ../../boot.php:899
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -7559,7 +7555,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1610 #: ../../include/nav.php:49 ../../boot.php:1611
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -7639,11 +7635,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1146 #: ../../include/nav.php:138 ../../boot.php:1147
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1146 #: ../../include/nav.php:138 ../../boot.php:1147
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -7789,12 +7785,12 @@ msgstr ""
msgid "%1$d %2$s ago" msgid "%1$d %2$s ago"
msgstr "" msgstr ""
#: ../../include/datetime.php:472 ../../include/items.php:1620 #: ../../include/datetime.php:472 ../../include/items.php:1621
#, php-format #, php-format
msgid "%s's birthday" msgid "%s's birthday"
msgstr "" msgstr ""
#: ../../include/datetime.php:473 ../../include/items.php:1621 #: ../../include/datetime.php:473 ../../include/items.php:1622
#, php-format #, php-format
msgid "Happy Birthday %s" msgid "Happy Birthday %s"
msgstr "" msgstr ""
@ -8064,15 +8060,15 @@ msgstr ""
msgid "following" msgid "following"
msgstr "" msgstr ""
#: ../../include/items.php:3211 #: ../../include/items.php:3212
msgid "A new person is sharing with you at " msgid "A new person is sharing with you at "
msgstr "" msgstr ""
#: ../../include/items.php:3211 #: ../../include/items.php:3212
msgid "You have a new follower at " msgid "You have a new follower at "
msgstr "" msgstr ""
#: ../../include/items.php:3880 #: ../../include/items.php:3881
msgid "Archives" msgid "Archives"
msgstr "" msgstr ""
@ -8166,34 +8162,34 @@ msgstr ""
msgid "stopped following" msgid "stopped following"
msgstr "" msgstr ""
#: ../../include/Contact.php:220 ../../include/conversation.php:966 #: ../../include/Contact.php:220 ../../include/conversation.php:967
msgid "Poke" msgid "Poke"
msgstr "" msgstr ""
#: ../../include/Contact.php:221 ../../include/conversation.php:960 #: ../../include/Contact.php:221 ../../include/conversation.php:961
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: ../../include/Contact.php:222 ../../include/conversation.php:961 #: ../../include/Contact.php:222 ../../include/conversation.php:962
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: ../../include/Contact.php:223 ../../include/conversation.php:962 #: ../../include/Contact.php:223 ../../include/conversation.php:963
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: ../../include/Contact.php:224 ../../include/Contact.php:237 #: ../../include/Contact.php:224 ../../include/Contact.php:237
#: ../../include/conversation.php:963 #: ../../include/conversation.php:964
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: ../../include/Contact.php:225 ../../include/Contact.php:237 #: ../../include/Contact.php:225 ../../include/Contact.php:237
#: ../../include/conversation.php:964 #: ../../include/conversation.php:965
msgid "Edit Contact" msgid "Edit Contact"
msgstr "" msgstr ""
#: ../../include/Contact.php:226 ../../include/Contact.php:237 #: ../../include/Contact.php:226 ../../include/Contact.php:237
#: ../../include/conversation.php:965 #: ../../include/conversation.php:966
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -8211,106 +8207,106 @@ msgstr ""
msgid "%1$s marked %2$s's %3$s as favorite" msgid "%1$s marked %2$s's %3$s as favorite"
msgstr "" msgstr ""
#: ../../include/conversation.php:866 #: ../../include/conversation.php:867
msgid "Delete Selected Items" msgid "Delete Selected Items"
msgstr "" msgstr ""
#: ../../include/conversation.php:1024 #: ../../include/conversation.php:1025
#, php-format #, php-format
msgid "%s likes this." msgid "%s likes this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1024 #: ../../include/conversation.php:1025
#, php-format #, php-format
msgid "%s doesn't like this." msgid "%s doesn't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1028 #: ../../include/conversation.php:1029
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> like this." msgid "<span %1$s>%2$d people</span> like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1030 #: ../../include/conversation.php:1031
#, php-format #, php-format
msgid "<span %1$s>%2$d people</span> don't like this." msgid "<span %1$s>%2$d people</span> don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1036 #: ../../include/conversation.php:1037
msgid "and" msgid "and"
msgstr "" msgstr ""
#: ../../include/conversation.php:1039 #: ../../include/conversation.php:1040
#, php-format #, php-format
msgid ", and %d other people" msgid ", and %d other people"
msgstr "" msgstr ""
#: ../../include/conversation.php:1040 #: ../../include/conversation.php:1041
#, php-format #, php-format
msgid "%s like this." msgid "%s like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1040 #: ../../include/conversation.php:1041
#, php-format #, php-format
msgid "%s don't like this." msgid "%s don't like this."
msgstr "" msgstr ""
#: ../../include/conversation.php:1064 ../../include/conversation.php:1081 #: ../../include/conversation.php:1065 ../../include/conversation.php:1082
msgid "Visible to <strong>everybody</strong>" msgid "Visible to <strong>everybody</strong>"
msgstr "" msgstr ""
#: ../../include/conversation.php:1066 ../../include/conversation.php:1083 #: ../../include/conversation.php:1067 ../../include/conversation.php:1084
msgid "Please enter a video link/URL:" msgid "Please enter a video link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:1067 ../../include/conversation.php:1084 #: ../../include/conversation.php:1068 ../../include/conversation.php:1085
msgid "Please enter an audio link/URL:" msgid "Please enter an audio link/URL:"
msgstr "" msgstr ""
#: ../../include/conversation.php:1068 ../../include/conversation.php:1085 #: ../../include/conversation.php:1069 ../../include/conversation.php:1086
msgid "Tag term:" msgid "Tag term:"
msgstr "" msgstr ""
#: ../../include/conversation.php:1070 ../../include/conversation.php:1087 #: ../../include/conversation.php:1071 ../../include/conversation.php:1088
msgid "Where are you right now?" msgid "Where are you right now?"
msgstr "" msgstr ""
#: ../../include/conversation.php:1130 #: ../../include/conversation.php:1131
msgid "upload photo" msgid "upload photo"
msgstr "" msgstr ""
#: ../../include/conversation.php:1132 #: ../../include/conversation.php:1133
msgid "attach file" msgid "attach file"
msgstr "" msgstr ""
#: ../../include/conversation.php:1134 #: ../../include/conversation.php:1135
msgid "web link" msgid "web link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1135 #: ../../include/conversation.php:1136
msgid "Insert video link" msgid "Insert video link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1136 #: ../../include/conversation.php:1137
msgid "video link" msgid "video link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1137 #: ../../include/conversation.php:1138
msgid "Insert audio link" msgid "Insert audio link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1138 #: ../../include/conversation.php:1139
msgid "audio link" msgid "audio link"
msgstr "" msgstr ""
#: ../../include/conversation.php:1140 #: ../../include/conversation.php:1141
msgid "set location" msgid "set location"
msgstr "" msgstr ""
#: ../../include/conversation.php:1142 #: ../../include/conversation.php:1143
msgid "clear location" msgid "clear location"
msgstr "" msgstr ""
#: ../../include/conversation.php:1149 #: ../../include/conversation.php:1150
msgid "permissions" msgid "permissions"
msgstr "" msgstr ""
@ -8326,96 +8322,96 @@ msgstr ""
msgid "This action is not available under your subscription plan." msgid "This action is not available under your subscription plan."
msgstr "" msgstr ""
#: ../../boot.php:568 #: ../../boot.php:569
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:571 #: ../../boot.php:572
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:774 #: ../../boot.php:775
#, php-format #, php-format
msgid "Update %s failed. See error logs." msgid "Update %s failed. See error logs."
msgstr "" msgstr ""
#: ../../boot.php:776 #: ../../boot.php:777
#, php-format #, php-format
msgid "Update Error at %s" msgid "Update Error at %s"
msgstr "" msgstr ""
#: ../../boot.php:877 #: ../../boot.php:878
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:901 #: ../../boot.php:902
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:902 #: ../../boot.php:903
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:905 #: ../../boot.php:906
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:911 #: ../../boot.php:912
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:1078 #: ../../boot.php:1079
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1138 #: ../../boot.php:1139
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1260 ../../boot.php:1346 #: ../../boot.php:1261 ../../boot.php:1347
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1261 ../../boot.php:1347 #: ../../boot.php:1262 ../../boot.php:1348
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1306 ../../boot.php:1387 #: ../../boot.php:1307 ../../boot.php:1388
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1318 #: ../../boot.php:1319
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1319 #: ../../boot.php:1320
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1380 #: ../../boot.php:1381
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1398 #: ../../boot.php:1399
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1399 #: ../../boot.php:1400
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""
#: ../../boot.php:1613 #: ../../boot.php:1614
msgid "Status Messages and Posts" msgid "Status Messages and Posts"
msgstr "" msgstr ""
#: ../../boot.php:1620 #: ../../boot.php:1621
msgid "Profile Details" msgid "Profile Details"
msgstr "" msgstr ""
#: ../../boot.php:1637 #: ../../boot.php:1638
msgid "Events and Calendar" msgid "Events and Calendar"
msgstr "" msgstr ""
#: ../../boot.php:1644 #: ../../boot.php:1645
msgid "Only You Can See This" msgid "Only You Can See This"
msgstr "" msgstr ""

44
view/theme/frost-mobile/style.css
View file

@ -156,7 +156,7 @@ nav #banner #logo-text a {
font-size: 40px; font-size: 40px;
font-weight: bold; font-weight: bold;
margin-left: 3px; margin-left: 3px;
color: #000000; color: #000000;
} }
nav #banner #logo-text a:hover { text-decoration: none; } nav #banner #logo-text a:hover { text-decoration: none; }
@ -2399,13 +2399,13 @@ aside input[type='text'] {
} }
.photo-album-image-wrapper .caption { .photo-album-image-wrapper .caption {
display: none; display: none;
width: 100%; width: 100%;
/* position: absolute; */ /* position: absolute; */
bottom: 0px; bottom: 0px;
padding: 0.5em 0.5em 0px 0.5em; padding: 0.5em 0.5em 0px 0.5em;
background-color: rgba(245, 245, 255, 0.8); background-color: rgba(245, 245, 255, 0.8);
border-bottom: 2px solid #CCC; border-bottom: 2px solid #CCC;
margin: 0px; margin: 0px;
} }
.photo-album-image-wrapper a:hover .caption { .photo-album-image-wrapper a:hover .caption {
display:block; display:block;
@ -2433,13 +2433,13 @@ aside input[type='text'] {
-webkit-border-radius: 10px; -webkit-border-radius: 10px;
} }
.photo-top-album-name { .photo-top-album-name {
width: 100%; width: 100%;
min-height: 2em; min-height: 2em;
/* position: absolute; */ /* position: absolute; */
bottom: 0px; bottom: 0px;
padding: 0px 3px; padding: 0px 3px;
padding-top: 0.5em; padding-top: 0.5em;
background-color: rgb(255, 255, 255); background-color: rgb(255, 255, 255);
} }
#photo-top-end { #photo-top-end {
clear: both; clear: both;
@ -3885,3 +3885,21 @@ ul.notifications-menu-popup {
margin-left: 40px; margin-left: 40px;
width: 130px; width: 130px;
} }
@media only screen and (min-device-width: 768px)
and (max-device-width: 1024px)
{
html {
width:700px
}
div.section-wrapper {
width:700px;
margin-left:0px;
}
.wall-item-body {
width:700px;
}
.comment .wall-item-body {
width:650px;
}
}