Merge pull request #208 from tuscanhobbit/master

updated logo in readme and r# shorthand
This commit is contained in:
friendica 2013-11-23 00:16:09 -08:00
commit c81eb2a795
5 changed files with 7 additions and 7 deletions

BIN
images/rm-16.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 949 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.2 KiB

After

Width:  |  Height:  |  Size: 6.3 KiB

View File

@ -916,8 +916,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://getzot.com"><img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="red#" /> the Red Matrix</a>',
'<a href="http://getzot.com"><img class="smiley" src="' . $a->get_baseurl() . '/images/rhash-16.png" alt="r#" /> the Red Matrix</a>',
'<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="red#" />matrix</strong></a>',
'<a href="http://getzot.com"><strong>red<img class="smiley" src="' . $a->get_baseurl() . '/images/rm-16.png" alt="r#" />matrix</strong></a>',
'<a href="http://friendica.com">~friendica <img class="smiley" src="' . $a->get_baseurl() . '/images/friendica-16.png" alt="~friendica" /></a>'
);

View File

@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: Red Matrix\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2013-11-15 00:03-0800\n"
"PO-Revision-Date: 2013-11-15 11:55+0000\n"
"PO-Revision-Date: 2013-11-22 22:02+0000\n"
"Last-Translator: tuscanhobbit Pa <pynolo@tarine.net>\n"
"Language-Team: Italian (http://www.transifex.com/projects/p/red-matrix/language/it/)\n"
"MIME-Version: 1.0\n"
@ -6951,11 +6951,11 @@ msgstr "Imposta l'opacità minima della barra di navigazione per nasconderla"
#: ../../view/theme/redbasic/php/config.php:98
msgid "Sloppy photo albums"
msgstr "Photo album semplificati"
msgstr "Album fotografici semplificati"
#: ../../view/theme/redbasic/php/config.php:98
msgid "Are you a clean desk or a messy desk person?"
msgstr "Hai una scrivania ordinata o sei una persona che lascia confusione?"
msgstr "La tua scrivania è sempre a posto? Sei una persona disordinata?"
#: ../../view/theme/apw/php/config.php:193
#: ../../view/theme/apw/php/config.php:211

View File

@ -1635,8 +1635,8 @@ $a->strings["Set radius of corners"] = "Raggio degli angoli stondati";
$a->strings["Set shadow depth of photos"] = "Profondità dell'ombra delle foto";
$a->strings["Set maximum width of conversation regions"] = "Larghezza massima delle aree delle conversazioni";
$a->strings["Set minimum opacity of nav bar - to hide it"] = "Imposta l'opacità minima della barra di navigazione per nasconderla";
$a->strings["Sloppy photo albums"] = "Photo album semplificati";
$a->strings["Are you a clean desk or a messy desk person?"] = "Hai una scrivania ordinata o sei una persona che lascia confusione?";
$a->strings["Sloppy photo albums"] = "Album fotografici semplificati";
$a->strings["Are you a clean desk or a messy desk person?"] = "La tua scrivania è sempre a posto? Sei una persona disordinata?";
$a->strings["Schema Default"] = "Schema predefinito";
$a->strings["Sans-Serif"] = "Sans-Serif";
$a->strings["Monospace"] = "Monospace";