aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--boot.php33
-rw-r--r--include/conversation.php4
-rw-r--r--include/nav.php4
-rw-r--r--mod/directory.php4
-rw-r--r--mod/photos.php4
-rw-r--r--mod/profiles.php4
-rw-r--r--util/messages.po159
7 files changed, 127 insertions, 85 deletions
diff --git a/boot.php b/boot.php
index e8bd1087b..3d0d5098d 100644
--- a/boot.php
+++ b/boot.php
@@ -10,7 +10,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
-define ( 'FRIENDICA_VERSION', '3.0.1378' );
+define ( 'FRIENDICA_VERSION', '3.0.1379' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1149 );
@@ -332,6 +332,9 @@ if(! class_exists('App')) {
private $curl_code;
private $curl_headers;
+ private $cached_profile_image;
+ private $cached_profile_picdate;
+
function __construct() {
global $default_timezone;
@@ -543,6 +546,28 @@ if(! class_exists('App')) {
return $this->curl_headers;
}
+ function get_cached_avatar_image($avatar_image){
+ if($this->cached_profile_image[$avatar_image])
+ return $this->cached_profile_image[$avatar_image];
+
+ $path_parts = explode("/",$avatar_image);
+ $common_filename = $path_parts[count($path_parts)-1];
+
+ if($this->cached_profile_picdate[$common_filename]){
+ $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
+ } else {
+ $r = q("SELECT `contact`.`avatar-date` AS picdate FROM `contact` WHERE `contact`.`thumb` like \"%%/%s\"",
+ $common_filename);
+ if(! count($r)){
+ $this->cached_profile_image[$avatar_image] = $avatar_image;
+ } else {
+ $this->cached_profile_picdate[$common_filename] = "?rev=" . urlencode($r[0]['picdate']);
+ $this->cached_profile_image[$avatar_image] = $avatar_image . $this->cached_profile_picdate[$common_filename];
+ }
+ }
+ return $this->cached_profile_image[$avatar_image];
+ }
+
}
}
@@ -1130,9 +1155,9 @@ if(! function_exists('profile_sidebar')) {
'fullname' => $profile['name'],
'firstname' => $firstname,
'lastname' => $lastname,
- 'photo300' => $a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
- 'photo100' => $a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
- 'photo50' => $a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
+ 'photo300' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/300/' . $profile['uid'] . '.jpg'),
+ 'photo100' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/100/' . $profile['uid'] . '.jpg'),
+ 'photo50' => $a->get_cached_avatar_image($a->get_baseurl() . '/photo/custom/50/' . $profile['uid'] . '.jpg'),
);
if (!$block){
diff --git a/include/conversation.php b/include/conversation.php
index 1d5a92284..2244e8df7 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -308,7 +308,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
if(($normalised != 'mailbox') && (x($a->contacts[$normalised])))
$profile_avatar = $a->contacts[$normalised]['thumb'];
else
- $profile_avatar = ((strlen($item['author-avatar'])) ? $item['author-avatar'] : $item['thumb']);
+ $profile_avatar = ((strlen($item['author-avatar'])) ? $a->get_cached_avatar_image($item['author-avatar']) : $item['thumb']);
$locate = array('location' => $item['location'], 'coord' => $item['coord'], 'html' => '');
call_hooks('render_location',$locate);
@@ -657,7 +657,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
if(($normalised != 'mailbox') && (x($a->contacts,$normalised)))
$profile_avatar = $a->contacts[$normalised]['thumb'];
else
- $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $thumb);
+ $profile_avatar = (((strlen($item['author-avatar'])) && $diff_author) ? $item['author-avatar'] : $a->get_cached_avatar_image($thumb));
$like = ((x($alike,$item['id'])) ? format_like($alike[$item['id']],$alike[$item['id'] . '-l'],'like',$item['id']) : '');
$dislike = ((x($dlike,$item['id'])) ? format_like($dlike[$item['id']],$dlike[$item['id'] . '-l'],'dislike',$item['id']) : '');
diff --git a/include/nav.php b/include/nav.php
index d760cc8ae..a67a8b614 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -53,9 +53,9 @@ function nav(&$a) {
$nav['usermenu'][] = Array('notes/', t('Personal notes'), "", t('Your personal photos'));
// user info
- $r = q("SELECT `micro`,`avatar-date` FROM `contact` WHERE uid=%d AND self=1", intval($a->user['uid']));
+ $r = q("SELECT micro FROM contact WHERE uid=%d AND self=1", intval($a->user['uid']));
$userinfo = array(
- 'icon' => (count($r) ? $r[0]['micro']."?rev=".urlencode($r[0]['avatar-date']): $a->get_baseurl($ssl_state)."/images/person-48.jpg"),
+ 'icon' => (count($r) ? $a->get_cached_avatar_image($r[0]['micro']) : $a->get_baseurl($ssl_state)."/images/person-48.jpg"),
'name' => $a->user['username'],
);
diff --git a/mod/directory.php b/mod/directory.php
index 7f3a44ff4..930a575b6 100644
--- a/mod/directory.php
+++ b/mod/directory.php
@@ -73,7 +73,7 @@ function directory_content(&$a) {
$order = " ORDER BY `name` ASC ";
- $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `contact`.`avatar-date` AS picdate, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT join `contact` on `contact`.`uid` = `profile`.`uid` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 AND `self` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
+ $r = q("SELECT `profile`.*, `profile`.`uid` AS `profile_uid`, `user`.`nickname`, `user`.`timezone` FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ",
intval($a->pager['start']),
intval($a->pager['itemspage'])
);
@@ -116,7 +116,7 @@ function directory_content(&$a) {
$entry = replace_macros($tpl,array(
'$id' => $rr['id'],
'$profile-link' => $profile_link,
- '$photo' => $rr[$photo] . '?rev=' . urlencode($rr['picdate']),
+ '$photo' => $a->get_cached_avatar_image($rr[$photo]),
'$alt-text' => $rr['name'],
'$name' => $rr['name'],
'$details' => $pdesc . $details
diff --git a/mod/photos.php b/mod/photos.php
index 4fa8aca08..91adbb33b 100644
--- a/mod/photos.php
+++ b/mod/photos.php
@@ -16,7 +16,7 @@ function photos_init(&$a) {
if($a->argc > 1) {
$nick = $a->argv[1];
- $r = q("SELECT `user`.*, `contact`.`avatar-date` AS picdate FROM `user` LEFT JOIN `contact` on `contact`.`uid` = `user`.`uid` WHERE `user`.`nickname` = '%s' AND `user`.`blocked` = 0 LIMIT 1",
+ $r = q("SELECT * FROM `user` WHERE `nickname` = '%s' AND `blocked` = 0 LIMIT 1",
dbesc($nick)
);
@@ -36,7 +36,7 @@ function photos_init(&$a) {
$o .= '<div class="vcard">';
$o .= '<div class="fn">' . $a->data['user']['username'] . '</div>';
- $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg?rev=' . urlencode($a->data['user']['picdate']) . '" alt="' . $a->data['user']['username'] . '" /></div>';
+ $o .= '<div id="profile-photo-wrapper"><img class="photo" style="width: 175px; height: 175px;" src="' . $a->get_cached_avatar_image($a->get_baseurl() . '/photo/profile/' . $a->data['user']['uid'] . '.jpg') . '" alt="' . $a->data['user']['username'] . '" /></div>';
$o .= '</div>';
if(! intval($a->data['user']['hidewall'])) {
diff --git a/mod/profiles.php b/mod/profiles.php
index 7b6e61ad6..a9da5454c 100644
--- a/mod/profiles.php
+++ b/mod/profiles.php
@@ -635,7 +635,7 @@ function profiles_content(&$a) {
}
else {
- $r = q("SELECT `profile`.*, `contact`.`avatar-date` AS picdate FROM `profile` LEFT JOIN `contact` on `contact`.`uid` = `profile`.`uid` WHERE `profile`.`uid` = %d and contact.self = 1",
+ $r = q("SELECT * FROM `profile` WHERE `uid` = %d",
local_user());
if(count($r)) {
@@ -652,7 +652,7 @@ function profiles_content(&$a) {
foreach($r as $rr) {
$o .= replace_macros($tpl, array(
- '$photo' => $rr['thumb'] . '?rev=' . urlencode($rr['picdate']),
+ '$photo' => $a->get_cached_avatar_image($rr['thumb']),
'$id' => $rr['id'],
'$alt' => t('Profile Image'),
'$profile_name' => $rr['profile-name'],
diff --git a/util/messages.po b/util/messages.po
index 1ff1bbf1b..e5252417f 100644
--- a/util/messages.po
+++ b/util/messages.po
@@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
-"Project-Id-Version: 3.0.1378\n"
+"Project-Id-Version: 3.0.1379\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-18 10:00-0700\n"
+"POT-Creation-Date: 2012-06-19 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"
@@ -36,7 +36,7 @@ msgstr ""
#: ../../mod/crepair.php:115 ../../mod/wall_attach.php:44
#: ../../mod/fsuggest.php:78 ../../mod/events.php:138 ../../mod/api.php:26
-#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:928
+#: ../../mod/api.php:31 ../../mod/photos.php:133 ../../mod/photos.php:929
#: ../../mod/editpost.php:10 ../../mod/install.php:151
#: ../../mod/notifications.php:66 ../../mod/contacts.php:145
#: ../../mod/settings.php:106 ../../mod/settings.php:537
@@ -55,8 +55,8 @@ msgstr ""
#: ../../mod/profiles.php:385 ../../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:507
-#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3387
-#: ../../index.php:299
+#: ../../addon/dav/layout.fnk.php:353 ../../include/items.php:3393
+#: ../../index.php:309
msgid "Permission denied."
msgstr ""
@@ -123,20 +123,21 @@ msgid "New photo from this URL"
msgstr ""
#: ../../mod/crepair.php:166 ../../mod/fsuggest.php:107
-#: ../../mod/events.php:428 ../../mod/photos.php:963 ../../mod/photos.php:1021
-#: ../../mod/photos.php:1266 ../../mod/photos.php:1306
-#: ../../mod/photos.php:1346 ../../mod/photos.php:1377
+#: ../../mod/events.php:428 ../../mod/photos.php:964 ../../mod/photos.php:1022
+#: ../../mod/photos.php:1267 ../../mod/photos.php:1307
+#: ../../mod/photos.php:1347 ../../mod/photos.php:1378
#: ../../mod/install.php:246 ../../mod/install.php:284
#: ../../mod/localtime.php:45 ../../mod/contacts.php:343
#: ../../mod/settings.php:555 ../../mod/settings.php:701
#: ../../mod/settings.php:762 ../../mod/settings.php:969
-#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/admin.php:420
-#: ../../mod/admin.php:656 ../../mod/admin.php:792 ../../mod/admin.php:991
-#: ../../mod/admin.php:1078 ../../mod/profiles.php:554
+#: ../../mod/group.php:85 ../../mod/message.php:216 ../../mod/message.php:410
+#: ../../mod/admin.php:420 ../../mod/admin.php:656 ../../mod/admin.php:792
+#: ../../mod/admin.php:991 ../../mod/admin.php:1078 ../../mod/profiles.php:554
#: ../../mod/invite.php:119 ../../addon/facebook/facebook.php:609
#: ../../addon/snautofollow/snautofollow.php:64
#: ../../addon/yourls/yourls.php:76 ../../addon/ljpost/ljpost.php:93
-#: ../../addon/nsfw/nsfw.php:57 ../../addon/planets/planets.php:158
+#: ../../addon/nsfw/nsfw.php:57 ../../addon/page/page.php:164
+#: ../../addon/planets/planets.php:158
#: ../../addon/uhremotestorage/uhremotestorage.php:89
#: ../../addon/randplace/randplace.php:177 ../../addon/dwpost/dwpost.php:93
#: ../../addon/drpost/drpost.php:110 ../../addon/startpage/startpage.php:92
@@ -358,15 +359,15 @@ msgstr ""
msgid "Photo Albums"
msgstr ""
-#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:942
-#: ../../mod/photos.php:1013 ../../mod/photos.php:1028
-#: ../../mod/photos.php:1455 ../../mod/photos.php:1467
+#: ../../mod/photos.php:52 ../../mod/photos.php:154 ../../mod/photos.php:943
+#: ../../mod/photos.php:1014 ../../mod/photos.php:1029
+#: ../../mod/photos.php:1456 ../../mod/photos.php:1468
#: ../../addon/communityhome/communityhome.php:110
#: ../../view/theme/diabook/theme.php:598
msgid "Contact Photos"
msgstr ""
-#: ../../mod/photos.php:59 ../../mod/photos.php:1038 ../../mod/photos.php:1505
+#: ../../mod/photos.php:59 ../../mod/photos.php:1039 ../../mod/photos.php:1506
msgid "Upload New Photos"
msgstr ""
@@ -378,8 +379,8 @@ msgstr ""
msgid "Contact information unavailable"
msgstr ""
-#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1013
-#: ../../mod/photos.php:1028 ../../mod/profile_photo.php:60
+#: ../../mod/photos.php:154 ../../mod/photos.php:656 ../../mod/photos.php:1014
+#: ../../mod/photos.php:1029 ../../mod/profile_photo.php:60
#: ../../mod/profile_photo.php:67 ../../mod/profile_photo.php:74
#: ../../mod/profile_photo.php:176 ../../mod/profile_photo.php:254
#: ../../mod/profile_photo.php:263
@@ -393,11 +394,11 @@ msgstr ""
msgid "Album not found."
msgstr ""
-#: ../../mod/photos.php:182 ../../mod/photos.php:1022
+#: ../../mod/photos.php:182 ../../mod/photos.php:1023
msgid "Delete Album"
msgstr ""
-#: ../../mod/photos.php:245 ../../mod/photos.php:1267
+#: ../../mod/photos.php:245 ../../mod/photos.php:1268
msgid "Delete Photo"
msgstr ""
@@ -430,155 +431,155 @@ msgstr ""
msgid "Unable to process image."
msgstr ""
-#: ../../mod/photos.php:734 ../../mod/profile_photo.php:259
+#: ../../mod/photos.php:735 ../../mod/profile_photo.php:259
#: ../../mod/wall_upload.php:105
msgid "Image upload failed."
msgstr ""
-#: ../../mod/photos.php:820 ../../mod/community.php:16
+#: ../../mod/photos.php:821 ../../mod/community.php:16
#: ../../mod/dfrn_request.php:759 ../../mod/viewcontacts.php:17
#: ../../mod/display.php:7 ../../mod/search.php:71 ../../mod/directory.php:29
msgid "Public access denied."
msgstr ""
-#: ../../mod/photos.php:830
+#: ../../mod/photos.php:831
msgid "No photos selected"
msgstr ""
-#: ../../mod/photos.php:909
+#: ../../mod/photos.php:910
msgid "Access to this item is restricted."
msgstr ""
-#: ../../mod/photos.php:970
+#: ../../mod/photos.php:971
msgid "Upload Photos"
msgstr ""
-#: ../../mod/photos.php:973 ../../mod/photos.php:1017
+#: ../../mod/photos.php:974 ../../mod/photos.php:1018
msgid "New album name: "
msgstr ""
-#: ../../mod/photos.php:974
+#: ../../mod/photos.php:975
msgid "or existing album name: "
msgstr ""
-#: ../../mod/photos.php:975
+#: ../../mod/photos.php:976
msgid "Do not show a status post for this upload"
msgstr ""
-#: ../../mod/photos.php:977 ../../mod/photos.php:1262
+#: ../../mod/photos.php:978 ../../mod/photos.php:1263
msgid "Permissions"
msgstr ""
-#: ../../mod/photos.php:1032
+#: ../../mod/photos.php:1033
msgid "Edit Album"
msgstr ""
-#: ../../mod/photos.php:1056 ../../mod/photos.php:1488
+#: ../../mod/photos.php:1057 ../../mod/photos.php:1489
msgid "View Photo"
msgstr ""
-#: ../../mod/photos.php:1091
+#: ../../mod/photos.php:1092
msgid "Permission denied. Access to this item may be restricted."
msgstr ""
-#: ../../mod/photos.php:1093
+#: ../../mod/photos.php:1094
msgid "Photo not available"
msgstr ""
-#: ../../mod/photos.php:1143
+#: ../../mod/photos.php:1144
msgid "View photo"
msgstr ""
-#: ../../mod/photos.php:1143
+#: ../../mod/photos.php:1144
msgid "Edit photo"
msgstr ""
-#: ../../mod/photos.php:1144
+#: ../../mod/photos.php:1145
msgid "Use as profile photo"
msgstr ""
-#: ../../mod/photos.php:1150 ../../include/conversation.php:490
+#: ../../mod/photos.php:1151 ../../include/conversation.php:490
msgid "Private Message"
msgstr ""
-#: ../../mod/photos.php:1172
+#: ../../mod/photos.php:1173
msgid "View Full Size"
msgstr ""
-#: ../../mod/photos.php:1240
+#: ../../mod/photos.php:1241
msgid "Tags: "
msgstr ""
-#: ../../mod/photos.php:1243
+#: ../../mod/photos.php:1244
msgid "[Remove any tag]"
msgstr ""
-#: ../../mod/photos.php:1253
+#: ../../mod/photos.php:1254
msgid "Rotate CW"
msgstr ""
-#: ../../mod/photos.php:1255
+#: ../../mod/photos.php:1256
msgid "New album name"
msgstr ""
-#: ../../mod/photos.php:1258
+#: ../../mod/photos.php:1259
msgid "Caption"
msgstr ""
-#: ../../mod/photos.php:1260
+#: ../../mod/photos.php:1261
msgid "Add a Tag"
msgstr ""
-#: ../../mod/photos.php:1264
+#: ../../mod/photos.php:1265
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com, #California, #camping"
msgstr ""
-#: ../../mod/photos.php:1284 ../../include/conversation.php:554
+#: ../../mod/photos.php:1285 ../../include/conversation.php:554
msgid "I like this (toggle)"
msgstr ""
-#: ../../mod/photos.php:1285 ../../include/conversation.php:555
+#: ../../mod/photos.php:1286 ../../include/conversation.php:555
msgid "I don't like this (toggle)"
msgstr ""
-#: ../../mod/photos.php:1286 ../../include/conversation.php:989
+#: ../../mod/photos.php:1287 ../../include/conversation.php:989
msgid "Share"
msgstr ""
-#: ../../mod/photos.php:1287 ../../mod/editpost.php:104
+#: ../../mod/photos.php:1288 ../../mod/editpost.php:104
#: ../../mod/wallmessage.php:145 ../../mod/message.php:215
-#: ../../mod/message.php:410 ../../include/conversation.php:371
+#: ../../mod/message.php:411 ../../include/conversation.php:371
#: ../../include/conversation.php:731 ../../include/conversation.php:1008
msgid "Please wait"
msgstr ""
-#: ../../mod/photos.php:1303 ../../mod/photos.php:1343
-#: ../../mod/photos.php:1374 ../../include/conversation.php:577
+#: ../../mod/photos.php:1304 ../../mod/photos.php:1344
+#: ../../mod/photos.php:1375 ../../include/conversation.php:577
msgid "This is you"
msgstr ""
-#: ../../mod/photos.php:1305 ../../mod/photos.php:1345
-#: ../../mod/photos.php:1376 ../../include/conversation.php:579
+#: ../../mod/photos.php:1306 ../../mod/photos.php:1346
+#: ../../mod/photos.php:1377 ../../include/conversation.php:579
#: ../../boot.php:523
msgid "Comment"
msgstr ""
-#: ../../mod/photos.php:1307 ../../mod/editpost.php:125
+#: ../../mod/photos.php:1308 ../../mod/editpost.php:125
#: ../../include/conversation.php:589 ../../include/conversation.php:1026
msgid "Preview"
msgstr ""
-#: ../../mod/photos.php:1404 ../../mod/settings.php:618
+#: ../../mod/photos.php:1405 ../../mod/settings.php:618
#: ../../mod/settings.php:699 ../../mod/group.php:168 ../../mod/admin.php:663
#: ../../include/conversation.php:328 ../../include/conversation.php:609
msgid "Delete"
msgstr ""
-#: ../../mod/photos.php:1494
+#: ../../mod/photos.php:1495
msgid "View Album"
msgstr ""
-#: ../../mod/photos.php:1503
+#: ../../mod/photos.php:1504
msgid "Recent Photos"
msgstr ""
@@ -821,7 +822,7 @@ msgstr ""
msgid "Confirm"
msgstr ""
-#: ../../mod/dfrn_request.php:715 ../../include/items.php:2783
+#: ../../mod/dfrn_request.php:715 ../../include/items.php:2789
msgid "[Name Withheld]"
msgstr ""
@@ -1723,7 +1724,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:692
#: ../../addon/facebook/facebook.php:1182
#: ../../addon/public_server/public_server.php:62
-#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2792
+#: ../../addon/testdrive/testdrive.php:67 ../../include/items.php:2798
#: ../../boot.php:703
msgid "Administrator"
msgstr ""
@@ -2618,7 +2619,7 @@ msgstr ""
msgid "Group name changed."
msgstr ""
-#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:298
+#: ../../mod/group.php:72 ../../mod/profperm.php:19 ../../index.php:308
msgid "Permission denied"
msgstr ""
@@ -2798,7 +2799,7 @@ msgstr ""
#: ../../mod/notice.php:15 ../../mod/viewsrc.php:15 ../../mod/admin.php:159
#: ../../mod/admin.php:700 ../../mod/admin.php:899 ../../mod/display.php:37
-#: ../../mod/display.php:142 ../../include/items.php:3234
+#: ../../mod/display.php:142 ../../include/items.php:3240
msgid "Item not found."
msgstr ""
@@ -4615,16 +4616,32 @@ msgstr ""
msgid "%s - Click to open/close"
msgstr ""
-#: ../../addon/page/page.php:48
+#: ../../addon/page/page.php:58 ../../addon/page/page.php:88
msgid "Forums"
msgstr ""
-#: ../../addon/page/page.php:63 ../../addon/showmore/showmore.php:87
-#: ../../include/contact_widgets.php:188 ../../include/conversation.php:476
-#: ../../boot.php:524
+#: ../../addon/page/page.php:73 ../../addon/page/page.php:107
+#: ../../addon/showmore/showmore.php:87 ../../include/contact_widgets.php:188
+#: ../../include/conversation.php:476 ../../boot.php:524
msgid "show more"
msgstr ""
+#: ../../addon/page/page.php:125
+msgid "Page settings updated."
+msgstr ""
+
+#: ../../addon/page/page.php:151
+msgid "Page Settings"
+msgstr ""
+
+#: ../../addon/page/page.php:153
+msgid "How many forums to display on sidebar without paging"
+msgstr ""
+
+#: ../../addon/page/page.php:156
+msgid "Randomise Page/Forum list"
+msgstr ""
+
#: ../../addon/planets/planets.php:150
msgid "Planets Settings"
msgstr ""
@@ -6064,7 +6081,7 @@ msgid "j F"
msgstr ""
#: ../../include/profile_advanced.php:30 ../../include/datetime.php:450
-#: ../../include/items.php:1446
+#: ../../include/items.php:1452
msgid "Birthday:"
msgstr ""
@@ -7039,7 +7056,7 @@ msgstr ""
#: ../../include/enotify.php:126
#, php-format
-msgid "%1$s [url=%2s]tagged you[/url]."
+msgid "%1$s [url=%2$s]tagged you[/url]."
msgstr ""
#: ../../include/enotify.php:137
@@ -7163,15 +7180,15 @@ msgstr ""
msgid "following"
msgstr ""
-#: ../../include/items.php:2790
+#: ../../include/items.php:2796
msgid "A new person is sharing with you at "
msgstr ""
-#: ../../include/items.php:2790
+#: ../../include/items.php:2796
msgid "You have a new follower at "
msgstr ""
-#: ../../include/items.php:3452
+#: ../../include/items.php:3458
msgid "Archives"
msgstr ""
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-11 18:59:14 +0000