From: Mike Gabriel Date: Tue, 23 Feb 2021 11:08:04 +0000 (+0100) Subject: Fix some typo flaws in output messages X-Git-Tag: archive/raspbian/17.35.10-1+rpi1~1^2^2^2~2 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4cff64d0814ee378cba6c0242dd7257018ebd825;p=libzypp.git Fix some typo flaws in output messages Gbp-Pq: Name 1003_various-typo-fixes.patch --- diff --git a/doc/autoinclude/Plugins.doc b/doc/autoinclude/Plugins.doc index 3fa17ab..6da44a9 100644 --- a/doc/autoinclude/Plugins.doc +++ b/doc/autoinclude/Plugins.doc @@ -8,7 +8,7 @@
\section plugins-intro Introduction -Plugins allow to extend the ZYpp package manager without the need to change +Plugins allow one to extend the ZYpp package manager without the need to change code. Plugins are designed as external programs so that they can be written in any language. \section plugin-protocols Plugin protocols diff --git a/doc/zypp-NameReqPrv.1.txt b/doc/zypp-NameReqPrv.1.txt index cc1708f..4ae835b 100644 --- a/doc/zypp-NameReqPrv.1.txt +++ b/doc/zypp-NameReqPrv.1.txt @@ -24,11 +24,11 @@ Reported matches show the packages 'internal id', 'name', 'version' and 'archite -------------------- 2431 zypper-1.9.16-22.2.x86_64 (99)@System openSUSE 1400499579 - nam: zypper + name: zypper 40947 zypper-1.9.3-1.1.x86_64 (99)repo-oss (13.1) openSUSE 1383049437 - nam: zypper + name: zypper 56140 zypper-1.9.16-22.2.x86_64 (99)repo-oss-update (13.1) openSUSE 1400499579 - nam: zypper + name: zypper -------------------- diff --git a/package/libzypp.changes b/package/libzypp.changes index 8f9abaf..6861c78 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -4694,7 +4694,7 @@ Tue Mar 31 15:51:32 CEST 2009 - ma@suse.de Thu Mar 12 18:38:30 CET 2009 - ma@suse.de - Add Resolver::setSolveSrcPackages. Per default disable solving - of source package dependencies. We will later allow to enable + of source package dependencies. We will later allow enabling it per package. - version 6.3.0 (2) @@ -4850,7 +4850,7 @@ Thu Jan 22 10:41:27 CET 2009 - ma@suse.de ------------------------------------------------------------------- Fri Jan 9 17:01:10 CET 2009 - jkupec@suse.cz -- handle HTTP 503 reponses as temporary errors (bnc #462545) +- handle HTTP 503 responses as temporary errors (bnc #462545) ------------------------------------------------------------------- Thu Dec 18 22:26:18 CET 2008 - ma@suse.de @@ -6781,7 +6781,7 @@ Wed Apr 2 10:24:17 CEST 2008 - ma@suse.de ------------------------------------------------------------------- Tue Apr 1 21:54:10 CEST 2008 - ma@suse.de -- Extend sat::WhatProvides to allow to query for possible providers +- Extend sat::WhatProvides allows one to query for possible providers of a collection of capabilies. E.g. all providers of a packages requirements. - Fixed retrieval of translated texts from .solv files, provided the @@ -6874,7 +6874,7 @@ Fri Mar 14 17:28:39 CET 2008 - ma@suse.de Fri Mar 14 14:27:43 CET 2008 - dmacvicar@suse.de - look for openssl in cmake, actually we build require it -- explicitely link against openssl and crypto, required to +- explicitly link against openssl and crypto, required to compile in all platforms/distros. ------------------------------------------------------------------- @@ -11209,7 +11209,7 @@ Tue Apr 4 19:19:39 CEST 2006 - mt@suse.de - Added flag to MediaManager::isUseableAttachPoint, whether to check against system mount entries or not. -- Disallow to use the attachpoints of another media handlers +- Disallows one to use the attachpoints of another media handlers as source path in MediaDIR. - rev 2917 @@ -11332,7 +11332,7 @@ Fri Mar 31 16:34:51 CEST 2006 - mt@suse.de Fri Mar 31 13:27:09 CEST 2006 - mt@suse.de - Implemented several hal get/set/removeDeviceProperty wrappers -- Improved HalException to allow to fetch HAL/DBUS error componets +- Improved HalException allows one to fetch HAL/DBUS error componets - rev 2830 ------------------------------------------------------------------- diff --git a/po/af.po b/po/af.po index 20a34f0..48e2521 100644 --- a/po/af.po +++ b/po/af.po @@ -4645,7 +4645,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/ar.po b/po/ar.po index c365508..45f42d4 100644 --- a/po/ar.po +++ b/po/ar.po @@ -4716,7 +4716,7 @@ msgstr "بتثبيت %1% على الرغم من أنه تم سحبه" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "تسمح بتثبيت PTF %1%" #. translator: %1% is a package name diff --git a/po/be.po b/po/be.po index 9c073f8..7cb6b60 100644 --- a/po/be.po +++ b/po/be.po @@ -4722,7 +4722,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/bg.po b/po/bg.po index b1ec795..cc3ec37 100644 --- a/po/bg.po +++ b/po/bg.po @@ -4884,7 +4884,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/bn.po b/po/bn.po index 5edda88..fd9e442 100644 --- a/po/bn.po +++ b/po/bn.po @@ -4645,7 +4645,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/bs.po b/po/bs.po index c5405dc..557ba1d 100644 --- a/po/bs.po +++ b/po/bs.po @@ -5136,7 +5136,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/ca.po b/po/ca.po index 442d180..a35acf4 100644 --- a/po/ca.po +++ b/po/ca.po @@ -5117,7 +5117,7 @@ msgstr "instal·la %1% tot i que ha estat retret" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "permet instal·lar el PTF %1%" #. translator: %1% is a package name diff --git a/po/cs.po b/po/cs.po index 070fe02..4c33c1d 100644 --- a/po/cs.po +++ b/po/cs.po @@ -4929,7 +4929,7 @@ msgstr "instalovat %1%, ačkoli byl odvolán" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "umožnit instalaci PTF %1%" #. translator: %1% is a package name diff --git a/po/cy.po b/po/cy.po index 2fa8a75..c3f48c9 100644 --- a/po/cy.po +++ b/po/cy.po @@ -4939,7 +4939,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/da.po b/po/da.po index 1edc542..b204897 100644 --- a/po/da.po +++ b/po/da.po @@ -4697,7 +4697,7 @@ msgstr "installér %1%, selvom den er blevet tilbagetrukket" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "giv tillade til installation af PTF'en %1%" #. translator: %1% is a package name diff --git a/po/de.po b/po/de.po index 488036c..ffdda82 100644 --- a/po/de.po +++ b/po/de.po @@ -4723,7 +4723,7 @@ msgstr "%1 installieren, obwohl es widerrufen wurde" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "Erlauben das PTF %1% zu installieren" #. translator: %1% is a package name diff --git a/po/el.po b/po/el.po index e6d95a9..caeb55f 100644 --- a/po/el.po +++ b/po/el.po @@ -4705,7 +4705,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/en_GB.po b/po/en_GB.po index 13684ee..6091481 100644 --- a/po/en_GB.po +++ b/po/en_GB.po @@ -4658,7 +4658,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/es.po b/po/es.po index 0c7ec2a..be2a15c 100644 --- a/po/es.po +++ b/po/es.po @@ -4727,7 +4727,7 @@ msgstr "instalar %1% aunque se haya retraído" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "permitir la instalación de PTF %1%" #. translator: %1% is a package name diff --git a/po/et.po b/po/et.po index 6e9bf7b..056a34e 100644 --- a/po/et.po +++ b/po/et.po @@ -4699,7 +4699,7 @@ msgstr "paigalda %1%, ehkki see on tagasi tõmmatud" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "lubage paigaldada PTF %1%" #. translator: %1% is a package name diff --git a/po/fa.po b/po/fa.po index ede00ca..c9b348c 100644 --- a/po/fa.po +++ b/po/fa.po @@ -4693,7 +4693,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/fi.po b/po/fi.po index b06284c..8f900cc 100644 --- a/po/fi.po +++ b/po/fi.po @@ -4906,7 +4906,7 @@ msgstr "asenna %1%, vaikka se on vedetty takaisin" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "salli asentaa PTF %1%" #. translator: %1% is a package name diff --git a/po/fr.po b/po/fr.po index c095141..4235e35 100644 --- a/po/fr.po +++ b/po/fr.po @@ -4732,7 +4732,7 @@ msgstr "installer %1% bien qu'il ait été retiré" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "autoriser l'installation du PTF %1%" #. translator: %1% is a package name diff --git a/po/gl.po b/po/gl.po index d5a10a1..b302af2 100644 --- a/po/gl.po +++ b/po/gl.po @@ -5039,7 +5039,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "permitir a instalación de PTF %1%" #. translator: %1% is a package name diff --git a/po/gu.po b/po/gu.po index c468979..b03b16b 100644 --- a/po/gu.po +++ b/po/gu.po @@ -4648,7 +4648,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/he.po b/po/he.po index 904e5ac..e5bc15e 100644 --- a/po/he.po +++ b/po/he.po @@ -5123,7 +5123,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/hi.po b/po/hi.po index c31eb63..ab102eb 100644 --- a/po/hi.po +++ b/po/hi.po @@ -4648,7 +4648,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/hr.po b/po/hr.po index 1c0e513..5ef7ca5 100644 --- a/po/hr.po +++ b/po/hr.po @@ -4778,7 +4778,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/hu.po b/po/hu.po index c5f30e3..1837006 100644 --- a/po/hu.po +++ b/po/hu.po @@ -4990,7 +4990,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/id.po b/po/id.po index 9f36853..2c71bae 100644 --- a/po/id.po +++ b/po/id.po @@ -5140,7 +5140,7 @@ msgstr "pasang %1% meskipun telah ditarik kembali" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "memungkinkan untuk memasang PTF %1%" #. translator: %1% is a package name diff --git a/po/it.po b/po/it.po index 5d6e151..fa1acf9 100644 --- a/po/it.po +++ b/po/it.po @@ -4714,7 +4714,7 @@ msgstr "installare %1% anche se è stato ritirato" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "consentire installazione di PTF %1%" #. translator: %1% is a package name diff --git a/po/ja.po b/po/ja.po index a756ee4..65276e9 100644 --- a/po/ja.po +++ b/po/ja.po @@ -4702,7 +4702,7 @@ msgstr "撤回済みの %1% をインストールする" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "PTF %1% のインストールを許可する" #. translator: %1% is a package name diff --git a/po/ka.po b/po/ka.po index 2e27be4..e5357e8 100644 --- a/po/ka.po +++ b/po/ka.po @@ -4625,7 +4625,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/km.po b/po/km.po index e338d1d..246524a 100644 --- a/po/km.po +++ b/po/km.po @@ -4649,7 +4649,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/ko.po b/po/ko.po index 1910c9f..0e8a25d 100644 --- a/po/ko.po +++ b/po/ko.po @@ -4887,7 +4887,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/ku.po b/po/ku.po index 6c9f16a..ac83196 100644 --- a/po/ku.po +++ b/po/ku.po @@ -4716,7 +4716,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/lt.po b/po/lt.po index 0f48e6f..efe7bf3 100644 --- a/po/lt.po +++ b/po/lt.po @@ -4799,7 +4799,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/mk.po b/po/mk.po index cf33492..45e1b5f 100644 --- a/po/mk.po +++ b/po/mk.po @@ -4995,7 +4995,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/mr.po b/po/mr.po index 1e141d3..b43575f 100644 --- a/po/mr.po +++ b/po/mr.po @@ -4646,7 +4646,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/nb.po b/po/nb.po index 8f3ac44..98432a6 100644 --- a/po/nb.po +++ b/po/nb.po @@ -4789,7 +4789,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/nl.po b/po/nl.po index 8deedc5..fa62b69 100644 --- a/po/nl.po +++ b/po/nl.po @@ -4740,7 +4740,7 @@ msgstr "%1% installeren hoewel het is ingetrokken" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "toestaan de PTF %1% te installeren" #. translator: %1% is a package name diff --git a/po/nn.po b/po/nn.po index 266f3f2..e7b6272 100644 --- a/po/nn.po +++ b/po/nn.po @@ -4671,7 +4671,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/pa.po b/po/pa.po index 490bb44..272f369 100644 --- a/po/pa.po +++ b/po/pa.po @@ -4650,7 +4650,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/pl.po b/po/pl.po index 37dd592..a30b65e 100644 --- a/po/pl.po +++ b/po/pl.po @@ -4707,7 +4707,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/pt.po b/po/pt.po index fedd9a8..8e97e7b 100644 --- a/po/pt.po +++ b/po/pt.po @@ -4873,7 +4873,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/pt_BR.po b/po/pt_BR.po index 897bc1c..51c4440 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -4726,7 +4726,7 @@ msgstr "instale %1% apesar de ter sido recolhido" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "permitir instalar o PTF %1%" #. translator: %1% is a package name diff --git a/po/ro.po b/po/ro.po index 929c490..5a5b174 100644 --- a/po/ro.po +++ b/po/ro.po @@ -4682,7 +4682,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/ru.po b/po/ru.po index 1f2b161..de73958 100644 --- a/po/ru.po +++ b/po/ru.po @@ -4710,7 +4710,7 @@ msgstr "установить %1%, хоть он и был отозван" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "разрешить установку PTF %1%" #. translator: %1% is a package name diff --git a/po/si.po b/po/si.po index 45a75d6..1152395 100644 --- a/po/si.po +++ b/po/si.po @@ -4654,7 +4654,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/sk.po b/po/sk.po index e172618..2767ce5 100644 --- a/po/sk.po +++ b/po/sk.po @@ -4723,7 +4723,7 @@ msgstr "inštalovať %1%, aj keď bol stiahnutý" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "umožniť inštaláciu PTF %1%" #. translator: %1% is a package name diff --git a/po/sl.po b/po/sl.po index e6c2785..9aa5cdc 100644 --- a/po/sl.po +++ b/po/sl.po @@ -5110,7 +5110,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/sr.po b/po/sr.po index fcc4251..6148bd0 100644 --- a/po/sr.po +++ b/po/sr.po @@ -4754,7 +4754,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/sv.po b/po/sv.po index 5ea3e47..53962e6 100644 --- a/po/sv.po +++ b/po/sv.po @@ -4873,7 +4873,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/ta.po b/po/ta.po index bfad303..97810f3 100644 --- a/po/ta.po +++ b/po/ta.po @@ -4644,7 +4644,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/th.po b/po/th.po index c197967..3c8532a 100644 --- a/po/th.po +++ b/po/th.po @@ -4761,7 +4761,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/tr.po b/po/tr.po index 8bb10a0..a2afa66 100644 --- a/po/tr.po +++ b/po/tr.po @@ -5335,7 +5335,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/uk.po b/po/uk.po index b473657..b8394fa 100644 --- a/po/uk.po +++ b/po/uk.po @@ -4889,7 +4889,7 @@ msgstr "встановити %1% хоч він і був відкладений" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "дозволити встановити PTF %1%" #. translator: %1% is a package name diff --git a/po/vi.po b/po/vi.po index ba8ff67..5a2c844 100644 --- a/po/vi.po +++ b/po/vi.po @@ -4627,7 +4627,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/wa.po b/po/wa.po index f21c4bf..9f5dc02 100644 --- a/po/wa.po +++ b/po/wa.po @@ -4669,7 +4669,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/xh.po b/po/xh.po index 26770d5..321aa95 100644 --- a/po/xh.po +++ b/po/xh.po @@ -4649,7 +4649,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/zh_CN.po b/po/zh_CN.po index e16f84c..8c6be85 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -4695,7 +4695,7 @@ msgstr "尽管 %1% 已收回，仍予以安装" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "允许安装 PTF %1%" #. translator: %1% is a package name diff --git a/po/zh_TW.po b/po/zh_TW.po index 59f8724..8f7e125 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -4686,7 +4686,7 @@ msgstr "儘管 %1% 已收回，仍予以安裝" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "允許安裝 PTF %1%" #. translator: %1% is a package name diff --git a/po/zu.po b/po/zu.po index cbb6877..861acb0 100644 --- a/po/zu.po +++ b/po/zu.po @@ -4652,7 +4652,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/po/zypp.pot b/po/zypp.pot index 496a8ec..e989449 100644 --- a/po/zypp.pot +++ b/po/zypp.pot @@ -4595,7 +4595,7 @@ msgstr "" #: zypp/solver/detail/SATResolver.cc:1877 #: zypp/solver/detail/SATResolver.cc:2155 #, boost-format -msgid "allow to install the PTF %1%" +msgid "allow installing the PTF %1%" msgstr "" #. translator: %1% is a package name diff --git a/tests/zypp/PluginFrame_test.cc b/tests/zypp/PluginFrame_test.cc index c4ee400..0d565b4 100644 --- a/tests/zypp/PluginFrame_test.cc +++ b/tests/zypp/PluginFrame_test.cc @@ -114,7 +114,7 @@ BOOST_AUTO_TEST_CASE(PluginScriptTest) scr.open( "/bin/cat" ); BOOST_CHECK_EQUAL( scr.isOpen(), true ); BOOST_CHECK_EQUAL( (scr.getPid() != PluginScript::NotConnected ), true ); - BOOST_CHECK_EQUAL( scr.script(), "/bin/cat" ); // set after successfull open + BOOST_CHECK_EQUAL( scr.script(), "/bin/cat" ); // set after successful open BOOST_CHECK_THROW( scr.open( "/bin/ls" ), PluginScriptException ); // already open BOOST_CHECK_EQUAL( scr.isOpen(), true ); // stay with "/bin/cat" diff --git a/tests/zypp/PurgeKernels_test.cc b/tests/zypp/PurgeKernels_test.cc index ce8feb6..9a6426c 100644 --- a/tests/zypp/PurgeKernels_test.cc +++ b/tests/zypp/PurgeKernels_test.cc @@ -164,7 +164,7 @@ namespace { } }, TestSample { - //kernel-1-2 is explicitely in the keep spec, it should not be removed + //kernel-1-2 is explicitly in the keep spec, it should not be removed //kernel-1-5 provides a symbol for a kmp that has a non kernel package depending on it, it should not be removed TESTS_SRC_DIR"/zypp/data/PurgeKernels/withdeps", "1-1-default", diff --git a/tests/zypp/ResStatus_test.cc b/tests/zypp/ResStatus_test.cc index 12ed695..5386157 100644 --- a/tests/zypp/ResStatus_test.cc +++ b/tests/zypp/ResStatus_test.cc @@ -145,8 +145,8 @@ void testTable( Transition transition, Evaluate evaluate ) // All tests below should define 3 checks, abbrev. by defines // // CHECK_DONE_*: When does the tranaction succeed? (return if not) -// CHECK_STATE( NEXT ): The state the transition leads to (if successfull) -// CHECK_CAUSER_*: Changes to the remembered causer (if successfull) +// CHECK_STATE( NEXT ): The state the transition leads to (if successful) +// CHECK_CAUSER_*: Changes to the remembered causer (if successful) // #define DOCHECK( FROMSTATE, TOSTATE, C_DONE, C_STATE, C_CAUSER ) \ diff --git a/tests/zypp/Url_test.cc b/tests/zypp/Url_test.cc index 7f44363..e4b2bf1 100644 --- a/tests/zypp/Url_test.cc +++ b/tests/zypp/Url_test.cc @@ -97,7 +97,7 @@ BOOST_AUTO_TEST_CASE(test_url1) BOOST_CHECK_EQUAL( one, url.asString() ); BOOST_CHECK_EQUAL( two, url.asCompleteString() ); - // hidden proxypass in the query is available when explicitely asked for + // hidden proxypass in the query is available when explicitly asked for BOOST_CHECK_EQUAL( url.getQueryParam( "proxypass" ), "@PROXYPASS@" ); // absolute path defaults to 'file://' diff --git a/tests/zyppng/media/EvDownloader_test.cc b/tests/zyppng/media/EvDownloader_test.cc index 95025eb..887312a 100644 --- a/tests/zyppng/media/EvDownloader_test.cc +++ b/tests/zyppng/media/EvDownloader_test.cc @@ -610,7 +610,7 @@ BOOST_DATA_TEST_CASE( dltest_auth_basic, bdata::make( withSSL ), withSSL ) web.addRequestHandler( "quit", [ &ev ]( WebServer::Request & ){ ev->quit();} ); { - // simply check by request count if the test was successfull: + // simply check by request count if the test was successful: // if the proactive code adding the credentials to the first request is not executed we will // have more than 1 request. int reqCount = 0; diff --git a/zypp/CMakeLists.txt b/zypp/CMakeLists.txt index d74f2bc..534f636 100644 --- a/zypp/CMakeLists.txt +++ b/zypp/CMakeLists.txt @@ -964,7 +964,7 @@ ADDZYPPLIB(zypp-allsym) ADD_DEPENDENCIES( zypp-allsym zypp ) #this part does nothing yet, only when switching away from using a map file to -#a approach where symbols are exported explicitely it would make a difference +#a approach where symbols are exported explicitly it would make a difference #ZYPPNG symbols need to be added to the map file to be exported IF( EXPORT_NG_API ) ADD_DEFINITIONS(-DEXPORT_EXPERIMENTAL_API) diff --git a/zypp/ExternalProgram.cc b/zypp/ExternalProgram.cc index ab853d2..d2af8d2 100644 --- a/zypp/ExternalProgram.cc +++ b/zypp/ExternalProgram.cc @@ -545,7 +545,7 @@ namespace zypp { else { // if 'launch' is logged, completion should be logged, - // even if successfull. + // even if successful. DBG << "Pid " << pid << " successfully completed" << endl; _execError.clear(); // empty if running or successfully completed } diff --git a/zypp/Fetcher.cc b/zypp/Fetcher.cc index b28ba23..5de651d 100644 --- a/zypp/Fetcher.cc +++ b/zypp/Fetcher.cc @@ -453,7 +453,7 @@ namespace zypp catch ( media::MediaFileNotFoundException & exception ) { ZYPP_CAUGHT( exception ); - WAR << "Skiping subtree hidden at " << resource.filename() << endl; + WAR << "Skipping subtree hidden at " << resource.filename() << endl; return; } diff --git a/zypp/PoolQuery.cc b/zypp/PoolQuery.cc index 96e6ce4..12a615a 100644 --- a/zypp/PoolQuery.cc +++ b/zypp/PoolQuery.cc @@ -319,7 +319,7 @@ namespace zypp static std::string serializeMode( Match::Mode mode_r ) { // Legacy code used "[C|X]" to differ just between OTHER (need to (C)ompile) and - // using the default search mode. As we now allow to specify a SEARCHMODE we + // using the default search mode. As we now allow specifying a SEARCHMODE we // need to serialize it: switch ( mode_r ) { diff --git a/zypp/PublicKey.cc b/zypp/PublicKey.cc index b7614b3..370efc8 100644 --- a/zypp/PublicKey.cc +++ b/zypp/PublicKey.cc @@ -361,7 +361,7 @@ namespace zypp bool PublicKeyData::providesKey( const std::string & id_r ) const { - if ( id_r.size() == 8 ) // as a convenience allow to test the 8byte short ID rpm uses as gpg-pubkey version + if ( id_r.size() == 8 ) // as a convenience for allowing one to test the 8byte short ID rpm uses as gpg-pubkey version return str::endsWithCI( _pimpl->_id, id_r ); return( id_r == _pimpl->_id || _pimpl->hasSubkeyId( id_r ) ); } diff --git a/zypp/PurgeKernels.cc b/zypp/PurgeKernels.cc index be6279a..a3ef501 100644 --- a/zypp/PurgeKernels.cc +++ b/zypp/PurgeKernels.cc @@ -399,7 +399,7 @@ namespace zypp { currOff++; currROff--; - // a kernel package might be explicitely locked by version + // a kernel package might be explicitly locked by version // We need to go over all package name provides ( provides is named like the package ) and match // them against the specified version to know which ones to keep. (bsc#1176740 bsc#1176192) std::for_each( kernelMap.second.begin(), kernelMap.second.end(), [ & ]( sat::Solvable solv ){ @@ -498,7 +498,7 @@ namespace zypp { editionToSolvableMap[edToUse].push_back( installedKrnlPck ); - //in the first step we collect all packages in this list, then later we will remove the packages we want to explicitely keep + //in the first step we collect all packages in this list, then later we will remove the packages we want to explicitly keep packagesToRemove.insert( installedKrnlPck ); }; @@ -542,18 +542,18 @@ namespace zypp { } else { - // if adapting the groups do not forget to explicitely handle the group when querying the matches - const str::regex explicitelyHandled("kernel-syms(-.*)?|kernel(-.*)?-devel"); + // if adapting the groups do not forget to explicitly handle the group when querying the matches + const str::regex explicitlyHandled("kernel-syms(-.*)?|kernel(-.*)?-devel"); MIL << "Not a kernel package, inspecting more closely " << std::endl; // we directly handle all noarch packages that export multiversion(kernel) if ( installedKrnlPck.arch() == Arch_noarch ) { - MIL << "Handling package explicitely due to architecture (noarch)."<< std::endl; + MIL << "Handling package explicitly due to architecture (noarch)."<< std::endl; addPackageToMap( GroupInfo::Sources, installedKrnlPck.name(), "", installedKrnlPck ); - } else if ( str::smatch match; str::regex_match( installedKrnlPck.name(), match, explicitelyHandled ) ) { + } else if ( str::smatch match; str::regex_match( installedKrnlPck.name(), match, explicitlyHandled ) ) { // try to get the flavour from the name // if we have a kernel-syms getting no flavour means we have the "default" one, otherwise we use the flavour @@ -570,10 +570,10 @@ namespace zypp { else if ( installedKrnlPck.name() == "kernel-syms" ) flav = "default"; - MIL << "Handling package explicitely due to name match."<< std::endl; + MIL << "Handling package explicitly due to name match."<< std::endl; addPackageToMap ( GroupInfo::RelatedBinaries, installedKrnlPck.name(), flav, installedKrnlPck ); } else { - MIL << "Package not explicitely handled" << std::endl; + MIL << "Package not explicitly handled" << std::endl; } } diff --git a/zypp/ResStatus.h b/zypp/ResStatus.h index b64adbc..b9fcc78 100644 --- a/zypp/ResStatus.h +++ b/zypp/ResStatus.h @@ -344,7 +344,7 @@ namespace zypp //------------------------------------------------------------------------ // get/set functions, returnig \c true if requested status change - // was successfull (i.e. leading to the desired transaction). + // was successful (i.e. leading to the desired transaction). // If a lower level (e.g.SOLVER) wants to transact, but it's // already set by a higher level, \c true should be returned. // Removing a higher levels transaction bit should fail. diff --git a/zypp/Resolver.h b/zypp/Resolver.h index 1a89977..e46b907 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -215,22 +215,22 @@ namespace zypp * Default for all flags is \c false unless overwritten by zypp.conf. */ //@{ - /** Whether to allow to downgrade installed solvable */ + /** Whether to allow one to downgrade installed solvable */ void setAllowDowngrade( bool yesno_r ); void setDefaultAllowDowngrade(); // Set back to default bool allowDowngrade() const; - /** Whether to allow to change name of installed solvable */ + /** Whether to allow one to change name of installed solvable */ void setAllowNameChange( bool yesno_r ); void setDefaultAllowNameChange(); // Set back to default bool allowNameChange() const; - /** Whether to allow to change architecture of installed solvables */ + /** Whether to allow one to change architecture of installed solvables */ void setAllowArchChange( bool yesno_r ); void setDefaultAllowArchChange(); // Set back to default bool allowArchChange() const; - /** Whether to allow to change vendor of installed solvables + /** Whether to allow one to change vendor of installed solvables * \see \ref VendorAttr for definition of vendor equivalence. */ void setAllowVendorChange( bool yesno_r ); @@ -273,22 +273,22 @@ namespace zypp * all DUP flags is \c true unless overwritten by zypp.conf. */ //@{ - /** dup mode: allow to downgrade installed solvable */ + /** dup mode: allow one to downgrade installed solvable */ void dupSetAllowDowngrade( bool yesno_r ); void dupSetDefaultAllowDowngrade(); // Set back to default (in zypp.conf) bool dupAllowDowngrade() const; - /** dup mode: allow to change name of installed solvable */ + /** dup mode: allow one to change name of installed solvable */ void dupSetAllowNameChange( bool yesno_r ); void dupSetDefaultAllowNameChange(); // Set back to default (in zypp.conf) bool dupAllowNameChange() const; - /** dup mode: allow to change architecture of installed solvables */ + /** dup mode: allow one to change architecture of installed solvables */ void dupSetAllowArchChange( bool yesno_r ); void dupSetDefaultAllowArchChange(); // Set back to default (in zypp.conf) bool dupAllowArchChange() const; - /** dup mode: allow to change vendor of installed solvables*/ + /** dup mode: allow one to change vendor of installed solvables*/ void dupSetAllowVendorChange( bool yesno_r ); void dupSetDefaultAllowVendorChange(); // Set back to default (in zypp.conf) bool dupAllowVendorChange() const; diff --git a/zypp/Target.h b/zypp/Target.h index a4c2c87..d433b92 100644 --- a/zypp/Target.h +++ b/zypp/Target.h @@ -137,7 +137,7 @@ namespace zypp public: /** \name Base product and registration. * - * Static methods herein allow to retrieve the values without explicitly + * Static methods herein allow one to retrieve the values without explicitly * initializing the \ref Target. They take a targets root directory as * argument. If an empty \ref Pathname is passed, an already existing * Targets root is used, otherwise \c "/" is assumed. diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc index 2947c31..0464555 100644 --- a/zypp/media/MediaCurl.cc +++ b/zypp/media/MediaCurl.cc @@ -1093,7 +1093,7 @@ void MediaCurl::doGetFileCopy(const Pathname & filename , const Pathname & targe } else { - WAR << "Could not get the reponse code." << endl; + WAR << "Could not get the response code." << endl; } if (modified || infoRet != CURLE_OK) diff --git a/zypp/media/MediaHandler.cc b/zypp/media/MediaHandler.cc index 3aef0de..840834c 100644 --- a/zypp/media/MediaHandler.cc +++ b/zypp/media/MediaHandler.cc @@ -314,7 +314,7 @@ MediaHandler::setAttachPrefix(const Pathname &attach_prefix) { if( attach_prefix.empty()) { - MIL << "Reseting to built-in attach point prefixes." + MIL << "Resetting to built-in attach point prefixes." << std::endl; MediaHandler::_attachPrefix = attach_prefix; return true; diff --git a/zypp/media/MediaMultiCurl.cc b/zypp/media/MediaMultiCurl.cc index dd2d23e..acb7d84 100644 --- a/zypp/media/MediaMultiCurl.cc +++ b/zypp/media/MediaMultiCurl.cc @@ -1381,7 +1381,7 @@ void MediaMultiCurl::doGetFileCopy( const Pathname & filename , const Pathname & } else { - WAR << "Could not get the reponse code." << endl; + WAR << "Could not get the response code." << endl; } bool ismetalink = false; diff --git a/zypp/misc/LoadTestcase.cc b/zypp/misc/LoadTestcase.cc index d5a5204..3b4567e 100644 --- a/zypp/misc/LoadTestcase.cc +++ b/zypp/misc/LoadTestcase.cc @@ -127,7 +127,7 @@ namespace zypp::misc::testcase { } else if (node->equals( "trial" )) { if ( !setupDone ) { - if ( err ) *err = "Any trials must be preceeded by the setup!"; + if ( err ) *err = "Any trials must be preceded by the setup!"; return false; } TestcaseTrial trial; diff --git a/zypp/misc/YamlTestcaseHelpers.h b/zypp/misc/YamlTestcaseHelpers.h index af29cf9..cffae35 100644 --- a/zypp/misc/YamlTestcaseHelpers.h +++ b/zypp/misc/YamlTestcaseHelpers.h @@ -245,7 +245,7 @@ namespace yamltest::detail { auto doc = YAML::LoadFile( fName ); if ( !parseJobs( doc, target, err ) ) return false; - MIL << "Including file " << fName << "was successfull" << std::endl; + MIL << "Including file " << fName << "was successful" << std::endl; } catch ( YAML::Exception &e ) { if ( err ) *err = e.what(); return false; diff --git a/zypp/repo/PackageDelta.cc b/zypp/repo/PackageDelta.cc index d62f3b3..f3610ed 100644 --- a/zypp/repo/PackageDelta.cc +++ b/zypp/repo/PackageDelta.cc @@ -107,7 +107,7 @@ namespace zypp break; default: - WAR << "Igore unknown attribute: " << it << endl; + WAR << "Ignore unknown attribute: " << it << endl; } } diff --git a/zypp/sat/LookupAttr.cc b/zypp/sat/LookupAttr.cc index 79f5638..9e9999c 100644 --- a/zypp/sat/LookupAttr.cc +++ b/zypp/sat/LookupAttr.cc @@ -258,9 +258,9 @@ namespace zypp return str << "search nothing"; if ( obj.attr() ) - str << "seach " << obj.attr() << " in "; + str << "search " << obj.attr() << " in "; else - str << "seach ALL in "; + str << "search ALL in "; if ( obj.solvable() ) return str << obj.solvable(); diff --git a/zypp/sat/Transaction.h b/zypp/sat/Transaction.h index abb75fc..42e5366 100644 --- a/zypp/sat/Transaction.h +++ b/zypp/sat/Transaction.h @@ -138,7 +138,7 @@ namespace zypp public: /** \name Iterate action steps (omit TRANSACTION_IGNORE steps). * - * All these methods allow to pass an optional OR'd combination of + * All these methods allow one to pass an optional OR'd combination of * \ref StepStages as filter. Per default all steps are processed/counted. * * \code diff --git a/zypp/solver/detail/SATResolver.cc b/zypp/solver/detail/SATResolver.cc index d36c0d4..24be4a8 100644 --- a/zypp/solver/detail/SATResolver.cc +++ b/zypp/solver/detail/SATResolver.cc @@ -1435,7 +1435,7 @@ SATResolver::problems () description = str::Format(_("install %1% although it has been retracted")) % s.asString(); } else if ( s.isPtf() ) { // translator: %1% is a package name - description = str::Format(_("allow to install the PTF %1%")) % s.asString(); + description = str::Format(_("allow installing the PTF %1%")) % s.asString(); } else { // translator: %1% is a package name description = str::Format(_("install %1% although it is blacklisted")) % s.asString(); diff --git a/zypp/solver/detail/SATResolver.h b/zypp/solver/detail/SATResolver.h index cc2a4eb..388862b 100644 --- a/zypp/solver/detail/SATResolver.h +++ b/zypp/solver/detail/SATResolver.h @@ -87,10 +87,10 @@ class SATResolver : public base::ReferenceCounted, private base::NonCopyable, pr ResolverFocus _focus; // The resolvers general attitude bool _fixsystem:1; // repair errors in rpm dependency graph - bool _allowdowngrade:1; // allow to downgrade installed solvable - bool _allownamechange:1; // allow to change name of installed solvable - bool _allowarchchange:1; // allow to change architecture of installed solvables - bool _allowvendorchange:1; // allow to change vendor of installed solvables + bool _allowdowngrade:1; // allow one to downgrade installed solvable + bool _allownamechange:1; // allow one to change name of installed solvable + bool _allowarchchange:1; // allow one to change architecture of installed solvables + bool _allowvendorchange:1; // allow one to change vendor of installed solvables bool _allowuninstall:1; // allow removal of installed solvables bool _updatesystem:1; // update bool _noupdateprovide:1; // true: update packages needs not to provide old package @@ -99,10 +99,10 @@ class SATResolver : public base::ReferenceCounted, private base::NonCopyable, pr bool _ignorealreadyrecommended:1; // true: ignore recommended packages that were already recommended by the installed packages bool _distupgrade:1; bool _distupgrade_removeunsupported:1; - bool _dup_allowdowngrade:1; // dup mode: allow to downgrade installed solvable - bool _dup_allownamechange:1; // dup mode: allow to change name of installed solvable - bool _dup_allowarchchange:1; // dup mode: allow to change architecture of installed solvables - bool _dup_allowvendorchange:1; // dup mode: allow to change vendor of installed solvables + bool _dup_allowdowngrade:1; // dup mode: allow one to downgrade installed solvable + bool _dup_allownamechange:1; // dup mode: allow one to change name of installed solvable + bool _dup_allowarchchange:1; // dup mode: allow one to change architecture of installed solvables + bool _dup_allowvendorchange:1; // dup mode: allow one to change vendor of installed solvables bool _solveSrcPackages:1; // false: generate no job rule for source packages selected in the pool bool _cleandepsOnRemove:1; // whether removing a package should also remove no longer needed requirements diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc index 8a2135c..4e96761 100644 --- a/zypp/target/TargetImpl.cc +++ b/zypp/target/TargetImpl.cc @@ -329,7 +329,7 @@ namespace zypp /** Execute script and report against report_r. * Return \c std::pair to indicate if - * execution was successfull (first = true), or the desired + * execution was successful (first = true), or the desired * \c PatchScriptReport::Action in case execution failed * (first = false). * @@ -1289,7 +1289,7 @@ namespace zypp } else { - DBG << "dryRun: Not stroring non-package data." << endl; + DBG << "dryRun: Not storing non-package data." << endl; } /////////////////////////////////////////////////////////////////// diff --git a/zypp/target/rpm/BinHeader.cc b/zypp/target/rpm/BinHeader.cc index d1ff771..7c3c523 100644 --- a/zypp/target/rpm/BinHeader.cc +++ b/zypp/target/rpm/BinHeader.cc @@ -261,7 +261,7 @@ unsigned BinHeader::int_list( tag tag_r, intList & lst_r ) const return lst_r.set( headerget.val(), headerget.cnt(), headerget.type() ); default: - INT << "RPM_TAG MISSMATCH: RPM_INTxx_TYPE " << tag_r << " got type " << headerget.type() << endl; + INT << "RPM_TAG MISMATCH: RPM_INTxx_TYPE " << tag_r << " got type " << headerget.type() << endl; } } } @@ -292,7 +292,7 @@ unsigned BinHeader::string_list( tag tag_r, stringList & lst_r ) const return lst_r.set( (char**)headerget.val(), headerget.cnt() ); default: - INT << "RPM_TAG MISSMATCH: RPM_STRING_ARRAY_TYPE " << tag_r << " got type " << headerget.type() << endl; + INT << "RPM_TAG MISMATCH: RPM_STRING_ARRAY_TYPE " << tag_r << " got type " << headerget.type() << endl; } } } @@ -335,7 +335,7 @@ int BinHeader::int_val( tag tag_r ) const #endif default: - INT << "RPM_TAG MISSMATCH: RPM_INTxx_TYPE " << tag_r << " got type " << headerget.type() << endl; + INT << "RPM_TAG MISMATCH: RPM_INTxx_TYPE " << tag_r << " got type " << headerget.type() << endl; } } } @@ -366,7 +366,7 @@ std::string BinHeader::string_val( tag tag_r ) const return (char*)headerget.val(); default: - INT << "RPM_TAG MISSMATCH: RPM_STRING_TYPE " << tag_r << " got type " << headerget.type() << endl; + INT << "RPM_TAG MISMATCH: RPM_STRING_TYPE " << tag_r << " got type " << headerget.type() << endl; } } } diff --git a/zypp/zyppng/base/socketnotifier.h b/zypp/zyppng/base/socketnotifier.h index 2ab702e..7834786 100644 --- a/zypp/zyppng/base/socketnotifier.h +++ b/zypp/zyppng/base/socketnotifier.h @@ -76,7 +76,7 @@ public: * Returns a new SocketNotifier * \param socket this is the filedescriptor to be modified * \param evTypes the event types that should be monitored \sa AbstractEventSource::EventTypes - * \param enable If set to true the notifier is enabled right away, otherwise \sa setEnabled needs to be called explicitely + * \param enable If set to true the notifier is enabled right away, otherwise \sa setEnabled needs to be called explicitly */ static Ptr create ( int socket, int evTypes, bool enable = true ); diff --git a/zypp/zyppng/media/network/downloader.cc b/zypp/zyppng/media/network/downloader.cc index d85a551..4c2e3f6 100644 --- a/zypp/zyppng/media/network/downloader.cc +++ b/zypp/zyppng/media/network/downloader.cc @@ -207,7 +207,7 @@ namespace zyppng { bool retry = false; - //Handle the auth errors explicitely, we need to give the user a way to put in new credentials + //Handle the auth errors explicitly, we need to give the user a way to put in new credentials //if we get valid new credentials we can retry the request if ( err.type() == NetworkRequestError::Unauthorized || err.type() == NetworkRequestError::AuthFailed ) { diff --git a/zypp/zyppng/media/network/networkrequestdispatcher.cc b/zypp/zyppng/media/network/networkrequestdispatcher.cc index c4177d6..a2d862f 100644 --- a/zypp/zyppng/media/network/networkrequestdispatcher.cc +++ b/zypp/zyppng/media/network/networkrequestdispatcher.cc @@ -339,7 +339,7 @@ void NetworkRequestDispatcher::enqueue(const std::shared_ptr &re void NetworkRequestDispatcher::cancel( NetworkRequest &req, std::string reason ) { - cancel( req, NetworkRequestErrorPrivate::customError( NetworkRequestError::Cancelled, reason.size() ? std::move(reason) : "Request explicitely cancelled" ) ); + cancel( req, NetworkRequestErrorPrivate::customError( NetworkRequestError::Cancelled, reason.size() ? std::move(reason) : "Request explicitly cancelled" ) ); } void NetworkRequestDispatcher::cancel(NetworkRequest &req, const NetworkRequestError &err) diff --git a/zypp/zyppng/media/network/networkrequestdispatcher.h b/zypp/zyppng/media/network/networkrequestdispatcher.h index 795c75f..23e4978 100644 --- a/zypp/zyppng/media/network/networkrequestdispatcher.h +++ b/zypp/zyppng/media/network/networkrequestdispatcher.h @@ -111,7 +111,7 @@ namespace zyppng { void cancel ( NetworkRequest &req , const NetworkRequestError &err ); /*! - * Start dispatching requests, this needs to be done explicitely before any request can be executed. + * Start dispatching requests, this needs to be done explicitly before any request can be executed. */ void run ( ); diff --git a/zypp/zyppng/media/network/networkrequesterror.h b/zypp/zyppng/media/network/networkrequesterror.h index 129a60a..fa608a8 100644 --- a/zypp/zyppng/media/network/networkrequesterror.h +++ b/zypp/zyppng/media/network/networkrequesterror.h @@ -36,7 +36,7 @@ class NetworkRequestErrorPrivate; NotFound, //< The requested path in the URL does not exist on the server Unauthorized, //<< No auth data given but authorization required AuthFailed, //<< Auth data was given, but authorization failed - ServerReturnedError //<< A error was returned by the server that is not explicitely handled + ServerReturnedError //<< A error was returned by the server that is not explicitly handled }; NetworkRequestError ();