1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262
|
Description: Fixes erroneous translations
Fixes translations for Portuguese, Ukrainian, Chinese.
Origin: upstream, https://github.com/akrennmair/newsbeuter/commit/2b73301359deeab2d27bb7a5cbd5aaaad06a07a9
Forwarded: https://github.com/akrennmair/newsbeuter/issues/274
Last-Update: 2016-03-09
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -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
--- a/po/uk.po
+++ b/po/uk.po
@@ -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"
--- a/po/zh.po
+++ b/po/zh.po
@@ -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 "错误:无法将种子标记为已读"
--- a/po/de.po
+++ b/po/de.po
@@ -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
--- a/po/es.po
+++ b/po/es.po
@@ -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
--- a/po/es_ES.po
+++ b/po/es_ES.po
@@ -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
--- a/po/fr.po
+++ b/po/fr.po
@@ -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
--- a/po/hu.po
+++ b/po/hu.po
@@ -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
--- a/po/it.po
+++ b/po/it.po
@@ -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
--- a/po/nb.po
+++ b/po/nb.po
@@ -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
--- a/po/newsbeuter.pot
+++ b/po/newsbeuter.pot
@@ -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
--- a/po/nl.po
+++ b/po/nl.po
@@ -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
--- a/po/pl.po
+++ b/po/pl.po
@@ -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
--- a/po/ru.po
+++ b/po/ru.po
@@ -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
--- a/po/sv.po
+++ b/po/sv.po
@@ -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
--- a/po/tr.po
+++ b/po/tr.po
@@ -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
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -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
--- a/src/controller.cpp
+++ b/src/controller.cpp
@@ -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;
@@ -1029,7 +1029,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;
}
--- a/test/test.cpp
+++ b/test/test.cpp
@@ -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");
|