Streams/streams
Streams/streams
1
0
Fork 0
mirror of https://codeberg.org/streams/streams.git synced 2024-09-20 02:15:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

very early attempt diaspora import from diaspora export file. Currently the json export has to be gunzipped prior to uploading and we're net yet adding connections (which should come soon) and we can't import items until they add guids to the export file - so consider it a work in progress. This first attempt should create a channel and get your profile details setup providing there isn't a nickname conflict on the server. That will also be handled later.

Browse source
This commit is contained in:
redmatrix 2015-06-19 16:39:03 -07:00
parent 25e134dd9c
commit 6bd90816dd
4 changed files with 221 additions and 110 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

100
include/Import/import_diaspora.php Normal file
View file

@ -0,0 +1,100 @@
<?php
require_once('include/bb2diaspora.php');
require_once('include/group.php');
function import_diaspora($data) {
$a = get_app();
$account = $a->get_account();
if(! $account)
return false;
$c = create_identity(array(
'name' => $data['user']['name'],
'nickname' => $data['user']['username'],
'account_id' => $account['account_id'],
'permissions_role' => 'social'
));
if(! $c['success'])
return;
$channel_id = $c['channel']['channel_id'];
// todo - add nsfw, auto follow, (and strip exif in hubzilla)
$location = escape_tags($data['user']['profile']['location']);
if(! $location)
$location = '';
q("update channel set channel_location = '%s' where channel_id = %d",
dbesc($location)
);
$photos = import_profile_photo($data['user']['profile']['image_url'],$c['channel']['channel_hash']);
if($photos[4])
$photodate = NULL_DATE;
else
$photodate = $xchan['xchan_photo_date'];
$r = q("update xchan set xchan_photo_l = '%s', xchan_photo_m = '%s', xchan_photo_s = '%s', xchan_photo_mimetype = '%s', xchan_photo_date = '%s'
where xchan_hash = '%s'",
dbesc($photos[0]),
dbesc($photos[1]),
dbesc($photos[2]),
dbesc($photos[3]),
dbesc($photodate),
dbesc($c['channel']['channel_hash'])
);
$gender = escape_tags($data['user']['profile']['gender']);
$about = diaspora2bb($data['user']['profile']['bio']);
if($data['user']['profile']['birthday'])
$dob = datetime_convert('UTC','UTC',$data['user']['profile']['birthday'],'Y-m-d');
else
$dob = '0000-00-00';
$r = q("update profile set gender = '%s', about = '%s', dob = '%s' where uid = %d",
dbesc($gender),
dbesc($about),
dbesc($dob),
intval($channel_id)
);
if($data['aspects']) {
foreach($data['aspects'] as $aspect) {
group_add($channel_id,escape_tags($aspect['name']),intval($aspect['contacts_visible']));
}
}
// now add connections and send friend requests
// Then add items - note this can't be done until Diaspora adds guids to exported
// items and comments
proc_run('php','include/notifier.php','location',$channel_id);
// This will indirectly perform a refresh_all *and* update the directory
proc_run('php', 'include/directory.php', $channel_id);
notice( t('Import completed.') . EOL);
change_channel($channel_id);
goaway(z_root() . '/network' );
}

9
mod/import.php
View file

@ -84,6 +84,13 @@ function import_post(&$a) {
$data = json_decode($data,true); $data = json_decode($data,true);
if(array_key_exists('user',$data) && array_key_exists('aspects',$data)) {
require_once('include/Import/import_diaspora.php');
import_diaspora($data);
return;
}
// logger('import: data: ' . print_r($data,true)); // logger('import: data: ' . print_r($data,true));
// print_r($data); // print_r($data);
@ -308,7 +315,7 @@ function import_post(&$a) {
dbesc($photos[2]), dbesc($photos[2]),
dbesc($photos[3]), dbesc($photos[3]),
dbesc($photodate), dbesc($photodate),
dbesc($xchan_hash) dbesc($xchan['xchan_hash'])
); );
} }

220
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2015-06-12.1061\n" "Project-Id-Version: 2015-06-19.1068\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2015-06-12 00:04-0700\n" "POT-Creation-Date: 2015-06-19 00:04-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"
@ -24,7 +24,7 @@ msgstr ""
#: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143 #: ../../include/photo/photo_driver.php:687 ../../mod/profile_photo.php:143
#: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424 #: ../../mod/profile_photo.php:302 ../../mod/profile_photo.php:424
#: ../../mod/photos.php:91 ../../mod/photos.php:625 #: ../../mod/photos.php:92 ../../mod/photos.php:637
msgid "Profile Photos" msgid "Profile Photos"
msgstr "" msgstr ""
@ -654,7 +654,7 @@ msgstr ""
#: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677 #: ../../include/page_widgets.php:40 ../../include/ItemObject.php:677
#: ../../include/conversation.php:1155 ../../mod/webpages.php:188 #: ../../include/conversation.php:1155 ../../mod/webpages.php:188
#: ../../mod/events.php:653 ../../mod/photos.php:970 #: ../../mod/events.php:653 ../../mod/photos.php:982
#: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150 #: ../../mod/editwebpage.php:214 ../../mod/editpost.php:150
#: ../../mod/editblock.php:176 #: ../../mod/editblock.php:176
msgid "Preview" msgid "Preview"
@ -727,19 +727,19 @@ msgstr ""
msgid "This Website Only" msgid "This Website Only"
msgstr "" msgstr ""
#: ../../include/event.php:19 ../../include/bb2diaspora.php:451 #: ../../include/event.php:19 ../../include/bb2diaspora.php:459
msgid "l F d, Y \\@ g:i A" msgid "l F d, Y \\@ g:i A"
msgstr "" msgstr ""
#: ../../include/event.php:27 ../../include/bb2diaspora.php:457 #: ../../include/event.php:27 ../../include/bb2diaspora.php:465
msgid "Starts:" msgid "Starts:"
msgstr "" msgstr ""
#: ../../include/event.php:37 ../../include/bb2diaspora.php:465 #: ../../include/event.php:37 ../../include/bb2diaspora.php:473
msgid "Finishes:" msgid "Finishes:"
msgstr "" msgstr ""
#: ../../include/event.php:47 ../../include/bb2diaspora.php:473 #: ../../include/event.php:47 ../../include/bb2diaspora.php:481
#: ../../include/identity.php:879 ../../mod/events.php:647 #: ../../include/identity.php:879 ../../mod/events.php:647
#: ../../mod/directory.php:234 #: ../../mod/directory.php:234
msgid "Location:" msgid "Location:"
@ -754,7 +754,7 @@ msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../include/js_strings.php:6 ../../include/ItemObject.php:667 #: ../../include/js_strings.php:6 ../../include/ItemObject.php:667
#: ../../mod/photos.php:968 ../../mod/photos.php:1086 #: ../../mod/photos.php:980 ../../mod/photos.php:1098
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -782,7 +782,7 @@ msgstr ""
msgid "Passwords do not match" msgid "Passwords do not match"
msgstr "" msgstr ""
#: ../../include/js_strings.php:13 ../../mod/photos.php:39 #: ../../include/js_strings.php:13 ../../mod/photos.php:40
msgid "everybody" msgid "everybody"
msgstr "" msgstr ""
@ -821,8 +821,8 @@ msgstr ""
#: ../../include/js_strings.php:22 ../../include/ItemObject.php:668 #: ../../include/js_strings.php:22 ../../include/ItemObject.php:668
#: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275 #: ../../mod/xchan.php:11 ../../mod/connect.php:93 ../../mod/thing.php:275
#: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81 #: ../../mod/thing.php:318 ../../mod/events.php:656 ../../mod/group.php:81
#: ../../mod/photos.php:565 ../../mod/photos.php:642 ../../mod/photos.php:929 #: ../../mod/photos.php:577 ../../mod/photos.php:654 ../../mod/photos.php:941
#: ../../mod/photos.php:969 ../../mod/photos.php:1087 ../../mod/pdledit.php:58 #: ../../mod/photos.php:981 ../../mod/photos.php:1099 ../../mod/pdledit.php:58
#: ../../mod/import.php:504 ../../mod/chat.php:177 ../../mod/chat.php:211 #: ../../mod/import.php:504 ../../mod/chat.php:177 ../../mod/chat.php:211
#: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105 #: ../../mod/rate.php:167 ../../mod/invite.php:142 ../../mod/locs.php:105
#: ../../mod/sources.php:104 ../../mod/sources.php:138 #: ../../mod/sources.php:104 ../../mod/sources.php:138
@ -949,7 +949,7 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019 #: ../../include/RedDAV/RedBrowser.php:164 ../../include/conversation.php:1019
#: ../../include/apps.php:336 ../../include/apps.php:387 #: ../../include/apps.php:336 ../../include/apps.php:387
#: ../../mod/photos.php:681 ../../mod/photos.php:1119 #: ../../mod/photos.php:693 ../../mod/photos.php:1131
msgid "Unknown" msgid "Unknown"
msgstr "" msgstr ""
@ -986,7 +986,7 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:257 #: ../../include/RedDAV/RedBrowser.php:257
#: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362 #: ../../include/RedDAV/RedBrowser.php:308 ../../mod/profile_photo.php:362
#: ../../mod/photos.php:706 ../../mod/photos.php:1236 #: ../../mod/photos.php:718 ../../mod/photos.php:1248
msgid "Upload" msgid "Upload"
msgstr "" msgstr ""
@ -1011,7 +1011,7 @@ msgstr ""
#: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120 #: ../../include/RedDAV/RedBrowser.php:270 ../../include/ItemObject.php:120
#: ../../include/conversation.php:660 ../../include/apps.php:255 #: ../../include/conversation.php:660 ../../include/apps.php:255
#: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176 #: ../../mod/webpages.php:183 ../../mod/thing.php:228 ../../mod/group.php:176
#: ../../mod/blocks.php:155 ../../mod/photos.php:1050 #: ../../mod/blocks.php:155 ../../mod/photos.php:1062
#: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225 #: ../../mod/editlayout.php:107 ../../mod/editwebpage.php:225
#: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113 #: ../../mod/admin.php:826 ../../mod/admin.php:988 ../../mod/editblock.php:113
#: ../../mod/settings.php:651 ../../mod/connedit.php:543 #: ../../mod/settings.php:651 ../../mod/connedit.php:543
@ -1288,7 +1288,7 @@ msgid "Categories"
msgstr "" msgstr ""
#: ../../include/widgets.php:91 ../../include/nav.php:163 #: ../../include/widgets.php:91 ../../include/nav.php:163
#: ../../mod/apps.php:34 #: ../../mod/apps.php:36
msgid "Apps" msgid "Apps"
msgstr "" msgstr ""
@ -1820,14 +1820,14 @@ msgid "I abstain"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187 #: ../../include/ItemObject.php:175 ../../include/ItemObject.php:187
#: ../../include/conversation.php:1677 ../../mod/photos.php:1003 #: ../../include/conversation.php:1677 ../../mod/photos.php:1015
#: ../../mod/photos.php:1015 #: ../../mod/photos.php:1027
msgid "View all" msgid "View all"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396 #: ../../include/ItemObject.php:179 ../../include/taxonomy.php:396
#: ../../include/conversation.php:1701 ../../include/identity.php:1138 #: ../../include/conversation.php:1701 ../../include/identity.php:1138
#: ../../mod/photos.php:1007 #: ../../mod/photos.php:1019
msgctxt "noun" msgctxt "noun"
msgid "Like" msgid "Like"
msgid_plural "Likes" msgid_plural "Likes"
@ -1835,7 +1835,7 @@ msgstr[0] ""
msgstr[1] "" msgstr[1] ""
#: ../../include/ItemObject.php:184 ../../include/conversation.php:1704 #: ../../include/ItemObject.php:184 ../../include/conversation.php:1704
#: ../../mod/photos.php:1012 #: ../../mod/photos.php:1024
msgctxt "noun" msgctxt "noun"
msgid "Dislike" msgid "Dislike"
msgid_plural "Dislikes" msgid_plural "Dislikes"
@ -1870,7 +1870,7 @@ msgstr ""
msgid "Add Tag" msgid "Add Tag"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:254 ../../mod/photos.php:947 #: ../../include/ItemObject.php:254 ../../mod/photos.php:959
msgid "I like this (toggle)" msgid "I like this (toggle)"
msgstr "" msgstr ""
@ -1878,7 +1878,7 @@ msgstr ""
msgid "like" msgid "like"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:255 ../../mod/photos.php:948 #: ../../include/ItemObject.php:255 ../../mod/photos.php:960
msgid "I don't like this (toggle)" msgid "I don't like this (toggle)"
msgstr "" msgstr ""
@ -1949,31 +1949,31 @@ msgstr ""
msgid "Mark all seen" msgid "Mark all seen"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:353 ../../mod/photos.php:1133 #: ../../include/ItemObject.php:353 ../../mod/photos.php:1145
msgctxt "noun" msgctxt "noun"
msgid "Likes" msgid "Likes"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:354 ../../mod/photos.php:1134 #: ../../include/ItemObject.php:354 ../../mod/photos.php:1146
msgctxt "noun" msgctxt "noun"
msgid "Dislikes" msgid "Dislikes"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249 #: ../../include/ItemObject.php:359 ../../include/acl_selectors.php:249
#: ../../mod/photos.php:1139 #: ../../mod/photos.php:1151
msgid "Close" msgid "Close"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:364 ../../include/conversation.php:737 #: ../../include/ItemObject.php:364 ../../include/conversation.php:737
#: ../../include/conversation.php:1209 ../../mod/photos.php:950 #: ../../include/conversation.php:1209 ../../mod/photos.php:962
#: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192 #: ../../mod/editlayout.php:153 ../../mod/editwebpage.php:192
#: ../../mod/editpost.php:130 ../../mod/editblock.php:155 #: ../../mod/editpost.php:130 ../../mod/editblock.php:155
#: ../../mod/mail.php:241 ../../mod/mail.php:356 #: ../../mod/mail.php:241 ../../mod/mail.php:356
msgid "Please wait" msgid "Please wait"
msgstr "" msgstr ""
#: ../../include/ItemObject.php:665 ../../mod/photos.php:966 #: ../../include/ItemObject.php:665 ../../mod/photos.php:978
#: ../../mod/photos.php:1084 #: ../../mod/photos.php:1096
msgid "This is you" msgid "This is you"
msgstr "" msgstr ""
@ -2041,7 +2041,7 @@ msgstr ""
msgid "Attachments:" msgid "Attachments:"
msgstr "" msgstr ""
#: ../../include/bb2diaspora.php:453 #: ../../include/bb2diaspora.php:461
msgid "$Projectname event notification:" msgid "$Projectname event notification:"
msgstr "" msgstr ""
@ -2525,42 +2525,42 @@ msgctxt "mood"
msgid "%1$s is %2$s" msgid "%1$s is %2$s"
msgstr "" msgstr ""
#: ../../include/conversation.php:572 ../../mod/photos.php:984 #: ../../include/conversation.php:572 ../../mod/photos.php:996
msgctxt "title" msgctxt "title"
msgid "Likes" msgid "Likes"
msgstr "" msgstr ""
#: ../../include/conversation.php:572 ../../mod/photos.php:984 #: ../../include/conversation.php:572 ../../mod/photos.php:996
msgctxt "title" msgctxt "title"
msgid "Dislikes" msgid "Dislikes"
msgstr "" msgstr ""
#: ../../include/conversation.php:573 ../../mod/photos.php:985 #: ../../include/conversation.php:573 ../../mod/photos.php:997
msgctxt "title" msgctxt "title"
msgid "Agree" msgid "Agree"
msgstr "" msgstr ""
#: ../../include/conversation.php:573 ../../mod/photos.php:985 #: ../../include/conversation.php:573 ../../mod/photos.php:997
msgctxt "title" msgctxt "title"
msgid "Disagree" msgid "Disagree"
msgstr "" msgstr ""
#: ../../include/conversation.php:573 ../../mod/photos.php:985 #: ../../include/conversation.php:573 ../../mod/photos.php:997
msgctxt "title" msgctxt "title"
msgid "Abstain" msgid "Abstain"
msgstr "" msgstr ""
#: ../../include/conversation.php:574 ../../mod/photos.php:986 #: ../../include/conversation.php:574 ../../mod/photos.php:998
msgctxt "title" msgctxt "title"
msgid "Attending" msgid "Attending"
msgstr "" msgstr ""
#: ../../include/conversation.php:574 ../../mod/photos.php:986 #: ../../include/conversation.php:574 ../../mod/photos.php:998
msgctxt "title" msgctxt "title"
msgid "Not attending" msgid "Not attending"
msgstr "" msgstr ""
#: ../../include/conversation.php:574 ../../mod/photos.php:986 #: ../../include/conversation.php:574 ../../mod/photos.php:998
msgctxt "title" msgctxt "title"
msgid "Might attend" msgid "Might attend"
msgstr "" msgstr ""
@ -2702,7 +2702,7 @@ msgid "Expires YYYY-MM-DD HH:MM"
msgstr "" msgstr ""
#: ../../include/conversation.php:1174 ../../mod/webpages.php:182 #: ../../include/conversation.php:1174 ../../mod/webpages.php:182
#: ../../mod/blocks.php:154 ../../mod/photos.php:949 ../../mod/layouts.php:184 #: ../../mod/blocks.php:154 ../../mod/photos.php:961 ../../mod/layouts.php:184
msgid "Share" msgid "Share"
msgstr "" msgstr ""
@ -3016,12 +3016,12 @@ msgstr ""
msgid "Item not found." msgid "Item not found."
msgstr "" msgstr ""
#: ../../include/items.php:4148 ../../include/photos.php:26 #: ../../include/items.php:4148 ../../include/attach.php:137
#: ../../include/attach.php:137 ../../include/attach.php:184 #: ../../include/attach.php:184 ../../include/attach.php:247
#: ../../include/attach.php:247 ../../include/attach.php:261 #: ../../include/attach.php:261 ../../include/attach.php:305
#: ../../include/attach.php:305 ../../include/attach.php:319 #: ../../include/attach.php:319 ../../include/attach.php:350
#: ../../include/attach.php:350 ../../include/attach.php:546 #: ../../include/attach.php:546 ../../include/attach.php:618
#: ../../include/attach.php:618 ../../include/chat.php:131 #: ../../include/chat.php:131 ../../include/photos.php:26
#: ../../mod/profile.php:64 ../../mod/profile.php:72 #: ../../mod/profile.php:64 ../../mod/profile.php:72
#: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/item.php:206 #: ../../mod/achievements.php:30 ../../mod/manage.php:6 ../../mod/item.php:206
#: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/api.php:26 #: ../../mod/item.php:214 ../../mod/item.php:978 ../../mod/api.php:26
@ -3031,7 +3031,7 @@ msgstr ""
#: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178 #: ../../mod/block.php:22 ../../mod/block.php:72 ../../mod/like.php:178
#: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/network.php:12 #: ../../mod/events.php:219 ../../mod/group.php:9 ../../mod/network.php:12
#: ../../mod/common.php:35 ../../mod/connections.php:169 #: ../../mod/common.php:35 ../../mod/connections.php:169
#: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:68 #: ../../mod/blocks.php:69 ../../mod/blocks.php:76 ../../mod/photos.php:69
#: ../../mod/pdledit.php:21 ../../mod/authtest.php:13 #: ../../mod/pdledit.php:21 ../../mod/authtest.php:13
#: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87 #: ../../mod/editlayout.php:63 ../../mod/editlayout.php:87
#: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64 #: ../../mod/chat.php:90 ../../mod/chat.php:95 ../../mod/editwebpage.php:64
@ -3082,27 +3082,6 @@ msgstr ""
msgid "Connection not found." msgid "Connection not found."
msgstr "" msgstr ""
#: ../../include/photos.php:94
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
msgstr ""
#: ../../include/photos.php:101
msgid "Image file is empty."
msgstr ""
#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
msgid "Unable to process image"
msgstr ""
#: ../../include/photos.php:199
msgid "Photo storage failed."
msgstr ""
#: ../../include/photos.php:363
msgid "Upload New Photos"
msgstr ""
#: ../../include/zot.php:666 #: ../../include/zot.php:666
msgid "Invalid data packet" msgid "Invalid data packet"
msgstr "" msgstr ""
@ -3209,7 +3188,7 @@ msgid "Don't show"
msgstr "" msgstr ""
#: ../../include/acl_selectors.php:248 ../../mod/events.php:654 #: ../../include/acl_selectors.php:248 ../../mod/events.php:654
#: ../../mod/photos.php:559 ../../mod/photos.php:922 ../../mod/chat.php:209 #: ../../mod/photos.php:571 ../../mod/photos.php:934 ../../mod/chat.php:209
#: ../../mod/filestorage.php:147 #: ../../mod/filestorage.php:147
msgid "Permissions" msgid "Permissions"
msgstr "" msgstr ""
@ -3885,6 +3864,27 @@ msgstr ""
msgid "Room is full" msgid "Room is full"
msgstr "" msgstr ""
#: ../../include/photos.php:94
#, php-format
msgid "Image exceeds website size limit of %lu bytes"
msgstr ""
#: ../../include/photos.php:101
msgid "Image file is empty."
msgstr ""
#: ../../include/photos.php:128 ../../mod/profile_photo.php:217
msgid "Unable to process image"
msgstr ""
#: ../../include/photos.php:199
msgid "Photo storage failed."
msgstr ""
#: ../../include/photos.php:363
msgid "Upload New Photos"
msgstr ""
#: ../../mod/achievements.php:34 #: ../../mod/achievements.php:34
msgid "Some blurb about what to do when you're new here" msgid "Some blurb about what to do when you're new here"
msgstr "" msgstr ""
@ -3988,7 +3988,7 @@ msgid ""
"and/or create new posts for you?" "and/or create new posts for you?"
msgstr "" msgstr ""
#: ../../mod/api.php:105 ../../mod/photos.php:556 ../../mod/menu.php:91 #: ../../mod/api.php:105 ../../mod/photos.php:568 ../../mod/menu.php:91
#: ../../mod/menu.php:145 ../../mod/filestorage.php:151 #: ../../mod/menu.php:145 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/admin.php:430 #: ../../mod/filestorage.php:159 ../../mod/admin.php:430
#: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 #: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164
@ -3998,7 +3998,7 @@ msgstr ""
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
#: ../../mod/api.php:106 ../../mod/photos.php:556 ../../mod/menu.php:91 #: ../../mod/api.php:106 ../../mod/photos.php:568 ../../mod/menu.php:91
#: ../../mod/menu.php:145 ../../mod/filestorage.php:151 #: ../../mod/menu.php:145 ../../mod/filestorage.php:151
#: ../../mod/filestorage.php:159 ../../mod/admin.php:428 #: ../../mod/filestorage.php:159 ../../mod/admin.php:428
#: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164 #: ../../mod/settings.php:579 ../../mod/mitem.php:163 ../../mod/mitem.php:164
@ -4028,7 +4028,7 @@ msgstr ""
msgid "Select a tag to remove: " msgid "Select a tag to remove: "
msgstr "" msgstr ""
#: ../../mod/tagrm.php:133 ../../mod/photos.php:875 #: ../../mod/tagrm.php:133 ../../mod/photos.php:887
msgid "Remove" msgid "Remove"
msgstr "" msgstr ""
@ -4330,11 +4330,11 @@ msgstr ""
msgid "Create New Event" msgid "Create New Event"
msgstr "" msgstr ""
#: ../../mod/events.php:474 ../../mod/photos.php:827 #: ../../mod/events.php:474 ../../mod/photos.php:839
msgid "Previous" msgid "Previous"
msgstr "" msgstr ""
#: ../../mod/events.php:475 ../../mod/photos.php:836 ../../mod/setup.php:281 #: ../../mod/events.php:475 ../../mod/photos.php:848 ../../mod/setup.php:281
msgid "Next" msgid "Next"
msgstr "" msgstr ""
@ -4547,6 +4547,10 @@ msgstr ""
msgid "Bug reports and issues: please visit" msgid "Bug reports and issues: please visit"
msgstr "" msgstr ""
#: ../../mod/siteinfo.php:167
msgid "$projectname issues"
msgstr ""
#: ../../mod/siteinfo.php:168 #: ../../mod/siteinfo.php:168
msgid "" msgid ""
"Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com" "Suggestions, praise, etc. - please email \"redmatrix\" at librelist - dot com"
@ -4718,148 +4722,148 @@ msgstr ""
msgid "$Projectname - Guests: Username: {your email address}, Password: +++" msgid "$Projectname - Guests: Username: {your email address}, Password: +++"
msgstr "" msgstr ""
#: ../../mod/photos.php:77 #: ../../mod/photos.php:78
msgid "Page owner information could not be retrieved." msgid "Page owner information could not be retrieved."
msgstr "" msgstr ""
#: ../../mod/photos.php:97 #: ../../mod/photos.php:98
msgid "Album not found." msgid "Album not found."
msgstr "" msgstr ""
#: ../../mod/photos.php:119 ../../mod/photos.php:643 #: ../../mod/photos.php:120 ../../mod/photos.php:655
msgid "Delete Album" msgid "Delete Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:159 ../../mod/photos.php:930 #: ../../mod/photos.php:160 ../../mod/photos.php:942
msgid "Delete Photo" msgid "Delete Photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:429 ../../mod/search.php:13 ../../mod/display.php:13 #: ../../mod/photos.php:441 ../../mod/search.php:13 ../../mod/display.php:13
#: ../../mod/ratings.php:82 ../../mod/directory.php:47 #: ../../mod/ratings.php:82 ../../mod/directory.php:47
#: ../../mod/viewconnections.php:17 #: ../../mod/viewconnections.php:17
msgid "Public access denied." msgid "Public access denied."
msgstr "" msgstr ""
#: ../../mod/photos.php:440 #: ../../mod/photos.php:452
msgid "No photos selected" msgid "No photos selected"
msgstr "" msgstr ""
#: ../../mod/photos.php:484 #: ../../mod/photos.php:496
msgid "Access to this item is restricted." msgid "Access to this item is restricted."
msgstr "" msgstr ""
#: ../../mod/photos.php:523 #: ../../mod/photos.php:535
#, php-format #, php-format
msgid "%1$.2f MB of %2$.2f MB photo storage used." msgid "%1$.2f MB of %2$.2f MB photo storage used."
msgstr "" msgstr ""
#: ../../mod/photos.php:526 #: ../../mod/photos.php:538
#, php-format #, php-format
msgid "%1$.2f MB photo storage used." msgid "%1$.2f MB photo storage used."
msgstr "" msgstr ""
#: ../../mod/photos.php:550 #: ../../mod/photos.php:562
msgid "Upload Photos" msgid "Upload Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:554 ../../mod/photos.php:636 ../../mod/photos.php:915 #: ../../mod/photos.php:566 ../../mod/photos.php:648 ../../mod/photos.php:927
msgid "Enter a new album name" msgid "Enter a new album name"
msgstr "" msgstr ""
#: ../../mod/photos.php:555 ../../mod/photos.php:637 ../../mod/photos.php:916 #: ../../mod/photos.php:567 ../../mod/photos.php:649 ../../mod/photos.php:928
msgid "or select an existing one (doubleclick)" msgid "or select an existing one (doubleclick)"
msgstr "" msgstr ""
#: ../../mod/photos.php:556 #: ../../mod/photos.php:568
msgid "Create a status post for this upload" msgid "Create a status post for this upload"
msgstr "" msgstr ""
#: ../../mod/photos.php:584 #: ../../mod/photos.php:596
msgid "Album name could not be decoded" msgid "Album name could not be decoded"
msgstr "" msgstr ""
#: ../../mod/photos.php:625 ../../mod/photos.php:1157 #: ../../mod/photos.php:637 ../../mod/photos.php:1169
#: ../../mod/photos.php:1173 #: ../../mod/photos.php:1185
msgid "Contact Photos" msgid "Contact Photos"
msgstr "" msgstr ""
#: ../../mod/photos.php:649 #: ../../mod/photos.php:661
msgid "Show Newest First" msgid "Show Newest First"
msgstr "" msgstr ""
#: ../../mod/photos.php:651 #: ../../mod/photos.php:663
msgid "Show Oldest First" msgid "Show Oldest First"
msgstr "" msgstr ""
#: ../../mod/photos.php:675 ../../mod/photos.php:1205 #: ../../mod/photos.php:687 ../../mod/photos.php:1217
msgid "View Photo" msgid "View Photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:704 #: ../../mod/photos.php:716
msgid "Edit Album" msgid "Edit Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:749 #: ../../mod/photos.php:761
msgid "Permission denied. Access to this item may be restricted." msgid "Permission denied. Access to this item may be restricted."
msgstr "" msgstr ""
#: ../../mod/photos.php:751 #: ../../mod/photos.php:763
msgid "Photo not available" msgid "Photo not available"
msgstr "" msgstr ""
#: ../../mod/photos.php:809 #: ../../mod/photos.php:821
msgid "Use as profile photo" msgid "Use as profile photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:816 #: ../../mod/photos.php:828
msgid "Private Photo" msgid "Private Photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:831 #: ../../mod/photos.php:843
msgid "View Full Size" msgid "View Full Size"
msgstr "" msgstr ""
#: ../../mod/photos.php:909 #: ../../mod/photos.php:921
msgid "Edit photo" msgid "Edit photo"
msgstr "" msgstr ""
#: ../../mod/photos.php:911 #: ../../mod/photos.php:923
msgid "Rotate CW (right)" msgid "Rotate CW (right)"
msgstr "" msgstr ""
#: ../../mod/photos.php:912 #: ../../mod/photos.php:924
msgid "Rotate CCW (left)" msgid "Rotate CCW (left)"
msgstr "" msgstr ""
#: ../../mod/photos.php:919 #: ../../mod/photos.php:931
msgid "Caption" msgid "Caption"
msgstr "" msgstr ""
#: ../../mod/photos.php:921 #: ../../mod/photos.php:933
msgid "Add a Tag" msgid "Add a Tag"
msgstr "" msgstr ""
#: ../../mod/photos.php:925 #: ../../mod/photos.php:937
msgid "Example: @bob, @Barbara_Jensen, @jim@example.com" msgid "Example: @bob, @Barbara_Jensen, @jim@example.com"
msgstr "" msgstr ""
#: ../../mod/photos.php:928 #: ../../mod/photos.php:940
msgid "Flag as adult in album view" msgid "Flag as adult in album view"
msgstr "" msgstr ""
#: ../../mod/photos.php:1120 #: ../../mod/photos.php:1132
msgid "In This Photo:" msgid "In This Photo:"
msgstr "" msgstr ""
#: ../../mod/photos.php:1125 #: ../../mod/photos.php:1137
msgid "Map" msgid "Map"
msgstr "" msgstr ""
#: ../../mod/photos.php:1211 #: ../../mod/photos.php:1223
msgid "View Album" msgid "View Album"
msgstr "" msgstr ""
#: ../../mod/photos.php:1234 #: ../../mod/photos.php:1246
msgid "Recent Photos" msgid "Recent Photos"
msgstr "" msgstr ""

2
version.inc
View file

@ -1 +1 @@
2015-06-18.1067 2015-06-19.1068