diff options
-rw-r--r-- | README.rst | 13 | ||||
-rw-r--r-- | db/feedmapper.php | 26 | ||||
-rw-r--r-- | l10n/ca.php | 6 | ||||
-rw-r--r-- | l10n/ca/news.po | 28 | ||||
-rw-r--r-- | l10n/cs_CZ.php | 3 | ||||
-rw-r--r-- | l10n/cs_CZ/news.po | 22 | ||||
-rw-r--r-- | l10n/en_GB.php | 3 | ||||
-rw-r--r-- | l10n/en_GB/news.po | 22 | ||||
-rw-r--r-- | l10n/et_EE.php | 3 | ||||
-rw-r--r-- | l10n/et_EE/news.po | 22 | ||||
-rw-r--r-- | l10n/fr.php | 2 | ||||
-rw-r--r-- | l10n/fr/news.po | 22 | ||||
-rw-r--r-- | l10n/hi.php | 3 | ||||
-rw-r--r-- | l10n/hi/news.po | 16 | ||||
-rw-r--r-- | l10n/lt_LT.php | 3 | ||||
-rw-r--r-- | l10n/lt_LT/news.po | 23 | ||||
-rw-r--r-- | l10n/nl.php | 7 | ||||
-rw-r--r-- | l10n/nl/news.po | 30 | ||||
-rw-r--r-- | l10n/pa.php | 3 | ||||
-rw-r--r-- | l10n/pa/news.po | 189 | ||||
-rw-r--r-- | l10n/pt_BR.php | 3 | ||||
-rw-r--r-- | l10n/pt_BR/news.po | 22 | ||||
-rw-r--r-- | l10n/pt_PT.php | 3 | ||||
-rw-r--r-- | l10n/pt_PT/news.po | 23 | ||||
-rw-r--r-- | l10n/ru.php | 6 | ||||
-rw-r--r-- | l10n/ru/news.po | 29 | ||||
-rw-r--r-- | l10n/sr@latin.php | 1 | ||||
-rw-r--r-- | l10n/sr@latin/news.po | 16 | ||||
-rw-r--r-- | l10n/templates/news.pot | 4 | ||||
-rw-r--r-- | tests/unit/db/FeedMapperTest.php | 104 |
30 files changed, 453 insertions, 204 deletions
diff --git a/README.rst b/README.rst index 6faef2947..24cc2c4f8 100644 --- a/README.rst +++ b/README.rst @@ -138,6 +138,17 @@ Performance Notices Frequent Problems ----------------- +How do I reset the News app +~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Delete the folder **owncloud/apps/news**, then connect to your database and run the following commands where **oc\_** is your table prefix (defaults to oc\_) + +.. code-block:: sql + + DELETE FROM oc_appconfig WHERE appid = 'news'; + DROP TABLE oc_news_items; + DROP TABLE oc_news_feeds; + DROP TABLE oc_news_folders; + All feeds are not updated anymore ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ `This is a bug in the core backgroundjob system <https://github.com/owncloud/core/issues/3221>`_ deleting the :file:`owncloud/data/cron.lock` file gets the cron back up running @@ -172,7 +183,7 @@ The configuration is in **INI** format and looks like this: useCronUpdates = true -* **autoPurgeMinimumInterval**: Minimum amount of seconds after deleted feeds and folders are removed from the database. +* **autoPurgeMinimumInterval**: Minimum amount of seconds after deleted feeds and folders are removed from the database. * **autoPurgeCount**: Defines the minimum amount of articles that can be unread per feed before they get deleted * **simplePieCacheDuration**: Amount of seconds to cache feeds * **feedFetcherTimeout**: Maximum number of seconds to wait for an RSS or Atom feed to load. If a feed takes longer than that number of seconds to update, the update will be aborted diff --git a/db/feedmapper.php b/db/feedmapper.php index 463f49413..60f9abefa 100644 --- a/db/feedmapper.php +++ b/db/feedmapper.php @@ -42,9 +42,9 @@ class FeedMapper extends Mapper implements IMapper { $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . - 'ON `feeds`.`id` = `items`.`feed_id` ' . + 'ON `feeds`.`id` = `items`.`feed_id` ' . // WARNING: this is a desperate attempt at making this query work - // because prepared statements dont work. This is a possible + // because prepared statements dont work. This is a possible // SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT. // think twice when changing this 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . @@ -53,7 +53,7 @@ class FeedMapper extends Mapper implements IMapper { 'AND `feeds`.`user_id` = ? ' . 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. - '`feeds`.`favicon_link`, `feeds`.`added`,'. + '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; $params = array($id, $userId); @@ -67,7 +67,7 @@ class FeedMapper extends Mapper implements IMapper { private function findAllRows($sql, $params=array(), $limit=null){ $result = $this->execute($sql, $params, $limit); - + $feeds = array(); while($row = $result->fetchRow()){ $feed = new Feed(); @@ -87,9 +87,9 @@ class FeedMapper extends Mapper implements IMapper { 'LEFT JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . // WARNING: this is a desperate attempt at making this query work - // because prepared statements dont work. This is a possible + // because prepared statements dont work. This is a possible // SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT. - // think twice when changing this + // think twice when changing this 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . StatusFlag::UNREAD . ' ' . 'WHERE `feeds`.`user_id` = ? ' . @@ -99,7 +99,7 @@ class FeedMapper extends Mapper implements IMapper { 'AND `feeds`.`deleted_at` = 0 ' . 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. - '`feeds`.`favicon_link`, `feeds`.`added`,'. + '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; $params = array($userId); @@ -115,9 +115,9 @@ class FeedMapper extends Mapper implements IMapper { 'LEFT JOIN `*PREFIX*news_items` `items` ' . 'ON `feeds`.`id` = `items`.`feed_id` ' . // WARNING: this is a desperate attempt at making this query work - // because prepared statements dont work. This is a possible + // because prepared statements dont work. This is a possible // SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT. - // think twice when changing this + // think twice when changing this 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . StatusFlag::UNREAD . ' ' . 'WHERE (`feeds`.`folder_id` = 0 ' . @@ -126,7 +126,7 @@ class FeedMapper extends Mapper implements IMapper { 'AND `feeds`.`deleted_at` = 0 ' . 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. - '`feeds`.`favicon_link`, `feeds`.`added`,'. + '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; return $this->findAllRows($sql); @@ -137,9 +137,9 @@ class FeedMapper extends Mapper implements IMapper { $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . - 'ON `feeds`.`id` = `items`.`feed_id` ' . + 'ON `feeds`.`id` = `items`.`feed_id` ' . // WARNING: this is a desperate attempt at making this query work - // because prepared statements dont work. This is a possible + // because prepared statements dont work. This is a possible // SQL INJECTION RISK WHEN MODIFIED WITHOUT THOUGHT. // think twice when changing this 'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . @@ -148,7 +148,7 @@ class FeedMapper extends Mapper implements IMapper { 'AND `feeds`.`user_id` = ? ' . 'GROUP BY `feeds`.`id`, `feeds`.`user_id`, `feeds`.`url_hash`,'. '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. - '`feeds`.`favicon_link`, `feeds`.`added`,'. + '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; $params = array($hash, $userId); diff --git a/l10n/ca.php b/l10n/ca.php index 63bd94175..62a129c45 100644 --- a/l10n/ca.php +++ b/l10n/ca.php @@ -2,7 +2,11 @@ "News" => "Notícies", "Can not add feed: Exists already" => "No es pot afegir la font: ja existeix", "Can not add feed: URL does not exist or has invalid xml" => "No es pot afegir la font: la URL no existeix o té un XML no vàlid", +"Articles without feed" => "Articles sense font", "Can not add folder: Exists already" => "No es pot afegir la carpeta: ja existeix", +" " => " ", +"_" => "-", +"status" => "estat", "Undo deletion of %s" => "Desfés l'eliminació de %s", "Add Website" => "Afegeix pàgina web", "Error: address exists already!" => "Error: l'adreça ja existeix!", @@ -28,9 +32,11 @@ "Collapse" => "Col·lapsa", "Delete folder" => "Elimina carpeta", "Rename folder" => "Reanomena carpeta", +"Subscriptions (OPML)" => "Subscripcions (OPML)", "Import" => "Importa", "Export" => "Exporta", "Error when importing: file does not contain valid OPML" => "Error en importar: el fitxer no conté un OPML vàlid", +"Unread/Starred Articles" => "Articles no llegits/amb estrelles", "Error when importing: file does not contain valid JSON" => "Error en importar: el fitxer no conté un JSON vàlid", "Show all" => "Mostra tot", "Show only unread" => "Mostra només els no llegits" diff --git a/l10n/ca/news.po b/l10n/ca/news.po index d85ce9065..5231e6a82 100644 --- a/l10n/ca/news.po +++ b/l10n/ca/news.po @@ -11,9 +11,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 19:48-0400\n" -"PO-Revision-Date: 2013-09-13 23:48+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-09-18 09:45-0400\n" +"PO-Revision-Date: 2013-09-17 13:31+0000\n" +"Last-Translator: rogerc\n" "Language-Team: Catalan (http://www.transifex.com/projects/p/owncloud/language/ca/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -21,7 +21,7 @@ msgstr "" "Language: ca\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:52 +#: appinfo/app.php:52 templates/main.php:38 msgid "News" msgstr "Notícies" @@ -35,7 +35,7 @@ msgstr "No es pot afegir la font: la URL no existeix o té un XML no vàlid" #: businesslayer/feedbusinesslayer.php:267 msgid "Articles without feed" -msgstr "" +msgstr "Articles sense font" #: businesslayer/folderbusinesslayer.php:66 msgid "Can not add folder: Exists already" @@ -43,16 +43,16 @@ msgstr "No es pot afegir la carpeta: ja existeix" #: js/vendor/angular-ui/build/angular-ui.min.js:7 msgid " " -msgstr "" +msgstr " " #: js/vendor/angular-ui/build/angular-ui.min.js:7 msgid "_" -msgstr "" +msgstr "-" #: js/vendor/jquery-ui/ui/minified/jquery-ui.min.js:8 #: js/vendor/jquery-ui/ui/minified/jquery.ui.autocomplete.min.js:4 msgid "status" -msgstr "" +msgstr "estat" #: templates/main.php:34 #, php-format @@ -124,19 +124,19 @@ msgstr "Marca com a llegit" msgid "Welcome to the ownCloud News app!" msgstr "Benvingut a l'aplicació de notícies d'ownCloud!" -#: templates/part.items.php:32 +#: templates/part.items.php:34 msgid "from" msgstr "des de" -#: templates/part.items.php:37 +#: templates/part.items.php:39 msgid "by" msgstr "per" -#: templates/part.items.php:44 +#: templates/part.items.php:46 msgid "Download" msgstr "Baixa" -#: templates/part.items.php:57 +#: templates/part.items.php:59 msgid "Keep unread" msgstr "Mantén com a sense llegir" @@ -158,7 +158,7 @@ msgstr "Reanomena carpeta" #: templates/part.settings.php:13 msgid "Subscriptions (OPML)" -msgstr "" +msgstr "Subscripcions (OPML)" #: templates/part.settings.php:17 templates/part.settings.php:20 #: templates/part.settings.php:48 templates/part.settings.php:53 @@ -178,7 +178,7 @@ msgstr "Error en importar: el fitxer no conté un OPML vàlid" #: templates/part.settings.php:44 msgid "Unread/Starred Articles" -msgstr "" +msgstr "Articles no llegits/amb estrelles" #: templates/part.settings.php:70 msgid "Error when importing: file does not contain valid JSON" diff --git a/l10n/cs_CZ.php b/l10n/cs_CZ.php index 700c88b68..bbaf6bb83 100644 --- a/l10n/cs_CZ.php +++ b/l10n/cs_CZ.php @@ -2,6 +2,7 @@ "News" => "Novinky", "Can not add feed: Exists already" => "Nelze přidat kanál: již existuje", "Can not add feed: URL does not exist or has invalid xml" => "Nelze přidat kanál: URL neexistuje nebo obsahuje neplatné XML", +"Articles without feed" => "Články bez zdroje", "Can not add folder: Exists already" => "Nelze přidat složku: již existuje", " " => " ", "_" => "_", @@ -31,9 +32,11 @@ "Collapse" => "Sbalit", "Delete folder" => "Smazat složku", "Rename folder" => "Přejmenovat složku", +"Subscriptions (OPML)" => "Odběry (OPML)", "Import" => "Importovat", "Export" => "Exportovat", "Error when importing: file does not contain valid OPML" => "Chyba při importu: soubor neobsahuje platná OPML data", +"Unread/Starred Articles" => "Články nepřečtené a s hvězdičkou", "Error when importing: file does not contain valid JSON" => "Chyba při importování: soubor neobsahuje platná data JSON", "Show all" => "Zobrazit vše", "Show only unread" => "Zobrazit pouze nepřečtené" diff --git a/l10n/cs_CZ/news.po b/l10n/cs_CZ/news.po index 65a6525a2..1c010c62b 100644 --- a/l10n/cs_CZ/news.po +++ b/l10n/cs_CZ/news.po @@ -12,9 +12,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 19:48-0400\n" -"PO-Revision-Date: 2013-09-13 23:48+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-09-18 09:45-0400\n" +"PO-Revision-Date: 2013-09-17 18:10+0000\n" +"Last-Translator: pstast <petr@stastny.eu>\n" "Language-Team: Czech (Czech Republic) (http://www.transifex.com/projects/p/owncloud/language/cs_CZ/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,7 +22,7 @@ msgstr "" "Language: cs_CZ\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: appinfo/app.php:52 +#: appinfo/app.php:52 templates/main.php:38 msgid "News" msgstr "Novinky" @@ -36,7 +36,7 @@ msgstr "Nelze přidat kanál: URL neexistuje nebo obsahuje neplatné XML" #: businesslayer/feedbusinesslayer.php:267 msgid "Articles without feed" -msgstr "" +msgstr "Články bez zdroje" #: businesslayer/folderbusinesslayer.php:66 msgid "Can not add folder: Exists already" @@ -125,19 +125,19 @@ msgstr "Označit jako přečtené" msgid "Welcome to the ownCloud News app!" msgstr "Vítejte v ownCloud aplikaci Novinky!" -#: templates/part.items.php:32 +#: templates/part.items.php:34 msgid "from" msgstr "z" -#: templates/part.items.php:37 +#: templates/part.items.php:39 msgid "by" msgstr "sdílí" -#: templates/part.items.php:44 +#: templates/part.items.php:46 msgid "Download" msgstr "Stáhnout" -#: templates/part.items.php:57 +#: templates/part.items.php:59 msgid "Keep unread" msgstr "Ponechat nepřečteno" @@ -159,7 +159,7 @@ msgstr "Přejmenovat složku" #: templates/part.settings.php:13 msgid "Subscriptions (OPML)" -msgstr "" +msgstr "Odběry (OPML)" #: templates/part.settings.php:17 templates/part.settings.php:20 #: templates/part.settings.php:48 templates/part.settings.php:53 @@ -179,7 +179,7 @@ msgstr "Chyba při importu: soubor neobsahuje platná OPML data" #: templates/part.settings.php:44 msgid "Unread/Starred Articles" -msgstr "" +msgstr "Články nepřečtené a s hvězdičkou" #: templates/part.settings.php:70 msgid "Error when importing: file does not contain valid JSON" diff --git a/l10n/en_GB.php b/l10n/en_GB.php index 059bddf5e..dee439c08 100644 --- a/l10n/en_GB.php +++ b/l10n/en_GB.php @@ -2,6 +2,7 @@ "News" => "News", "Can not add feed: Exists already" => "Can not add feed: Exists already", "Can not add feed: URL does not exist or has invalid xml" => "Can not add feed: URL does not exist or has invalid xml", +"Articles without feed" => "Articles without feed", "Can not add folder: Exists already" => "Can not add folder: Exists already", " " => " ", "_" => "_", @@ -31,9 +32,11 @@ "Collapse" => "Collapse", "Delete folder" => "Delete folder", "Rename folder" => "Rename folder", +"Subscriptions (OPML)" => "Subscriptions (OPML)", "Import" => "Import", "Export" => "Export", "Error when importing: file does not contain valid OPML" => "Error when importing: file does not contain valid OPML", +"Unread/Starred Articles" => "Unread/Starred Articles", "Error when importing: file does not contain valid JSON" => "Error when importing: file does not contain valid JSON", "Show all" => "Show all", "Show only unread" => "Show only unread" diff --git a/l10n/en_GB/news.po b/l10n/en_GB/news.po index 6dfb6d7d3..2a6a02532 100644 --- a/l10n/en_GB/news.po +++ b/l10n/en_GB/news.po @@ -8,9 +8,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 19:48-0400\n" -"PO-Revision-Date: 2013-09-13 23:48+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-09-20 08:46-0400\n" +"PO-Revision-Date: 2013-09-18 16:41+0000\n" +"Last-Translator: mnestis <transifex@mnestis.net>\n" "Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/owncloud/language/en_GB/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -18,7 +18,7 @@ msgstr "" "Language: en_GB\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:52 +#: appinfo/app.php:52 templates/main.php:38 msgid "News" msgstr "News" @@ -32,7 +32,7 @@ msgstr "Can not add feed: URL does not exist or has invalid xml" #: businesslayer/feedbusinesslayer.php:267 msgid "Articles without feed" -msgstr "" +msgstr "Articles without feed" #: businesslayer/folderbusinesslayer.php:66 msgid "Can not add folder: Exists already" @@ -121,19 +121,19 @@ msgstr "Mark read" msgid "Welcome to the ownCloud News app!" msgstr "Welcome to the ownCloud News app!" -#: templates/part.items.php:32 +#: templates/part.items.php:34 msgid "from" msgstr "from" -#: templates/part.items.php:37 +#: templates/part.items.php:39 msgid "by" msgstr "by" -#: templates/part.items.php:44 +#: templates/part.items.php:46 msgid "Download" msgstr "Download" -#: templates/part.items.php:57 +#: templates/part.items.php:59 msgid "Keep unread" msgstr "Keep unread" @@ -155,7 +155,7 @@ msgstr "Rename folder" #: templates/part.settings.php:13 msgid "Subscriptions (OPML)" -msgstr "" +msgstr "Subscriptions (OPML)" #: templates/part.settings.php:17 templates/part.settings.php:20 #: templates/part.settings.php:48 templates/part.settings.php:53 @@ -175,7 +175,7 @@ msgstr "Error when importing: file does not contain valid OPML" #: templates/part.settings.php:44 msgid "Unread/Starred Articles" -msgstr "" +msgstr "Unread/Starred Articles" #: templates/part.settings.php:70 msgid "Error when importing: file does not contain valid JSON" diff --git a/l10n/et_EE.php b/l10n/et_EE.php index 536f5dc27..abb29c451 100644 --- a/l10n/et_EE.php +++ b/l10n/et_EE.php @@ -2,6 +2,7 @@ "News" => "Uudised", "Can not add feed: Exists already" => "Voogu ei saa lisada: on juba olemas", "Can not add feed: URL does not exist or has invalid xml" => "Voogu ei saa lisada: URL-i pole olemas või sisaldab vigast XML-i", +"Articles without feed" => "Artiklid ilma voota", "Can not add folder: Exists already" => "Kausta ei saa lisada: on juba olemas", " " => " ", "_" => "_", @@ -31,9 +32,11 @@ "Collapse" => "Sulge", "Delete folder" => "Kustuta kaust", "Rename folder" => "Nimeta kaust ümber", +"Subscriptions (OPML)" => "Tellimused (OPML)", "Import" => "Impordi", "Export" => "Ekspordi", "Error when importing: file does not contain valid OPML" => "Viga importimisel: fail ei sisalda korrektset OPML-i", +"Unread/Starred Articles" => "Lugemata/Märgitud artiklid", "Error when importing: file does not contain valid JSON" => "Viga importimisel: fail ei sisalda korrektset JSON-i", "Show all" => "Näita kõiki", "Show only unread" => "Näita ainult lugemata" diff --git a/l10n/et_EE/news.po b/l10n/et_EE/news.po index c9b7843fb..78ce329a3 100644 --- a/l10n/et_EE/news.po +++ b/l10n/et_EE/news.po @@ -9,9 +9,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 19:48-0400\n" -"PO-Revision-Date: 2013-09-13 23:48+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-09-18 09:45-0400\n" +"PO-Revision-Date: 2013-09-18 08:20+0000\n" +"Last-Translator: pisike.sipelgas <pisike.sipelgas@gmail.com>\n" "Language-Team: Estonian (Estonia) (http://www.transifex.com/projects/p/owncloud/language/et_EE/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,7 +19,7 @@ msgstr "" "Language: et_EE\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:52 +#: appinfo/app.php:52 templates/main.php:38 msgid "News" msgstr "Uudised" @@ -33,7 +33,7 @@ msgstr "Voogu ei saa lisada: URL-i pole olemas või sisaldab vigast XML-i" #: businesslayer/feedbusinesslayer.php:267 msgid "Articles without feed" -msgstr "" +msgstr "Artiklid ilma voota" #: businesslayer/folderbusinesslayer.php:66 msgid "Can not add folder: Exists already" @@ -122,19 +122,19 @@ msgstr "Märgi loetuks" msgid "Welcome to the ownCloud News app!" msgstr "Tere tulemast ownCloud News rakendisse!" -#: templates/part.items.php:32 +#: templates/part.items.php:34 msgid "from" msgstr "kohast" -#: templates/part.items.php:37 +#: templates/part.items.php:39 msgid "by" msgstr "lisas" -#: templates/part.items.php:44 +#: templates/part.items.php:46 msgid "Download" msgstr "Lae alla" -#: templates/part.items.php:57 +#: templates/part.items.php:59 msgid "Keep unread" msgstr "Hoia kui lugemata" @@ -156,7 +156,7 @@ msgstr "Nimeta kaust ümber" #: templates/part.settings.php:13 msgid "Subscriptions (OPML)" -msgstr "" +msgstr "Tellimused (OPML)" #: templates/part.settings.php:17 templates/part.settings.php:20 #: templates/part.settings.php:48 templates/part.settings.php:53 @@ -176,7 +176,7 @@ msgstr "Viga importimisel: fail ei sisalda korrektset OPML-i" #: templates/part.settings.php:44 msgid "Unread/Starred Articles" -msgstr "" +msgstr "Lugemata/Märgitud artiklid" #: templates/part.settings.php:70 msgid "Error when importing: file does not contain valid JSON" diff --git a/l10n/fr.php b/l10n/fr.php index 74fc5ab34..54075fd68 100644 --- a/l10n/fr.php +++ b/l10n/fr.php @@ -2,6 +2,7 @@ "News" => "Abonnements", "Can not add feed: Exists already" => "Impossible d'ajouter le flux : Déjà présent", "Can not add feed: URL does not exist or has invalid xml" => "Impossible d'ajouter le flux : l'URL n'existe pas ou pointe vers un document xml invalide", +"Articles without feed" => "Articles sans flux", "Can not add folder: Exists already" => "Impossible d'ajouter le dossier : Déjà présent", " " => " ", "_" => "_", @@ -34,6 +35,7 @@ "Import" => "Importer", "Export" => "Exporter", "Error when importing: file does not contain valid OPML" => "Erreur lors de l'import : le fichier spécifié n'est pas un fichier OPML valide", +"Unread/Starred Articles" => "Articles non lus / Regardés ", "Error when importing: file does not contain valid JSON" => "Erreur lors de l'import : le fichier spécifié n'est pas un fichier JSON valide", "Show all" => "Tout afficher", "Show only unread" => "Montrer uniquement les articles non-lus" diff --git a/l10n/fr/news.po b/l10n/fr/news.po index 1644a5d61..8caa3a672 100644 --- a/l10n/fr/news.po +++ b/l10n/fr/news.po @@ -10,10 +10,12 @@ # Florentin Le Moal <florentin.lemoal@gmail.com>, 2012 # gp4004 <gp4004@arghh.org>, 2012 # Guillaume Paumier <guillom.pom@gmail.com>, 2012 +# Mystyle <maelvstyle@gmail.com>, 2013 # msoko <sokolovitch@yahoo.com>, 2013 # MathieuP <mathieu.payrol@gmail.com>, 2012 # Nahir Mohamed <nahirmoha@gmail.com>, 2013 # nicoroud <nicolas@tycho.fr>, 2013 +# ogre_sympathique <ogre.sympathique@speed.1s.fr>, 2013 # Paul McFly <roipoussiere@gmail.com>, 2012 # Robert Di Rosa <>, 2012 # Romain DEP. <rom1dep@gmail.com>, 2012-2013 @@ -21,9 +23,9 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 19:48-0400\n" -"PO-Revision-Date: 2013-09-13 23:48+0000\n" -"Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" +"POT-Creation-Date: 2013-09-20 08:46-0400\n" +"PO-Revision-Date: 2013-09-19 13:10+0000\n" +"Last-Translator: ogre_sympathique <ogre.sympathique@speed.1s.fr>\n" "Language-Team: French (http://www.transifex.com/projects/p/owncloud/language/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -31,7 +33,7 @@ msgstr "" "Language: fr\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: appinfo/app.php:52 +#: appinfo/app.php:52 templates/main.php:38 msgid "News" msgstr "Abonnements" @@ -45,7 +47,7 @@ msgstr "Impossible d'ajouter le flux : l'URL n'existe pas ou pointe vers un doc #: businesslayer/feedbusinesslayer.php:267 msgid "Articles without feed" -msgstr "" +msgstr "Articles sans flux" #: businesslayer/folderbusinesslayer.php:66 msgid "Can not add folder: Exists already" @@ -134,19 +136,19 @@ msgstr "Marquer comme lu" msgid "Welcome to the ownCloud News app!" msgstr "Bienvenue dans l'application de Nouvelles Owncloud !" -#: templates/part.items.php:32 +#: templates/part.items.php:34 msgid "from" msgstr "de" -#: templates/part.items.php:37 +#: templates/part.items.php:39 msgid "by" msgstr "par" -#: templates/part.items.php:44 +#: templates/part.items.php:46 msgid "Download" msgstr "Télécharger" -#: templates/part.items.php:57 +#: templates/part.items.php:59 msgid "Keep unread" msgstr "Garder non lu" @@ -188,7 +190,7 @@ msgstr "Erreur lors de l'import : le fichier spécifié n'est pas un fichier OP #: templates/part.settings.php:44 msgid "Unread/Starred Articles" -msgstr "" +msgstr "Articles non lus / Regardés " #: templates/part.settings.php:70 msgid "Error when importing: file does not contain valid JSON" diff --git a/l10n/hi.php b/l10n/hi.php index bc249300c..b418691eb 100644 --- a/l10n/hi.php +++ b/l10n/hi.php @@ -1,3 +1,4 @@ <?php $TRANSLATIONS = array( -"Add" => "डाले" +"Add" => "डाले", +"Starred" => "तारांकित " ); diff --git a/l10n/hi/news.po b/l10n/hi/news.po index 503015838..a258a99a3 100644 --- a/l10n/hi/news.po +++ b/l10n/hi/news.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: ownCloud\n" "Report-Msgid-Bugs-To: http://bugs.owncloud.org/\n" -"POT-Creation-Date: 2013-09-13 19:48-0400\n" -"PO-Revision-Date: 2013-09-13 23:48+0000\n" +"POT-Creation-Date: 2013-09-18 09:45-0400\n" +"PO-Revision-Date: 2013-09-17 13:13+0000\n" "Last-Translator: I Robot <owncloud-bot@tmit.eu>\n" "Language-Team: Hindi (http://www.transifex.com/projects/p/owncloud/language/hi/)\n" "MIME-Version: 1.0\n" @@ -17,7 +17,7 @@ msgstr "" "Language: hi\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -#: appinfo/app.php:52 +#: appinfo/app.php:52 templates/main.php:38 msgid "News" msgstr "" @@ -101,7 +101,7 @@ msgstr "" #: templates/part.feed.starred.php:11 msgid "Starred" -msgstr "" +msgstr "तारांकित " #: templates/part.feed.unread.php:10 msgid "Unread articles" @@ -120,19 +120,19 @@ msgstr "" msgid "Welcome to the ownCloud News app!" msgstr "" -#: templat |