Merge https://github.com/friendica/friendica into pull
This commit is contained in:
commit
8fe82d35d4
5 changed files with 7575 additions and 10744 deletions
BIN
images/rhash-16.png
Normal file
BIN
images/rhash-16.png
Normal file
Binary file not shown.
After (image error) Size: 679 B |
|
@ -1061,7 +1061,8 @@ function smilies($s, $sample = false) {
|
|||
':facepalm',
|
||||
':like',
|
||||
':dislike',
|
||||
'~friendica'
|
||||
'~friendica',
|
||||
'red#'
|
||||
|
||||
);
|
||||
|
||||
|
@ -1098,7 +1099,8 @@ function smilies($s, $sample = false) {
|
|||
'<img class="smiley" src="' . $a->get_baseurl() . '/images/smiley-facepalm.gif" alt=":facepalm" />',
|
||||
'<img class="smiley" src="' . $a->get_baseurl() . '/images/like.gif" alt=":like" />',
|
||||
'<img class="smiley" src="' . $a->get_baseurl() . '/images/dislike.gif" alt=":dislike" />',
|
||||
'<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
|
||||
'<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>',
|
||||
'<a href="http://friendica.com">red <img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red" /></a>'
|
||||
);
|
||||
|
||||
$params = array('texts' => $texts, 'icons' => $icons, 'string' => $s);
|
||||
|
|
14958
view/cs/messages.po
14958
view/cs/messages.po
File diff suppressed because it is too large
Load diff
3344
view/cs/strings.php
3344
view/cs/strings.php
File diff suppressed because it is too large
Load diff
11
view/cs/update_fail_eml.tpl
Normal file
11
view/cs/update_fail_eml.tpl
Normal file
|
@ -0,0 +1,11 @@
|
|||
Ahoj,
|
||||
Já jsem $sitename.
|
||||
Vývojáři friendica nednávno uvolnili aktualizaci $update,
|
||||
ale když jsem se ji snažil nainstalovat, nepovedlo se mi to.
|
||||
Je to třeba rychle opravit a já to sám nedokážu. Prosím kontaktuj
|
||||
vývojáře friendica, pokud mi nemůžeš pomoct ty sám. Moje databáze může být nekonzistentní.
|
||||
|
||||
Chybová zpráva je '$error'.
|
||||
|
||||
Je mi líto,
|
||||
Tvůj web friendica na $siteurl
|
Loading…
Reference in a new issue