fix merge conflict with master

diff --git a/functions.js b/functions.js
index b3fc8876a24d63bd21f168ef0cc59d4797159189..59ff28efb8dd8a16aa0cb7c78e09e690e5fff481 100644 (file)
--- a/functions.js
+++ b/functions.js
@@ -46,12 +46,12 @@ function exception_error(location, e, ext_info) {
 
                        if (ext_info) {
                                ebc.innerHTML += "<div><b>Additional information:</b></div>" +
-                                       "<textarea readonly=\"1\">" + ext_info + "</textarea>";
+                               "<textarea readonly=\"1\">" + ext_info + "</textarea>";
                        }
 
                        ebc.innerHTML += "<div><b>Stack trace:</b></div>" +
                                "<textarea readonly=\"1\">" + e.stack + "</textarea>";
-
+       
                } else {
                        alert(msg);
                }

diff --git a/locale/ca_CA/LC_MESSAGES/messages.mo b/locale/ca_CA/LC_MESSAGES/messages.mo
index bce204d62d3ab5b4ddf6325917f71f817712a448..1ff99ce72c706f0d886156b0e0fd3192f68dbfdb 100644 (file)
Binary files a/locale/ca_CA/LC_MESSAGES/messages.mo and b/locale/ca_CA/LC_MESSAGES/messages.mo differ

diff --git a/locale/ca_CA/LC_MESSAGES/messages.po b/locale/ca_CA/LC_MESSAGES/messages.po
index 102fd3e079508ed9e0c2b571c6e760a034f42ee4..864dee8f495aeeec53078f2622302f5a9b2e53a3 100644 (file)
--- a/locale/ca_CA/LC_MESSAGES/messages.po
+++ b/locale/ca_CA/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2009-11-19 09:40+0100\n"
 "Last-Translator: Alfred Galitó <bratac@bratac.cat>\n"
 "Language-Team: Català <bratac@bratac.cat>\n"
@@ -110,30 +110,6 @@ msgstr "Administrador"
 msgid "Default profile"
 msgstr "Nombre maximal d'articles par défaut"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Hola, "
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Surt"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Torna a Tiny Tiny RSS"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Canals"
-
-#: digest.php:94
-#, fuzzy
-msgid "headlines"
-msgstr "Derniers en-têtes&nbsp;:"
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Error desconegut"
@@ -487,8 +463,7 @@ msgstr "Filtra l'article"
 msgid "Set starred"
 msgstr "Marca'l com a destacat"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "Publica l'article"
 
@@ -851,10 +826,19 @@ msgstr ""
 "reviseu els vostres\n"
 "/t/t paràmetres del navegador."
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Hola, "
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Surt de les preferències"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Surt"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "Dreceres de teclat"
@@ -2274,27 +2258,6 @@ msgstr "Mostra/amaga els canals llegits"
 msgid "Sort feeds by unread count"
 msgstr "Ordena els canals per articles no llegits"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Accions..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "Marca l'article"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "Treu la marca de l'article"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "Si us plau, espereu..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "Deixa de publicar l'article"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "No s'ha pogut afegir el filtre: no hi ha coincidències."
@@ -2634,6 +2597,22 @@ msgstr "No podeu canviar la puntuació d'aquest tipus de canal."
 msgid "Rescore articles in %s?"
 msgstr "Esteu segur que voleu canviar la puntuació dels articles a %s?"
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "Marca l'article"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "Treu la marca de l'article"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "Si us plau, espereu..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "Deixa de publicar l'article"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."
@@ -3195,6 +3174,9 @@ msgstr "Si us plau, escriviu una nota per aquest article:"
 #~ msgid "Last updated:"
 #~ msgstr "Dernière mise à jour&nbsp;:"
 
+#~ msgid "Last headlines:"
+#~ msgstr "Derniers en-têtes&nbsp;:"
+
 #~ msgid "Other feeds: Top 25"
 #~ msgstr "Autres flux&nbsp;: Top 25"
 

diff --git a/locale/de_DE/LC_MESSAGES/messages.mo b/locale/de_DE/LC_MESSAGES/messages.mo
index 85fe6a66bcf73b312a78f7faa4ba0398939c5a63..f0616f5a727cd6a4723009b79757ec2c032dc61e 100644 (file)
Binary files a/locale/de_DE/LC_MESSAGES/messages.mo and b/locale/de_DE/LC_MESSAGES/messages.mo differ

diff --git a/locale/de_DE/LC_MESSAGES/messages.po b/locale/de_DE/LC_MESSAGES/messages.po
index 8525e45528bc53335f53699d1e21a0f196a4cce0..fc9c97eb7e3057384ac7ff33e9ff63af1df72476 100644 (file)
--- a/locale/de_DE/LC_MESSAGES/messages.po
+++ b/locale/de_DE/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Kevin Kraft <kev@nurzen.de>\n"
 "Language-Team: Deutsch <de.org>\n"
@@ -113,29 +113,6 @@ msgstr "Administrator"
 msgid "Default profile"
 msgstr "Standard Artikelgrenzwert"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Hallo,"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Abmelden"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Zu Tiny Tiny RSS zurückkehren"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Feeds"
-
-#: digest.php:94
-msgid "headlines"
-msgstr ""
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
@@ -492,8 +469,7 @@ msgstr "Artikel filtern"
 msgid "Set starred"
 msgstr "Bewertung setzen"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "Artikel veröffentlichen"
 
@@ -846,10 +822,19 @@ msgstr ""
 "\t\tfunktionieren, welches von Ihrem Browser nicht unterstützt wird.\t"
 "\tBitte überprüfen Sie Ihre Browser Einstellungen."
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Hallo,"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Einstellungen verlassen"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Abmelden"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "Tastaturbefehle"
@@ -2276,27 +2261,6 @@ msgstr "Gelesene ein-/ausblenden"
 msgid "Sort feeds by unread count"
 msgstr "Feeds nach Anzahl der ungelesenen Artikel sortieren"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Aktionen..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "Artikel bewerten"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "Artikelbewertung zurücknehmen"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "Bitte warten..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "Artikelveröffentlichung widerrufen"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "Kann den Filter nicht hinzufügen: keine Übereinstimmung vorhanden."
@@ -2636,6 +2600,22 @@ msgstr "Sie können diese Art von Feed nicht neu bewerten."
 msgid "Rescore articles in %s?"
 msgstr "Artikel in %s neu bewerten?"
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "Artikel bewerten"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "Artikelbewertung zurücknehmen"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "Bitte warten..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "Artikelveröffentlichung widerrufen"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."

diff --git a/locale/es_ES/LC_MESSAGES/messages.mo b/locale/es_ES/LC_MESSAGES/messages.mo
index 511545e574a98be1dd4b2b1e611275061e8ce599..c5851f81a9a60b15019c23dd9730b7208d37f63a 100644 (file)
Binary files a/locale/es_ES/LC_MESSAGES/messages.mo and b/locale/es_ES/LC_MESSAGES/messages.mo differ

diff --git a/locale/es_ES/LC_MESSAGES/messages.po b/locale/es_ES/LC_MESSAGES/messages.po
index eb2d70ba03ee82794192004a4d52ac6324630807..f1f3ee711c73760693b95c94055ceaa7f1d806b4 100644 (file)
--- a/locale/es_ES/LC_MESSAGES/messages.po
+++ b/locale/es_ES/LC_MESSAGES/messages.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2009-11-10 00:12+0100\n"
 "Last-Translator: Manuel Gualda Caballero <manuel@utopiaverde.org>\n"
 "Language-Team: Español <manuel@utopiaverde.org>\n"
@@ -107,29 +107,6 @@ msgstr "Administrador"
 msgid "Default profile"
 msgstr "Límite de artículos por defecto"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Hola,"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Cerrar sesión"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Volver a Tiny Tiny RSS"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Fuentes"
-
-#: digest.php:94
-msgid "headlines"
-msgstr ""
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Error desconocido"
@@ -483,8 +460,7 @@ msgstr "Filtrar artículo"
 msgid "Set starred"
 msgstr "Fijar como favorito"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "Publicar artículo"
 
@@ -850,10 +826,19 @@ msgstr ""
 "navegador no lo soporta actualmente. Por favor, revise las opciones de "
 "configuración de su navegador."
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Hola,"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Salir de las preferencias"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Cerrar sesión"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "Atajos de teclado"
@@ -2284,27 +2269,6 @@ msgstr "Ocultar/Mostrar las leídas"
 msgid "Sort feeds by unread count"
 msgstr "Ordenar las fuentes en función del número de artículos sin leer"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Acciones..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "Marcar el artículo como favorito"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "Quitar el artículo de los favoritos"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "Por favor, espere..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "Anular la publicación del artículo"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "No se puede añadir el filtro: no se ha indicado ninguna coincidencia."
@@ -2641,6 +2605,22 @@ msgstr "No puede reiniciar la puntuación de esta clase de fuente."
 msgid "Rescore articles in %s?"
 msgstr "¿Reiniciar la puntuación de los artículos de %s?"
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "Marcar el artículo como favorito"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "Quitar el artículo de los favoritos"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "Por favor, espere..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "Anular la publicación del artículo"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."

diff --git a/locale/fr_FR/LC_MESSAGES/messages.mo b/locale/fr_FR/LC_MESSAGES/messages.mo
index e31c3fb6d72b185b88f6674510a560838bbcec73..65a13520c836267c3a6c721978f9b9624e01996f 100644 (file)
Binary files a/locale/fr_FR/LC_MESSAGES/messages.mo and b/locale/fr_FR/LC_MESSAGES/messages.mo differ

diff --git a/locale/fr_FR/LC_MESSAGES/messages.po b/locale/fr_FR/LC_MESSAGES/messages.po
index 06faeb1f29fa2ad8d9fa62f31785ef7413392b2d..e0f6f5801485cc1e6f717cfb23029dfd90133950 100644 (file)
--- a/locale/fr_FR/LC_MESSAGES/messages.po
+++ b/locale/fr_FR/LC_MESSAGES/messages.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: messages\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2007-11-20 23:01+0100\n"
 "Last-Translator: Ploc <plub2009@acampado.net>\n"
 "Language-Team: Français <fr@li.org>\n"
@@ -112,29 +112,6 @@ msgstr "Administrateur"
 msgid "Default profile"
 msgstr "Nombre maximal d'articles par défaut"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Bonjour,"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Déconnexion"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Revenir à Tiny Tiny RSS"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Flux"
-
-#: digest.php:94
-msgid "headlines"
-msgstr ""
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Erreur inconnue"
@@ -492,8 +469,7 @@ msgstr "Filtrer l'article"
 msgid "Set starred"
 msgstr "Marquer comme remarquable"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "Publier l'article"
 
@@ -854,10 +830,19 @@ msgstr ""
 "\t\tpour le bon fonctionnement de ce logiciel. Veuillez modifier la\n"
 "\t\tconfiguration de votre navigateur."
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Bonjour,"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Quitter la configuration"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Déconnexion"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "Raccourcis clavier"
@@ -2288,27 +2273,6 @@ msgstr "(Dé)Masquer les flux lus"
 msgid "Sort feeds by unread count"
 msgstr "Trier les flux par nombre d'articles non lus"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Actions..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "Marquer comme remarquable"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "Ne plus marquer comme remarquable"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "Veuillez patienter..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "Ne plus publier l'article"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "Impossible d'ajouter un filtre : aucune correspondance."
@@ -2654,6 +2618,22 @@ msgstr "Vous ne pouvez pas recalculer le score de ce type de flux."
 msgid "Rescore articles in %s?"
 msgstr "Recalculer le score des articles de %s ?"
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "Marquer comme remarquable"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "Ne plus marquer comme remarquable"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "Veuillez patienter..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "Ne plus publier l'article"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."

diff --git a/locale/hu_HU/LC_MESSAGES/messages.mo b/locale/hu_HU/LC_MESSAGES/messages.mo
index 3079d1c777da8a147ddba6fc05996a1c92724205..462ce1f034f6d83bcc923dcb109991dbdb2b867c 100644 (file)
Binary files a/locale/hu_HU/LC_MESSAGES/messages.mo and b/locale/hu_HU/LC_MESSAGES/messages.mo differ

diff --git a/locale/hu_HU/LC_MESSAGES/messages.po b/locale/hu_HU/LC_MESSAGES/messages.po
index 014e79d0a3e8f0c347310430d86f4b42b1463ffc..7fd2fa884af0ffce05e6aa491b86c6823cfcd899 100644 (file)
--- a/locale/hu_HU/LC_MESSAGES/messages.po
+++ b/locale/hu_HU/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2009-08-17 23:04+0100\n"
 "Last-Translator: MoJo2009\n"
 "Language-Team: HUNGARIAN\n"
@@ -111,29 +111,6 @@ msgstr "Adminisztrátor"
 msgid "Default profile"
 msgstr "Hírek maximális száma"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Üdv,"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Kijelentkezés"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Vissza az RSS-olvasóhoz"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Hírcsatornák"
-
-#: digest.php:94
-msgid "headlines"
-msgstr ""
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Ismeretlen hiba"
@@ -479,8 +456,7 @@ msgstr "Hír szűrése"
 msgid "Set starred"
 msgstr "Csillagoz"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "Hír publikálása"
 
@@ -834,10 +810,19 @@ msgstr ""
 "\t\telengedhetetlen a program működéséhez.\n"
 "\t\tKérem ellenőrizze böngészőbeállításait, és engedélyezze a Javascriptet!"
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Üdv,"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Kilépés a beállításokból"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Kijelentkezés"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "Billentyűparancsok"
@@ -2246,27 +2231,6 @@ msgstr "Olvasottak rejtése/mutatása"
 msgid "Sort feeds by unread count"
 msgstr "Hírcsatornák rendezése olvasatlan hírek száma alapján"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Műveletek"
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "Hír csillagozása"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "Csillagot levesz a hírről"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "Kérem várjon..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "Publikálás visszavonása"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "Szűrő hozzáadása sikertelen: nincs érvényes szűrőfeltétel."
@@ -2607,6 +2571,22 @@ msgstr ""
 msgid "Rescore articles in %s?"
 msgstr ""
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "Hír csillagozása"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "Csillagot levesz a hírről"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "Kérem várjon..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "Publikálás visszavonása"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."

diff --git a/locale/it_IT/LC_MESSAGES/messages.mo b/locale/it_IT/LC_MESSAGES/messages.mo
index 9585d1dc170268caf853f211586a2354ea9c6e96..57f551c3624e26711c52a4c6aeb2dd339f7408b1 100644 (file)
Binary files a/locale/it_IT/LC_MESSAGES/messages.mo and b/locale/it_IT/LC_MESSAGES/messages.mo differ

diff --git a/locale/it_IT/LC_MESSAGES/messages.po b/locale/it_IT/LC_MESSAGES/messages.po
index 4a984a494ddee9be1a462830a4396ed30a0550ee..4be367a51845220dea6b5bb5979f283d06521609 100644 (file)
--- a/locale/it_IT/LC_MESSAGES/messages.po
+++ b/locale/it_IT/LC_MESSAGES/messages.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ttrss-1.4.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2010-04-19 16:36+0200\n"
 "Last-Translator: Andrea Zagli <azagli@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -107,30 +107,6 @@ msgstr "Amministratore"
 msgid "Default profile"
 msgstr "Profilo predefinito"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Salve,"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Esci"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Ritorna a Tiny Tiny RSS"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Notiziari"
-
-#: digest.php:94
-#, fuzzy
-msgid "headlines"
-msgstr "Ultimi sommari:"
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Errore sconosciuto"
@@ -480,8 +456,7 @@ msgstr "Filtra articoli"
 msgid "Set starred"
 msgstr "Imposta con stella"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "Pubblica articolo"
 
@@ -842,10 +817,19 @@ msgstr ""
 "\t\tda questa applicazione per funzionare correttamente. Controllare\n"
 "\t\tle impostazioni del browser."
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Salve,"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Esci dalle preferenze"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Esci"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "Scorciatoie da tastiera"
@@ -2245,27 +2229,6 @@ msgstr "Nascondi notiziari letti"
 msgid "Sort feeds by unread count"
 msgstr "Ordinare i notiziari per numero di non letti"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Altre azioni..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "Metti la stella all&apos;articolo"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "Togli la stella all&apos;articolo"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "Attendere prego..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "Non pubblicare articolo"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "Impossibile aggiungere il filtro: niente a cui corrisponda."
@@ -2602,6 +2565,22 @@ msgstr "Impossibile cambiare il punteggio a questo tipo di notiziari."
 msgid "Rescore articles in %s?"
 msgstr "Cambiare il punteggio degli articoli in «%s»?"
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "Metti la stella all&apos;articolo"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "Togli la stella all&apos;articolo"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "Attendere prego..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "Non pubblicare articolo"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."
@@ -2689,6 +2668,9 @@ msgstr "Inserire una nota per questo articolo:"
 #~ msgid "Last updated:"
 #~ msgstr "Ultimo aggiornamento:"
 
+#~ msgid "Last headlines:"
+#~ msgstr "Ultimi sommari:"
+
 #~ msgid ""
 #~ "Feed browser cache information is missing. Please refer to the <a "
 #~ "class='visibleLink' target='_blank' href='http://tt-rss.org/trac/wiki/"

diff --git a/locale/ja_JP/LC_MESSAGES/messages.mo b/locale/ja_JP/LC_MESSAGES/messages.mo
index 74b06d16f2d7033c4e553d1f8cc56ff7899e72e3..ee7e5972b331b3c89c78cd326a0d893b9d9ad655 100644 (file)
Binary files a/locale/ja_JP/LC_MESSAGES/messages.mo and b/locale/ja_JP/LC_MESSAGES/messages.mo differ

diff --git a/locale/ja_JP/LC_MESSAGES/messages.po b/locale/ja_JP/LC_MESSAGES/messages.po
index fba0d0523e30da607ab12d1263d9b736a84b26a0..f992b8ebcaad0fc5e0899fb48ebfb9db9cbbaa03 100644 (file)
--- a/locale/ja_JP/LC_MESSAGES/messages.po
+++ b/locale/ja_JP/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss unstable\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2009-05-12 03:25+0900\n"
 "Last-Translator: Tadashi Jokagi <elf2000@users.sourceforge.net>\n"
 "Language-Team: Japanese <http://oss.poyo.jp/>\n"
@@ -109,30 +109,6 @@ msgstr "管理者"
 msgid "Default profile"
 msgstr "標準の記事制限"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "ようこそ、"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "ログアウト"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Tiny Tiny RSS に戻る"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "フィード"
-
-#: digest.php:94
-#, fuzzy
-msgid "headlines"
-msgstr "最終ヘッドライン:"
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "未知のエラー"
@@ -485,8 +461,7 @@ msgstr "記事フィルター"
 msgid "Set starred"
 msgstr "お気に入りに設定する"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "公開記事"
 
@@ -811,10 +786,19 @@ msgid ""
 "\t\tbrowser settings."
 msgstr ""
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "ようこそ、"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "設定を終了する"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "ログアウト"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "キーボードショートカット"
@@ -2208,27 +2192,6 @@ msgstr "読んだフィードを隠す/再表示する"
 msgid "Sort feeds by unread count"
 msgstr "未読記事数によるフィードの並び替え"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "操作..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "記事をお気に入りにする"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "記事のお気に入りを解除する"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "しばらくお待ちください..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "非公開記事"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "フィルターを追加できません: 一致するものがありません。"
@@ -2562,6 +2525,22 @@ msgstr ""
 msgid "Rescore articles in %s?"
 msgstr "%s の記事のスコアを再計算しますか?"
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "記事をお気に入りにする"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "記事のお気に入りを解除する"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "しばらくお待ちください..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "非公開記事"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."
@@ -3119,6 +3098,9 @@ msgstr "このアーティクルのノートを入力してください:"
 #~ msgid "Last updated:"
 #~ msgstr "最終更新:"
 
+#~ msgid "Last headlines:"
+#~ msgstr "最終ヘッドライン:"
+
 #~ msgid "Other feeds: Top 25"
 #~ msgstr "その他のフィード: トップ 25"
 

diff --git a/locale/nb_NO/LC_MESSAGES/messages.mo b/locale/nb_NO/LC_MESSAGES/messages.mo
index b0424836401cadc39b88c8b38febc0115e1817fd..fa67eea02db7459b89c667719ba1e671f2ec4b09 100644 (file)
Binary files a/locale/nb_NO/LC_MESSAGES/messages.mo and b/locale/nb_NO/LC_MESSAGES/messages.mo differ

diff --git a/locale/nb_NO/LC_MESSAGES/messages.po b/locale/nb_NO/LC_MESSAGES/messages.po
index f16382a3d647f310e1f2efb76eb22f6ec099589c..04a2b84ef2d51247c554019859c33f0f7a941e21 100644 (file)
--- a/locale/nb_NO/LC_MESSAGES/messages.po
+++ b/locale/nb_NO/LC_MESSAGES/messages.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS 1.3.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2009-05-02 00:10+0100\n"
 "Last-Translator: Christian Lomsdalen <christian@vindstille.net>\n"
 "Language-Team: Norwegian Bokmål <christian@vindstille.net>\n"
@@ -109,30 +109,6 @@ msgstr "Administrator"
 msgid "Default profile"
 msgstr "Standard artikkelbegrensning"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Hei, "
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Logg ut"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Returner til Tiny Tiny RSS"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Nyhetsstrømmer"
-
-#: digest.php:94
-#, fuzzy
-msgid "headlines"
-msgstr "Siste artikler:"
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Ukjent feil"
@@ -484,8 +460,7 @@ msgstr "Filtrer artikkel"
 msgid "Set starred"
 msgstr "Sett som favorittartikkel"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "Publiser artiklen"
 
@@ -841,10 +816,19 @@ msgstr ""
 "\t\tfor at dette programmet skal fungere ordentlig. Vennligst sjekk din \n"
 "\t\tnettlesers instillinger."
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Hei, "
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Forlat innstillinger"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Logg ut"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "Tastatursnarveier"
@@ -2271,27 +2255,6 @@ msgstr "Skjul/vis leste nyhetsstrømmer"
 msgid "Sort feeds by unread count"
 msgstr "Sorter nyhetsstrømer ut i fra antall uleste artikler"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Handlinger..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "Marker artikkel som favoritt"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "Fjern favorittmerkingen fra artiklen"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "Vennligst vent..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "Fjern publiseringen av artikkelen."
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "Kan ikke legge til filter, ingen match på kriteriene"
@@ -2623,6 +2586,22 @@ msgstr "Du kan ikke endre poengsummen for denne typen nyhetskanal"
 msgid "Rescore articles in %s?"
 msgstr "Endre poengene for artiklene i %s?"
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "Marker artikkel som favoritt"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "Fjern favorittmerkingen fra artiklen"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "Vennligst vent..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "Fjern publiseringen av artikkelen."
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."
@@ -3170,6 +3149,9 @@ msgstr "Vennligst skriv inn et notat for denne artikkelen:"
 #~ msgid "Last updated:"
 #~ msgstr "Siste oppdatering:"
 
+#~ msgid "Last headlines:"
+#~ msgstr "Siste artikler:"
+
 #~ msgid "Other feeds: Top 25"
 #~ msgstr "Andre nyhetsstrømmer: Topp 25"
 

diff --git a/locale/pt_BR/LC_MESSAGES/messages.mo b/locale/pt_BR/LC_MESSAGES/messages.mo
index 385601b371148793684e915c6f6eeff1af671ce4..c9c7ca42e5e01e20c6eadb45433b10db1e45592f 100644 (file)
Binary files a/locale/pt_BR/LC_MESSAGES/messages.mo and b/locale/pt_BR/LC_MESSAGES/messages.mo differ

diff --git a/locale/pt_BR/LC_MESSAGES/messages.po b/locale/pt_BR/LC_MESSAGES/messages.po
index 424736a01e5ed2febb27fa6b05bacc13420f6e30..882de8a7b55e393f8e818c84fca40a4ce4d37b27 100644 (file)
--- a/locale/pt_BR/LC_MESSAGES/messages.po
+++ b/locale/pt_BR/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tt-rss 1.2.14.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2007-10-24 00:47-0200\n"
 "Last-Translator: Marcelo Jorge VIeira (metal) <metal@alucinados.com>\n"
 "Language-Team: Portuguese/Brazil\n"
@@ -112,28 +112,6 @@ msgstr "Administrador"
 msgid "Default profile"
 msgstr "Padrão"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Olá,"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Sair"
-
-#: digest.php:67
-msgid "Tiny Tiny RSS"
-msgstr ""
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Feed"
-
-#: digest.php:94
-msgid "headlines"
-msgstr ""
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Erro desconhecido"
@@ -485,8 +463,7 @@ msgstr ""
 msgid "Set starred"
 msgstr "Marcar como favorito"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr ""
 
@@ -811,10 +788,19 @@ msgid ""
 "\t\tbrowser settings."
 msgstr ""
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Olá,"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Sair das preferências"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Sair"
+
 #: prefs.php:102
 #, fuzzy
 msgid "Keyboard shortcuts"
@@ -2257,28 +2243,6 @@ msgstr "Favoritos"
 msgid "Sort feeds by unread count"
 msgstr ""
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Ações..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-#, fuzzy
-msgid "Star article"
-msgstr "Favoritos"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr ""
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr ""
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr ""
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr ""
@@ -2616,6 +2580,23 @@ msgstr ""
 msgid "Rescore articles in %s?"
 msgstr "Favoritos"
 
+#: viewfeed.js:528 viewfeed.js:592
+#, fuzzy
+msgid "Star article"
+msgstr "Favoritos"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr ""
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr ""
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr ""
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."

diff --git a/locale/ru_RU/LC_MESSAGES/messages.mo b/locale/ru_RU/LC_MESSAGES/messages.mo
index 422cc3c3297555d516b4664ee8070017458ae468..74d6e5c9776608d7252043cd503e2523dfcef8a0 100644 (file)
Binary files a/locale/ru_RU/LC_MESSAGES/messages.mo and b/locale/ru_RU/LC_MESSAGES/messages.mo differ

diff --git a/locale/ru_RU/LC_MESSAGES/messages.po b/locale/ru_RU/LC_MESSAGES/messages.po
index 7be489d7b868720628ec9e3447b8dc3de3c97933..5bcf2e2ea9f8a70e39bea8af570164f9087b9875 100644 (file)
--- a/locale/ru_RU/LC_MESSAGES/messages.po
+++ b/locale/ru_RU/LC_MESSAGES/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2009-05-29 14:38+0300\n"
 "Last-Translator: Max Kamashev <max.kamashev@floscoeli.com>\n"
 "Language-Team: Русский <ru@li.org>\n"
@@ -115,30 +115,6 @@ msgstr "Администратор"
 msgid "Default profile"
 msgstr "Количество статей по умолчанию"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "Привет,"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "Выход"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "Вернуться к Tiny Tiny RSS"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Каналы"
-
-#: digest.php:94
-#, fuzzy
-msgid "headlines"
-msgstr "Последние заголовки:"
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "Неизвестная ошибка"
@@ -488,8 +464,7 @@ msgstr "Отфильтровать статью"
 msgid "Set starred"
 msgstr "Отметить"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "Опубликовать"
 
@@ -839,10 +814,19 @@ msgstr ""
 "\t\tдля функционала этой программы. Пожалуйста, проверьте\n"
 "\t\tнастройки вашего браузера."
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "Привет,"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "Закрыть настройки"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "Выход"
+
 #: prefs.php:102
 msgid "Keyboard shortcuts"
 msgstr "Горячие Клавиши"
@@ -2265,27 +2249,6 @@ msgstr "&nbsp;&nbsp;Показать/скрыть прочитанные"
 msgid "Sort feeds by unread count"
 msgstr "Сортировать каналы по количеству непрочитанных статей"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "Действия..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-msgid "Star article"
-msgstr "Отмеченные"
-
-#: digest.js:371 viewfeed.js:577
-msgid "Unstar article"
-msgstr "Не отмеченные"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-msgid "Please wait..."
-msgstr "Пожалуйста, подождите..."
-
-#: digest.js:412 viewfeed.js:648
-msgid "Unpublish article"
-msgstr "Не публиковать"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "Не могу добавить фильтр: нет соответствия."
@@ -2617,6 +2580,22 @@ msgstr "Вы не можете снова оценить этот канал."
 msgid "Rescore articles in %s?"
 msgstr "Установить оценку статьям в %s?"
 
+#: viewfeed.js:528 viewfeed.js:592
+msgid "Star article"
+msgstr "Отмеченные"
+
+#: viewfeed.js:577
+msgid "Unstar article"
+msgstr "Не отмеченные"
+
+#: viewfeed.js:585 viewfeed.js:652
+msgid "Please wait..."
+msgstr "Пожалуйста, подождите..."
+
+#: viewfeed.js:648
+msgid "Unpublish article"
+msgstr "Не публиковать"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."
@@ -3169,6 +3148,9 @@ msgstr "Пожалуйста, укажите заметку для статьи:
 #~ msgid "Last updated:"
 #~ msgstr "Последнее обновление"
 
+#~ msgid "Last headlines:"
+#~ msgstr "Последние заголовки:"
+
 #, fuzzy
 #~ msgid ""
 #~ "Feed browser cache information is missing. Please refer to the <a "

diff --git a/locale/zh_CN/LC_MESSAGES/messages.mo b/locale/zh_CN/LC_MESSAGES/messages.mo
index 9ac9c1f5163a04f508ae62ebefc5523e45890a21..b015e6b0e0f1286cf057551925e74adfaef1904b 100644 (file)
Binary files a/locale/zh_CN/LC_MESSAGES/messages.mo and b/locale/zh_CN/LC_MESSAGES/messages.mo differ

diff --git a/locale/zh_CN/LC_MESSAGES/messages.po b/locale/zh_CN/LC_MESSAGES/messages.po
index 8c7a8c7f39caba77a551dc2e666e5fc059747ba9..9da82cb55755e190a937c80ba68ee1f7c6475e77 100644 (file)
--- a/locale/zh_CN/LC_MESSAGES/messages.po
+++ b/locale/zh_CN/LC_MESSAGES/messages.po
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Tiny Tiny RSS1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-09-11 12:07+0400\n"
+"POT-Creation-Date: 2010-09-11 12:16+0400\n"
 "PO-Revision-Date: 2007-08-19 19:03+0800\n"
 "Last-Translator: sluke <sluke520@yahoo.com.cn>\n"
 "Language-Team: hicode.org <sluke520@yahoo.com.cn>\n"
@@ -108,30 +108,6 @@ msgstr "管理员"
 msgid "Default profile"
 msgstr "默认文章限制"
 
-#: digest.php:58 prefs.php:90 tt-rss.php:112
-msgid "Hello,"
-msgstr "你好,"
-
-#: digest.php:62 prefs.php:94 tt-rss.php:122 mobile/functions.php:60
-#: mobile/functions.php:234
-msgid "Logout"
-msgstr "注销"
-
-#: digest.php:67
-#, fuzzy
-msgid "Tiny Tiny RSS"
-msgstr "返回Tiny Tiny RSS"
-
-#: digest.php:88
-#, fuzzy
-msgid "feeds"
-msgstr "Feed"
-
-#: digest.php:94
-#, fuzzy
-msgid "headlines"
-msgstr "最新提要："
-
 #: errors.php:3
 msgid "Unknown error"
 msgstr "未知错误"
@@ -487,8 +463,7 @@ msgstr "过滤文章"
 msgid "Set starred"
 msgstr "设置星级"
 
-#: localized_schema.php:18 digest.js:346 digest.js:420 viewfeed.js:545
-#: viewfeed.js:659
+#: localized_schema.php:18 viewfeed.js:545 viewfeed.js:659
 msgid "Publish article"
 msgstr "发布文章"
 
@@ -820,10 +795,19 @@ msgid ""
 "\t\tbrowser settings."
 msgstr "您的浏览器不支持Javascript, 请检查设置。"
 
+#: prefs.php:90 tt-rss.php:112
+msgid "Hello,"
+msgstr "你好,"
+
 #: prefs.php:92 help/4.php:14
 msgid "Exit preferences"
 msgstr "退出我的最爱"
 
+#: prefs.php:94 tt-rss.php:122 mobile/functions.php:60
+#: mobile/functions.php:234
+msgid "Logout"
+msgstr "注销"
+
 #: prefs.php:102
 #, fuzzy
 msgid "Keyboard shortcuts"
@@ -2307,31 +2291,6 @@ msgstr "&nbsp;&nbsp;(显示)隐藏已读feed"
 msgid "Sort feeds by unread count"
 msgstr "以未读文章数量排序feed源"
 
-#: digest.js:295
-#, fuzzy
-msgid "More articles..."
-msgstr "激活..."
-
-#: digest.js:329 digest.js:378 viewfeed.js:528 viewfeed.js:592
-#, fuzzy
-msgid "Star article"
-msgstr "星级文章"
-
-#: digest.js:371 viewfeed.js:577
-#, fuzzy
-msgid "Unstar article"
-msgstr "星级文章"
-
-#: digest.js:374 digest.js:416 viewfeed.js:585 viewfeed.js:652
-#, fuzzy
-msgid "Please wait..."
-msgstr "读取中，请等待..."
-
-#: digest.js:412 viewfeed.js:648
-#, fuzzy
-msgid "Unpublish article"
-msgstr "发布文章"
-
 #: functions.js:1332
 msgid "Can't add filter: nothing to match on."
 msgstr "未能添加过滤：无匹配。"
@@ -2682,6 +2641,26 @@ msgstr "您不能编辑本分类feed"
 msgid "Rescore articles in %s?"
 msgstr "星级文章"
 
+#: viewfeed.js:528 viewfeed.js:592
+#, fuzzy
+msgid "Star article"
+msgstr "星级文章"
+
+#: viewfeed.js:577
+#, fuzzy
+msgid "Unstar article"
+msgstr "星级文章"
+
+#: viewfeed.js:585 viewfeed.js:652
+#, fuzzy
+msgid "Please wait..."
+msgstr "读取中，请等待..."
+
+#: viewfeed.js:648
+#, fuzzy
+msgid "Unpublish article"
+msgstr "发布文章"
+
 #: viewfeed.js:935 viewfeed.js:971 viewfeed.js:1012 viewfeed.js:1097
 #: viewfeed.js:1141 viewfeed.js:1288 viewfeed.js:1338 viewfeed.js:1394
 msgid "No articles are selected."
@@ -3172,6 +3151,9 @@ msgstr "请输入标签主题"
 #~ msgid "Last updated:"
 #~ msgstr "已更新"
 
+#~ msgid "Last headlines:"
+#~ msgstr "最新提要："
+
 #~ msgid "Other feeds: Top 25"
 #~ msgstr " 其他feed: Top 25"