diff options
| -rw-r--r-- | apt-pkg/acquire-item.cc | 2 | ||||
| -rw-r--r-- | debian/changelog | 4 | ||||
| -rw-r--r-- | methods/http.h | 2 | ||||
| -rw-r--r-- | po/apt-all.pot | 2 | ||||
| -rw-r--r-- | po/ar.po | 2 | ||||
| -rw-r--r-- | po/ast.po | 2 | ||||
| -rw-r--r-- | po/bg.po | 2 | ||||
| -rw-r--r-- | po/bs.po | 2 | ||||
| -rw-r--r-- | po/ca.po | 2 | ||||
| -rw-r--r-- | po/cs.po | 2 | ||||
| -rw-r--r-- | po/cy.po | 2 | ||||
| -rw-r--r-- | po/da.po | 2 | ||||
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/dz.po | 2 | ||||
| -rw-r--r-- | po/el.po | 2 | ||||
| -rw-r--r-- | po/es.po | 2 | ||||
| -rw-r--r-- | po/eu.po | 2 | ||||
| -rw-r--r-- | po/fi.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/gl.po | 2 | ||||
| -rw-r--r-- | po/hu.po | 2 | ||||
| -rw-r--r-- | po/it.po | 2 | ||||
| -rw-r--r-- | po/ja.po | 2 | ||||
| -rw-r--r-- | po/km.po | 2 | ||||
| -rw-r--r-- | po/ko.po | 2 | ||||
| -rw-r--r-- | po/ku.po | 2 | ||||
| -rw-r--r-- | po/lt.po | 2 | ||||
| -rw-r--r-- | po/mr.po | 2 | ||||
| -rw-r--r-- | po/nb.po | 2 | ||||
| -rw-r--r-- | po/ne.po | 2 | ||||
| -rw-r--r-- | po/nl.po | 2 | ||||
| -rw-r--r-- | po/nn.po | 2 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | po/pt.po | 2 | ||||
| -rw-r--r-- | po/pt_BR.po | 2 | ||||
| -rw-r--r-- | po/ro.po | 2 | ||||
| -rw-r--r-- | po/ru.po | 2 | ||||
| -rw-r--r-- | po/sk.po | 2 | ||||
| -rw-r--r-- | po/sl.po | 2 | ||||
| -rw-r--r-- | po/sv.po | 2 | ||||
| -rw-r--r-- | po/th.po | 2 | ||||
| -rw-r--r-- | po/tl.po | 2 | ||||
| -rw-r--r-- | po/tr.po | 2 | ||||
| -rw-r--r-- | po/uk.po | 2 | ||||
| -rw-r--r-- | po/vi.po | 2 | ||||
| -rw-r--r-- | po/zh_CN.po | 2 | ||||
| -rw-r--r-- | po/zh_TW.po | 2 |
47 files changed, 50 insertions, 46 deletions
diff --git a/apt-pkg/acquire-item.cc b/apt-pkg/acquire-item.cc index d12733747..7b800e42f 100644 --- a/apt-pkg/acquire-item.cc +++ b/apt-pkg/acquire-item.cc @@ -1515,7 +1515,7 @@ void pkgAcqMetaIndex::Failed(string Message,pkgAcquire::MethodConfig *Cnf) VerifiedSigFile.append(".gpg"); Rename(LastGoodSigFile, VerifiedSigFile); Status = StatTransientNetworkError; - _error->Warning(_("A error occurred during the signature " + _error->Warning(_("An error occurred during the signature " "verification. The repository is not updated " "and the previous index files will be used. " "GPG error: %s: %s\n"), diff --git a/debian/changelog b/debian/changelog index bf32cf624..7944d76ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,6 +29,10 @@ apt (0.9.7.9~exp3) experimental; urgency=low [ Marc Deslauriers ] * make apt-ftparchive generate missing deb-src hashes (LP: #1078697) + + [ Yaroslav Halchenko ] + * Fix English spelling error in a message ('A error'). Unfuzzy + translations. Closes: #705087 [ Programs translations ] * French translation completed (Christian Perrier) diff --git a/methods/http.h b/methods/http.h index 7a3ccda54..7446119cd 100644 --- a/methods/http.h +++ b/methods/http.h @@ -158,7 +158,7 @@ class HttpMethod : public pkgAcqMethod ERROR_UNRECOVERABLE, /** \brief The server reported a error with a error content page */ ERROR_WITH_CONTENT_PAGE, - /** \brief A error on the client side */ + /** \brief An error on the client side */ ERROR_NOT_FROM_SERVER, /** \brief A redirect or retry request */ TRY_AGAIN_OR_REDIRECT diff --git a/po/apt-all.pot b/po/apt-all.pot index a69dc9295..763d8a034 100644 --- a/po/apt-all.pot +++ b/po/apt-all.pot @@ -2773,7 +2773,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -2805,7 +2805,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3038,7 +3038,7 @@ msgstr "Conflictu de distribución: %s (esperábase %s pero obtúvose %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Hebo un fallu durante la verificación de la robla. El repositoriu nun ta " @@ -3096,7 +3096,7 @@ msgstr "Конфликт в дистрибуцията: %s (очаквана: %s #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Грешка при проверка на цифровия подпис. Хранилището не е обновено и ще се " @@ -2802,7 +2802,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3079,7 +3079,7 @@ msgstr "Distribució en conflicte: %s (s'esperava %s però s'ha obtingut %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "S'ha produït un error durant la verificació de la signatura. El dipòsit no " @@ -3037,7 +3037,7 @@ msgstr "Konfliktní distribuce: %s (očekáváno %s, obdrženo %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Při ověřování podpisů se objevila chyba. Repositář není aktualizovaný, tudíž " @@ -3096,7 +3096,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3062,7 +3062,7 @@ msgstr "Konfliktdistribution: %s (forventede %s men fik %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Der opstod en fejl under underskriftsbekræftelse. Arkivet er ikke opdateret " @@ -3153,7 +3153,7 @@ msgstr "Konflikt bei Distribution: %s (%s erwartet, aber %s bekommen)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Während der Überprüfung der Signatur trat ein Fehler auf. Das Repository " @@ -3022,7 +3022,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3055,7 +3055,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3137,7 +3137,7 @@ msgstr "Distribución conflictiva: %s (se esperaba %s, pero se obtuvo %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Se produjo un error durante la verificación de las firmas. El repositorio no " @@ -3019,7 +3019,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3011,7 +3011,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3162,7 +3162,7 @@ msgstr "Distribution en conflit : %s (%s attendu, mais %s obtenu)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Une erreur s'est produite lors du contrôle de la signature. Le dépôt n'est " @@ -3078,7 +3078,7 @@ msgstr "Conflito na distribución: %s (agardábase %s mais obtívose %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Produciuse un erro durante a verificación da sinatura. O repositorio non foi " @@ -3086,7 +3086,7 @@ msgstr "Ütköző disztribúció: %s (a várt %s helyett %s érkezett)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Hiba történt az aláírás ellenőrzése közben. A tároló nem frissült, és az " @@ -3132,7 +3132,7 @@ msgstr "Distribuzione in conflitto: %s (atteso %s ma ottenuto %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Si è verificato un errore nel verificare la firma. Il repository non è " @@ -3073,7 +3073,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "署名照合中にエラーが発生しました。リポジトリは更新されず、過去のインデックス" @@ -2985,7 +2985,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3011,7 +3011,7 @@ msgstr "배포판 충돌: %s (예상값 %s, 실제값 %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "디지털 서명 확인에 오류가 발생했습니다. 저장고를 업데이트하지 않고\n" @@ -2818,7 +2818,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -2917,7 +2917,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -2994,7 +2994,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3034,7 +3034,7 @@ msgstr "Konflikt mellom distribusjoner: %s (forventet %s men fant %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "En feil oppstod under signaturverifisering. Depotet er ikke oppdatert og den " @@ -2988,7 +2988,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3082,7 +3082,7 @@ msgstr "Conflicterende distributie: %s (verwachtte %s, maar kreeg %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Er is een fout opgetreden bij de handtekeningcontrole. De pakketbron is niet " @@ -3007,7 +3007,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3108,7 +3108,7 @@ msgstr "Nieprawidłowa dystrybucja: %s (oczekiwano %s, a otrzymano %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Podczas weryfikacji podpisu wystąpił błąd. Nie zaktualizowano repozytorium i " @@ -3098,7 +3098,7 @@ msgstr "Distribuição em conflito: %s (esperado %s mas obtido %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Ocorreu um erro durante a verificação da assinatura. O repositório não está " diff --git a/po/pt_BR.po b/po/pt_BR.po index 922279f9e..0a5317c70 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -3050,7 +3050,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3057,7 +3057,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3115,7 +3115,7 @@ msgstr "Конфликт распространения: %s (ожидался %s #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Произошла ошибка при проверке подписи. Репозиторий не обновлён и будут " @@ -3058,7 +3058,7 @@ msgstr "V konflikte s distribúciou: %s (očakávalo sa %s ale dostali sme %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Počas overovania podpisu sa vyskytla chyba. Repozitár nie je aktualizovaný a " @@ -3061,7 +3061,7 @@ msgstr "Distribucija v sporu: %s (pričakovana %s, toda dobljena %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Med preverjanjem podpisa je prišlo do napake. Skladišče ni bilo posodobljeno " @@ -3060,7 +3060,7 @@ msgstr "Konflikt i distribution: %s (förväntade %s men fick %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Ett fel inträffade vid verifiering av signaturen. Förrådet har inte " @@ -2990,7 +2990,7 @@ msgstr "ชุดจัดแจกขัดแย้งกัน: %s (ต้อ #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "เกิดข้อผิดพลาดขณะตรวจสอบลายเซ็น จะไม่ปรับข้อมูลคลังแพกเกจนี้ และจะใช้แฟ้มดัชนีเก่า " @@ -3040,7 +3040,7 @@ msgstr "" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" @@ -3062,7 +3062,7 @@ msgstr "Dağıtım çakışması: %s (beklenen %s ama eldeki %s)" #: apt-pkg/acquire-item.cc:1521 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "İmza doğrulama sırasında bir hata meydana geldi. Depo güncel değil ve önceki " @@ -3109,7 +3109,7 @@ msgstr "Конфліктуючий дистрибутив: %s (очікував #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Виникла помилка під час перевірки підпису. Репозиторій не оновлено, " @@ -3096,7 +3096,7 @@ msgstr "Bản phát hành xung đột: %s (mong đợi %s còn nhận %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "Gặp lỗi trong khi thẩm tra chữ ký.\n" diff --git a/po/zh_CN.po b/po/zh_CN.po index 6ac4536b9..8f25691e9 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -2979,7 +2979,7 @@ msgstr "冲突的发行版：%s (期望 %s 但得到 %s)" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" "校验签名出错。此仓库未被更新，仍然使用以前的索引文件。GPG 错误：%s: %s\n" diff --git a/po/zh_TW.po b/po/zh_TW.po index 11d299a3b..0cb4f8b8c 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -2971,7 +2971,7 @@ msgstr "發行版本衝突：%s（應當是 %s 但卻得到 %s）" #: apt-pkg/acquire-item.cc:1518 #, c-format msgid "" -"A error occurred during the signature verification. The repository is not " +"An error occurred during the signature verification. The repository is not " "updated and the previous index files will be used. GPG error: %s: %s\n" msgstr "" |