diff --git a/po/es.po b/po/es.po
index 6d0edcd..f49b55a 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SeriesFinale\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-12-25 03:11+0000\n"
+"POT-Creation-Date: 2010-12-30 01:12+0000\n"
 "PO-Revision-Date: 2010-05-10 21:17+0100\n"
 "Last-Translator: Juan A. Suarez Romero <jasuarez@igalia.com>\n"
 "Language-Team: Spanish\n"
@@ -17,8 +17,8 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../src/SeriesFinale/gui.py:118 ../src/SeriesFinale/gui.py:1314
-msgid "Add Shows"
-msgstr "Añadir Series"
+msgid "Add shows"
+msgstr "Añadir series"
 
 #: ../src/SeriesFinale/gui.py:125
 msgid "Sort by ep. date"
@@ -29,12 +29,12 @@ msgid "Sort by name"
 msgstr "Ord. por nombre"
 
 #: ../src/SeriesFinale/gui.py:139 ../src/SeriesFinale/gui.py:343
-msgid "Delete Shows"
-msgstr "Borrar Series"
+msgid "Delete shows"
+msgstr "Borrar series"
 
 #: ../src/SeriesFinale/gui.py:144
-msgid "Update All"
-msgstr "Actualizar Todo"
+msgid "Update all"
+msgstr "Actualizar todo"
 
 #: ../src/SeriesFinale/gui.py:149 ../src/SeriesFinale/gui.py:1555
 msgid "Settings"
@@ -54,9 +54,8 @@ msgid "Please verify your internet connection is available"
 msgstr "Por favor verifique que su conexión a internet esté disponible"
 
 #: ../src/SeriesFinale/gui.py:199 ../src/SeriesFinale/gui.py:1448
-#, python-format
-msgid "An error occurred.%s"
-msgstr "Ocurrió un error.%s"
+msgid "An error occurred. %s"
+msgstr "Ocurrió un error. %s"
 
 #: ../src/SeriesFinale/gui.py:278
 msgid "Finished updating the shows"
@@ -82,28 +81,28 @@ msgid "Info"
 msgstr "Info"
 
 #: ../src/SeriesFinale/gui.py:543 ../src/SeriesFinale/gui.py:1198
-msgid "Edit Info"
-msgstr "Editar Info"
+msgid "Edit info"
+msgstr "Editar info"
 
 #: ../src/SeriesFinale/gui.py:550
-msgid "Update Show"
-msgstr "Actualizar Serie"
+msgid "Update show"
+msgstr "Actualizar serie"
 
 #: ../src/SeriesFinale/gui.py:555
-msgid "Delete Season"
-msgstr "Borrar Temporada"
+msgid "Delete season"
+msgstr "Borrar temporada"
 
 #: ../src/SeriesFinale/gui.py:560 ../src/SeriesFinale/gui.py:854
-msgid "New Episode"
-msgstr "Nuevo Episodio"
+msgid "New episode"
+msgstr "Nuevo episodio"
 
 #: ../src/SeriesFinale/gui.py:579
 msgid "Updating show. Please wait..."
 msgstr "Actualizando serie. Espere por favor..."
 
 #: ../src/SeriesFinale/gui.py:584
-msgid "Show Details"
-msgstr "Detalles de la Serie"
+msgid "Show details"
+msgstr "Detalles de la serie"
 
 #: ../src/SeriesFinale/gui.py:589
 msgid "Genre"
@@ -111,7 +110,7 @@ msgstr "Género"
 
 #: ../src/SeriesFinale/gui.py:590
 msgid "Network"
-msgstr "Estación"
+msgstr "Cadena"
 
 #: ../src/SeriesFinale/gui.py:591
 msgid "Actors"
@@ -122,12 +121,10 @@ msgid "Rating"
 msgstr "Clasificación"
 
 #: ../src/SeriesFinale/gui.py:671
-#, fuzzy
-msgid "Delete Seasons"
-msgstr "Borrar Temporadas"
+msgid "Delete seasons"
+msgstr "Borrar temporadas"
 
 #: ../src/SeriesFinale/gui.py:682
-#, fuzzy
 msgid "Please select one or more seasons"
 msgstr "Por favor seleccione una o más series"
 
@@ -141,8 +138,8 @@ msgid "Season %s"
 msgstr "Temporada %s"
 
 #: ../src/SeriesFinale/gui.py:782
-msgid "Edit Show"
-msgstr "Editar Serie"
+msgid "Edit show"
+msgstr "Editar serie"
 
 #: ../src/SeriesFinale/gui.py:786 ../src/SeriesFinale/gui.py:858
 msgid "Overview"
@@ -158,7 +155,7 @@ msgstr "Género:"
 
 #: ../src/SeriesFinale/gui.py:802
 msgid "Network:"
-msgstr "Estación:"
+msgstr "Cadena:"
 
 #: ../src/SeriesFinale/gui.py:803 ../src/SeriesFinale/gui.py:905
 msgid "Rating:"
@@ -189,8 +186,8 @@ msgid "Original air date:"
 msgstr "Fecha de emisión original:"
 
 #: ../src/SeriesFinale/gui.py:906
-msgid "Guest Stars:"
-msgstr "Estrellas Invitadas:"
+msgid "Guest stars:"
+msgstr "Estrellas invitadas:"
 
 #: ../src/SeriesFinale/gui.py:994
 msgid "A-Z"
@@ -201,16 +198,16 @@ msgid "Z-A"
 msgstr "Z-A"
 
 #: ../src/SeriesFinale/gui.py:1009
-msgid "Mark All"
-msgstr "Marcar Todos"
+msgid "Mark all"
+msgstr "Marcar todos"
 
 #: ../src/SeriesFinale/gui.py:1014
-msgid "Mark None"
-msgstr "Marcar Ninguno"
+msgid "Mark none"
+msgstr "Marcar ninguno"
 
 #: ../src/SeriesFinale/gui.py:1019 ../src/SeriesFinale/gui.py:1228
-msgid "Delete Episodes"
-msgstr "Borrar Episodios"
+msgid "Delete episodes"
+msgstr "Borrar episodios"
 
 #: ../src/SeriesFinale/gui.py:1187
 msgid "Original air date"
@@ -225,8 +222,8 @@ msgid "Writer"
 msgstr "Escritor"
 
 #: ../src/SeriesFinale/gui.py:1190
-msgid "Guest Stars"
-msgstr "Estrellas Invitadas"
+msgid "Guest stars"
+msgstr "Estrellas invitadas"
 
 #: ../src/SeriesFinale/gui.py:1239
 msgid "Please select one or more episodes"
@@ -241,18 +238,14 @@ msgstr ""
 "\n"
 "%(label)s: %(contents)s"
 
-#: ../src/SeriesFinale/gui.py:1317
-msgid "Search Shows"
-msgstr "Buscar Series"
-
-#: ../src/SeriesFinale/gui.py:1320
-msgid "Add Manually"
-msgstr "Añadir Manualmente"
-
-#: ../src/SeriesFinale/gui.py:1359
+#: ../src/SeriesFinale/gui.py:1317 ../src/SeriesFinale/gui.py:1359
 msgid "Search shows"
 msgstr "Buscar series"
 
+#: ../src/SeriesFinale/gui.py:1320
+msgid "Add manually"
+msgstr "Añadir manualmente"
+
 #: ../src/SeriesFinale/gui.py:1382
 msgid "Search"
 msgstr "Buscar"
@@ -279,8 +272,8 @@ msgid "Done"
 msgstr "Hecho"
 
 #: ../src/SeriesFinale/gui.py:1570
-msgid "Screen Rotation:"
-msgstr "Girar Pantalla"
+msgid "Screen rotation:"
+msgstr "Girar pantalla:"
 
 #: ../src/SeriesFinale/gui.py:1571
 msgid "Automatic"
@@ -342,6 +335,3 @@ msgstr "Una aplicación para la navegación y seguimiento de series de TV."
 #: ../data/seriesfinale.desktop.in.h:2
 msgid "SeriesFinale"
 msgstr "SeriesFinale"
-
-#~ msgid "<i>Next to watch:</i> %s"
-#~ msgstr "<i>Próx. a ver:</i> %s"
diff --git a/po/pt.po b/po/pt.po
index a657aed..a6d66e0 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: SeriesFinale\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-10 17:38+0200\n"
+"POT-Creation-Date: 2010-12-30 01:12+0000\n"
 "PO-Revision-Date: 2010-05-10 17:50+0100\n"
 "Last-Translator: Joaquim Rocha <jrocha@igalia.com>\n"
 "Language-Team: Portuguese\n"
@@ -16,212 +16,220 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
-#: ../src/SeriesFinale/gui.py:108
-#: ../src/SeriesFinale/gui.py:1180
-msgid "Add Shows"
-msgstr "Adicionar Programas"
+#: ../src/SeriesFinale/gui.py:118 ../src/SeriesFinale/gui.py:1314
+msgid "Add shows"
+msgstr "Adicionar programas"
 
-#: ../src/SeriesFinale/gui.py:113
-#: ../src/SeriesFinale/gui.py:298
-msgid "Delete Shows"
-msgstr "Apagar Programas"
+#: ../src/SeriesFinale/gui.py:125
+msgid "Sort by ep. date"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:133
+msgid "Sort by name"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:139 ../src/SeriesFinale/gui.py:343
+msgid "Delete shows"
+msgstr "Apagar programas"
+
+#: ../src/SeriesFinale/gui.py:144
+msgid "Update all"
+msgstr "Actualizar tudo"
 
-#: ../src/SeriesFinale/gui.py:118
-msgid "Update All"
-msgstr "Actualizar Tudo"
+#: ../src/SeriesFinale/gui.py:149 ../src/SeriesFinale/gui.py:1555
+msgid "Settings"
+msgstr ""
 
-#: ../src/SeriesFinale/gui.py:123
+#: ../src/SeriesFinale/gui.py:154
 msgid "About"
 msgstr "Acerca"
 
-#: ../src/SeriesFinale/gui.py:153
+#: ../src/SeriesFinale/gui.py:184
 msgid "Gathering show information. Please wait..."
 msgstr "A obter a informação do program. Por favor aguarde..."
 
-#: ../src/SeriesFinale/gui.py:165
-#: ../src/SeriesFinale/gui.py:244
-#: ../src/SeriesFinale/gui.py:550
-#: ../src/SeriesFinale/gui.py:1312
+#: ../src/SeriesFinale/gui.py:196 ../src/SeriesFinale/gui.py:275
+#: ../src/SeriesFinale/gui.py:641 ../src/SeriesFinale/gui.py:1446
 msgid "Please verify your internet connection is available"
 msgstr "Por favor verifique que a sua conexão à internet está disponível"
 
-#: ../src/SeriesFinale/gui.py:168
-#: ../src/SeriesFinale/gui.py:1314
-#, python-format
-msgid "An error occurred.%s"
-msgstr "Ocorreu um erro.%s"
+#: ../src/SeriesFinale/gui.py:199 ../src/SeriesFinale/gui.py:1448
+msgid "An error occurred. %s"
+msgstr "Ocorreu um erro. %s"
 
-#: ../src/SeriesFinale/gui.py:247
+#: ../src/SeriesFinale/gui.py:278
 msgid "Finished updating the shows"
 msgstr "Actualização de programas finalizada"
 
-#: ../src/SeriesFinale/gui.py:254
+#: ../src/SeriesFinale/gui.py:285
 #, python-format
 msgid "Updated \"%s\""
 msgstr "Actualizou \"%s\""
 
-#: ../src/SeriesFinale/gui.py:275
-#: ../src/SeriesFinale/gui.py:276
-#: ../src/SeriesFinale/gui.py:299
-#: ../src/SeriesFinale/gui.py:1095
+#: ../src/SeriesFinale/gui.py:320 ../src/SeriesFinale/gui.py:321
+#: ../src/SeriesFinale/gui.py:344 ../src/SeriesFinale/gui.py:672
+#: ../src/SeriesFinale/gui.py:1229
 msgid "Delete"
 msgstr "Apagar"
 
-#: ../src/SeriesFinale/gui.py:309
+#: ../src/SeriesFinale/gui.py:354
 msgid "Please select one or more shows"
 msgstr "Por favor seleccione um ou mais programas"
 
-#: ../src/SeriesFinale/gui.py:452
+#: ../src/SeriesFinale/gui.py:538
 msgid "Info"
 msgstr "Info"
 
-#: ../src/SeriesFinale/gui.py:457
-#: ../src/SeriesFinale/gui.py:1064
-msgid "Edit Info"
-msgstr "Editar Info"
+#: ../src/SeriesFinale/gui.py:543 ../src/SeriesFinale/gui.py:1198
+msgid "Edit info"
+msgstr "Editar info"
+
+#: ../src/SeriesFinale/gui.py:550
+msgid "Update show"
+msgstr "Actualizar programa"
 
-#: ../src/SeriesFinale/gui.py:464
-msgid "Update Show"
-msgstr "Actualizar Programa"
+#: ../src/SeriesFinale/gui.py:555
+msgid "Delete season"
+msgstr "Apagar episódios"
 
-#: ../src/SeriesFinale/gui.py:469
-#: ../src/SeriesFinale/gui.py:729
-msgid "New Episode"
-msgstr "Novo Episódio"
+#: ../src/SeriesFinale/gui.py:560 ../src/SeriesFinale/gui.py:854
+msgid "New episode"
+msgstr "Novo episódio"
 
-#: ../src/SeriesFinale/gui.py:488
+#: ../src/SeriesFinale/gui.py:579
 msgid "Updating show. Please wait..."
 msgstr "A actualizar programa. Por favor aguarde..."
 
-#: ../src/SeriesFinale/gui.py:493
-msgid "Show Details"
-msgstr "Detalhes do Programa"
+#: ../src/SeriesFinale/gui.py:584
+msgid "Show details"
+msgstr "Detalhes do programa"
 
-#: ../src/SeriesFinale/gui.py:498
+#: ../src/SeriesFinale/gui.py:589
 msgid "Genre"
 msgstr "Género"
 
-#: ../src/SeriesFinale/gui.py:499
+#: ../src/SeriesFinale/gui.py:590
 msgid "Network"
 msgstr "Estação"
 
-#: ../src/SeriesFinale/gui.py:500
+#: ../src/SeriesFinale/gui.py:591
 msgid "Actors"
 msgstr "Actores"
 
-#: ../src/SeriesFinale/gui.py:501
-#: ../src/SeriesFinale/gui.py:1057
+#: ../src/SeriesFinale/gui.py:592 ../src/SeriesFinale/gui.py:1191
 msgid "Rating"
 msgstr "Classificação"
 
-#: ../src/SeriesFinale/gui.py:584
-#: ../src/SeriesFinale/series.py:157
+#: ../src/SeriesFinale/gui.py:671
+msgid "Delete seasons"
+msgstr "Apagar programas"
+
+#: ../src/SeriesFinale/gui.py:682
+msgid "Please select one or more seasons"
+msgstr "Por favor seleccione um ou mais programas"
+
+#: ../src/SeriesFinale/gui.py:706 ../src/SeriesFinale/series.py:180
 msgid "Special"
 msgstr "Especial"
 
-#: ../src/SeriesFinale/gui.py:586
-#: ../src/SeriesFinale/series.py:159
+#: ../src/SeriesFinale/gui.py:708 ../src/SeriesFinale/series.py:182
 #, python-format
 msgid "Season %s"
 msgstr "%sª temporada"
 
-#: ../src/SeriesFinale/gui.py:657
-msgid "Edit Show"
-msgstr "Editar Programa"
+#: ../src/SeriesFinale/gui.py:782
+msgid "Edit show"
+msgstr "Editar programa"
 
-#: ../src/SeriesFinale/gui.py:661
-#: ../src/SeriesFinale/gui.py:733
+#: ../src/SeriesFinale/gui.py:786 ../src/SeriesFinale/gui.py:858
 msgid "Overview"
 msgstr "Apresentação"
 
-#: ../src/SeriesFinale/gui.py:671
-#: ../src/SeriesFinale/gui.py:768
+#: ../src/SeriesFinale/gui.py:796 ../src/SeriesFinale/gui.py:893
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../src/SeriesFinale/gui.py:676
+#: ../src/SeriesFinale/gui.py:801
 msgid "Genre:"
 msgstr "Género:"
 
-#: ../src/SeriesFinale/gui.py:677
+#: ../src/SeriesFinale/gui.py:802
 msgid "Network:"
 msgstr "Estação:"
 
-#: ../src/SeriesFinale/gui.py:678
-#: ../src/SeriesFinale/gui.py:780
+#: ../src/SeriesFinale/gui.py:803 ../src/SeriesFinale/gui.py:905
 msgid "Rating:"
 msgstr "Classificação:"
 
-#: ../src/SeriesFinale/gui.py:679
+#: ../src/SeriesFinale/gui.py:804
 msgid "Actors:"
 msgstr "Actores:"
 
-#: ../src/SeriesFinale/gui.py:739
+#: ../src/SeriesFinale/gui.py:864
 msgid "Number:"
 msgstr "Número:"
 
-#: ../src/SeriesFinale/gui.py:748
+#: ../src/SeriesFinale/gui.py:873
 msgid "Season:"
 msgstr "Temporada:"
 
-#: ../src/SeriesFinale/gui.py:777
+#: ../src/SeriesFinale/gui.py:902
 msgid "Director:"
 msgstr "Realizador:"
 
-#: ../src/SeriesFinale/gui.py:778
+#: ../src/SeriesFinale/gui.py:903
 msgid "Writer:"
 msgstr "Escritor:"
 
-#: ../src/SeriesFinale/gui.py:779
+#: ../src/SeriesFinale/gui.py:904
 msgid "Original air date:"
 msgstr "Data de exibição original:"
 
-#: ../src/SeriesFinale/gui.py:781
-msgid "Guest Stars:"
-msgstr "Estrelas Convidadas:"
+#: ../src/SeriesFinale/gui.py:906
+msgid "Guest stars:"
+msgstr "Estrelas convidadas:"
 
-#: ../src/SeriesFinale/gui.py:868
+#: ../src/SeriesFinale/gui.py:994
 msgid "A-Z"
 msgstr ""
 
-#: ../src/SeriesFinale/gui.py:873
+#: ../src/SeriesFinale/gui.py:999
 msgid "Z-A"
 msgstr ""
 
-#: ../src/SeriesFinale/gui.py:882
-msgid "Mark All"
-msgstr "Marcar Todos"
+#: ../src/SeriesFinale/gui.py:1009
+msgid "Mark all"
+msgstr "Marcar todos"
 
-#: ../src/SeriesFinale/gui.py:887
-msgid "Mark None"
-msgstr "Marcar Nenhum"
+#: ../src/SeriesFinale/gui.py:1014
+msgid "Mark none"
+msgstr "Marcar nenhum"
 
-#: ../src/SeriesFinale/gui.py:892
-#: ../src/SeriesFinale/gui.py:1094
-msgid "Delete Episodes"
-msgstr "Apagar Episódios"
+#: ../src/SeriesFinale/gui.py:1019 ../src/SeriesFinale/gui.py:1228
+msgid "Delete episodes"
+msgstr "Apagar episódios"
 
-#: ../src/SeriesFinale/gui.py:1053
+#: ../src/SeriesFinale/gui.py:1187
 msgid "Original air date"
 msgstr "Data de exibição original"
 
-#: ../src/SeriesFinale/gui.py:1054
+#: ../src/SeriesFinale/gui.py:1188
 msgid "Director"
 msgstr "Realizador"
 
-#: ../src/SeriesFinale/gui.py:1055
+#: ../src/SeriesFinale/gui.py:1189
 msgid "Writer"
 msgstr "Escritor:"
 
-#: ../src/SeriesFinale/gui.py:1056
-msgid "Guest Stars"
-msgstr "Estrelas Convidadas"
+#: ../src/SeriesFinale/gui.py:1190
+msgid "Guest stars"
+msgstr "Estrelas convidadas"
 
-#: ../src/SeriesFinale/gui.py:1105
+#: ../src/SeriesFinale/gui.py:1239
 msgid "Please select one or more episodes"
 msgstr "Por favor seleccione um ou mais episódios"
 
-#: ../src/SeriesFinale/gui.py:1161
+#: ../src/SeriesFinale/gui.py:1295
 #, python-format
 msgid ""
 "\n"
@@ -230,76 +238,92 @@ msgstr ""
 "\n"
 "%(label)s: %(contents)s"
 
-#: ../src/SeriesFinale/gui.py:1183
-msgid "Search Shows"
-msgstr "Pesquisar Programas"
-
-#: ../src/SeriesFinale/gui.py:1186
-msgid "Add Manually"
-msgstr "Adicionar Manualmente"
-
-#: ../src/SeriesFinale/gui.py:1225
+#: ../src/SeriesFinale/gui.py:1317 ../src/SeriesFinale/gui.py:1359
 msgid "Search shows"
 msgstr "Pesquisar programas"
 
-#: ../src/SeriesFinale/gui.py:1248
+#: ../src/SeriesFinale/gui.py:1320
+msgid "Add manually"
+msgstr "Adicionar manualmente"
+
+#: ../src/SeriesFinale/gui.py:1382
 msgid "Search"
 msgstr "Pesquisar"
 
-#: ../src/SeriesFinale/gui.py:1261
+#: ../src/SeriesFinale/gui.py:1395
 msgid "Language"
 msgstr "Língua"
 
-#: ../src/SeriesFinale/gui.py:1362
+#: ../src/SeriesFinale/gui.py:1496
 msgid "Authors:"
 msgstr "Autores:"
 
-#: ../src/SeriesFinale/gui.py:1393
+#: ../src/SeriesFinale/gui.py:1527
 #, python-format
 msgid "About %s"
 msgstr "Acerca de %s"
 
-#: ../src/SeriesFinale/gui.py:1410
+#: ../src/SeriesFinale/gui.py:1544
 msgid "License:"
 msgstr "Licença:"
 
-#: ../src/SeriesFinale/series.py:126
+#: ../src/SeriesFinale/gui.py:1568
+msgid "Done"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1570
+msgid "Screen rotation:"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1571
+msgid "Automatic"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1571
+msgid "Portrait"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1571
+msgid "Landscape"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1582
+msgid "Add special seasons"
+msgstr ""
+
+#: ../src/SeriesFinale/series.py:149
 #, python-format
 msgid "%s season"
 msgid_plural "%s seasons"
 msgstr[0] "%s temporada"
 msgstr[1] "%s temporadas"
 
-#: ../src/SeriesFinale/series.py:129
-#: ../src/SeriesFinale/series.py:170
+#: ../src/SeriesFinale/series.py:152 ../src/SeriesFinale/series.py:193
 msgid "Completely watched"
 msgstr "Completamente visto"
 
-#: ../src/SeriesFinale/series.py:133
-#: ../src/SeriesFinale/series.py:173
+#: ../src/SeriesFinale/series.py:156 ../src/SeriesFinale/series.py:196
 #, python-format
 msgid "%s episode not watched"
 msgid_plural "%s episodes not watched"
 msgstr[0] "%s episódio não visto"
 msgstr[1] "%s episódios não vistos"
 
-#: ../src/SeriesFinale/series.py:140
-#: ../src/SeriesFinale/series.py:180
+#: ../src/SeriesFinale/series.py:163 ../src/SeriesFinale/series.py:203
 #, python-format
 msgid "<i>Next episode:</i> %s on %s"
 msgstr "<i>Próx. Episódio:</i> %s em %s"
 
-#: ../src/SeriesFinale/series.py:144
-#: ../src/SeriesFinale/series.py:184
+#: ../src/SeriesFinale/series.py:167 ../src/SeriesFinale/series.py:207
 #, python-format
 msgid "<i>Next episode:</i> %s"
 msgstr "<i>Próx. episódio:</i> %s"
 
-#: ../src/SeriesFinale/series.py:149
+#: ../src/SeriesFinale/series.py:172
 msgid "No episodes to watch"
 msgstr "Sem episódios para ver"
 
-#: ../src/SeriesFinale/series.py:233
+#: ../src/SeriesFinale/series.py:263
 #, python-format
 msgid "Ep. %s: %s"
 msgstr ""
@@ -311,7 +335,3 @@ msgstr "Uma aplicação para navegar e seguir the séries de TV."
 #: ../data/seriesfinale.desktop.in.h:2
 msgid "SeriesFinale"
 msgstr ""
-
-#~ msgid "<i>Next to watch:</i> %s"
-#~ msgstr "<i>Próx. a ver:</i> %s"
-
diff --git a/po/ru.po b/po/ru.po
index 7a7509e..b6f6dd6 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -3,212 +3,233 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-05-21 17:49+0100\n"
+"POT-Creation-Date: 2010-12-30 01:12+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Misha K. <thezogg@gmail.com>\n"
 "Language-Team: Russian <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3; plural=((((n%10)==1)&&((n%100)!=11))?(0):(((((n%10)>=2)&&((n%10)<=4))&&(((n%100)<10)||((n%100)>=20)))?(1):2));\n"
+"Plural-Forms: nplurals=3; plural=((((n%10)==1)&&((n%100)!=11))?(0):(((((n%10)"
+">=2)&&((n%10)<=4))&&(((n%100)<10)||((n%100)>=20)))?(1):2));\n"
 
-#: gui.py:83 gui.py:977
-msgid "Add Shows"
+#: ../src/SeriesFinale/gui.py:118 ../src/SeriesFinale/gui.py:1314
+msgid "Add shows"
 msgstr "Добавить сериалы"
 
-#: gui.py:88 gui.py:199
-msgid "Delete Shows"
+#: ../src/SeriesFinale/gui.py:125
+msgid "Sort by ep. date"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:133
+msgid "Sort by name"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:139 ../src/SeriesFinale/gui.py:343
+msgid "Delete shows"
 msgstr "Удалить сериалы"
 
-#: gui.py:117
+#: ../src/SeriesFinale/gui.py:144
+msgid "Update all"
+msgstr "Обновить сериал"
+
+#: ../src/SeriesFinale/gui.py:149 ../src/SeriesFinale/gui.py:1555
+msgid "Settings"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:154
+msgid "About"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:184
 msgid "Gathering show information. Please wait..."
 msgstr "Сбор данных о сериале. Подождите пожалуйста..."
 
-#: gui.py:125 gui.py:405 gui.py:1054
+#: ../src/SeriesFinale/gui.py:196 ../src/SeriesFinale/gui.py:275
+#: ../src/SeriesFinale/gui.py:641 ../src/SeriesFinale/gui.py:1446
 msgid "Please verify your internet connection is available"
 msgstr "Пожалуйста, убедитесь, что вы подключены к интернету"
 
-#: gui.py:128 gui.py:1056
-#, python-format
-msgid "An error occurred.%s"
-msgstr "Возникла ошибка.%s"
+#: ../src/SeriesFinale/gui.py:199 ../src/SeriesFinale/gui.py:1448
+msgid "An error occurred. %s"
+msgstr "Возникла ошибка. %s"
+
+#: ../src/SeriesFinale/gui.py:278
+msgid "Finished updating the shows"
+msgstr ""
 
-#: gui.py:176 gui.py:177 gui.py:200 gui.py:892
+#: ../src/SeriesFinale/gui.py:285
+msgid "Updated \"%s\""
+msgstr "Обновить сериал"
+
+#: ../src/SeriesFinale/gui.py:320 ../src/SeriesFinale/gui.py:321
+#: ../src/SeriesFinale/gui.py:344 ../src/SeriesFinale/gui.py:672
+#: ../src/SeriesFinale/gui.py:1229
 msgid "Delete"
 msgstr "Удалить"
 
-#: gui.py:210
+#: ../src/SeriesFinale/gui.py:354
 msgid "Please select one or more shows"
 msgstr "Выберите хотя бы один сериал"
 
-#: gui.py:257
-#, python-format
-msgid "%s season"
-msgid_plural "%s seasons"
-msgstr[0] "%s сезон"
-msgstr[1] "%s сезона"
-msgstr[2] "%s сезонов"
-
-#: gui.py:260 gui.py:466
-msgid "Completely watched"
-msgstr "Полностью просмотрено"
-
-#: gui.py:265 gui.py:469
-#, python-format
-msgid "%s episode not watched"
-msgid_plural "%s episodes not watched"
-msgstr[0] "%s сезон еще не просмотрен"
-msgstr[1] "%s сезона еще не просмотрено"
-msgstr[2] "%s сезонов еще не просмотрено"
-
-#: gui.py:270
-msgid "No episodes to watch"
-msgstr "Нет эпизодов для просмотра"
-
-#: gui.py:318
+#: ../src/SeriesFinale/gui.py:538
 msgid "Info"
 msgstr "Информация"
 
-#: gui.py:323 gui.py:862
-msgid "Edit Info"
+#: ../src/SeriesFinale/gui.py:543 ../src/SeriesFinale/gui.py:1198
+msgid "Edit info"
 msgstr "Изменить информацию"
 
-#: gui.py:329
-msgid "Update Show"
+#: ../src/SeriesFinale/gui.py:550
+msgid "Update show"
 msgstr "Обновить сериал"
 
-#: gui.py:334 gui.py:567
-msgid "New Episode"
+#: ../src/SeriesFinale/gui.py:555
+msgid "Delete season"
+msgstr "Удалить эпизоды"
+
+#: ../src/SeriesFinale/gui.py:560 ../src/SeriesFinale/gui.py:854
+msgid "New episode"
 msgstr "Новый эпизод"
 
-#: gui.py:345
+#: ../src/SeriesFinale/gui.py:579
 msgid "Updating show. Please wait..."
 msgstr "Обновление сериала. Подождите..."
 
-#: gui.py:349
-msgid "Show Details"
+#: ../src/SeriesFinale/gui.py:584
+msgid "Show details"
 msgstr "О сериале"
 
-#: gui.py:354
+#: ../src/SeriesFinale/gui.py:589
 msgid "Genre"
 msgstr "Жанр"
 
-#: gui.py:355
+#: ../src/SeriesFinale/gui.py:590
 msgid "Network"
 msgstr "Сеть"
 
-#: gui.py:356
+#: ../src/SeriesFinale/gui.py:591
 msgid "Actors"
 msgstr "Актеры"
 
-#: gui.py:357 gui.py:855
+#: ../src/SeriesFinale/gui.py:592 ../src/SeriesFinale/gui.py:1191
 msgid "Rating"
 msgstr "Рейтинг"
 
-#: gui.py:438 gui.py:455
+#: ../src/SeriesFinale/gui.py:671
+msgid "Delete seasons"
+msgstr "Удалить сериалы"
+
+#: ../src/SeriesFinale/gui.py:682
+msgid "Please select one or more seasons"
+msgstr "Выберите хотя бы один сериал"
+
+#: ../src/SeriesFinale/gui.py:706 ../src/SeriesFinale/series.py:180
 msgid "Special"
 msgstr "Дополнительнные"
 
-#: gui.py:440 gui.py:457
+#: ../src/SeriesFinale/gui.py:708 ../src/SeriesFinale/series.py:182
 #, python-format
 msgid "Season %s"
 msgstr "Сезон %s"
 
-#: gui.py:481
-#, python-format
-msgid "<i>Next to watch:</i> %s"
-msgstr "<i>Следующий для просмотра:</i> %s"
-
-#: gui.py:495
-msgid "Edit Show"
+#: ../src/SeriesFinale/gui.py:782
+msgid "Edit show"
 msgstr "Изменить сериал"
 
-#: gui.py:499 gui.py:571
+#: ../src/SeriesFinale/gui.py:786 ../src/SeriesFinale/gui.py:858
 msgid "Overview"
 msgstr "Обзор"
 
-#: gui.py:509 gui.py:605
+#: ../src/SeriesFinale/gui.py:796 ../src/SeriesFinale/gui.py:893
 msgid "Name:"
 msgstr "Название:"
 
-#: gui.py:514
+#: ../src/SeriesFinale/gui.py:801
 msgid "Genre:"
 msgstr "Жанр"
 
-#: gui.py:515
+#: ../src/SeriesFinale/gui.py:802
 msgid "Network:"
 msgstr "Сеть:"
 
-#: gui.py:516 gui.py:616
+#: ../src/SeriesFinale/gui.py:803 ../src/SeriesFinale/gui.py:905
 msgid "Rating:"
 msgstr "Рейтинг:"
 
-#: gui.py:517
+#: ../src/SeriesFinale/gui.py:804
 msgid "Actors:"
 msgstr "Актеры:"
 
-#: gui.py:577
+#: ../src/SeriesFinale/gui.py:864
 msgid "Number:"
 msgstr "Номер:"
 
-#: gui.py:586
+#: ../src/SeriesFinale/gui.py:873
 msgid "Season:"
 msgstr "Сезон:"
 
-#: gui.py:614
+#: ../src/SeriesFinale/gui.py:902
 msgid "Director:"
 msgstr "Режиссер:"
 
-#: gui.py:615
+#: ../src/SeriesFinale/gui.py:903
 msgid "Writer:"
 msgstr "Сценарист:"
 
-#: gui.py:617
-msgid "Guest Stars:"
+#: ../src/SeriesFinale/gui.py:904
+msgid "Original air date:"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:906
+msgid "Guest stars:"
 msgstr "Гости сериала:"
 
-#: gui.py:702
+#: ../src/SeriesFinale/gui.py:994
 msgid "A-Z"
 msgstr "A-Z"
 
-#: gui.py:707
+#: ../src/SeriesFinale/gui.py:999
 msgid "Z-A"
 msgstr "Z-A"
 
-#: gui.py:716
-msgid "Mark All"
+#: ../src/SeriesFinale/gui.py:1009
+msgid "Mark all"
 msgstr "Отметить все"
 
-#: gui.py:721
-msgid "Mark None"
+#: ../src/SeriesFinale/gui.py:1014
+msgid "Mark none"
 msgstr "Снять отметки"
 
-#: gui.py:726 gui.py:891
-msgid "Delete Episodes"
+#: ../src/SeriesFinale/gui.py:1019 ../src/SeriesFinale/gui.py:1228
+msgid "Delete episodes"
 msgstr "Удалить эпизоды"
 
-#: gui.py:852
+#: ../src/SeriesFinale/gui.py:1187
+msgid "Original air date"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1188
 msgid "Director"
 msgstr "Режиссер"
 
-#: gui.py:853
+#: ../src/SeriesFinale/gui.py:1189
 msgid "Writer"
 msgstr "Сценарист"
 
-#: gui.py:854
-msgid "Guest Stars"
+#: ../src/SeriesFinale/gui.py:1190
+msgid "Guest stars"
 msgstr "Гости сериала"
 
-#: gui.py:902
+#: ../src/SeriesFinale/gui.py:1239
 msgid "Please select one or more episodes"
 msgstr "Пожалуйста, выберите хотя бы один эпизод"
 
-#: gui.py:958
+#: ../src/SeriesFinale/gui.py:1295
 #, python-format
 msgid ""
 "\n"
@@ -217,23 +238,100 @@ msgstr ""
 "\n"
 "%(label)s: %(contents)s"
 
-#: gui.py:980
-msgid "Search Shows"
+#: ../src/SeriesFinale/gui.py:1317 ../src/SeriesFinale/gui.py:1359
+msgid "Search shows"
 msgstr "Поиск сериалов"
 
-#: gui.py:983
-msgid "Add Manually"
+#: ../src/SeriesFinale/gui.py:1320
+msgid "Add manually"
 msgstr "Добавить вручнную"
 
-#: gui.py:1001
-msgid "Search shows"
-msgstr "Поиск сериалов"
-
-#: gui.py:1019
+#: ../src/SeriesFinale/gui.py:1382
 msgid "Search"
 msgstr "Поиск"
 
-#: series.py:100
+#: ../src/SeriesFinale/gui.py:1395
+msgid "Language"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1496
+msgid "Authors:"
+msgstr "Актеры:"
+
+#: ../src/SeriesFinale/gui.py:1527
+#, python-format
+msgid "About %s"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1544
+msgid "License:"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1568
+msgid "Done"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1570
+msgid "Screen rotation:"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1571
+msgid "Automatic"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1571
+msgid "Portrait"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1571
+msgid "Landscape"
+msgstr ""
+
+#: ../src/SeriesFinale/gui.py:1582
+msgid "Add special seasons"
+msgstr ""
+
+#: ../src/SeriesFinale/series.py:149
 #, python-format
-msgid "Ep. %(number)s: %(name)s"
-msgstr "Эпизод %(number)s: %(name)s"
+msgid "%s season"
+msgid_plural "%s seasons"
+msgstr[0] "%s сезон"
+msgstr[1] "%s сезона"
+msgstr[2] "%s сезонов"
+
+#: ../src/SeriesFinale/series.py:152 ../src/SeriesFinale/series.py:193
+msgid "Completely watched"
+msgstr "Полностью просмотрено"
+
+#: ../src/SeriesFinale/series.py:156 ../src/SeriesFinale/series.py:196
+#, python-format
+msgid "%s episode not watched"
+msgid_plural "%s episodes not watched"
+msgstr[0] "%s сезон еще не просмотрен"
+msgstr[1] "%s сезона еще не просмотрено"
+msgstr[2] "%s сезонов еще не просмотрено"
+
+#: ../src/SeriesFinale/series.py:163 ../src/SeriesFinale/series.py:203
+msgid "<i>Next episode:</i> %s on %s"
+msgstr "<i>Следующий для просмотра:</i> %s"
+
+#: ../src/SeriesFinale/series.py:167 ../src/SeriesFinale/series.py:207
+msgid "<i>Next episode:</i> %s"
+msgstr "<i>Следующий для просмотра:</i> %s"
+
+#: ../src/SeriesFinale/series.py:172
+msgid "No episodes to watch"
+msgstr "Нет эпизодов для просмотра"
+
+#: ../src/SeriesFinale/series.py:263
+#, python-format
+msgid "Ep. %s: %s"
+msgstr ""
+
+#: ../data/seriesfinale.desktop.in.h:1
+msgid "A TV series browser and tracker application."
+msgstr ""
+
+#: ../data/seriesfinale.desktop.in.h:2
+msgid "SeriesFinale"
+msgstr ""
diff --git a/src/SeriesFinale/gui.py b/src/SeriesFinale/gui.py
index b8f7ca9..a377349 100644
--- a/src/SeriesFinale/gui.py
+++ b/src/SeriesFinale/gui.py
@@ -115,7 +115,7 @@ def _create_menu(self):
         menu = hildon.AppMenu()
 
         button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label(_('Add Shows'))
+        button.set_label(_('Add shows'))
         button.connect('clicked', self._add_shows_cb)
         menu.append(button)
 
@@ -136,12 +136,12 @@ def _create_menu(self):
         menu.add_filter(self.sort_by_name_filter)
 
         self.delete_menu = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        self.delete_menu.set_label(_('Delete Shows'))
+        self.delete_menu.set_label(_('Delete shows'))
         self.delete_menu.connect('clicked', self._delete_shows_cb)
         menu.append(self.delete_menu)
 
         self.update_all_menu = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        self.update_all_menu.set_label(_('Update All'))
+        self.update_all_menu.set_label(_('Update all'))
         self.update_all_menu.connect('clicked', self._update_all_shows_cb)
         menu.append(self.update_all_menu)
 
@@ -196,7 +196,7 @@ def _get_show_complete_cb(self, series_manager, show, error):
                 error_message = '\n ' + _('Please verify your internet connection '
                                           'is available')
                 show_information(self,
-                                 _('An error occurred.%s') % error_message)
+                                 _('An error occurred. %s') % error_message)
         else:
             self.shows_view.set_shows(self.series_manager.series_list)
             self._update_delete_menu_visibility()
@@ -340,7 +340,7 @@ class ShowsDeleteView(DeleteView):
     def __init__(self, series_manager):
         self.shows_select_view = ShowsSelectView()
         super(ShowsDeleteView, self).__init__(self.shows_select_view,
-                                               _('Delete Shows'),
+                                               _('Delete shows'),
                                                _('Delete'))
         self.series_manager = series_manager
         self.toolbar.connect('button-clicked',
@@ -540,24 +540,24 @@ def _create_menu(self):
         menu.append(button)
 
         button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label(_('Edit Info'))
+        button.set_label(_('Edit info'))
         button.connect('clicked', self._edit_show_info)
         menu.append(button)
 
         self.update_menu = None
         if str(self.show.thetvdb_id) != '-1':
             self.update_menu = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-            self.update_menu.set_label(_('Update Show'))
+            self.update_menu.set_label(_('Update show'))
             self.update_menu.connect('clicked', self._update_series_cb)
             menu.append(self.update_menu)
 
         button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label(_('Delete Season'))
+        button.set_label(_('Delete season'))
         button.connect('clicked', self._delete_seasons_cb)
         menu.append(button)
 
         button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label(_('New Episode'))
+        button.set_label(_('New episode'))
         button.connect('clicked', self._new_episode_cb)
         menu.append(button)
 
@@ -581,7 +581,7 @@ def _update_series_cb(self, button):
 
     def _show_info_cb(self, button):
         dialog = gtk.Dialog(parent = self)
-        dialog.set_title(_('Show Details'))
+        dialog.set_title(_('Show details'))
         infotextview = InfoTextView()
         infotextview.set_title(self.show.name)
         infotextview.add_field (self.show.overview)
@@ -668,7 +668,7 @@ def __init__(self, series_manager, seasons_select_view):
         self.seasons_select_view = SeasonSelectView(seasons_select_view.show)
         self.seasons_select_view.set_model(seasons_select_view.get_model())
         super(SeasonsDeleteView, self).__init__(self.seasons_select_view,
-                                               _('Delete Seasons'),
+                                               _('Delete seasons'),
                                                _('Delete'))
         self.series_manager = series_manager
         self.toolbar.connect('button-clicked',
@@ -779,7 +779,7 @@ def __init__(self, parent):
                                              buttons = (gtk.STOCK_ADD,
                                                         gtk.RESPONSE_ACCEPT))
 
-        self.set_title(_('Edit Show'))
+        self.set_title(_('Edit show'))
 
         self.show_name = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
         self.show_overview = hildon.TextView()
@@ -851,7 +851,7 @@ def __init__(self, parent, show):
                                                buttons = (gtk.STOCK_ADD,
                                                           gtk.RESPONSE_ACCEPT))
 
-        self.set_title(_('New Episode'))
+        self.set_title(_('New episode'))
 
         self.episode_name = hildon.Entry(gtk.HILDON_SIZE_FINGER_HEIGHT)
         self.episode_overview = hildon.TextView()
@@ -903,7 +903,7 @@ def __init__(self, parent, show):
                   (_('Writer:'), self.episode_writer),
                   (_('Original air date:'), self.episode_air_date),
                   (_('Rating:'), self.episode_rating),
-                  (_('Guest Stars:'), self.episode_guest_stars),
+                  (_('Guest stars:'), self.episode_guest_stars),
                  ]
         size_group = gtk.SizeGroup(gtk.SIZE_GROUP_BOTH)
         for text, widget in fields:
@@ -1006,17 +1006,17 @@ def _create_menu(self):
             button.set_active(False)
 
         button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label(_('Mark All'))
+        button.set_label(_('Mark all'))
         button.connect('clicked', self._select_all_cb)
         menu.append(button)
 
         button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label(_('Mark None'))
+        button.set_label(_('Mark none'))
         button.connect('clicked', self._select_none_cb)
         menu.append(button)
 
         button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label(_('Delete Episodes'))
+        button.set_label(_('Delete episodes'))
         button.connect('clicked', self._delete_episodes_cb)
         menu.append(button)
 
@@ -1187,7 +1187,7 @@ def _update_info_text_view(self):
                                     _('Original air date'))
         self.infotextview.add_field(self.episode.director, _('Director'))
         self.infotextview.add_field(self.episode.writer, _('Writer'))
-        self.infotextview.add_field(self.episode.guest_stars, _('Guest Stars'))
+        self.infotextview.add_field(self.episode.guest_stars, _('Guest stars'))
         self.infotextview.add_field(self.episode.rating, _('Rating'))
         self.set_title(self.episode.name)
 
@@ -1195,7 +1195,7 @@ def _create_menu(self):
         menu = hildon.AppMenu()
 
         button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        button.set_label(_('Edit Info'))
+        button.set_label(_('Edit info'))
         button.connect('clicked', self._edit_episode_cb)
         menu.append(button)
 
@@ -1225,7 +1225,7 @@ class EpisodesDeleteView(DeleteView):
     def __init__(self, show):
         self.episodes_select_view = EpisodesSelectView()
         super(EpisodesDeleteView, self).__init__(self.episodes_select_view,
-                                                 _('Delete Episodes'),
+                                                 _('Delete episodes'),
                                                  _('Delete'))
         self.show = show
         self.toolbar.connect('button-clicked',
@@ -1311,13 +1311,13 @@ class NewShowsDialog(gtk.Dialog):
 
     def __init__(self, parent):
         super(NewShowsDialog, self).__init__(parent = parent)
-        self.set_title(_('Add Shows'))
+        self.set_title(_('Add shows'))
         contents = gtk.HBox(True, 0)
         self.search_shows_button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        self.search_shows_button.set_label(_('Search Shows'))
+        self.search_shows_button.set_label(_('Search shows'))
         self.search_shows_button.connect('clicked', self._button_clicked_cb)
         self.manual_add_button = hildon.GtkButton(gtk.HILDON_SIZE_FINGER_HEIGHT)
-        self.manual_add_button.set_label(_('Add Manually'))
+        self.manual_add_button.set_label(_('Add manually'))
         self.manual_add_button.connect('clicked', self._button_clicked_cb)
         contents.add(self.search_shows_button)
         contents.add(self.manual_add_button)
@@ -1445,7 +1445,7 @@ def _search_shows_complete_cb(self, series_manager, shows, error):
             if 'socket' in str(error).lower():
                 error_message = '\n ' + _('Please verify your internet connection '
                                           'is available')
-                show_information(self, _('An error occurred.%s') % error_message)
+                show_information(self, _('An error occurred. %s') % error_message)
         else:
             model = self.shows_view.get_model()
             if not model:
@@ -1567,7 +1567,7 @@ def _create_screen_rotation_settings(self):
         picker_button.set_alignment(0, 0.5, 0, 1)
         picker_button.set_done_button_text(_('Done'))
         selector = hildon.TouchSelector(text = True)
-        picker_button.set_title(_('Screen Rotation:'))
+        picker_button.set_title(_('Screen rotation:'))
         modes = [_('Automatic'), _('Portrait'), _('Landscape')]
         for mode in modes:
             selector.append_text(mode)