Description: Fixes erroneous translations
 Fixes translations for Portuguese, Ukrainian, Chinese.
Author: Nikos Tsipinakis <nikos@tsipinakis.com>
Origin: upsteam, https://github.com/akrennmair/newsbeuter/commit/2b73301359deeab2d27bb7a5cbd5aaaad06a07a9
Forwarded: https://github.com/akrennmair/newsbeuter/issues/274
Last-Update: 2016-03-09

Index: newsbeuter-2.9/po/pt_BR.po
===================================================================
--- newsbeuter-2.9.orig/po/pt_BR.po	2016-03-11 21:54:40.317885106 +0200
+++ newsbeuter-2.9/po/pt_BR.po	2016-03-11 21:55:52.094351344 +0200
@@ -10,8 +10,8 @@
 "POT-Creation-Date: 2013-12-21 16:44+0100\n"
 "PO-Revision-Date: 2011-01-01 06:56-0200\n"
 "Last-Translator:  <>\n"
-"Language-Team: Russian <kde-russian@lists.kde.ru>\n"
-"Language: ru\n"
+"Language-Team: \n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -404,7 +404,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Um erro ocorreu durante a análise de %s."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/uk.po
===================================================================
--- newsbeuter-2.9.orig/po/uk.po	2016-03-11 21:54:40.317885106 +0200
+++ newsbeuter-2.9/po/uk.po	2016-03-11 21:55:52.142351655 +0200
@@ -401,7 +401,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Виникла помилка при парсуванні %s"
 
 #: src/controller.cpp:1050
@@ -1432,7 +1432,7 @@
 #: src/regexmanager.cpp:49
 #, c-format
 msgid "`%s' is not a valid regular expression: %s"
-msgstr "`%s' неправильний вираз"
+msgstr "`%s' не є правильним регулярним виразом: %s"
 
 #: src/rss.cpp:116
 msgid "%a, %d %b %Y %T %z"
Index: newsbeuter-2.9/po/zh.po
===================================================================
--- newsbeuter-2.9.orig/po/zh.po	2016-03-11 21:54:40.317885106 +0200
+++ newsbeuter-2.9/po/zh.po	2016-03-11 21:55:52.154351733 +0200
@@ -96,7 +96,7 @@
 msgstr "把文章保存到 %s"
 
 #: src/configparser.cpp:80
-#, c-format
+#, fuzzy, c-format
 msgid "Error while processing command `%s' (%s line %u): %s"
 msgstr "当处理命令`%s'(%s 第 %n 行)时出错: %s"
 
@@ -390,7 +390,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr ""
 
 #: src/controller.cpp:1050
@@ -589,7 +589,7 @@
 msgstr "标记该种子已读"
 
 #: src/feedlist_formaction.cpp:188 src/itemlist_formaction.cpp:334
-#, c-format
+#, fuzzy, c-format
 msgid "Error: couldn't mark feed read: %s"
 msgstr "错误：无法将种子标记为已读"
 
Index: newsbeuter-2.9/po/de.po
===================================================================
--- newsbeuter-2.9.orig/po/de.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/de.po	2016-03-11 21:55:52.026350902 +0200
@@ -397,7 +397,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Ein Fehler ist beim Parsen von %s aufgetreten."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/es.po
===================================================================
--- newsbeuter-2.9.orig/po/es.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/es.po	2016-03-11 21:55:52.042351005 +0200
@@ -402,7 +402,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Ocurrió un error al procesar %s."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/es_ES.po
===================================================================
--- newsbeuter-2.9.orig/po/es_ES.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/es_ES.po	2016-03-11 21:55:52.034350954 +0200
@@ -406,7 +406,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Se produjo un error analizando %s."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/fr.po
===================================================================
--- newsbeuter-2.9.orig/po/fr.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/fr.po	2016-03-11 21:55:52.050351057 +0200
@@ -398,7 +398,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Une erreur est survenue en analysant %s."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/hu.po
===================================================================
--- newsbeuter-2.9.orig/po/hu.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/hu.po	2016-03-11 21:55:52.062351136 +0200
@@ -400,7 +400,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Egy hiba lépett fel, miközben %s-t elemeztem."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/it.po
===================================================================
--- newsbeuter-2.9.orig/po/it.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/it.po	2016-03-11 21:55:52.066351162 +0200
@@ -405,7 +405,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Si è verificato un errore analizzando %s."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/nb.po
===================================================================
--- newsbeuter-2.9.orig/po/nb.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/nb.po	2016-03-11 21:55:52.074351213 +0200
@@ -405,7 +405,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "En feil oppsto under tolkningen av %s"
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/newsbeuter.pot
===================================================================
--- newsbeuter-2.9.orig/po/newsbeuter.pot	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/newsbeuter.pot	2016-03-11 21:55:52.078351239 +0200
@@ -377,7 +377,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr ""
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/nl.po
===================================================================
--- newsbeuter-2.9.orig/po/nl.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/nl.po	2016-03-11 21:55:52.082351265 +0200
@@ -404,7 +404,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Het ontleden van %s is mislukt."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/pl.po
===================================================================
--- newsbeuter-2.9.orig/po/pl.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/pl.po	2016-03-11 21:55:52.090351318 +0200
@@ -402,7 +402,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Wystąpił błąd podczas przetwarzania %s."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/ru.po
===================================================================
--- newsbeuter-2.9.orig/po/ru.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/ru.po	2016-03-11 21:55:52.110351447 +0200
@@ -399,7 +399,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "При обработке %s возникла ошибка."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/sv.po
===================================================================
--- newsbeuter-2.9.orig/po/sv.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/sv.po	2016-03-11 21:55:52.122351525 +0200
@@ -404,7 +404,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "Ett fel inträffade vid tolkning av %s."
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/tr.po
===================================================================
--- newsbeuter-2.9.orig/po/tr.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/tr.po	2016-03-11 21:55:52.134351603 +0200
@@ -400,7 +400,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr ""
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/po/zh_TW.po
===================================================================
--- newsbeuter-2.9.orig/po/zh_TW.po	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/po/zh_TW.po	2016-03-11 21:55:52.158351759 +0200
@@ -390,7 +390,7 @@
 
 #: src/controller.cpp:1035
 #, c-format
-msgid "An error occured while parsing %s."
+msgid "An error occurred while parsing %s."
 msgstr "在分析%s時發生錯誤"
 
 #: src/controller.cpp:1050
Index: newsbeuter-2.9/src/controller.cpp
===================================================================
--- newsbeuter-2.9.orig/src/controller.cpp	2016-03-11 21:54:27.873804254 +0200
+++ newsbeuter-2.9/src/controller.cpp	2016-03-11 21:55:14.450106842 +0200
@@ -376,7 +376,7 @@
 		cfgparser.parse("/etc/" PROGRAM_NAME "/config");
 		cfgparser.parse(config_file);
 	} catch (const configexception& ex) {
-		LOG(LOG_ERROR,"an exception occured while parsing the configuration file: %s",ex.what());
+		LOG(LOG_ERROR,"an exception occurred while parsing the configuration file: %s",ex.what());
 		std::cout << ex.what() << std::endl;
 		utils::remove_fs_lock(lock_file);
 		return;
@@ -1030,7 +1030,7 @@
 void controller::import_opml(const char * filename) {
 	xmlDoc * doc = xmlReadFile(filename, NULL, 0);
 	if (doc == NULL) {
-		std::cout << utils::strprintf(_("An error occured while parsing %s."), filename) << std::endl;
+		std::cout << utils::strprintf(_("An error occurred while parsing %s."), filename) << std::endl;
 		return;
 	}
 
Index: newsbeuter-2.9/test/test.cpp
===================================================================
--- newsbeuter-2.9.orig/test/test.cpp	2016-03-11 21:54:27.877804280 +0200
+++ newsbeuter-2.9/test/test.cpp	2016-03-11 21:55:22.490159067 +0200
@@ -86,7 +86,7 @@
 	try {
 		cfgparser.parse("test-config.txt");
 	}  catch (const configexception& ex) {
-		LOG(LOG_ERROR,"an exception occured while parsing the configuration file: %s", ex.what());
+		LOG(LOG_ERROR,"an exception occurred while parsing the configuration file: %s", ex.what());
 		lemon.fail("TODO: description");
 	} catch (...) {
 		lemon.fail("TODO: description");
