Merge pull request #208 from tuscanhobbit/master

updated logo in readme and r# shorthand

5 files changed, 7 insertions, 7 deletions

diff --git a/images/rm-16.png b/images/rm-16.png
new file mode 100644
index 000000000..62e45c2dd
--- /dev/null
+++ b/images/rm-16.png
diff --git a/images/rm300.png b/images/rm300.png
index 52c234dc2..bc2600348 100644
--- a/images/rm300.png
+++ b/images/rm300.png
diff --git a/include/text.php b/include/text.php
index 780992f4a..54626a772 100755
--- a/include/text.php
+++ b/include/text.php
@@ -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>'
 	);
 
diff --git a/view/it/messages.po b/view/it/messages.po
index 7a77586bc..0143952d4 100644
--- a/view/it/messages.po
+++ b/view/it/messages.po
@@ -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
diff --git a/view/it/strings.php b/view/it/strings.php
index 62936964f..5c71824db 100644
--- a/view/it/strings.php
+++ b/view/it/strings.php
@@ -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";