Merge remote branch 'upstream/master'

This commit is contained in:
Michael Vogel 2012-07-18 21:03:57 +02:00
commit c8f99a8a66
10 changed files with 1155 additions and 891 deletions

View file

@ -10,7 +10,7 @@ require_once('include/nav.php');
require_once('include/cache.php');
define ( 'FRIENDICA_PLATFORM', 'Friendica');
define ( 'FRIENDICA_VERSION', '3.0.1404' );
define ( 'FRIENDICA_VERSION', '3.0.1407' );
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
define ( 'DB_UPDATE_VERSION', 1153 );

View file

@ -404,6 +404,7 @@ function bbcode($Text,$preserve_nl = false, $tryoembed = true) {
// fix any escaped ampersands that may have been converted into links
$Text = preg_replace("/\<(.*?)(src|href)=(.*?)\&amp\;(.*?)\>/ism",'<$1$2=$3&$4>',$Text);
$Text = preg_replace("/\<(.*?)(src|href)=\"[^hfm](.*?)\>/ism",'<$1$2="">',$Text);
if($saved_image)
$Text = bb_replace_images($Text, $saved_image);

View file

@ -772,7 +772,7 @@ function conversation(&$a, $items, $mode, $update, $preview = false) {
'text' => strip_tags(template_escape($body)),
'id' => $item['item_id'],
'linktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['author-link'])) ? $item['author-link'] : $item['url'])),
'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $profile_name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
'olinktitle' => sprintf( t('View %s\'s profile @ %s'), $owner-name, ((strlen($item['owner-link'])) ? $item['owner-link'] : $item['url'])),
'to' => t('to'),
'wall' => t('Wall-to-Wall'),
'vwall' => t('via Wall-To-Wall:'),

View file

@ -100,11 +100,33 @@ function datetime_convert($from = 'UTC', $to = 'UTC', $s = 'now', $fmt = "Y-m-d
return str_replace('1','0',$d->format($fmt));
}
$d = new DateTime($s, new DateTimeZone($from));
$d->setTimeZone(new DateTimeZone($to));
try {
$from_obj = new DateTimeZone($from);
}
catch(Exception $e) {
$from_obj = new DateTimeZone('UTC');
}
try {
$d = new DateTime($s, $from_obj);
}
catch(Exception $e) {
logger('datetime_convert: exception: ' . $e->getMessage());
$d = new DateTime('now', $from_obj);
}
try {
$to_obj = new DateTimeZone($to);
}
catch(Exception $e) {
$to_obj = new DateTimeZone('UTC');
}
$d->setTimeZone($to_obj);
return($d->format($fmt));
}}
// wrapper for date selector, tailored for use in birthday fields
function dob($dob) {

View file

@ -229,7 +229,7 @@ function count_common_friends_zcid($uid,$zcid) {
}
function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle) {
function common_friends_zcid($uid,$zcid,$start = 0, $limit = 9999,$shuffle = false) {
if($shuffle)
$sql_extra = " order by rand() ";

View file

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: 3.0.1404\n"
"Project-Id-Version: 3.0.1407\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2012-07-14 10:00-0700\n"
"POT-Creation-Date: 2012-07-17 10:00-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -148,9 +148,10 @@ msgstr ""
#: ../../addon/notimeline/notimeline.php:64 ../../addon/blockem/blockem.php:57
#: ../../addon/qcomment/qcomment.php:61
#: ../../addon/openstreetmap/openstreetmap.php:70
#: ../../addon/libertree/libertree.php:90 ../../addon/mathjax/mathjax.php:42
#: ../../addon/editplain/editplain.php:84 ../../addon/blackout/blackout.php:98
#: ../../addon/gravatar/gravatar.php:86
#: ../../addon/libravatar/libravatar.php:99
#: ../../addon/libertree/libertree.php:90 ../../addon/altpager/altpager.php:87
#: ../../addon/mathjax/mathjax.php:42 ../../addon/editplain/editplain.php:84
#: ../../addon/blackout/blackout.php:98 ../../addon/gravatar/gravatar.php:95
#: ../../addon/pageheader/pageheader.php:55 ../../addon/ijpost/ijpost.php:93
#: ../../addon/jappixmini/jappixmini.php:302
#: ../../addon/statusnet/statusnet.php:278
@ -224,7 +225,7 @@ msgstr ""
msgid "Edit event"
msgstr ""
#: ../../mod/events.php:304 ../../include/text.php:1069
#: ../../mod/events.php:304 ../../include/text.php:1094
msgid "link to source"
msgstr ""
@ -419,7 +420,7 @@ msgstr ""
#: ../../mod/photos.php:591 ../../mod/like.php:145 ../../mod/tagger.php:70
#: ../../addon/communityhome/communityhome.php:163
#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1321
#: ../../view/theme/diabook/theme.php:570 ../../include/text.php:1346
#: ../../include/diaspora.php:1793 ../../include/conversation.php:114
#: ../../include/conversation.php:187
msgid "photo"
@ -624,7 +625,8 @@ msgstr ""
msgid "Community"
msgstr ""
#: ../../mod/community.php:61 ../../mod/search.php:144
#: ../../mod/community.php:61 ../../mod/community.php:86
#: ../../mod/search.php:146 ../../mod/search.php:172
msgid "No results."
msgstr ""
@ -2569,7 +2571,7 @@ msgstr ""
#: ../../mod/notes.php:63 ../../mod/filer.php:30
#: ../../addon/facebook/facebook.php:770
#: ../../addon/privacy_image_cache/privacy_image_cache.php:187
#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:652
#: ../../addon/dav/layout.fnk.php:384 ../../include/text.php:677
msgid "Save"
msgstr ""
@ -2829,7 +2831,7 @@ msgstr ""
msgid "No contacts."
msgstr ""
#: ../../mod/viewcontacts.php:76 ../../include/text.php:589
#: ../../mod/viewcontacts.php:76 ../../include/text.php:614
msgid "View Contacts"
msgstr ""
@ -3874,8 +3876,8 @@ msgstr ""
msgid "No installed applications."
msgstr ""
#: ../../mod/search.php:83 ../../include/text.php:649
#: ../../include/text.php:650 ../../include/nav.php:91
#: ../../mod/search.php:83 ../../include/text.php:674
#: ../../include/text.php:675 ../../include/nav.php:91
msgid "Search"
msgstr ""
@ -4943,7 +4945,7 @@ msgid "Latest likes"
msgstr ""
#: ../../addon/communityhome/communityhome.php:155
#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1319
#: ../../view/theme/diabook/theme.php:562 ../../include/text.php:1344
#: ../../include/conversation.php:106 ../../include/conversation.php:179
msgid "event"
msgstr ""
@ -5053,7 +5055,7 @@ msgstr ""
msgid "Limitations"
msgstr ""
#: ../../addon/dav/layout.fnk.php:391
#: ../../addon/dav/layout.fnk.php:391 ../../addon/libravatar/libravatar.php:82
msgid "Warning"
msgstr ""
@ -5537,6 +5539,69 @@ msgstr ""
msgid "The default zoom level. (1:world, 18:highest)"
msgstr ""
#: ../../addon/libravatar/libravatar.php:14
msgid "Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"
msgstr ""
#: ../../addon/libravatar/libravatar.php:73
#: ../../addon/gravatar/gravatar.php:71
msgid "generic profile image"
msgstr ""
#: ../../addon/libravatar/libravatar.php:74
#: ../../addon/gravatar/gravatar.php:72
msgid "random geometric pattern"
msgstr ""
#: ../../addon/libravatar/libravatar.php:75
#: ../../addon/gravatar/gravatar.php:73
msgid "monster face"
msgstr ""
#: ../../addon/libravatar/libravatar.php:76
#: ../../addon/gravatar/gravatar.php:74
msgid "computer generated face"
msgstr ""
#: ../../addon/libravatar/libravatar.php:77
#: ../../addon/gravatar/gravatar.php:75
msgid "retro arcade style face"
msgstr ""
#: ../../addon/libravatar/libravatar.php:83
#, php-format
msgid "Your PHP version %s is lower than the required PHP >= 5.3."
msgstr ""
#: ../../addon/libravatar/libravatar.php:84
msgid "This addon is not functional on your server."
msgstr ""
#: ../../addon/libravatar/libravatar.php:93
#: ../../addon/gravatar/gravatar.php:89
msgid "Information"
msgstr ""
#: ../../addon/libravatar/libravatar.php:93
msgid ""
"Gravatar addon is installed. Please disable the Gravatar addon.<br>The "
"Libravatar addon will fall back to Gravatar if nothing was found at "
"Libravatar."
msgstr ""
#: ../../addon/libravatar/libravatar.php:100
#: ../../addon/gravatar/gravatar.php:96
msgid "Default avatar image"
msgstr ""
#: ../../addon/libravatar/libravatar.php:100
msgid "Select default avatar image if none was found. See README"
msgstr ""
#: ../../addon/libravatar/libravatar.php:112
msgid "Libravatar settings updated."
msgstr ""
#: ../../addon/libertree/libertree.php:36
msgid "Post to libertree"
msgstr ""
@ -5561,6 +5626,18 @@ msgstr ""
msgid "Post to Libertree by default"
msgstr ""
#: ../../addon/altpager/altpager.php:46
msgid "Altpager settings updated."
msgstr ""
#: ../../addon/altpager/altpager.php:79
msgid "Alternate Pagination Setting"
msgstr ""
#: ../../addon/altpager/altpager.php:81
msgid "Use links to \"newer\" and \"older\" pages in place of page numbers?"
msgstr ""
#: ../../addon/mathjax/mathjax.php:37
msgid ""
"The MathJax addon renders mathematical formulae written using the LaTeX "
@ -5594,43 +5671,26 @@ msgstr ""
msgid "Disable richtext status editor"
msgstr ""
#: ../../addon/gravatar/gravatar.php:71
msgid "generic profile image"
#: ../../addon/gravatar/gravatar.php:89
msgid ""
"Libravatar addon is installed, too. Please disable Libravatar addon or this "
"Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if "
"nothing was found at Libravatar."
msgstr ""
#: ../../addon/gravatar/gravatar.php:72
msgid "random geometric pattern"
msgstr ""
#: ../../addon/gravatar/gravatar.php:73
msgid "monster face"
msgstr ""
#: ../../addon/gravatar/gravatar.php:74
msgid "computer generated face"
msgstr ""
#: ../../addon/gravatar/gravatar.php:75
msgid "retro arcade style face"
msgstr ""
#: ../../addon/gravatar/gravatar.php:87
msgid "Default avatar image"
msgstr ""
#: ../../addon/gravatar/gravatar.php:87
#: ../../addon/gravatar/gravatar.php:96
msgid "Select default avatar image if none was found at Gravatar. See README"
msgstr ""
#: ../../addon/gravatar/gravatar.php:88
#: ../../addon/gravatar/gravatar.php:97
msgid "Rating of images"
msgstr ""
#: ../../addon/gravatar/gravatar.php:88
#: ../../addon/gravatar/gravatar.php:97
msgid "Select the appropriate avatar rating for your site. See README"
msgstr ""
#: ../../addon/gravatar/gravatar.php:102
#: ../../addon/gravatar/gravatar.php:111
msgid "Gravatar settings updated."
msgstr ""
@ -6735,138 +6795,146 @@ msgstr ""
msgid "next"
msgstr ""
#: ../../include/text.php:568
#: ../../include/text.php:295
msgid "newer"
msgstr ""
#: ../../include/text.php:299
msgid "older"
msgstr ""
#: ../../include/text.php:593
msgid "No contacts"
msgstr ""
#: ../../include/text.php:577
#: ../../include/text.php:602
#, php-format
msgid "%d Contact"
msgid_plural "%d Contacts"
msgstr[0] ""
msgstr[1] ""
#: ../../include/text.php:839
#: ../../include/text.php:864
msgid "Monday"
msgstr ""
#: ../../include/text.php:839
#: ../../include/text.php:864
msgid "Tuesday"
msgstr ""
#: ../../include/text.php:839
#: ../../include/text.php:864
msgid "Wednesday"
msgstr ""
#: ../../include/text.php:839
#: ../../include/text.php:864
msgid "Thursday"
msgstr ""
#: ../../include/text.php:839
#: ../../include/text.php:864
msgid "Friday"
msgstr ""
#: ../../include/text.php:839
#: ../../include/text.php:864
msgid "Saturday"
msgstr ""
#: ../../include/text.php:839
#: ../../include/text.php:864
msgid "Sunday"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "January"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "February"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "March"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "April"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "May"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "June"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "July"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "August"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "September"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "October"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "November"
msgstr ""
#: ../../include/text.php:843
#: ../../include/text.php:868
msgid "December"
msgstr ""
#: ../../include/text.php:929
#: ../../include/text.php:954
msgid "bytes"
msgstr ""
#: ../../include/text.php:949 ../../include/text.php:964
#: ../../include/text.php:974 ../../include/text.php:989
msgid "remove"
msgstr ""
#: ../../include/text.php:949 ../../include/text.php:964
#: ../../include/text.php:974 ../../include/text.php:989
msgid "[remove]"
msgstr ""
#: ../../include/text.php:952
#: ../../include/text.php:977
msgid "Categories:"
msgstr ""
#: ../../include/text.php:967
#: ../../include/text.php:992
msgid "Filed under:"
msgstr ""
#: ../../include/text.php:983 ../../include/text.php:995
#: ../../include/text.php:1008 ../../include/text.php:1020
msgid "Click to open/close"
msgstr ""
#: ../../include/text.php:1101 ../../include/user.php:236
#: ../../include/text.php:1126 ../../include/user.php:236
msgid "default"
msgstr ""
#: ../../include/text.php:1113
#: ../../include/text.php:1138
msgid "Select an alternate language"
msgstr ""
#: ../../include/text.php:1323
#: ../../include/text.php:1348
msgid "activity"
msgstr ""
#: ../../include/text.php:1325
#: ../../include/text.php:1350
msgid "comment"
msgstr ""
#: ../../include/text.php:1326
#: ../../include/text.php:1351
msgid "post"
msgstr ""
#: ../../include/text.php:1481
#: ../../include/text.php:1506
msgid "Item filed"
msgstr ""
@ -7110,81 +7178,81 @@ msgstr ""
msgid "Miscellaneous"
msgstr ""
#: ../../include/datetime.php:131 ../../include/datetime.php:263
#: ../../include/datetime.php:153 ../../include/datetime.php:285
msgid "year"
msgstr ""
#: ../../include/datetime.php:136 ../../include/datetime.php:264
#: ../../include/datetime.php:158 ../../include/datetime.php:286
msgid "month"
msgstr ""
#: ../../include/datetime.php:141 ../../include/datetime.php:266
#: ../../include/datetime.php:163 ../../include/datetime.php:288
msgid "day"
msgstr ""
#: ../../include/datetime.php:254
#: ../../include/datetime.php:276
msgid "never"
msgstr ""
#: ../../include/datetime.php:260
#: ../../include/datetime.php:282
msgid "less than a second ago"
msgstr ""
#: ../../include/datetime.php:263
#: ../../include/datetime.php:285
msgid "years"
msgstr ""
#: ../../include/datetime.php:264
#: ../../include/datetime.php:286
msgid "months"
msgstr ""
#: ../../include/datetime.php:265
#: ../../include/datetime.php:287
msgid "week"
msgstr ""
#: ../../include/datetime.php:265
#: ../../include/datetime.php:287
msgid "weeks"
msgstr ""
#: ../../include/datetime.php:266
#: ../../include/datetime.php:288
msgid "days"
msgstr ""
#: ../../include/datetime.php:267
#: ../../include/datetime.php:289
msgid "hour"
msgstr ""
#: ../../include/datetime.php:267
#: ../../include/datetime.php:289
msgid "hours"
msgstr ""
#: ../../include/datetime.php:268
#: ../../include/datetime.php:290
msgid "minute"
msgstr ""
#: ../../include/datetime.php:268
#: ../../include/datetime.php:290
msgid "minutes"
msgstr ""
#: ../../include/datetime.php:269
#: ../../include/datetime.php:291
msgid "second"
msgstr ""
#: ../../include/datetime.php:269
#: ../../include/datetime.php:291
msgid "seconds"
msgstr ""
#: ../../include/datetime.php:278
#: ../../include/datetime.php:300
#, php-format
msgid "%1$d %2$s ago"
msgstr ""
#: ../../include/datetime.php:450 ../../include/items.php:1561
#: ../../include/datetime.php:472 ../../include/items.php:1561
#, php-format
msgid "%s's birthday"
msgstr ""
#: ../../include/datetime.php:451 ../../include/items.php:1562
#: ../../include/datetime.php:473 ../../include/items.php:1562
#, php-format
msgid "Happy Birthday %s"
msgstr ""

File diff suppressed because it is too large Load diff

View file

@ -259,6 +259,39 @@ $a->strings["Connect"] = "Konekti";
$a->strings["No matches"] = "Nenio estas trovita";
$a->strings["Remote privacy information not available."] = "Informoj pri fora privateca ne estas disponebla.";
$a->strings["Visible to:"] = "Videbla al:";
$a->strings["No such group"] = "Grupo ne estas trovita";
$a->strings["Group is empty"] = "Grupo estas malplena";
$a->strings["Group: "] = "Grupo:";
$a->strings["Select"] = "Elekti";
$a->strings["View %s's profile @ %s"] = "Vidi la profilon de %s ĉe %s";
$a->strings["%s from %s"] = "%s de %s";
$a->strings["View in context"] = "Vidi kun kunteksto";
$a->strings["%d comment"] = array(
0 => "%d komento",
1 => "%d komentoj",
);
$a->strings["show more"] = "montri pli";
$a->strings["like"] = "ŝati";
$a->strings["dislike"] = "malŝati";
$a->strings["Share this"] = "Kunhavigi ĉi tiun";
$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["remove star"] = "forpreni stelon";
$a->strings["toggle star status"] = "ŝalti/malŝalti steloŝtato";
$a->strings["starred"] = "steligita";
$a->strings["add tag"] = "aldoni markon";
$a->strings["save to folder"] = "konservi en dosierujo";
$a->strings["to"] = "al";
$a->strings["Wall-to-Wall"] = "Muro-al-Muro";
$a->strings["via Wall-To-Wall:"] = "per Muro-al-Muro:";
$a->strings["Welcome to %s"] = "Bonvenon ĉe %s";
$a->strings["Invalid request identifier."] = "Nevalida peta identigilo.";
$a->strings["Discard"] = "Forviŝi";
@ -542,9 +575,6 @@ $a->strings["Warning: This group contains %s member from an insecure network."]
1 => "Averto: La grupo enhavas %s membrojn el nesekuraj retejoj.",
);
$a->strings["Private messages to this group are at risk of public disclosure."] = "La privateco de privataj mesaĝoj al ĉi tiu grupo ne ĉiam estas garantita.";
$a->strings["No such group"] = "Grupo ne estas trovita";
$a->strings["Group is empty"] = "Grupo estas malplena";
$a->strings["Group: "] = "Grupo:";
$a->strings["Contact: "] = "Kontakto:";
$a->strings["Private messages to this person are at risk of public disclosure."] = "La privateco de privataj mesaĝoj al ĉi tiu persono ne ĉiam estas garantita.";
$a->strings["Invalid contact."] = "Nevalida kontakto.";
@ -691,6 +721,8 @@ $a->strings["Normal Account"] = "Normala konto";
$a->strings["Soapbox Account"] = "Soapbox Konto";
$a->strings["Community/Celebrity Account"] = "Komunuma/eminentula Konto";
$a->strings["Automatic Friend Account"] = "Aŭtomata Amika Konto";
$a->strings["Blog Account"] = "Blogkonto";
$a->strings["Private Forum"] = "Privata Forumo";
$a->strings["Message queues"] = "Mesaĝvicoj";
$a->strings["Administration"] = "Administrado";
$a->strings["Summary"] = "Resumo";
@ -835,6 +867,7 @@ $a->strings["Login failed."] = "Ensalutado malsukcesis.";
$a->strings["Contact added"] = "Aldonis kontakton";
$a->strings["Common Friends"] = "Komunaj Amikoj";
$a->strings["No contacts in common."] = "Neniom da komunaj kontaktoj.";
$a->strings["link"] = "ligilo";
$a->strings["Item has been removed."] = "Elemento estas forviŝita.";
$a->strings["Applications"] = "Programoj";
$a->strings["No installed applications."] = "Neniom da instalitaj programoj.";
@ -925,6 +958,17 @@ $a->strings["Existing Page Delegates"] = "Estantaj Delegitoj de la Paĝo";
$a->strings["Potential Delegates"] = "Eblaj Delegitoj";
$a->strings["Add"] = "Aldoni";
$a->strings["No entries."] = "Neniom da afiŝoj.";
$a->strings["Source (bbcode) text:"] = "Fontkodo (bbcode):";
$a->strings["Source (Diaspora) text to convert to BBcode:"] = "Fontokodo (Diaspora) konvertota al BBcode:";
$a->strings["Source input: "] = "Fontoenigo:";
$a->strings["bb2html: "] = "bb2html: ";
$a->strings["bb2html2bb: "] = "bb2html2bb: ";
$a->strings["bb2md: "] = "bb2md: ";
$a->strings["bb2md2html: "] = "bb2md2html: ";
$a->strings["bb2dia2bb: "] = "bb2dia2bb: ";
$a->strings["bb2md2html2bb: "] = "bb2md2html2bb: ";
$a->strings["Source input (Diaspora format): "] = "Fontoenigo (Diaspora formato):";
$a->strings["diaspora2bb: "] = "diaspora2bb: ";
$a->strings["Friend Suggestions"] = "Amikosugestoj";
$a->strings["No suggestions available. If this is a new site, please try again in 24 hours."] = "Neniu sugestoj disponeblas. Se ĉi tiu estas nova retejo, bonvolu reprovi post 24 horoj.";
$a->strings["Ignore/Hide"] = "Ignori/Kaŝi";
@ -932,6 +976,10 @@ $a->strings["Global Directory"] = "Tutmonda Katalogo";
$a->strings["Find on this site"] = "Trovi en ĉi retejo";
$a->strings["Site Directory"] = "Reteja Katalogo";
$a->strings["Gender: "] = "Sekso:";
$a->strings["Gender:"] = "Sekso:";
$a->strings["Status:"] = "Stato:";
$a->strings["Homepage:"] = "Hejmpaĝo:";
$a->strings["About:"] = "Pri:";
$a->strings["No entries (some entries may be hidden)."] = "Neniom da afiŝoj (kelkaj afiŝoj eble ne estas videbla).";
$a->strings["%s : Not a valid email address."] = "%s: Ne estas valida retpoŝtadreso.";
$a->strings["Please join us on Friendica"] = "Bonvolu aliĝi kun ni ĉe Friendica";
@ -999,7 +1047,7 @@ $a->strings["Facebook API Key"] = "Facebook API ŝlosilo";
$a->strings["Error: it appears that you have specified the App-ID and -Secret in your .htconfig.php file. As long as they are specified there, they cannot be set using this form.<br><br>"] = "Eraro: Ŝajnas kvazaŭ vi agordis la App-ID kaj la sekreton en via .htconfig.php dosiero. Kiam ili estas agordita tie, vi ne povas agordi ĝin en tiu ĉi formo.<br><br>";
$a->strings["Error: the given API Key seems to be incorrect (the application access token could not be retrieved)."] = "Eraro: La API ŝlosilo aspektas malĝusta (ne eblas ricevi la programa atingoĵetono).";
$a->strings["The given API Key seems to work correctly."] = "La API ŝlosilo ŝajne ĝuste funkcias.";
$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. Something strange's going on."] = "Ne povis kontroli la ĝusteco de la API ŝlosilo. Stranga afero okazas.";
$a->strings["App-ID / API-Key"] = "Programo ID / API Ŝlosilo";
$a->strings["Application secret"] = "Programo sekreto";
$a->strings["Polling Interval in minutes (minimum %1\$s minutes)"] = "Intervalo de enketo en minutoj (minimume %1\$s minutoj)";
@ -1058,7 +1106,6 @@ $a->strings["Use /expression/ to provide regular expressions"] = "Uzu /expr/ por
$a->strings["NSFW Settings saved."] = "NSFW agordoj konservitaj.";
$a->strings["%s - Click to open/close"] = "%s - Klaku por malfermi/fermi";
$a->strings["Forums"] = "Forumoj";
$a->strings["show more"] = "montri pli";
$a->strings["Forums:"] = "Forumoj:";
$a->strings["Page settings updated."] = "Paĝajn agordojn ĝisdatigita.";
$a->strings["Page Settings"] = "Paĝaj Agordoj";
@ -1212,12 +1259,28 @@ $a->strings["Tile Server URL"] = "Adreso de Kahelservilo";
$a->strings["A list of <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">public tile servers</a>"] = "Listo de <a href=\"http://wiki.openstreetmap.org/wiki/TMS\" target=\"_blank\">publikaj kahelserviloj</a>";
$a->strings["Default zoom"] = "Defaŭlta zoma faktoro";
$a->strings["The default zoom level. (1:world, 18:highest)"] = "La defaŭlta zoma faktoro. (1:tutmonda, 18:plej proksima)";
$a->strings["Could NOT install Libravatar successfully.<br>It requires PHP >= 5.3"] = "NE SUKCESIS instali la bibliotekon Libravatar.<br>Ĝi bezonas PHP >= 5.3";
$a->strings["generic profile image"] = "komuna profilbildo";
$a->strings["random geometric pattern"] = "loteca geometria skemo";
$a->strings["monster face"] = "monstrobildo";
$a->strings["computer generated face"] = "komputita vizaĝo";
$a->strings["retro arcade style face"] = "retrostila videoludstila vizaĝo";
$a->strings["Your PHP version %s is lower than the required PHP >= 5.3."] = "Via PHP versio %s estas malpli alta ol la bezonata PHP >= 5.3.";
$a->strings["This addon is not functional on your server."] = "Tiu ĉi kromprogramo ne funkcieblas je via servilo.";
$a->strings["Information"] = "Informo";
$a->strings["Gravatar addon is installed. Please disable the Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "La Gravatar kromprogramo estas instalita. Bonvolu malŝalti la Gravatar kromprogramon.<tr>La Libravatar kromprogramo retropaŝos al Gravatar se neniu troveblis ĉe Libravatar.";
$a->strings["Default avatar image"] = "Defaŭlta avatarbildo";
$a->strings["Select default avatar image if none was found. See README"] = "Elektu la defaŭltan avatar bildon sen neniu troveblis. Legu README.";
$a->strings["Libravatar settings updated."] = "Ĝisdatigis Libravatar agordojn.";
$a->strings["Post to libertree"] = "Afiŝi al libertree";
$a->strings["libertree Post Settings"] = "Agordoj por Afiŝoj ĉe libertree";
$a->strings["Enable Libertree Post Plugin"] = "Aktivigi Kromprogramon por Afiŝoj ĉe libertree";
$a->strings["Libertree API token"] = "Libertree API ĵetono";
$a->strings["Libertree site URL"] = "URL adreso de libertree retejo:";
$a->strings["Post to Libertree by default"] = "Defaŭlte afiŝi ĉe Libertree";
$a->strings["Altpager settings updated."] = "Ĝisdatigis Altpager agordojn.";
$a->strings["Alternate Pagination Setting"] = "Alternativa paĝonumerado agordoj";
$a->strings["Use links to \"newer\" and \"older\" pages in place of page numbers?"] = "Uzi ligilojn al \"pli nova\" kaj \"pli malnova\" paĝoj anstataŭ paĝnombrojn?";
$a->strings["The MathJax addon renders mathematical formulae written using the LaTeX syntax surrounded by the usual $$ or an eqnarray block in the postings of your wall,network tab and private mail."] = "La Mathjax kromprogramo bildigas matematikajn formulojn skribitajn en la LaTeX sintakso, cirkaŭigita de la komuna $$ aŭ eqnarray bloko en afiŝoj ĉe via muro, Reto folio kaj privataj mesaĝoj.";
$a->strings["Use the MathJax renderer"] = "Ĉu uzi la Mathjax bildigilo";
$a->strings["MathJax Base URL"] = "Mathjax Baza URL Adreso";
@ -1225,12 +1288,7 @@ $a->strings["The URL for the javascript file that should be included to use Math
$a->strings["Editplain settings updated."] = "Ĝisdatigis la Editplain agordojn.";
$a->strings["Editplain Settings"] = "Agordoj por Editplain";
$a->strings["Disable richtext status editor"] = "Malŝalti la riĉteksto-redaktilon";
$a->strings["generic profile image"] = "komuna profilbildo";
$a->strings["random geometric pattern"] = "loteca geometria skemo";
$a->strings["monster face"] = "monstrobildo";
$a->strings["computer generated face"] = "komputita vizaĝo";
$a->strings["retro arcade style face"] = "retrostila videoludstila vizaĝo";
$a->strings["Default avatar image"] = "Defaŭlta avatarbildo";
$a->strings["Libravatar addon is installed, too. Please disable Libravatar addon or this Gravatar addon.<br>The Libravatar addon will fall back to Gravatar if nothing was found at Libravatar."] = "La Libravatar kromprogramo estas ankaŭ instaltga. Bonvolu malŝalti la Libravatar kromprogramon.<br>La Libravatar kromprogramo retropaŝos al Gravatar se neniu troveblis ĉe Libravatar.";
$a->strings["Select default avatar image if none was found at Gravatar. See README"] = "Elektu defaŭltan avatarbildon se neniu troviĝis ĉe Gravatar. Vidu README.";
$a->strings["Rating of images"] = "Pritakso de bildoj";
$a->strings["Select the appropriate avatar rating for your site. See README"] = "Elektu la ĝustan pritakson de via avataro por via retejo. Vidu README.";
@ -1383,17 +1441,13 @@ $a->strings["Alignment"] = "Ĝisrandigo";
$a->strings["Left"] = "Maldekstren";
$a->strings["Center"] = "Centren";
$a->strings["Set colour scheme"] = "Agordi Kolorskemon";
$a->strings["Gender:"] = "Sekso:";
$a->strings["j F, Y"] = "j F, Y";
$a->strings["j F"] = "j F";
$a->strings["Birthday:"] = "Naskiĝtago:";
$a->strings["Age:"] = "Aĝo:";
$a->strings["Status:"] = "Stato:";
$a->strings["for %1\$d %2\$s"] = "por %1\$d %2\$s";
$a->strings["Homepage:"] = "Hejmpaĝo:";
$a->strings["Tags:"] = "Markoj:";
$a->strings["Religion:"] = "Religio:";
$a->strings["About:"] = "Pri:";
$a->strings["Hobbies/Interests:"] = "Ŝatokupoj/Interesoj:";
$a->strings["Contact information and Social Networks:"] = "Kontaktinformoj kaj Interkonaj Retejoj:";
$a->strings["Musical interests:"] = "Muzaikaj interesoj:";
@ -1488,6 +1542,8 @@ $a->strings["prev"] = "antaŭa";
$a->strings["first"] = "unua";
$a->strings["last"] = "lasta";
$a->strings["next"] = "sekvanta";
$a->strings["newer"] = "pli nova";
$a->strings["older"] = "pli malnova";
$a->strings["No contacts"] = "Neniu kontaktoj";
$a->strings["%d Contact"] = array(
0 => "%d Kontakto",
@ -1605,8 +1661,8 @@ $a->strings["%1\$d %2\$s ago"] = "antaŭ %1\$d %2\$s";
$a->strings["%s's birthday"] = "Naskiĝtago de %s";
$a->strings["Happy Birthday %s"] = "Feliĉan Naskiĝtagon al %s";
$a->strings["From: "] = "De: ";
$a->strings["$1 wrote:"] = "$1 skribis:";
$a->strings["Image/photo"] = "Bildo";
$a->strings["$1 wrote:"] = "$1 skribis:";
$a->strings["Cannot locate DNS info for database server '%s'"] = "Ne trovis DNS informojn por datumbaza servilo '%s'.";
$a->strings["[no subject]"] = "[neniu temo]";
$a->strings["Visible to everybody"] = "Videbla al ĉiuj";
@ -1627,7 +1683,7 @@ $a->strings["%s commented on an item/conversation you have been following."] = "
$a->strings["Please visit %s to view and/or reply to the conversation."] = "Bonvolu viziti %s por vidi aŭ respondi la konversacion.";
$a->strings["[Friendica:Notify] %s posted to your profile wall"] = "[Friendica:Atentigo] %s afiŝis al via profilmuro";
$a->strings["%1\$s posted to your profile wall at %2\$s"] = "%1\$s skribis al via profilmuro ĉe %2\$s";
$a->strings["%1\$s posted to [url=%2s]your wall[/url]"] = "%1\$s afiŝis al [url=%2s]via muro[/url]";
$a->strings["%1\$s posted to [url=%2\$s]your wall[/url]"] = "%1\$s afiŝis al [url=%2\$s]via muro[/url]";
$a->strings["[Friendica:Notify] %s tagged you"] = "[Friendica:Atentigo] %s markis vin";
$a->strings["%1\$s tagged you at %2\$s"] = "%1\$s markis vin ĉe %2\$s";
$a->strings["%1\$s [url=%2\$s]tagged you[/url]."] = "%1\$s [url=%2\$s]markis vin[/url].";
@ -1660,6 +1716,7 @@ $a->strings["following"] = "sekvanta";
$a->strings["A new person is sharing with you at "] = "Nova persono kunhavigas kun vi ĉe ";
$a->strings["You have a new follower at "] = "Vi havas novan sekvanton ĉe ";
$a->strings["Archives"] = "Arkivoj";
$a->strings["image/photo"] = "bildo/foto";
$a->strings["An invitation is required."] = "Invio bezonata.";
$a->strings["Invitation could not be verified."] = "Ne povis kontroli la inviton.";
$a->strings["Invalid OpenID url"] = "Nevalida OpenID adreso";
@ -1689,35 +1746,6 @@ $a->strings["Edit Contact"] = "Redakti Kontakton";
$a->strings["Send PM"] = "Sendi PM";
$a->strings["post/item"] = "afiŝo/elemento";
$a->strings["%1\$s marked %2\$s's %3\$s as favorite"] = "%1\$s markis la %3\$s de %2\$s kiel preferita.";
$a->strings["Select"] = "Elekti";
$a->strings["View %s's profile @ %s"] = "Vidi la profilon de %s ĉe %s";
$a->strings["%s from %s"] = "%s de %s";
$a->strings["View in context"] = "Vidi kun kunteksto";
$a->strings["%d comment"] = array(
0 => "%d komento",
1 => "%d komentoj",
);
$a->strings["like"] = "ŝati";
$a->strings["dislike"] = "malŝati";
$a->strings["Share this"] = "Kunhavigi ĉi tiun";
$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["remove star"] = "forpreni stelon";
$a->strings["toggle star status"] = "ŝalti/malŝalti steloŝtato";
$a->strings["starred"] = "steligita";
$a->strings["add tag"] = "aldoni markon";
$a->strings["save to folder"] = "konservi en dosierujo";
$a->strings["to"] = "al";
$a->strings["Wall-to-Wall"] = "Muro-al-Muro";
$a->strings["via Wall-To-Wall:"] = "per Muro-al-Muro:";
$a->strings["Delete Selected Items"] = "Forviŝi Elektitajn Elementojn";
$a->strings["%s likes this."] = "%s ŝatas tiun.";
$a->strings["%s doesn't like this."] = "%s malŝatas tiun.";

View file

@ -52,7 +52,7 @@
<li><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.filer"></a></li>
{{ endif }}
{{ if $item.plink }}
<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$item.sparkle"></a></li>
<li class="wall-item-links-wrapper$item.sparkle"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
{{ endif }}
{{ if $item.edpost }}
<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>

View file

@ -59,7 +59,7 @@ class="icon recycle wall-item-share-buttons" title="$item.vote.share.0" onclick
<li class="wall-item-filer-wrapper"><a href="#" id="filer-$item.id" onclick="itemFiler($item.id); return false;" class="filer-item icon file-as" title="$item.star.filer"></a></li>
{{ endif }}
{{ if $item.plink }}
<li class="wall-item-links-wrapper"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link$item.sparkle"></a></li>
<li class="wall-item-links-wrapper$item.sparkle"><a href="$item.plink.href" title="$item.plink.title" target="external-link" class="icon remote-link"></a></li>
{{ endif }}
{{ if $item.edpost }}
<li><a class="editpost icon pencil" href="$item.edpost.0" title="$item.edpost.1"></a></li>