diff --git a/locale/el/LC_MESSAGES/django.mo b/locale/el/LC_MESSAGES/django.mo
index d90918f5a676c683b84e974ea217ac914b38ca56..5b6d81a911b92f58e6602a60bfb612629c16484e 100644
Binary files a/locale/el/LC_MESSAGES/django.mo and b/locale/el/LC_MESSAGES/django.mo differ
diff --git a/locale/el/LC_MESSAGES/django.po b/locale/el/LC_MESSAGES/django.po
index a6be0ebcc2e2fdb9e8ac81a9c5d35be13bf52029..0bc6c8142d5bee4ed69072ef6d4423d9182f1875 100644
--- a/locale/el/LC_MESSAGES/django.po
+++ b/locale/el/LC_MESSAGES/django.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-05-03 11:07+0300\n"
+"POT-Creation-Date: 2012-05-03 11:40+0300\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Leonidas Poulopoulos <leopoul@grnet.gr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -692,17 +692,25 @@ msgstr "ΧρΞ�στης"
 msgid "Actions"
 msgstr "ΕνέργΡιΡς"
 
-#: templates/user_routes.html:294
-msgid "Rule expired"
-msgstr "Ξ›Ξ�ΞΎΞ· Φίλτρου"
+#: templates/user_routes.html:286 templates/user_routes.html.py:294
+msgid "Suspended by user"
+msgstr "ΑπΡνΡργοποιΞ�ΞΈΞ·ΞΊΞ΅ Ξ±Ο€ΟŒ το χρΞ�στη"
 
-#: templates/user_routes.html:294
+#: templates/user_routes.html:286 templates/user_routes.html.py:294
 msgid "Suspended by administrator"
 msgstr "ΑπΡνΡργοποιΞ�ΞΈΞ·ΞΊΞ΅ Ξ±Ο€ΟŒ το διαχΡιριστΞ�"
 
+#: templates/user_routes.html:286
+msgid "Suspended due to expiration"
+msgstr "ΑπΡνΡργοποιΞ�ΞΈΞ·ΞΊΞ΅ Ξ»ΟŒΞ³Ο‰ Ξ»Ξ�ΞΎΞ·Ο‚"
+
+#: templates/user_routes.html:286
+msgid "Syncronization error. Configuration in device deffers from rule"
+msgstr "Σφάλμα συγχρονισμού. Διαφορά Ξ΄ΞΉΞ±ΞΌΟŒΟΟ†Ο‰ΟƒΞ·Ο‚ Ξ±Ο€ΟŒ συσκΡυΞ�"
+
 #: templates/user_routes.html:294
-msgid "Suspended by user"
-msgstr "ΑπΡνΡργοποιΞ�ΞΈΞ·ΞΊΞ΅ Ξ±Ο€ΟŒ το χρΞ�στη"
+msgid "Rule expired"
+msgstr "Ξ›Ξ�ΞΎΞ· Φίλτρου"
 
 #: templates/user_routes.html:297
 msgid "Edit"
@@ -720,6 +728,10 @@ msgstr ""
 msgid "Fix it!"
 msgstr "Ξ•Ο€ΞΉΞ΄ΞΉΟŒΟΞΈΟ‰ΟƒΞ·"
 
+#: templates/user_routes.html:322
+msgid "Suspend Rule"
+msgstr "ΞšΞ±Ο„Ξ¬ΟΞ³Ξ·ΟƒΞ· Φίλτρου"
+
 #: templates/user_routes.html:323
 msgid "You are about to suspend rule"
 msgstr "Ξ ΟΟŒΞΊΞ΅ΞΉΟ„Ξ±ΞΉ Ξ½Ξ± απΡνΡργοποιΞ�σΡτΡ το φίλτρο"
@@ -793,12 +805,3 @@ msgstr "Ο χρΞ�στης έχΡι Ξ�δη ΡνΡργοποιηθΡί"
 msgid "The user will be notified about his/her account activation"
 msgstr "Ο χρΞ�στης ΞΈΞ± ΡνημΡρωθΡί Ξ³ΞΉΞ± την ΡνΡργοποίηση του λογαριασμού"
 
-#~ msgid ""
-#~ "After clicking Retry Login, it is strongly suggested to close your "
-#~ "browser and visit the page again"
-#~ msgstr ""
-#~ "Αφού ΡπιλέξΡτΡ Ξ•Ο€Ξ±Ξ½Ξ¬Ξ»Ξ·ΟˆΞ· Ξ•ΞΉΟƒΟŒΞ΄ΞΏΟ…, προτΡίνουμΡ Ξ½Ξ± κλΡίσΡτΡ την ΡφαρμογΞ� "
-#~ "πΡριΞ�γησης ΞΊΞ±ΞΉ Ξ½Ξ± ΡπισκΡφθέιτΡ τη σΡλίδα ΞΎΞ±Ξ½Ξ¬"
-
-#~ msgid "My routes"
-#~ msgstr "΀α φίλτρα ΞΌΞΏΟ…"
diff --git a/templates/user_routes.html b/templates/user_routes.html
index a4248ed07064a21dd58734c5ed8f143623eedc84..0960aaf5f901dca37032e5573717ad95680cb8cf 100644
--- a/templates/user_routes.html
+++ b/templates/user_routes.html
@@ -283,7 +283,7 @@ function delete_route(route){
 	<td>{{ route.get_match|safe|escape }}</td>
 	<td style="text-align: center;">{{route.get_then|safe|escape}}</td>
 	<td style="text-align: center; "><span {% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%} class="statustootipclass" style="border-bottom:1px dotted red;" 
-		title = "{% ifequal route.status 'INACTIVE' %}Suspended by user{% else %}{% ifequal route.status 'ADMININACTIVE' %}Suspended by administrator{% else %}{% ifequal route.status 'EXPIRED' %}Suspended due to expiration{% else %}{% ifequal route.status 'OUTOFSYNC' %}Syncronization error. Configuration in device deffers from rule{% endifequal %}{% endifequal %}{% endifequal %}{% endifequal %}"{% endif %}>{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}SUSPENDED{% else %}{% if route.status == 'OUTOFSYNC' %}ERROR{% else %}{{route.status}}{% endif %}{% endif %}</span></td>
+		title = "{% ifequal route.status 'INACTIVE' %}{% trans "Suspended by user" %}{% else %}{% ifequal route.status 'ADMININACTIVE' %}{% trans "Suspended by administrator" %}{% else %}{% ifequal route.status 'EXPIRED' %}{% trans "Suspended due to expiration" %}{% else %}{% ifequal route.status 'OUTOFSYNC' %}{% trans "Syncronization error. Configuration in device deffers from rule" %}{% endifequal %}{% endifequal %}{% endifequal %}{% endifequal %}"{% endif %}>{% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' %}SUSPENDED{% else %}{% if route.status == 'OUTOFSYNC' %}ERROR{% else %}{{route.status}}{% endif %}{% endif %}</span></td>
 	{% comment %}<td style="text-align: center;">{{ route.response }}</td>{% endcomment %}
 	<td style="text-align: center;">{{ route.applier }}</td>
 	<td style="text-align: center;"><span {% if route.status == 'EXPIRED' or route.status == 'ADMININACTIVE' or route.status == 'INACTIVE' or route.status == 'OUTOFSYNC'%}{% else %}{% if route.days_to_expire %}
@@ -319,7 +319,7 @@ function delete_route(route){
 </tbody>
 </table>
 
-<div id="dialog" title="Suspend Rule">
+<div id="dialog" title="{% trans "Suspend Rule" %}">
 		<p>{% blocktrans %}You are about to suspend rule{% endblocktrans %} <strong><span id="route_to_delete"></span></strong></p>
 		<p>{% blocktrans %}Suspending the rule will automatically remove the configuration from the network and mark this rule as inactive.{% endblocktrans %}</p>
 		<p>{% blocktrans %}Are you sure you want to proceed?{% endblocktrans %}</p>