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

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

Browse source 
* remotes/upstream/master:
  provide "xxx joined yyy" notifications
  adding META viewport tag for better look on tablets
  Update Esperanto to 100%
  DE update to the strings
  activitystreams schema constants for "join group"
  missed a db field
  typo in profile_selectors, fix remote tagging
  not all profile selector choices have unique or direct translations
  log db error strings in all cases
  admin page to manage failed updates
  improved db error logging
  close one menu (like the notifications menu) when another one is opened (like it is done when clicking somewhere else) (thx to ^mw)

* master:
This commit is contained in:
Simon L'nu 2012-04-30 06:02:38 -04:00
commit 9b7dac6ce1
18 changed files with 1846 additions and 1917 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
boot.php
View file

@ -9,7 +9,7 @@ require_once('include/nav.php');
require_once('include/cache.php'); require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica'); define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '2.3.1326' ); define ( 'FRIENDICA_VERSION', '2.3.1327' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1140 ); define ( 'DB_UPDATE_VERSION', 1140 );
@ -201,6 +201,8 @@ define ( 'ACTIVITY_REQ_FRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'request-friend' );
define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' ); define ( 'ACTIVITY_UNFRIEND', NAMESPACE_ACTIVITY_SCHEMA . 'remove-friend' );
define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' ); define ( 'ACTIVITY_FOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'follow' );
define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' ); define ( 'ACTIVITY_UNFOLLOW', NAMESPACE_ACTIVITY_SCHEMA . 'stop-following' );
define ( 'ACTIVITY_JOIN', NAMESPACE_ACTIVITY_SCHEMA . 'join' );
define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' ); define ( 'ACTIVITY_POST', NAMESPACE_ACTIVITY_SCHEMA . 'post' );
define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' ); define ( 'ACTIVITY_UPDATE', NAMESPACE_ACTIVITY_SCHEMA . 'update' );
define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' ); define ( 'ACTIVITY_TAG', NAMESPACE_ACTIVITY_SCHEMA . 'tag' );
@ -213,6 +215,7 @@ define ( 'ACTIVITY_OBJ_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'photo' );
define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' ); define ( 'ACTIVITY_OBJ_P_PHOTO', NAMESPACE_ACTIVITY_SCHEMA . 'profile-photo' );
define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' ); define ( 'ACTIVITY_OBJ_ALBUM', NAMESPACE_ACTIVITY_SCHEMA . 'photo-album' );
define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' ); define ( 'ACTIVITY_OBJ_EVENT', NAMESPACE_ACTIVITY_SCHEMA . 'event' );
define ( 'ACTIVITY_OBJ_GROUP', NAMESPACE_ACTIVITY_SCHEMA . 'group' );
define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' ); define ( 'ACTIVITY_OBJ_TAGTERM', NAMESPACE_DFRN . '/tagterm' );
define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' ); define ( 'ACTIVITY_OBJ_PROFILE', NAMESPACE_DFRN . '/profile' );
@ -667,7 +670,7 @@ if(! function_exists('check_config')) {
// call the specific update // call the specific update
$func = 'update_' . $x; $func = 'update_' . $x;
$retval = $func($a); $retval = $func();
if($retval) { if($retval) {
//send the administrator an e-mail //send the administrator an e-mail
$email_tpl = get_intltext_template("update_fail_eml.tpl"); $email_tpl = get_intltext_template("update_fail_eml.tpl");

28
include/dba.php
View file

@ -75,22 +75,28 @@ class dba {
if((! $this->db) || (! $this->connected)) if((! $this->db) || (! $this->connected))
return false; return false;
$this->error = '';
if($this->mysqli) if($this->mysqli)
$result = @$this->db->query($sql); $result = @$this->db->query($sql);
else else
$result = @mysql_query($sql,$this->db); $result = @mysql_query($sql,$this->db);
if($this->mysqli) {
if($this->db->errno)
$this->error = $this->db->error;
}
elseif(mysql_errno($this->db))
$this->error = mysql_error($this->db);
if(strlen($this->error)) {
logger('dba: ' . $this->error);
}
if($this->debug) { if($this->debug) {
$mesg = ''; $mesg = '';
if($this->mysqli) {
if($this->db->errno)
logger('dba: ' . $this->db->error);
}
elseif(mysql_errno($this->db))
logger('dba: ' . mysql_error($this->db));
if($result === false) if($result === false)
$mesg = 'false'; $mesg = 'false';
elseif($result === true) elseif($result === true)
@ -102,7 +108,9 @@ class dba {
$mesg = mysql_num_rows($result) . ' results' . EOL; $mesg = mysql_num_rows($result) . ' results' . EOL;
} }
$str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg . EOL; $str = 'SQL = ' . printable($sql) . EOL . 'SQL returned ' . $mesg
. (($this->error) ? ' error: ' . $this->error : '')
. EOL;
logger('dba: ' . $str ); logger('dba: ' . $str );
} }
@ -114,9 +122,9 @@ class dba {
*/ */
if($result === false) { if($result === false) {
logger('dba: ' . printable($sql) . ' returned false.'); logger('dba: ' . printable($sql) . ' returned false.' . "\n" . $this->error);
if(file_exists('dbfail.out')) if(file_exists('dbfail.out'))
file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n", FILE_APPEND); file_put_contents('dbfail.out', datetime_convert() . "\n" . printable($sql) . ' returned false' . "\n" . $this->error . "\n", FILE_APPEND);
} }
if(($result === true) || ($result === false)) if(($result === true) || ($result === false))

44
include/items.php
View file

@ -2227,10 +2227,10 @@ function local_delivery($importer,$data) {
logger('local_delivery: received remote comment'); logger('local_delivery: received remote comment');
$is_like = false; $is_like = false;
// remote reply to our post. Import and then notify everybody else. // remote reply to our post. Import and then notify everybody else.
$datarray = get_atom_elements($feed,$item); $datarray = get_atom_elements($feed,$item);
$r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
$r = q("SELECT `id`, `uid`, `last-child`, `edited`, `body` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1",
dbesc($item_id), dbesc($item_id),
intval($importer['importer_uid']) intval($importer['importer_uid'])
); );
@ -2266,14 +2266,22 @@ function local_delivery($importer,$data) {
// return 0; // return 0;
// } // }
// our user with $importer['importer_uid'] is the owner
$own = q("select name,url,thumb from contact where uid = %d and self = 1 limit 1",
intval($importer['importer_uid'])
);
$datarray['type'] = 'remote-comment'; $datarray['type'] = 'remote-comment';
$datarray['wall'] = 1; $datarray['wall'] = 1;
$datarray['parent-uri'] = $parent_uri; $datarray['parent-uri'] = $parent_uri;
$datarray['uid'] = $importer['importer_uid']; $datarray['uid'] = $importer['importer_uid'];
$datarray['owner-name'] = $r[0]['name']; $datarray['owner-name'] = $own[0]['name'];
$datarray['owner-link'] = $r[0]['url']; $datarray['owner-link'] = $own[0]['url'];
$datarray['owner-avatar'] = $r[0]['thumb']; $datarray['owner-avatar'] = $own[0]['thumb'];
$datarray['contact-id'] = $importer['id']; $datarray['contact-id'] = $importer['id'];
if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) { if(($datarray['verb'] === ACTIVITY_LIKE) || ($datarray['verb'] === ACTIVITY_DISLIKE)) {
$is_like = true; $is_like = true;
$datarray['type'] = 'activity'; $datarray['type'] = 'activity';
@ -2290,26 +2298,34 @@ function local_delivery($importer,$data) {
} }
if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) { if(($datarray['verb'] === ACTIVITY_TAG) && ($datarray['object-type'] === ACTIVITY_OBJ_TAGTERM)) {
$xo = parse_xml_string($datarray['object'],false); $xo = parse_xml_string($datarray['object'],false);
$xt = parse_xml_string($datarray['target'],false); $xt = parse_xml_string($datarray['target'],false);
if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id == $r[0]['uri'])) { if(($xt->type == ACTIVITY_OBJ_NOTE) && ($xt->id)) {
// fetch the parent item
$tagp = q("select * from item where uri = '%s' and uid = %d limit 1",
dbesc($xt->id),
intval($importer['importer_uid'])
);
if(! count($tagp))
continue;
// extract tag, if not duplicate, and this user allows tags, add to parent item // extract tag, if not duplicate, and this user allows tags, add to parent item
if($xo->id && $xo->content) { if($xo->id && $xo->content) {
$newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]'; $newtag = '#[url=' . $xo->id . ']'. $xo->content . '[/url]';
if(! (stristr($tagp[0]['tag'],$newtag))) {
if(! (stristr($r[0]['tag'],$newtag))) {
$i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1", $i = q("SELECT `blocktags` FROM `user` where `uid` = %d LIMIT 1",
intval($importer['importer_uid']) intval($importer['importer_uid'])
); );
if(count($i) && ! ($i[0]['blocktags'])) { if(count($i) && ! intval($i[0]['blocktags'])) {
q("UPDATE item SET tag = '%s' WHERE id = %d LIMIT 1", q("UPDATE item SET tag = '%s', `edited` = '%s' WHERE id = %d LIMIT 1",
dbesc($r[0]['tag'] . (strlen($r[0]['tag']) ? ',' : '') . $newtag), dbesc($tagp[0]['tag'] . (strlen($tagp[0]['tag']) ? ',' : '') . $newtag),
intval($r[0]['id']) intval($tagp[0]['id']),
dbesc(datetime_convert())
); );
} }
} }

18
include/profile_selectors.php
View file

@ -7,8 +7,10 @@ function gender_selector($current="",$suffix="") {
$o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >"; $o .= "<select name=\"gender$suffix\" id=\"gender-select$suffix\" size=\"1\" >";
foreach($select as $selection) { foreach($select as $selection) {
$selected = (($selection == $current) ? ' selected="selected" ' : ''); if($selection !== 'NOTRANSLATION') {
$o .= "<option value=\"$selection\" $selected >$selection</option>"; $selected = (($selection == $current) ? ' selected="selected" ' : '');
$o .= "<option value=\"$selection\" $selected >$selection</option>";
}
} }
$o .= '</select>'; $o .= '</select>';
return $o; return $o;
@ -20,8 +22,10 @@ function sexpref_selector($current="",$suffix="") {
$o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >"; $o .= "<select name=\"sexual$suffix\" id=\"sexual-select$suffix\" size=\"1\" >";
foreach($select as $selection) { foreach($select as $selection) {
$selected = (($selection == $current) ? ' selected="selected" ' : ''); if($selection !== 'NOTRANSLATION') {
$o .= "<option value=\"$selection\" $selected >$selection</option>"; $selected = (($selection == $current) ? ' selected="selected" ' : '');
$o .= "<option value=\"$selection\" $selected >$selection</option>";
}
} }
$o .= '</select>'; $o .= '</select>';
return $o; return $o;
@ -34,8 +38,10 @@ function marital_selector($current="",$suffix="") {
$o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >"; $o .= "<select name=\"marital\" id=\"marital-select\" size=\"1\" >";
foreach($select as $selection) { foreach($select as $selection) {
$selected = (($selection == $current) ? ' selected="selected" ' : ''); if($selection !== 'NOTRANSLATION') {
$o .= "<option value=\"$selection\" $selected >$selection</option>"; $selected = (($selection == $current) ? ' selected="selected" ' : '');
$o .= "<option value=\"$selection\" $selected >$selection</option>";
}
} }
$o .= '</select>'; $o .= '</select>';
return $o; return $o;

16
js/main.js
View file

@ -73,7 +73,16 @@
setupFieldRichtext(); setupFieldRichtext();
/* popup menus */ /* popup menus */
function close_last_popup_menu() {
if(last_popup_menu) {
last_popup_menu.hide();
last_popup_button.removeClass("selected");
last_popup_menu = null;
last_popup_button = null;
}
}
$('a[rel^=#]').click(function(e){ $('a[rel^=#]').click(function(e){
close_last_popup_menu();
menu = $( $(this).attr('rel') ); menu = $( $(this).attr('rel') );
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
@ -90,12 +99,7 @@
return false; return false;
}); });
$('html').click(function() { $('html').click(function() {
if(last_popup_menu) { close_last_popup_menu();
last_popup_menu.hide();
last_popup_button.removeClass("selected");
last_popup_menu = null;
last_popup_button = null;
}
}); });
// fancyboxes // fancyboxes

66
mod/admin.php
View file

@ -61,6 +61,9 @@ function admin_post(&$a){
case 'logs': case 'logs':
admin_page_logs_post($a); admin_page_logs_post($a);
break; break;
case 'dbsync':
admin_page_dbsync_post($a);
break;
case 'update': case 'update':
admin_page_remoteupdate_post($a); admin_page_remoteupdate_post($a);
break; break;
@ -94,7 +97,8 @@ function admin_content(&$a) {
'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"), 'users' => Array($a->get_baseurl(true)."/admin/users/", t("Users") , "users"),
'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"), 'plugins'=> Array($a->get_baseurl(true)."/admin/plugins/", t("Plugins") , "plugins"),
'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"), 'themes' => Array($a->get_baseurl(true)."/admin/themes/", t("Themes") , "themes"),
'update' => Array($a->get_baseurl(true)."/admin/update/", t("Update") , "update") 'dbsync' => Array($a->get_baseurl(true)."/admin/dbsync/", t('DB updates'), "dbsync"),
'update' => Array($a->get_baseurl(true)."/admin/update/", t("Software Update") , "update")
); );
/* get plugins admin page */ /* get plugins admin page */
@ -142,6 +146,9 @@ function admin_content(&$a) {
case 'logs': case 'logs':
$o = admin_page_logs($a); $o = admin_page_logs($a);
break; break;
case 'dbsync':
$o = admin_page_dbsync($a);
break;
case 'update': case 'update':
$o = admin_page_remoteupdate($a); $o = admin_page_remoteupdate($a);
break; break;
@ -435,6 +442,62 @@ function admin_page_site(&$a) {
} }
function admin_page_dbsync(&$a) {
$o = '';
if($a->argc > 3 && intval($a->argv[3]) && $a->argv[2] === 'mark') {
set_config('database', 'update_' . intval($a->argv[3]), 'success');
info( t('Update has been marked successful') . EOL);
goaway($a->get_baseurl(true) . '/admin/dbsync');
}
if($a->argc > 2 && intval($a->argv[2])) {
require_once('update.php');
$func = 'update_' . intval($a->argv[2]);
if(function_exists($func)) {
$retval = $func();
if($retval === UPDATE_FAILED) {
$o .= sprintf( t('Executing %s failed. Check system logs.'), $func);
}
elseif($retval === UPDATE_SUCCESS) {
$o .= sprintf( t('Update %s was successfully applied.', $func));
set_config('database',$func, 'success');
}
else
$o .= sprintf( t('Update %s did not return a status. Unknown if it succeeded.'), $func);
}
else
$o .= sprintf( t('Update function %s could not be found.'), $func);
return $o;
}
$failed = array();
$r = q("select * from config where `cat` = 'database' ");
if(count($r)) {
foreach($r as $rr) {
$upd = intval(substr($rr['k'],7));
if($upd < 1139 || $rr['v'] === 'success')
continue;
$failed[] = $upd;
}
}
if(! count($failed))
return '<h3>' . t('No failed updates.') . '</h3>';
$o = replace_macros(get_markup_template('failed_updates.tpl'),array(
'$base' => $a->get_baseurl(true),
'$banner' => t('Failed Updates'),
'$desc' => t('This does not include updates prior to 1139, which did not return a status.'),
'$mark' => t('Mark success (if update was manually applied)'),
'$apply' => t('Attempt to execute this update step automatically'),
'$failed' => $failed
));
return $o;
}
/** /**
* Users admin page * Users admin page
* *
@ -979,7 +1042,6 @@ readable.");
$size = 5000000; $size = 5000000;
$seek = fseek($fp,0-$size,SEEK_END); $seek = fseek($fp,0-$size,SEEK_END);
if($seek === 0) { if($seek === 0) {
fgets($fp); // throw away the first partial line
$data = escape_tags(fread($fp,$size)); $data = escape_tags(fread($fp,$size));
while(! feof($fp)) while(! feof($fp))
$data .= escape_tags(fread($fp,4096)); $data .= escape_tags(fread($fp,4096));

45
mod/dfrn_confirm.php
View file

@ -434,9 +434,14 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
else else
$contact = null; $contact = null;
if(isset($new_relation) && $new_relation == CONTACT_IS_FRIEND) {
if(($contact) && ($contact['network'] === NETWORK_DIASPORA)) { $forum_type = false;
if($user['page-flags'] == PAGE_SOAPBOX || $user['page-flags'] == PAGE_COMMUNITY)
$forum_type = true;
if((isset($new_relation) && $new_relation == CONTACT_IS_FRIEND) || ($forum_type)) {
if(($contact) && ($contact['network'] === NETWORK_DIASPORA) && (! $forum_type)) {
require_once('include/diaspora.php'); require_once('include/diaspora.php');
$ret = diaspora_share($user[0],$r[0]); $ret = diaspora_share($user[0],$r[0]);
logger('mod_follow: diaspora_share returns: ' . $ret); logger('mod_follow: diaspora_share returns: ' . $ret);
@ -468,19 +473,37 @@ function dfrn_confirm_post(&$a,$handsfree = null) {
$arr['author-name'] = $arr['owner-name'] = $self[0]['name']; $arr['author-name'] = $arr['owner-name'] = $self[0]['name'];
$arr['author-link'] = $arr['owner-link'] = $self[0]['url']; $arr['author-link'] = $arr['owner-link'] = $self[0]['url'];
$arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb']; $arr['author-avatar'] = $arr['owner-avatar'] = $self[0]['thumb'];
$arr['verb'] = ACTIVITY_FRIEND;
$arr['object-type'] = ACTIVITY_OBJ_PERSON;
$A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]'; $A = '[url=' . $self[0]['url'] . ']' . $self[0]['name'] . '[/url]';
$APhoto = '[url=' . $self[0]['url'] . ']' . '[img]' . $self[0]['thumb'] . '[/img][/url]';
$B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]'; $B = '[url=' . $contact['url'] . ']' . $contact['name'] . '[/url]';
$BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]'; $BPhoto = '[url=' . $contact['url'] . ']' . '[img]' . $contact['thumb'] . '[/img][/url]';
$arr['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>' if($forum_type) {
. '<id>' . $contact['url'] . '/' . $contact['name'] . '</id>'; $arr['verb'] = ACTIVITY_JOIN;
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $contact['url'] . '" />' . "\n"); $arr['object-type'] = ACTIVITY_OBJ_GROUP;
$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $contact['thumb'] . '" />' . "\n"); $arr['body'] = sprintf( t('%1$s joined %2$s'), $B, $A)."\n\n\n".$APhoto;
$arr['object'] .= '</link></object>' . "\n"; $arr['object'] = '<object><type>' . ACTIVITY_OBJ_GROUP . '</type><title>' . $self[0]['name'] . '</title>'
. '<id>' . $self[0]['url'] . '/' . $self[0]['name'] . '</id>';
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $self[0]['url'] . '" />' . "\n");
$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $self[0]['thumb'] . '" />' . "\n");
$arr['object'] .= '</link></object>' . "\n";
}
else {
$arr['verb'] = ACTIVITY_FRIEND;
$arr['object-type'] = ACTIVITY_OBJ_PERSON;
$arr['body'] = sprintf( t('%1$s is now friends with %2$s'), $A, $B)."\n\n\n".$BPhoto;
$arr['object'] = '<object><type>' . ACTIVITY_OBJ_PERSON . '</type><title>' . $contact['name'] . '</title>'
. '<id>' . $contact['url'] . '/' . $contact['name'] . '</id>';
$arr['object'] .= '<link>' . xmlify('<link rel="alternate" type="text/html" href="' . $contact['url'] . '" />' . "\n");
$arr['object'] .= xmlify('<link rel="photo" type="image/jpeg" href="' . $contact['thumb'] . '" />' . "\n");
$arr['object'] .= '</link></object>' . "\n";
}
$arr['last-child'] = 1; $arr['last-child'] = 1;
$arr['allow_cid'] = $user[0]['allow_cid']; $arr['allow_cid'] = $user[0]['allow_cid'];

8
mod/tagger.php
View file

@ -66,14 +66,14 @@ function tagger_content(&$a) {
} }
$uri = item_new_uri($a->get_hostname(),$owner_uid); $uri = item_new_uri($a->get_hostname(),$owner_uid);
$xterm = xmlify($term);
$post_type = (($item['resource-id']) ? t('photo') : t('status')); $post_type = (($item['resource-id']) ? t('photo') : t('status'));
$targettype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE ); $targettype = (($item['resource-id']) ? ACTIVITY_OBJ_PHOTO : ACTIVITY_OBJ_NOTE );
$link = xmlify('<link rel="alternate" type="text/html" href="' $link = xmlify('<link rel="alternate" type="text/html" href="'
. $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ; . $a->get_baseurl() . '/display/' . $owner['nickname'] . '/' . $item['id'] . '" />' . "\n") ;
$body = $item['body']; $body = xmlify($item['body']);
$target = <<< EOT $target = <<< EOT
<target> <target>
@ -95,8 +95,8 @@ EOT;
<local>1</local> <local>1</local>
<id>$tagid</id> <id>$tagid</id>
<link>$tagid</link> <link>$tagid</link>
<title>$term</title> <title>$xterm</title>
<content>$term</content> <content>$xterm</content>
</object> </object>
EOT; EOT;

253
util/messages.po
View file

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: 2.3.1326\n" "Project-Id-Version: 2.3.1327\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-04-28 10:00-0700\n" "POT-Creation-Date: 2012-04-29 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"
@ -52,7 +52,7 @@ msgstr ""
#: ../../mod/message.php:90 ../../mod/allfriends.php:9 #: ../../mod/message.php:90 ../../mod/allfriends.php:9
#: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53 #: ../../mod/nogroup.php:25 ../../mod/wall_upload.php:53
#: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138 #: ../../mod/follow.php:8 ../../mod/common.php:9 ../../mod/display.php:138
#: ../../mod/profiles.php:7 ../../mod/profiles.php:329 #: ../../mod/profiles.php:7 ../../mod/profiles.php:365
#: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13 #: ../../mod/delegate.php:6 ../../mod/suggest.php:28 ../../mod/invite.php:13
#: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53 #: ../../mod/invite.php:81 ../../mod/dfrn_confirm.php:53
#: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171 #: ../../addon/facebook/facebook.php:484 ../../include/items.php:3171
@ -132,7 +132,7 @@ msgstr ""
#: ../../mod/settings.php:744 ../../mod/settings.php:935 #: ../../mod/settings.php:744 ../../mod/settings.php:935
#: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:393 #: ../../mod/manage.php:109 ../../mod/group.php:85 ../../mod/admin.php:393
#: ../../mod/admin.php:572 ../../mod/admin.php:708 ../../mod/admin.php:907 #: ../../mod/admin.php:572 ../../mod/admin.php:708 ../../mod/admin.php:907
#: ../../mod/admin.php:995 ../../mod/profiles.php:498 ../../mod/invite.php:119 #: ../../mod/admin.php:995 ../../mod/profiles.php:534 ../../mod/invite.php:119
#: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76 #: ../../addon/facebook/facebook.php:574 ../../addon/yourls/yourls.php:76
#: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57 #: ../../addon/ljpost/ljpost.php:93 ../../addon/nsfw/nsfw.php:57
#: ../../addon/planets/planets.php:158 #: ../../addon/planets/planets.php:158
@ -220,7 +220,7 @@ msgid "link to source"
msgstr "" msgstr ""
#: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255 #: ../../mod/events.php:296 ../../view/theme/diabook/theme.php:255
#: ../../include/nav.php:52 ../../boot.php:1481 #: ../../include/nav.php:52 ../../boot.php:1487
msgid "Events" msgid "Events"
msgstr "" msgstr ""
@ -270,7 +270,7 @@ msgid "Description:"
msgstr "" msgstr ""
#: ../../mod/events.php:395 ../../include/event.php:37 #: ../../mod/events.php:395 ../../include/event.php:37
#: ../../include/bb2diaspora.php:260 ../../boot.php:1083 #: ../../include/bb2diaspora.php:260 ../../boot.php:1089
msgid "Location:" msgid "Location:"
msgstr "" msgstr ""
@ -330,7 +330,7 @@ msgstr ""
#: ../../mod/settings.php:884 ../../mod/settings.php:890 #: ../../mod/settings.php:884 ../../mod/settings.php:890
#: ../../mod/settings.php:926 ../../mod/settings.php:927 #: ../../mod/settings.php:926 ../../mod/settings.php:927
#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/settings.php:928 ../../mod/settings.php:929
#: ../../mod/register.php:532 ../../mod/profiles.php:475 #: ../../mod/register.php:532 ../../mod/profiles.php:511
msgid "Yes" msgid "Yes"
msgstr "" msgstr ""
@ -341,7 +341,7 @@ msgstr ""
#: ../../mod/settings.php:884 ../../mod/settings.php:890 #: ../../mod/settings.php:884 ../../mod/settings.php:890
#: ../../mod/settings.php:926 ../../mod/settings.php:927 #: ../../mod/settings.php:926 ../../mod/settings.php:927
#: ../../mod/settings.php:928 ../../mod/settings.php:929 #: ../../mod/settings.php:928 ../../mod/settings.php:929
#: ../../mod/register.php:533 ../../mod/profiles.php:476 #: ../../mod/register.php:533 ../../mod/profiles.php:512
msgid "No" msgid "No"
msgstr "" msgstr ""
@ -545,7 +545,7 @@ msgstr ""
#: ../../mod/photos.php:1232 ../../mod/photos.php:1272 #: ../../mod/photos.php:1232 ../../mod/photos.php:1272
#: ../../mod/photos.php:1303 ../../include/conversation.php:554 #: ../../mod/photos.php:1303 ../../include/conversation.php:554
#: ../../boot.php:495 #: ../../boot.php:503
msgid "Comment" msgid "Comment"
msgstr "" msgstr ""
@ -1166,7 +1166,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:1027 #: ../../include/contact_widgets.php:9 ../../boot.php:1033
msgid "Connect" msgid "Connect"
msgstr "" msgstr ""
@ -1648,6 +1648,7 @@ msgstr ""
#: ../../addon/facebook/facebook.php:650 #: ../../addon/facebook/facebook.php:650
#: ../../addon/facebook/facebook.php:1139 #: ../../addon/facebook/facebook.php:1139
#: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700 #: ../../addon/testdrive/testdrive.php:58 ../../include/items.php:2700
#: ../../boot.php:683
msgid "Administrator" msgid "Administrator"
msgstr "" msgstr ""
@ -1657,7 +1658,7 @@ msgid ""
"Password reset failed." "Password reset failed."
msgstr "" msgstr ""
#: ../../mod/lostpass.php:83 ../../boot.php:809 #: ../../mod/lostpass.php:83 ../../boot.php:815
msgid "Password Reset" msgid "Password Reset"
msgstr "" msgstr ""
@ -2279,7 +2280,7 @@ msgstr ""
msgid "Invalid contact." msgid "Invalid contact."
msgstr "" msgstr ""
#: ../../mod/notes.php:44 ../../boot.php:1486 #: ../../mod/notes.php:44 ../../boot.php:1492
msgid "Personal Notes" msgid "Personal Notes"
msgstr "" msgstr ""
@ -2530,7 +2531,7 @@ msgstr ""
#: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252 #: ../../mod/profperm.php:103 ../../view/theme/diabook/theme.php:252
#: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74 #: ../../include/profile_advanced.php:7 ../../include/profile_advanced.php:74
#: ../../include/nav.php:50 ../../boot.php:1468 #: ../../include/nav.php:50 ../../boot.php:1474
msgid "Profile" msgid "Profile"
msgstr "" msgstr ""
@ -2702,7 +2703,7 @@ msgstr ""
msgid "Choose a nickname: " msgid "Choose a nickname: "
msgstr "" msgstr ""
#: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:775 #: ../../mod/register.php:567 ../../include/nav.php:81 ../../boot.php:781
msgid "Register" msgid "Register"
msgstr "" msgstr ""
@ -2745,7 +2746,7 @@ msgid "Access denied."
msgstr "" msgstr ""
#: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254 #: ../../mod/fbrowser.php:23 ../../view/theme/diabook/theme.php:254
#: ../../include/nav.php:51 ../../boot.php:1473 #: ../../include/nav.php:51 ../../boot.php:1479
msgid "Photos" msgid "Photos"
msgstr "" msgstr ""
@ -3451,7 +3452,7 @@ msgstr ""
msgid "FTP Password" msgid "FTP Password"
msgstr "" msgstr ""
#: ../../mod/profile.php:21 ../../boot.php:940 #: ../../mod/profile.php:21 ../../boot.php:946
msgid "Requested profile is not available." msgid "Requested profile is not available."
msgstr "" msgstr ""
@ -3595,8 +3596,8 @@ msgstr ""
msgid "Search This Site" msgid "Search This Site"
msgstr "" msgstr ""
#: ../../mod/profiles.php:21 ../../mod/profiles.php:339 #: ../../mod/profiles.php:21 ../../mod/profiles.php:375
#: ../../mod/profiles.php:453 ../../mod/dfrn_confirm.php:62 #: ../../mod/profiles.php:489 ../../mod/dfrn_confirm.php:62
msgid "Profile not found." msgid "Profile not found."
msgstr "" msgstr ""
@ -3604,259 +3605,273 @@ msgstr ""
msgid "Profile Name is required." msgid "Profile Name is required."
msgstr "" msgstr ""
#: ../../mod/profiles.php:143 #: ../../mod/profiles.php:145
msgid "Marital Status" msgid "Marital Status"
msgstr "" msgstr ""
#: ../../mod/profiles.php:144 #: ../../mod/profiles.php:149
msgid "Romantic Partner" msgid "Romantic Partner"
msgstr "" msgstr ""
#: ../../mod/profiles.php:145 #: ../../mod/profiles.php:153
msgid "Work/Employment" msgid "Work/Employment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:146 #: ../../mod/profiles.php:156
msgid "Religion" msgid "Religion"
msgstr "" msgstr ""
#: ../../mod/profiles.php:147 #: ../../mod/profiles.php:160
msgid "Political Views" msgid "Political Views"
msgstr "" msgstr ""
#: ../../mod/profiles.php:148 #: ../../mod/profiles.php:164
msgid "Gender" msgid "Gender"
msgstr "" msgstr ""
#: ../../mod/profiles.php:149 #: ../../mod/profiles.php:168
msgid "Sexual Preference" msgid "Sexual Preference"
msgstr "" msgstr ""
#: ../../mod/profiles.php:150 #: ../../mod/profiles.php:172
msgid "Homepage" msgid "Homepage"
msgstr "" msgstr ""
#: ../../mod/profiles.php:151 #: ../../mod/profiles.php:176
msgid "Interests" msgid "Interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:154 #: ../../mod/profiles.php:181
msgid "Location" msgid "Location"
msgstr "" msgstr ""
#: ../../mod/profiles.php:225 #: ../../mod/profiles.php:253
msgid "Profile updated." msgid "Profile updated."
msgstr "" msgstr ""
#: ../../mod/profiles.php:300 #: ../../mod/profiles.php:320
msgid " and "
msgstr ""
#: ../../mod/profiles.php:328
msgid "public profile" msgid "public profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:302 #: ../../mod/profiles.php:331
#, php-format
msgid "%1$s changed %2$s to %3$s"
msgstr ""
#: ../../mod/profiles.php:332
#, php-format
msgid " - Visit %1$s's %2$s"
msgstr ""
#: ../../mod/profiles.php:335
#, php-format #, php-format
msgid "%1$s has an updated %2$s, changing %3$s." msgid "%1$s has an updated %2$s, changing %3$s."
msgstr "" msgstr ""
#: ../../mod/profiles.php:358 #: ../../mod/profiles.php:394
msgid "Profile deleted." msgid "Profile deleted."
msgstr "" msgstr ""
#: ../../mod/profiles.php:376 ../../mod/profiles.php:410 #: ../../mod/profiles.php:412 ../../mod/profiles.php:446
msgid "Profile-" msgid "Profile-"
msgstr "" msgstr ""
#: ../../mod/profiles.php:395 ../../mod/profiles.php:437 #: ../../mod/profiles.php:431 ../../mod/profiles.php:473
msgid "New profile created." msgid "New profile created."
msgstr "" msgstr ""
#: ../../mod/profiles.php:416 #: ../../mod/profiles.php:452
msgid "Profile unavailable to clone." msgid "Profile unavailable to clone."
msgstr "" msgstr ""
#: ../../mod/profiles.php:474 #: ../../mod/profiles.php:510
msgid "Hide your contact/friend list from viewers of this profile?" msgid "Hide your contact/friend list from viewers of this profile?"
msgstr "" msgstr ""
#: ../../mod/profiles.php:497 #: ../../mod/profiles.php:533
msgid "Edit Profile Details" msgid "Edit Profile Details"
msgstr "" msgstr ""
#: ../../mod/profiles.php:499 #: ../../mod/profiles.php:535
msgid "View this profile" msgid "View this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:500 #: ../../mod/profiles.php:536
msgid "Create a new profile using these settings" msgid "Create a new profile using these settings"
msgstr "" msgstr ""
#: ../../mod/profiles.php:501 #: ../../mod/profiles.php:537
msgid "Clone this profile" msgid "Clone this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:502 #: ../../mod/profiles.php:538
msgid "Delete this profile" msgid "Delete this profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:503 #: ../../mod/profiles.php:539
msgid "Profile Name:" msgid "Profile Name:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:504 #: ../../mod/profiles.php:540
msgid "Your Full Name:" msgid "Your Full Name:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:505 #: ../../mod/profiles.php:541
msgid "Title/Description:" msgid "Title/Description:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:506 #: ../../mod/profiles.php:542
msgid "Your Gender:" msgid "Your Gender:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:507 #: ../../mod/profiles.php:543
#, php-format #, php-format
msgid "Birthday (%s):" msgid "Birthday (%s):"
msgstr "" msgstr ""
#: ../../mod/profiles.php:508 #: ../../mod/profiles.php:544
msgid "Street Address:" msgid "Street Address:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:509 #: ../../mod/profiles.php:545
msgid "Locality/City:" msgid "Locality/City:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:510 #: ../../mod/profiles.php:546
msgid "Postal/Zip Code:" msgid "Postal/Zip Code:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:511 #: ../../mod/profiles.php:547
msgid "Country:" msgid "Country:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:512 #: ../../mod/profiles.php:548
msgid "Region/State:" msgid "Region/State:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:513 #: ../../mod/profiles.php:549
msgid "<span class=\"heart\">&hearts;</span> Marital Status:" msgid "<span class=\"heart\">&hearts;</span> Marital Status:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:514 #: ../../mod/profiles.php:550
msgid "Who: (if applicable)" msgid "Who: (if applicable)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:515 #: ../../mod/profiles.php:551
msgid "Examples: cathy123, Cathy Williams, cathy@example.com" msgid "Examples: cathy123, Cathy Williams, cathy@example.com"
msgstr "" msgstr ""
#: ../../mod/profiles.php:516 ../../include/profile_advanced.php:43 #: ../../mod/profiles.php:552 ../../include/profile_advanced.php:43
msgid "Sexual Preference:" msgid "Sexual Preference:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:517 #: ../../mod/profiles.php:553
msgid "Homepage URL:" msgid "Homepage URL:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:518 ../../include/profile_advanced.php:49 #: ../../mod/profiles.php:554 ../../include/profile_advanced.php:49
msgid "Political Views:" msgid "Political Views:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:519 #: ../../mod/profiles.php:555
msgid "Religious Views:" msgid "Religious Views:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:520 #: ../../mod/profiles.php:556
msgid "Public Keywords:" msgid "Public Keywords:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:521 #: ../../mod/profiles.php:557
msgid "Private Keywords:" msgid "Private Keywords:"
msgstr "" msgstr ""
#: ../../mod/profiles.php:522 #: ../../mod/profiles.php:558
msgid "Example: fishing photography software" msgid "Example: fishing photography software"
msgstr "" msgstr ""
#: ../../mod/profiles.php:523 #: ../../mod/profiles.php:559
msgid "(Used for suggesting potential friends, can be seen by others)" msgid "(Used for suggesting potential friends, can be seen by others)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:524 #: ../../mod/profiles.php:560
msgid "(Used for searching profiles, never shown to others)" msgid "(Used for searching profiles, never shown to others)"
msgstr "" msgstr ""
#: ../../mod/profiles.php:525 #: ../../mod/profiles.php:561
msgid "Tell us about yourself..." msgid "Tell us about yourself..."
msgstr "" msgstr ""
#: ../../mod/profiles.php:526 #: ../../mod/profiles.php:562
msgid "Hobbies/Interests" msgid "Hobbies/Interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:527 #: ../../mod/profiles.php:563
msgid "Contact information and Social Networks" msgid "Contact information and Social Networks"
msgstr "" msgstr ""
#: ../../mod/profiles.php:528 #: ../../mod/profiles.php:564
msgid "Musical interests" msgid "Musical interests"
msgstr "" msgstr ""
#: ../../mod/profiles.php:529 #: ../../mod/profiles.php:565
msgid "Books, literature" msgid "Books, literature"
msgstr "" msgstr ""
#: ../../mod/profiles.php:530 #: ../../mod/profiles.php:566
msgid "Television" msgid "Television"
msgstr "" msgstr ""
#: ../../mod/profiles.php:531 #: ../../mod/profiles.php:567
msgid "Film/dance/culture/entertainment" msgid "Film/dance/culture/entertainment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:532 #: ../../mod/profiles.php:568
msgid "Love/romance" msgid "Love/romance"
msgstr "" msgstr ""
#: ../../mod/profiles.php:533 #: ../../mod/profiles.php:569
msgid "Work/employment" msgid "Work/employment"
msgstr "" msgstr ""
#: ../../mod/profiles.php:534 #: ../../mod/profiles.php:570
msgid "School/education" msgid "School/education"
msgstr "" msgstr ""
#: ../../mod/profiles.php:539 #: ../../mod/profiles.php:575
msgid "" msgid ""
"This is your <strong>public</strong> profile.<br />It <strong>may</strong> " "This is your <strong>public</strong> profile.<br />It <strong>may</strong> "
"be visible to anybody using the internet." "be visible to anybody using the internet."
msgstr "" msgstr ""
#: ../../mod/profiles.php:549 ../../mod/directory.php:111 #: ../../mod/profiles.php:585 ../../mod/directory.php:111
msgid "Age: " msgid "Age: "
msgstr "" msgstr ""
#: ../../mod/profiles.php:584 #: ../../mod/profiles.php:620
msgid "Edit/Manage Profiles" msgid "Edit/Manage Profiles"
msgstr "" msgstr ""
#: ../../mod/profiles.php:585 ../../boot.php:1049 #: ../../mod/profiles.php:621 ../../boot.php:1055
msgid "Change profile photo" msgid "Change profile photo"
msgstr "" msgstr ""
#: ../../mod/profiles.php:586 ../../boot.php:1050 #: ../../mod/profiles.php:622 ../../boot.php:1056
msgid "Create New Profile" msgid "Create New Profile"
msgstr "" msgstr ""
#: ../../mod/profiles.php:597 ../../boot.php:1060 #: ../../mod/profiles.php:633 ../../boot.php:1066
msgid "Profile Image" msgid "Profile Image"
msgstr "" msgstr ""
#: ../../mod/profiles.php:599 ../../boot.php:1063 #: ../../mod/profiles.php:635 ../../boot.php:1069
msgid "visible to everybody" msgid "visible to everybody"
msgstr "" msgstr ""
#: ../../mod/profiles.php:600 ../../boot.php:1064 #: ../../mod/profiles.php:636 ../../boot.php:1070
msgid "Edit visibility" msgid "Edit visibility"
msgstr "" msgstr ""
@ -4457,7 +4472,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:796 #: ../../include/nav.php:64 ../../boot.php:802
msgid "Login" msgid "Login"
msgstr "" msgstr ""
@ -5199,7 +5214,7 @@ msgid "Show More Settings saved."
msgstr "" msgstr ""
#: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466 #: ../../addon/showmore/showmore.php:87 ../../include/conversation.php:466
#: ../../boot.php:496 #: ../../boot.php:504
msgid "show more" msgid "show more"
msgstr "" msgstr ""
@ -5503,7 +5518,7 @@ msgstr ""
msgid "Set colour scheme" msgid "Set colour scheme"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:17 ../../boot.php:1085 #: ../../include/profile_advanced.php:17 ../../boot.php:1091
msgid "Gender:" msgid "Gender:"
msgstr "" msgstr ""
@ -5524,11 +5539,11 @@ msgstr ""
msgid "Age:" msgid "Age:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:37 ../../boot.php:1088 #: ../../include/profile_advanced.php:37 ../../boot.php:1094
msgid "Status:" msgid "Status:"
msgstr "" msgstr ""
#: ../../include/profile_advanced.php:45 ../../boot.php:1090 #: ../../include/profile_advanced.php:45 ../../boot.php:1096
msgid "Homepage:" msgid "Homepage:"
msgstr "" msgstr ""
@ -6112,7 +6127,7 @@ msgstr ""
msgid "Contacts not in any group" msgid "Contacts not in any group"
msgstr "" msgstr ""
#: ../../include/nav.php:46 ../../boot.php:795 #: ../../include/nav.php:46 ../../boot.php:801
msgid "Logout" msgid "Logout"
msgstr "" msgstr ""
@ -6120,7 +6135,7 @@ msgstr ""
msgid "End this session" msgid "End this session"
msgstr "" msgstr ""
#: ../../include/nav.php:49 ../../boot.php:1463 #: ../../include/nav.php:49 ../../boot.php:1469
msgid "Status" msgid "Status"
msgstr "" msgstr ""
@ -6200,11 +6215,11 @@ msgstr ""
msgid "Manage other pages" msgid "Manage other pages"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1043 #: ../../include/nav.php:138 ../../boot.php:1049
msgid "Profiles" msgid "Profiles"
msgstr "" msgstr ""
#: ../../include/nav.php:138 ../../boot.php:1043 #: ../../include/nav.php:138 ../../boot.php:1049
msgid "Manage/edit profiles" msgid "Manage/edit profiles"
msgstr "" msgstr ""
@ -6626,33 +6641,33 @@ msgid ""
"form has been opened for too long (>3 hours) before submitting it." "form has been opened for too long (>3 hours) before submitting it."
msgstr "" msgstr ""
#: ../../include/Contact.php:96 #: ../../include/Contact.php:111
msgid "stopped following" msgid "stopped following"
msgstr "" msgstr ""
#: ../../include/Contact.php:188 ../../include/conversation.php:817 #: ../../include/Contact.php:203 ../../include/conversation.php:817
msgid "View Status" msgid "View Status"
msgstr "" msgstr ""
#: ../../include/Contact.php:189 ../../include/conversation.php:818 #: ../../include/Contact.php:204 ../../include/conversation.php:818
msgid "View Profile" msgid "View Profile"
msgstr "" msgstr ""
#: ../../include/Contact.php:190 ../../include/conversation.php:819 #: ../../include/Contact.php:205 ../../include/conversation.php:819
msgid "View Photos" msgid "View Photos"
msgstr "" msgstr ""
#: ../../include/Contact.php:191 ../../include/Contact.php:204 #: ../../include/Contact.php:206 ../../include/Contact.php:219
#: ../../include/conversation.php:820 #: ../../include/conversation.php:820
msgid "Network Posts" msgid "Network Posts"
msgstr "" msgstr ""
#: ../../include/Contact.php:192 ../../include/Contact.php:204 #: ../../include/Contact.php:207 ../../include/Contact.php:219
#: ../../include/conversation.php:821 #: ../../include/conversation.php:821
msgid "Edit Contact" msgid "Edit Contact"
msgstr "" msgstr ""
#: ../../include/Contact.php:193 ../../include/Contact.php:204 #: ../../include/Contact.php:208 ../../include/Contact.php:219
#: ../../include/conversation.php:822 #: ../../include/conversation.php:822
msgid "Send PM" msgid "Send PM"
msgstr "" msgstr ""
@ -6879,70 +6894,80 @@ msgstr ""
msgid "permissions" msgid "permissions"
msgstr "" msgstr ""
#: ../../boot.php:494 #: ../../boot.php:502
msgid "Delete this item?" msgid "Delete this item?"
msgstr "" msgstr ""
#: ../../boot.php:497 #: ../../boot.php:505
msgid "show fewer" msgid "show fewer"
msgstr "" msgstr ""
#: ../../boot.php:774 #: ../../boot.php:678
#, php-format
msgid "Update %s failed. See error logs."
msgstr ""
#: ../../boot.php:680
#, php-format
msgid "Update Error at %s"
msgstr ""
#: ../../boot.php:780
msgid "Create a New Account" msgid "Create a New Account"
msgstr "" msgstr ""
#: ../../boot.php:798 #: ../../boot.php:804
msgid "Nickname or Email address: " msgid "Nickname or Email address: "
msgstr "" msgstr ""
#: ../../boot.php:799 #: ../../boot.php:805
msgid "Password: " msgid "Password: "
msgstr "" msgstr ""
#: ../../boot.php:802 #: ../../boot.php:808
msgid "Or login using OpenID: " msgid "Or login using OpenID: "
msgstr "" msgstr ""
#: ../../boot.php:808 #: ../../boot.php:814
msgid "Forgot your password?" msgid "Forgot your password?"
msgstr "" msgstr ""
#: ../../boot.php:975 #: ../../boot.php:981
msgid "Edit profile" msgid "Edit profile"
msgstr "" msgstr ""
#: ../../boot.php:1035 #: ../../boot.php:1041
msgid "Message" msgid "Message"
msgstr "" msgstr ""
#: ../../boot.php:1151 ../../boot.php:1227 #: ../../boot.php:1157 ../../boot.php:1233
msgid "g A l F d" msgid "g A l F d"
msgstr "" msgstr ""
#: ../../boot.php:1152 ../../boot.php:1228 #: ../../boot.php:1158 ../../boot.php:1234
msgid "F d" msgid "F d"
msgstr "" msgstr ""
#: ../../boot.php:1197 ../../boot.php:1268 #: ../../boot.php:1203 ../../boot.php:1274
msgid "[today]" msgid "[today]"
msgstr "" msgstr ""
#: ../../boot.php:1209 #: ../../boot.php:1215
msgid "Birthday Reminders" msgid "Birthday Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1210 #: ../../boot.php:1216
msgid "Birthdays this week:" msgid "Birthdays this week:"
msgstr "" msgstr ""
#: ../../boot.php:1261 #: ../../boot.php:1267
msgid "[No description]" msgid "[No description]"
msgstr "" msgstr ""
#: ../../boot.php:1279 #: ../../boot.php:1285
msgid "Event Reminders" msgid "Event Reminders"
msgstr "" msgstr ""
#: ../../boot.php:1280 #: ../../boot.php:1286
msgid "Events this week:" msgid "Events this week:"
msgstr "" msgstr ""

1
view/admin_aside.tpl
View file

@ -16,6 +16,7 @@
<li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li> <li class='admin link button $admin.users.2'><a href='$admin.users.0'>$admin.users.1</a><span id='pending-update' title='$h_pending'></span></li>
<li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li> <li class='admin link button $admin.plugins.2'><a href='$admin.plugins.0'>$admin.plugins.1</a></li>
<li class='admin link button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li> <li class='admin link button $admin.themes.2'><a href='$admin.themes.0'>$admin.themes.1</a></li>
<li class='admin link button $admin.dbsync.2'><a href='$admin.dbsync.0'>$admin.dbsync.1</a></li>
</ul> </ul>
<ul class='admin linklist'> <ul class='admin linklist'>

15
view/de/follow_notify_eml.tpl
View file

@ -1,15 +1,14 @@
Hallo $myname, Hallo $[myname],
'$requestor' folgt dir jetzt auf $sitename. Du hast einen neuen Anhänger auf $[sitename] - '$[requestor]'.
Du kannst das Profil unter $url abrufen. Du kannst das Profil unter $[url] besuchen.
Bitte melde dich auf deiner Seite an um die Anfrage zu bestätigen, abzulehnen Bitte melde dich an um die Anfrage zu bestätigen oder sie zu ignorieren bzw. abzulehnen.
oder zu ignorieren.
$siteurl $[siteurl]
Grüße, beste Grüße,
$sitename Administrator
$[sitename] Administrator

1593
view/de/messages.po
View file

File diff suppressed because it is too large Load diff

66
view/de/register_open_eml.tpl
View file

@ -1,34 +1,34 @@
Hallo $[username], Hallo $[username],
Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt. Danke für deine Anmeldung auf $[sitename]. Dein Account wurde angelegt.
Die Login Details sind die folgenden: Die Login Details sind die folgenden:
Adresse der Seite: $[siteurl] Adresse der Seite: $[siteurl]
Login Name: $[email] Login Name: $[email]
Passwort: $[password] Passwort: $[password]
Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern Du kannst das Passwort in den "Einstellungen" zu deinem Account ändern
nachdem du dich eingeloggt hast. nachdem du dich eingeloggt hast.
Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen. Bitte nimm dir einige Augenblicke Zeit um die anderen Einstellungen auf der Seite zu überprüfen.
Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen Eventuell möchtest du außerdem einige grundlegenden Informationen in dein Standart-Profil eintragen
(auf der "Profile" Seite) damit andere Leute dich einfacher finden können. (auf der "Profile" Seite) damit andere Leute dich einfacher finden können.
Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto, Wir empfehlen den kompletten Namen anzugeben, ein eigenes Profil-Foto,
ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und ein paar "Profil-Schlüsselwörter" anzugeben (damit man leichter Gleichinteressierte finden kann) - und
natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest natürlich in welchen Land Du lebst; wenn Du es nicht genauer angeben möchtest
dann das. dann das.
Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig. Wir respektieren Ihr Recht auf Privatsphäre, und keines dieser Elemente sind notwendig.
Wenn Du hier neu bist und keinen kennst, wird man Dir helfen Wenn Du hier neu bist und keinen kennst, wird man Dir helfen
ein paar neue und interessante Freunde zu finden. ein paar neue und interessante Freunde zu finden.
Danke dir und willkommen auf $[sitename]. Danke dir und willkommen auf $[sitename].
Beste Grüße, Beste Grüße,
$[sitename] Administrator $[sitename] Administrator

56
view/de/strings.php
View file

@ -138,7 +138,7 @@ $a->strings["Permission settings"] = "Berechtigungseinstellungen";
$a->strings["CC: email addresses"] = "Cc:-E-Mail-Addressen"; $a->strings["CC: email addresses"] = "Cc:-E-Mail-Addressen";
$a->strings["Public post"] = "Öffentlicher Beitrag"; $a->strings["Public post"] = "Öffentlicher Beitrag";
$a->strings["Set title"] = "Titel setzen"; $a->strings["Set title"] = "Titel setzen";
$a->strings["Categories (comma-separated list)"] = "Kategorien (mit Komma separierte Liste)"; $a->strings["Categories (comma-separated list)"] = "Kategorien (kommasepariert)";
$a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com"; $a->strings["Example: bob@example.com, mary@example.com"] = "Z.B.: bob@example.com, mary@example.com";
$a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert."; $a->strings["This introduction has already been accepted."] = "Diese Kontaktanfrage wurde bereits akzeptiert.";
$a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung."; $a->strings["Profile location is not valid or does not contain profile information."] = "Profiladresse ist ungültig oder stellt einige Profildaten nicht zur Verfügung.";
@ -301,7 +301,8 @@ $a->strings["Contact has been blocked"] = "Kontakt wurde blockiert";
$a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben"; $a->strings["Contact has been unblocked"] = "Kontakt wurde wieder freigegeben";
$a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert"; $a->strings["Contact has been ignored"] = "Kontakt wurde ignoriert";
$a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert"; $a->strings["Contact has been unignored"] = "Kontakt wird nicht mehr ignoriert";
$a->strings["stopped following"] = "wird nicht mehr gefolgt"; $a->strings["Contact has been archived"] = "Kontakt wurde archiviert";
$a->strings["Contact has been unarchived"] = "Kontakt wurde aus dem Archiv geholt";
$a->strings["Contact has been removed."] = "Kontakt wurde entfernt."; $a->strings["Contact has been removed."] = "Kontakt wurde entfernt.";
$a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft"; $a->strings["You are mutual friends with %s"] = "Du hast mit %s eine beidseitige Freundschaft";
$a->strings["You are sharing with %s"] = "Du teilst mit %s"; $a->strings["You are sharing with %s"] = "Du teilst mit %s";
@ -320,6 +321,8 @@ $a->strings["View all contacts"] = "Alle Kontakte anzeigen";
$a->strings["Unblock"] = "Entsperren"; $a->strings["Unblock"] = "Entsperren";
$a->strings["Block"] = "Sperren"; $a->strings["Block"] = "Sperren";
$a->strings["Unignore"] = "Ignorieren aufheben"; $a->strings["Unignore"] = "Ignorieren aufheben";
$a->strings["Unarchive"] = "Unarchivieren";
$a->strings["Archive"] = "Archivieren";
$a->strings["Repair"] = "Reparieren"; $a->strings["Repair"] = "Reparieren";
$a->strings["Contact Editor"] = "Kontakt Editor"; $a->strings["Contact Editor"] = "Kontakt Editor";
$a->strings["Profile Visibility"] = "Profil Anzeige"; $a->strings["Profile Visibility"] = "Profil Anzeige";
@ -337,13 +340,15 @@ $a->strings["Update public posts"] = "Öffentliche Beiträge aktualisieren";
$a->strings["Update now"] = "Jetzt aktualisieren"; $a->strings["Update now"] = "Jetzt aktualisieren";
$a->strings["Currently blocked"] = "Derzeit geblockt"; $a->strings["Currently blocked"] = "Derzeit geblockt";
$a->strings["Currently ignored"] = "Derzeit ignoriert"; $a->strings["Currently ignored"] = "Derzeit ignoriert";
$a->strings["Currently archived"] = "Momentan archiviert";
$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein"; $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Antworten/Likes auf deine öffentlichen Beiträge <strong>könnten</strong> weiterhin sichtbar sein";
$a->strings["Suggestions"] = "Kontaktvorschläge"; $a->strings["Suggestions"] = "Kontaktvorschläge";
$a->strings["All Contacts"] = "Alle Kontakte"; $a->strings["All Contacts"] = "Alle Kontakte";
$a->strings["Unblocked Contacts"] = "Nicht blockierte Kontakte"; $a->strings["Unblocked"] = "Ungeblockt";
$a->strings["Blocked Contacts"] = "Blockierte Kontakte"; $a->strings["Blocked"] = "Geblockt";
$a->strings["Ignored Contacts"] = "Ignorierte Kontakte"; $a->strings["Ignored"] = "Ignoriert";
$a->strings["Hidden Contacts"] = "Verborgene Kontakte"; $a->strings["Archived"] = "Archiviert";
$a->strings["Hidden"] = "Verborgen";
$a->strings["Mutual Friendship"] = "Beidseitige Freundschaft"; $a->strings["Mutual Friendship"] = "Beidseitige Freundschaft";
$a->strings["is a fan of yours"] = "ist ein Fan von dir"; $a->strings["is a fan of yours"] = "ist ein Fan von dir";
$a->strings["you are a fan of"] = "du bist Fan von"; $a->strings["you are a fan of"] = "du bist Fan von";
@ -373,6 +378,7 @@ $a->strings["Connector settings"] = "Connector-Einstellungen";
$a->strings["Plugin settings"] = "Plugin-Einstellungen"; $a->strings["Plugin settings"] = "Plugin-Einstellungen";
$a->strings["Connected apps"] = "Verbundene Programme"; $a->strings["Connected apps"] = "Verbundene Programme";
$a->strings["Export personal data"] = "Persönliche Daten exportieren"; $a->strings["Export personal data"] = "Persönliche Daten exportieren";
$a->strings["Remove account"] = "Account entfernen";
$a->strings["Settings"] = "Einstellungen"; $a->strings["Settings"] = "Einstellungen";
$a->strings["Missing some important data!"] = "Wichtige Daten fehlen!"; $a->strings["Missing some important data!"] = "Wichtige Daten fehlen!";
$a->strings["Update"] = "Aktualisierungen"; $a->strings["Update"] = "Aktualisierungen";
@ -723,6 +729,8 @@ $a->strings["Proxy user"] = "Proxy Nutzer";
$a->strings["Proxy URL"] = "Proxy URL"; $a->strings["Proxy URL"] = "Proxy URL";
$a->strings["Network timeout"] = "Netzwerk Wartezeit"; $a->strings["Network timeout"] = "Netzwerk Wartezeit";
$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen)."; $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Der Wert ist in Sekunden. Setze 0 für unbegrenzt (nicht empfohlen).";
$a->strings["Delivery interval"] = "Zustellungsintervall";
$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Verzögere im Hintergrund laufende Auslieferungsprozesse um die angegebene Anzahl an Sekunden um die Systemlast zu verringern. Empfehlungen: 4-5 für Shared-Hosts, 2-3 für VPS, 0-1 für große dedizierte Server.";
$a->strings["%s user blocked/unblocked"] = array( $a->strings["%s user blocked/unblocked"] = array(
0 => "%s Benutzer geblockt/freigegeben", 0 => "%s Benutzer geblockt/freigegeben",
1 => "%s Benutzer geblockt/freigegeben", 1 => "%s Benutzer geblockt/freigegeben",
@ -947,7 +955,8 @@ $a->strings["The given API Key seems to work correctly."] = "Der angegebene API
$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange."; $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Die Echtheit des API Schlüssels konnte nicht überprüft werden. Etwas Merkwürdiges ist hier im Gange.";
$a->strings["App-ID / API-Key"] = "App-ID / API-Key"; $a->strings["App-ID / API-Key"] = "App-ID / API-Key";
$a->strings["Application secret"] = "Anwendungs-Geheimnis"; $a->strings["Application secret"] = "Anwendungs-Geheimnis";
$a->strings["Polling Interval (min. %1\$s minutes)"] = "Abrufintervall (min. %1\$s Minuten)"; $a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Abfrage-Intervall in Minuten (min %1\$s Minuten)";
$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Kommentare synchronisieren (Kein Kommentar von Facebook geht verlohren, verursacht höhere Last auf dem Server)";
$a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen"; $a->strings["Real-Time Updates"] = "Echt-Zeit Aktualisierungen";
$a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert."; $a->strings["Real-Time Updates are activated."] = "Echtzeit-Updates sind aktiviert.";
$a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren"; $a->strings["Deactivate Real-Time Updates"] = "Echtzeit-Updates deaktivieren";
@ -961,6 +970,11 @@ $a->strings["Facebook post failed. Queued for retry."] = "Veröffentlichung bei
$a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich."; $a->strings["Your Facebook connection became invalid. Please Re-authenticate."] = "Deine Facebook Anmeldedaten sind ungültig geworden. Bitte re-authentifiziere dich.";
$a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden"; $a->strings["Facebook connection became invalid"] = "Facebook Anmeldedaten sind ungültig geworden";
$a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3\$sden Facebook-Connector neu Authentifizieren%4\$s."; $a->strings["Hi %1\$s,\n\nThe connection between your accounts on %2\$s and Facebook became invalid. This usually happens after you change your Facebook-password. To enable the connection again, you have to %3\$sre-authenticate the Facebook-connector%4\$s."] = "Hi %1\$s,\n\ndie Verbindung von deinem Account auf %2\$s und Facebook funktioniert derzeit nicht. Dies ist im Allgemeinen das Ergebnis einer Passwortänderung bei Facebook. Um die Verbindung wieder zu aktivieren musst du %3\$sden Facebook-Connector neu Authentifizieren%4\$s.";
$a->strings["Lifetime of the cache (in hours)"] = "Lebenszeit des Caches (in Stunden)";
$a->strings["Cache Statistics"] = "Cache Statistik";
$a->strings["Number of items"] = "Anzahl der Einträge";
$a->strings["Size of the cache"] = "Größe des Caches";
$a->strings["Delete the whole cache"] = "Cache leeren";
$a->strings["%d person likes this"] = array( $a->strings["%d person likes this"] = array(
0 => "%d Person mag das", 0 => "%d Person mag das",
1 => "%d Leuten mögen das", 1 => "%d Leuten mögen das",
@ -969,6 +983,7 @@ $a->strings["%d person doesn't like this"] = array(
0 => " %d Person mag das nicht", 0 => " %d Person mag das nicht",
1 => "%d Leute mögen das nicht", 1 => "%d Leute mögen das nicht",
); );
$a->strings["Get added to this list!"] = "Werde Mitglied dieser Liste";
$a->strings["Generate new key"] = "Neuen Schlüssel erstellen"; $a->strings["Generate new key"] = "Neuen Schlüssel erstellen";
$a->strings["Widgets key"] = "Widgets Schlüssel"; $a->strings["Widgets key"] = "Widgets Schlüssel";
$a->strings["Widgets available"] = "Verfügbare Widgets"; $a->strings["Widgets available"] = "Verfügbare Widgets";
@ -1058,12 +1073,12 @@ $a->strings["The impressum addon needs to be configured!<br />Please add at leas
$a->strings["The page operators name."] = "Name des Server-Administrators"; $a->strings["The page operators name."] = "Name des Server-Administrators";
$a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers"; $a->strings["Site Owners Profile"] = "Profil des Seitenbetreibers";
$a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators"; $a->strings["Profile address of the operator."] = "Profil-Adresse des Server-Administrators";
$a->strings["How to contact the operator via snail mail."] = "Wie erreicht man den Betreiber der Seite postalisch."; $a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kontaktmöglichkeiten zum Administrator via Schneckenpost. Du kannst BBCode verwenden.";
$a->strings["Notes"] = "Hinweise"; $a->strings["Notes"] = "Hinweise";
$a->strings["Additional notes that are displayed beneath the contact information."] = "Zusätzliche Angaben, die unterhalb der Kontakt-Informationen angezeigt werden."; $a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Zusätzliche Informationen die neben den Kontaktmöglichkeiten angezeigt werden. Du kannst BBCode verwenden.";
$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)"; $a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Wie erreichts man den Betreiber per Email. (Adresse wird verschleiert dargestellt)";
$a->strings["Footer note"] = "Fußnote"; $a->strings["Footer note"] = "Fußnote";
$a->strings["Text for the footer."] = "Text für die Fußnote"; $a->strings["Text for the footer. You can use BBCode here."] = "Text für die Fußzeile. Du kannst BBCode verwenden.";
$a->strings["Report Bug"] = "Fehlerreport erstellen"; $a->strings["Report Bug"] = "Fehlerreport erstellen";
$a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen"; $a->strings["\"Blockem\" Settings"] = "\"Blockem\"-Einstellungen";
$a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)"; $a->strings["Comma separated profile URLS to block"] = "Profil-URLs, die blockiert werden sollen (durch Kommas getrennt)";
@ -1204,6 +1219,10 @@ $a->strings["Enable Posterous Post Plugin"] = "Posterous-Plugin aktivieren";
$a->strings["Posterous login"] = "Posterous-Anmeldename"; $a->strings["Posterous login"] = "Posterous-Anmeldename";
$a->strings["Posterous password"] = "Posterous-Passwort"; $a->strings["Posterous password"] = "Posterous-Passwort";
$a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous"; $a->strings["Post to Posterous by default"] = "Veröffentliche öffentliche Beiträge standardmäßig bei Posterous";
$a->strings["Theme settings"] = "Themen Einstellungen";
$a->strings["Set resize level for images in posts and comments (width and height)"] = "Wähle das Vergrößerungsmaß für Bilder in Beiträgen und Kommentaren (Höhe und Breite)";
$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen";
$a->strings["Color scheme"] = "Farbschema";
$a->strings["Last users"] = "Letzte Nutzer"; $a->strings["Last users"] = "Letzte Nutzer";
$a->strings["Last likes"] = "Zuletzt gemocht"; $a->strings["Last likes"] = "Zuletzt gemocht";
$a->strings["Last photos"] = "Letzte Fotos"; $a->strings["Last photos"] = "Letzte Fotos";
@ -1221,15 +1240,13 @@ $a->strings["Your photos"] = "Deine Fotos";
$a->strings["Your events"] = "Deine Ereignisse"; $a->strings["Your events"] = "Deine Ereignisse";
$a->strings["Personal notes"] = "Persönliche Notizen"; $a->strings["Personal notes"] = "Persönliche Notizen";
$a->strings["Your personal photos"] = "Deine privaten Fotos"; $a->strings["Your personal photos"] = "Deine privaten Fotos";
$a->strings["Theme settings"] = "Themen Einstellungen";
$a->strings["Set font-size for posts and comments"] = "Schriftgröße für Beiträge und Kommentare festlegen";
$a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen"; $a->strings["Set line-height for posts and comments"] = "Liniengröße für Beiträge und Kommantare festlegen";
$a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen"; $a->strings["Set resolution for middle column"] = "Auflösung für die Mittelspalte setzen";
$a->strings["Set color scheme"] = "Wähle Farbschema"; $a->strings["Set color scheme"] = "Wähle Farbschema";
$a->strings["Alignment"] = "Ausrichtung"; $a->strings["Alignment"] = "Ausrichtung";
$a->strings["Left"] = "Links"; $a->strings["Left"] = "Links";
$a->strings["Center"] = "Mitte"; $a->strings["Center"] = "Mitte";
$a->strings["Color scheme"] = "Farbschema"; $a->strings["Set colour scheme"] = "Farbschema wählen";
$a->strings["Gender:"] = "Geschlecht:"; $a->strings["Gender:"] = "Geschlecht:";
$a->strings["j F, Y"] = "j F, Y"; $a->strings["j F, Y"] = "j F, Y";
$a->strings["j F"] = "j F"; $a->strings["j F"] = "j F";
@ -1505,6 +1522,7 @@ $a->strings["Welcome "] = "Willkommen ";
$a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch."; $a->strings["Please upload a profile photo."] = "Bitte lade ein Profilbild hoch.";
$a->strings["Welcome back "] = "Willkommen zurück "; $a->strings["Welcome back "] = "Willkommen zurück ";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden)."; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "Das Sicherheits-Merkmal war nicht korrekt. Das passiert meistens wenn das Formular vor dem Absenden zu lange geöffnet war (länger als 3 Stunden).";
$a->strings["stopped following"] = "wird nicht mehr gefolgt";
$a->strings["View Status"] = "Pinnwand anschauen"; $a->strings["View Status"] = "Pinnwand anschauen";
$a->strings["View Profile"] = "Profil anschauen"; $a->strings["View Profile"] = "Profil anschauen";
$a->strings["View Photos"] = "Bilder anschauen"; $a->strings["View Photos"] = "Bilder anschauen";
@ -1525,6 +1543,14 @@ $a->strings["like"] = "mag ich";
$a->strings["dislike"] = "mag ich nicht"; $a->strings["dislike"] = "mag ich nicht";
$a->strings["Share this"] = "Teile dieses"; $a->strings["Share this"] = "Teile dieses";
$a->strings["share"] = "Teilen"; $a->strings["share"] = "Teilen";
$a->strings["Bold"] = "Fett";
$a->strings["Italic"] = "Kursiv";
$a->strings["Underline"] = "Unterstrichen";
$a->strings["Quote"] = "Zitat";
$a->strings["Code"] = "Code";
$a->strings["Image"] = "Bild";
$a->strings["Link"] = "Verweis";
$a->strings["Video"] = "Video";
$a->strings["add star"] = "markieren"; $a->strings["add star"] = "markieren";
$a->strings["remove star"] = "Markierung entfernen"; $a->strings["remove star"] = "Markierung entfernen";
$a->strings["toggle star status"] = "Markierung umschalten"; $a->strings["toggle star status"] = "Markierung umschalten";
@ -1569,9 +1595,9 @@ $a->strings["Edit profile"] = "Profil bearbeiten";
$a->strings["Message"] = "Nachricht"; $a->strings["Message"] = "Nachricht";
$a->strings["g A l F d"] = "l, d. F G \\U\\h\\r"; $a->strings["g A l F d"] = "l, d. F G \\U\\h\\r";
$a->strings["F d"] = "d. F"; $a->strings["F d"] = "d. F";
$a->strings["[today]"] = "[heute]";
$a->strings["Birthday Reminders"] = "Geburtstagserinnerungen"; $a->strings["Birthday Reminders"] = "Geburtstagserinnerungen";
$a->strings["Birthdays this week:"] = "Geburtstage diese Woche:"; $a->strings["Birthdays this week:"] = "Geburtstage diese Woche:";
$a->strings["[today]"] = "[heute]"; $a->strings["[No description]"] = "[keine Beschreibung]";
$a->strings["Event Reminders"] = "Veranstaltungserinnerungen"; $a->strings["Event Reminders"] = "Veranstaltungserinnerungen";
$a->strings["Events this week:"] = "Veranstaltungen diese Woche"; $a->strings["Events this week:"] = "Veranstaltungen diese Woche";
$a->strings["[No description]"] = "[keine Beschreibung]";

1481
view/eo/messages.po
View file

File diff suppressed because it is too large Load diff

48
view/eo/strings.php
View file

@ -301,7 +301,8 @@ $a->strings["Contact has been blocked"] = "Kontakto estas blokita.";
$a->strings["Contact has been unblocked"] = "Kontakto estas malblokita."; $a->strings["Contact has been unblocked"] = "Kontakto estas malblokita.";
$a->strings["Contact has been ignored"] = "Kontakto estas ignorita."; $a->strings["Contact has been ignored"] = "Kontakto estas ignorita.";
$a->strings["Contact has been unignored"] = "Kontakto estas malignorita."; $a->strings["Contact has been unignored"] = "Kontakto estas malignorita.";
$a->strings["stopped following"] = "ne plu sekvas"; $a->strings["Contact has been archived"] = "Enarkivigis kontakton";
$a->strings["Contact has been unarchived"] = "Elarkivigis kontakton";
$a->strings["Contact has been removed."] = "Kontakto estas forigita."; $a->strings["Contact has been removed."] = "Kontakto estas forigita.";
$a->strings["You are mutual friends with %s"] = "Vi estas reciproka amiko de %s"; $a->strings["You are mutual friends with %s"] = "Vi estas reciproka amiko de %s";
$a->strings["You are sharing with %s"] = "Vi kunhavigas kun %s"; $a->strings["You are sharing with %s"] = "Vi kunhavigas kun %s";
@ -320,6 +321,8 @@ $a->strings["View all contacts"] = "Vidi ĉiujn kontaktojn";
$a->strings["Unblock"] = "Malbloki"; $a->strings["Unblock"] = "Malbloki";
$a->strings["Block"] = "Bloki"; $a->strings["Block"] = "Bloki";
$a->strings["Unignore"] = "Malignori"; $a->strings["Unignore"] = "Malignori";
$a->strings["Unarchive"] = "Elarkivigi";
$a->strings["Archive"] = "Enarkivigi";
$a->strings["Repair"] = "Ripari"; $a->strings["Repair"] = "Ripari";
$a->strings["Contact Editor"] = "Kontakta redaktilo."; $a->strings["Contact Editor"] = "Kontakta redaktilo.";
$a->strings["Profile Visibility"] = "Videbleco de profilo"; $a->strings["Profile Visibility"] = "Videbleco de profilo";
@ -337,13 +340,15 @@ $a->strings["Update public posts"] = "Ĝisdatigi publikajn afiŝojn";
$a->strings["Update now"] = "Ĝisdatigi nun"; $a->strings["Update now"] = "Ĝisdatigi nun";
$a->strings["Currently blocked"] = "Nuntempe blokata"; $a->strings["Currently blocked"] = "Nuntempe blokata";
$a->strings["Currently ignored"] = "Nuntempe ignorata"; $a->strings["Currently ignored"] = "Nuntempe ignorata";
$a->strings["Currently archived"] = "Nuntempe enarkivigita";
$a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Rispondoj/ŝataĵo al viaj publikaj afiŝoj <strong>eble</strong> plu estos videbla"; $a->strings["Replies/likes to your public posts <strong>may</strong> still be visible"] = "Rispondoj/ŝataĵo al viaj publikaj afiŝoj <strong>eble</strong> plu estos videbla";
$a->strings["Suggestions"] = "Sugestoj"; $a->strings["Suggestions"] = "Sugestoj";
$a->strings["All Contacts"] = "Ĉiuj Kontaktoj"; $a->strings["All Contacts"] = "Ĉiuj Kontaktoj";
$a->strings["Unblocked Contacts"] = "Malblokitaj Kontaktoj"; $a->strings["Unblocked"] = "Malblokita";
$a->strings["Blocked Contacts"] = "Blokitaj Kontaktoj"; $a->strings["Blocked"] = "Blokita";
$a->strings["Ignored Contacts"] = "Ignoritaj Kontaktoj"; $a->strings["Ignored"] = "Ignorita";
$a->strings["Hidden Contacts"] = "Kaŝitaj Kontaktoj"; $a->strings["Archived"] = "Enarkivigita";
$a->strings["Hidden"] = "Kaŝita";
$a->strings["Mutual Friendship"] = "Reciproka amikeco"; $a->strings["Mutual Friendship"] = "Reciproka amikeco";
$a->strings["is a fan of yours"] = "estas admiranto de vi"; $a->strings["is a fan of yours"] = "estas admiranto de vi";
$a->strings["you are a fan of"] = "vi estas admiranto de"; $a->strings["you are a fan of"] = "vi estas admiranto de";
@ -373,6 +378,7 @@ $a->strings["Connector settings"] = "Konektiloj";
$a->strings["Plugin settings"] = "Kromprogramoj"; $a->strings["Plugin settings"] = "Kromprogramoj";
$a->strings["Connected apps"] = "Konektitaj programoj"; $a->strings["Connected apps"] = "Konektitaj programoj";
$a->strings["Export personal data"] = "Eksporto"; $a->strings["Export personal data"] = "Eksporto";
$a->strings["Remove account"] = "Forigi konton";
$a->strings["Settings"] = "Agordoj"; $a->strings["Settings"] = "Agordoj";
$a->strings["Missing some important data!"] = "Mankas importantaj datumoj!"; $a->strings["Missing some important data!"] = "Mankas importantaj datumoj!";
$a->strings["Update"] = "Ĝisdatigi"; $a->strings["Update"] = "Ĝisdatigi";
@ -723,6 +729,8 @@ $a->strings["Proxy user"] = "Uzantnomo por retperanto";
$a->strings["Proxy URL"] = "URL adreso de retperanto"; $a->strings["Proxy URL"] = "URL adreso de retperanto";
$a->strings["Network timeout"] = "Reta tempolimo"; $a->strings["Network timeout"] = "Reta tempolimo";
$a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata)."; $a->strings["Value is in seconds. Set to 0 for unlimited (not recommended)."] = "Valoro en sekundoj. Uzu 0 por mallimitigi (ne rekomendata).";
$a->strings["Delivery interval"] = "Intervalo de liverado";
$a->strings["Delay background delivery processes by this many seconds to reduce system load. Recommend: 4-5 for shared hosts, 2-3 for virtual private servers. 0-1 for large dedicated servers."] = "Malfruigi fonan liveradon dum tiom da sekundoj por malpliigi la ŝargon de la sistemo. Rekomendoj: 4-5 por komunaj serviloj, 2-3 por virtualaj privataj serviloj, 0-1 por grandaj dediĉitaj serviloj.";
$a->strings["%s user blocked/unblocked"] = array( $a->strings["%s user blocked/unblocked"] = array(
0 => "Blokis/malblokis %s uzanton", 0 => "Blokis/malblokis %s uzanton",
1 => "Blokis/malblokis %s uzantojn", 1 => "Blokis/malblokis %s uzantojn",
@ -947,7 +955,7 @@ $a->strings["The given API Key seems to work correctly."] = "La API ŝlosilo ŝa
$a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Ne povis kontroli la ĝustecon de la API ŝlosilo. Ia stranga afero okazas. "; $a->strings["The correctness of the API Key could not be detected. Somthing strange's going on."] = "Ne povis kontroli la ĝustecon de la API ŝlosilo. Ia stranga afero okazas. ";
$a->strings["App-ID / API-Key"] = "Programo ID / API Ŝlosilo"; $a->strings["App-ID / API-Key"] = "Programo ID / API Ŝlosilo";
$a->strings["Application secret"] = "Programo sekreto"; $a->strings["Application secret"] = "Programo sekreto";
$a->strings["Polling Interval (min. %1\$s minutes)"] = "Intervalo por la enketilo (poller intervalo, minimume %1\$s mintuoj) "; $a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Intervalo de enketo en minutoj (minimume %1\$s minutoj)";
$a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Sinkronigi komentojn (vi ricevas ĉiujn komentojn de Facebook, sed la ŝargo de la sistemo iom kreskas)"; $a->strings["Synchronize comments (no comments on Facebook are missed, at the cost of increased system load)"] = "Sinkronigi komentojn (vi ricevas ĉiujn komentojn de Facebook, sed la ŝargo de la sistemo iom kreskas)";
$a->strings["Real-Time Updates"] = "Realtempaj Ĝisdatigoj"; $a->strings["Real-Time Updates"] = "Realtempaj Ĝisdatigoj";
$a->strings["Real-Time Updates are activated."] = "Realtempaj Ĝisdatigoj estas ŝaltita"; $a->strings["Real-Time Updates are activated."] = "Realtempaj Ĝisdatigoj estas ŝaltita";
@ -975,6 +983,7 @@ $a->strings["%d person doesn't like this"] = array(
0 => "%d homo malŝatas tiun", 0 => "%d homo malŝatas tiun",
1 => "%d homo malŝatas tiun", 1 => "%d homo malŝatas tiun",
); );
$a->strings["Get added to this list!"] = "Iĝu membro de ĉi tiu listo!";
$a->strings["Generate new key"] = "Generi novan ĉifroŝlosilon"; $a->strings["Generate new key"] = "Generi novan ĉifroŝlosilon";
$a->strings["Widgets key"] = "Ŝlosilo por fenestraĵoj"; $a->strings["Widgets key"] = "Ŝlosilo por fenestraĵoj";
$a->strings["Widgets available"] = "Disponeblaj fenestraĵoj"; $a->strings["Widgets available"] = "Disponeblaj fenestraĵoj";
@ -1064,12 +1073,12 @@ $a->strings["The impressum addon needs to be configured!<br />Please add at leas
$a->strings["The page operators name."] = "La nomo de la funkciigisto de la retejo."; $a->strings["The page operators name."] = "La nomo de la funkciigisto de la retejo.";
$a->strings["Site Owners Profile"] = "Profilo de la Proprietulo de la Retejo"; $a->strings["Site Owners Profile"] = "Profilo de la Proprietulo de la Retejo";
$a->strings["Profile address of the operator."] = "La profilo de la funkciigisto de la retejo."; $a->strings["Profile address of the operator."] = "La profilo de la funkciigisto de la retejo.";
$a->strings["How to contact the operator via snail mail."] = "Kiel kontakti la funkciigiston de la retejo tra paperpoŝto."; $a->strings["How to contact the operator via snail mail. You can use BBCode here."] = "Kiel poŝte kontakti la funkciigisto de la retejo. Vi eblas uzi BBCode ĉi tie.";
$a->strings["Notes"] = "Notoj"; $a->strings["Notes"] = "Notoj";
$a->strings["Additional notes that are displayed beneath the contact information."] = "Pliaj notoj kiuj estas montrigota malsupre la kontaktinformojn."; $a->strings["Additional notes that are displayed beneath the contact information. You can use BBCode here."] = "Pli da notoj kiuj aperas sub la kontaktinformoj. Vi eblas uzi BBCode ĉi tie.";
$a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Kiel kontakti la funkciigiston de la retejo tra retpoŝto. (montriĝos vuale) "; $a->strings["How to contact the operator via email. (will be displayed obfuscated)"] = "Kiel kontakti la funkciigiston de la retejo tra retpoŝto. (montriĝos vuale) ";
$a->strings["Footer note"] = "Paĝpiednoto"; $a->strings["Footer note"] = "Paĝpiednoto";
$a->strings["Text for the footer."] = "Teksto por la paĝpiedo."; $a->strings["Text for the footer. You can use BBCode here."] = "Teksto por la paĝpiedo. Vie eblas uzi BBCode ĉi tie.";
$a->strings["Report Bug"] = "Skribi cimraporton"; $a->strings["Report Bug"] = "Skribi cimraporton";
$a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj"; $a->strings["\"Blockem\" Settings"] = "\"Blockem\" Agordoj";
$a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo"; $a->strings["Comma separated profile URLS to block"] = "Blokotaj URL adresoj, disigita per komo";
@ -1210,6 +1219,10 @@ $a->strings["Enable Posterous Post Plugin"] = "Ŝalti la Poserous-afiŝo krompro
$a->strings["Posterous login"] = "Posterous salutnomo"; $a->strings["Posterous login"] = "Posterous salutnomo";
$a->strings["Posterous password"] = "Posterous pasvorto"; $a->strings["Posterous password"] = "Posterous pasvorto";
$a->strings["Post to Posterous by default"] = "Defaŭlte afiŝi al Posterous"; $a->strings["Post to Posterous by default"] = "Defaŭlte afiŝi al Posterous";
$a->strings["Theme settings"] = "Agordoj pri la etoso";
$a->strings["Set resize level for images in posts and comments (width and height)"] = "Agordi la regrandignivelo por bildoj en afiŝoj kaj komentoj (larĝo kaj alto)";
$a->strings["Set font-size for posts and comments"] = "Agordi la tiparan grandon por afiŝoj kaj komentoj";
$a->strings["Color scheme"] = "Kolorskemo";
$a->strings["Last users"] = "Ĵusaj uzantoj"; $a->strings["Last users"] = "Ĵusaj uzantoj";
$a->strings["Last likes"] = "Ĵusaj ŝatitaj elementoj"; $a->strings["Last likes"] = "Ĵusaj ŝatitaj elementoj";
$a->strings["Last photos"] = "Ĵusaj bildoj"; $a->strings["Last photos"] = "Ĵusaj bildoj";
@ -1227,15 +1240,13 @@ $a->strings["Your photos"] = "Viaj bildoj";
$a->strings["Your events"] = "Viaj okazoj"; $a->strings["Your events"] = "Viaj okazoj";
$a->strings["Personal notes"] = "Personaj notoj"; $a->strings["Personal notes"] = "Personaj notoj";
$a->strings["Your personal photos"] = "Viaj personaj bildoj"; $a->strings["Your personal photos"] = "Viaj personaj bildoj";
$a->strings["Theme settings"] = "Agordoj pri la etoso";
$a->strings["Set font-size for posts and comments"] = "Agordi la tiparan grandon por afiŝoj kaj komentoj";
$a->strings["Set line-height for posts and comments"] = "Agordi la linigrandon por afiŝoj kaj komentoj"; $a->strings["Set line-height for posts and comments"] = "Agordi la linigrandon por afiŝoj kaj komentoj";
$a->strings["Set resolution for middle column"] = "Agordi la distingivon por la meza kolumno"; $a->strings["Set resolution for middle column"] = "Agordi la distingivon por la meza kolumno";
$a->strings["Set color scheme"] = "Agordi Kolorskemon"; $a->strings["Set color scheme"] = "Agordi Kolorskemon";
$a->strings["Alignment"] = "Ĝisrandigo"; $a->strings["Alignment"] = "Ĝisrandigo";
$a->strings["Left"] = "Maldekstren"; $a->strings["Left"] = "Maldekstren";
$a->strings["Center"] = "Centren"; $a->strings["Center"] = "Centren";
$a->strings["Color scheme"] = "Kolorskemo"; $a->strings["Set colour scheme"] = "Agordi Kolorskemon";
$a->strings["Gender:"] = "Sekso:"; $a->strings["Gender:"] = "Sekso:";
$a->strings["j F, Y"] = "j F, Y"; $a->strings["j F, Y"] = "j F, Y";
$a->strings["j F"] = "j F"; $a->strings["j F"] = "j F";
@ -1511,6 +1522,7 @@ $a->strings["Welcome "] = "Bonvenon ";
$a->strings["Please upload a profile photo."] = "Bonvolu alŝuti profilbildon."; $a->strings["Please upload a profile photo."] = "Bonvolu alŝuti profilbildon.";
$a->strings["Welcome back "] = "Bonvenon "; $a->strings["Welcome back "] = "Bonvenon ";
$a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La sekuriga ĵetono de la formo estis malĝusta. Tio verŝajne okazis ĉar la formo estis malfermita dum tro longa tempo (>3 horoj) antaŭ la sendado."; $a->strings["The form security token was not correct. This probably happened because the form has been opened for too long (>3 hours) before submitting it."] = "La sekuriga ĵetono de la formo estis malĝusta. Tio verŝajne okazis ĉar la formo estis malfermita dum tro longa tempo (>3 horoj) antaŭ la sendado.";
$a->strings["stopped following"] = "ne plu sekvas";
$a->strings["View Status"] = "Vidi Staton"; $a->strings["View Status"] = "Vidi Staton";
$a->strings["View Profile"] = "Vidi Profilon"; $a->strings["View Profile"] = "Vidi Profilon";
$a->strings["View Photos"] = "Vidi Bildojn"; $a->strings["View Photos"] = "Vidi Bildojn";
@ -1531,6 +1543,14 @@ $a->strings["like"] = "ŝati";
$a->strings["dislike"] = "malŝati"; $a->strings["dislike"] = "malŝati";
$a->strings["Share this"] = "Kunhavigi ĉi tiun"; $a->strings["Share this"] = "Kunhavigi ĉi tiun";
$a->strings["share"] = "kunhavigi"; $a->strings["share"] = "kunhavigi";
$a->strings["Bold"] = "Grasa";
$a->strings["Italic"] = "Kursiva";
$a->strings["Underline"] = "Substreki";
$a->strings["Quote"] = "Citaĵo";
$a->strings["Code"] = "Kodo";
$a->strings["Image"] = "Bildo";
$a->strings["Link"] = "Ligilo";
$a->strings["Video"] = "Video";
$a->strings["add star"] = "aldoni stelon"; $a->strings["add star"] = "aldoni stelon";
$a->strings["remove star"] = "forpreni stelon"; $a->strings["remove star"] = "forpreni stelon";
$a->strings["toggle star status"] = "ŝalti/malŝalti steloŝtato"; $a->strings["toggle star status"] = "ŝalti/malŝalti steloŝtato";
@ -1575,9 +1595,9 @@ $a->strings["Edit profile"] = "Redakti profilon";
$a->strings["Message"] = "Mesaĝo"; $a->strings["Message"] = "Mesaĝo";
$a->strings["g A l F d"] = "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d"; $a->strings["g A l F d"] = "\\j\\e \\l\\a G\\a \\h\\o\\r\\o, l F d";
$a->strings["F d"] = "F d"; $a->strings["F d"] = "F d";
$a->strings["[today]"] = "[hodiaŭ]";
$a->strings["Birthday Reminders"] = "Memorigilo pri naskiĝtagoj"; $a->strings["Birthday Reminders"] = "Memorigilo pri naskiĝtagoj";
$a->strings["Birthdays this week:"] = "Naskiĝtagoj ĉi-semajne:"; $a->strings["Birthdays this week:"] = "Naskiĝtagoj ĉi-semajne:";
$a->strings["[today]"] = "[hodiaŭ]"; $a->strings["[No description]"] = "[Neniu priskribo]";
$a->strings["Event Reminders"] = "Memorigiloj pri Okazoj"; $a->strings["Event Reminders"] = "Memorigiloj pri Okazoj";
$a->strings["Events this week:"] = "Okazoj ĉi-semajne:"; $a->strings["Events this week:"] = "Okazoj ĉi-semajne:";
$a->strings["[No description]"] = "[Neniu priskribo]";

17
view/failed_updates.tpl Normal file
View file

@ -0,0 +1,17 @@
<h2>$banner</h2>
<div id="failed_updates_desc">$desc</div>
{{ if $failed }}
{{ for $failed as $f }}
<h4>$f</h4>
<ul>
<li><a href="$base/admin/dbsync/mark/$f">$mark</a></li>
<li><a href="$base/admin/dbsync/$f">$apply</a></li>
</ul>
<hr />
{{ endfor }}
{{ endif }}

1
view/head.tpl
View file

@ -6,6 +6,7 @@
<link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" /> <link rel="stylesheet" href="$baseurl/library/jgrowl/jquery.jgrowl.css" type="text/css" media="screen" />
<link rel="stylesheet" type="text/css" href="$stylesheet" media="all" /> <link rel="stylesheet" type="text/css" href="$stylesheet" media="all" />
<meta name="viewport" content="width=800, initial-scale=1, maximum-scale=3">
<link rel="shortcut icon" href="$baseurl/images/friendica-32.png" /> <link rel="shortcut icon" href="$baseurl/images/friendica-32.png" />
<link rel="search" <link rel="search"