diff options
Diffstat (limited to 'lang')
-rw-r--r-- | lang/cl/gpgme.lisp | 22 | ||||
-rw-r--r-- | lang/cpp/README | 2 | ||||
-rw-r--r-- | lang/cpp/src/key.h | 2 | ||||
-rw-r--r-- | lang/js/DemoExtension/maindemo.js | 2 | ||||
-rw-r--r-- | lang/js/jsdoc_index.md | 2 | ||||
-rw-r--r-- | lang/js/src/Helpers.js | 2 | ||||
-rw-r--r-- | lang/js/src/Key.js | 4 | ||||
-rw-r--r-- | lang/js/src/Keyring.js | 2 | ||||
-rw-r--r-- | lang/python/doc/meta/old-commits.log | 16 | ||||
-rw-r--r-- | lang/python/doc/rst/gpgme-python-howto.rst | 6 | ||||
-rw-r--r-- | lang/python/doc/src/gpgme-python-howto | 6 | ||||
-rw-r--r-- | lang/python/doc/texinfo/gpgme-python-howto.texi | 8 | ||||
-rw-r--r-- | lang/python/helpers.c | 2 | ||||
-rwxr-xr-x | lang/python/tests/t-quick-key-manipulation.py | 2 | ||||
-rw-r--r-- | lang/qt/README | 6 | ||||
-rw-r--r-- | lang/qt/doc/Doxyfile.in | 6 | ||||
-rw-r--r-- | lang/qt/src/dn.h | 2 | ||||
-rw-r--r-- | lang/qt/src/wkspublishjob.h | 4 | ||||
-rw-r--r-- | lang/qt/tests/t-encrypt.cpp | 2 |
19 files changed, 49 insertions, 49 deletions
diff --git a/lang/cl/gpgme.lisp b/lang/cl/gpgme.lisp index b1a38ca1..a0d5f3d0 100644 --- a/lang/cl/gpgme.lisp +++ b/lang/cl/gpgme.lisp @@ -140,11 +140,11 @@ (gpg-err-source err)) (defun gpgme-strerror (err) - "Return a string containig a description of the error code." + "Return a string containing a description of the error code." (gpg-strerror err)) (defun gpgme-strsource (err) - "Return a string containig a description of the error source." + "Return a string containing a description of the error source." (gpg-strsource err)) (defun gpgme-err-code-from-errno (err) @@ -267,7 +267,7 @@ :from-c translate-gpgme-sig-notation-t-from-foreign) "Signature notation pointer type.") -;; FIXME: Doesn't this depend on endianess? +;; FIXME: Doesn't this depend on endianness? (defbitfield (gpgme-sig-notation-bitfield :unsigned-int) (:human-readable 1) (:critical 2)) @@ -411,7 +411,7 @@ :from-c translate-gpgme-subkey-t-from-foreign) "A subkey from a key.") -;; FIXME: Doesn't this depend on endianess? +;; FIXME: Doesn't this depend on endianness? (defbitfield (gpgme-subkey-bitfield :unsigned-int) "The subkey bitfield." (:revoked 1) @@ -445,7 +445,7 @@ :from-c translate-gpgme-key-sig-t-from-foreign) "A signature on a user ID.") -;; FIXME: Doesn't this depend on endianess? +;; FIXME: Doesn't this depend on endianness? (defbitfield (gpgme-key-sig-bitfield :unsigned-int) "The key signature bitfield." (:revoked 1) @@ -476,7 +476,7 @@ :from-c translate-gpgme-user-id-t-from-foreign) "A user ID from a key.") -;; FIXME: Doesn't this depend on endianess? +;; FIXME: Doesn't this depend on endianness? (defbitfield (gpgme-user-id-bitfield :unsigned-int) "The user ID bitfield." (:revoked 1) @@ -501,7 +501,7 @@ :to-c translate-gpgme-key-t-to-foreign) "A key from the keyring.") -;; FIXME: Doesn't this depend on endianess? +;; FIXME: Doesn't this depend on endianness? (defbitfield (gpgme-key-bitfield :unsigned-int) "The key bitfield." (:revoked 1) @@ -1017,7 +1017,7 @@ :from-c translate-gpgme-signature-t-from-foreign) "A signature structure.") -;; FIXME: Doesn't this depend on endianess? +;; FIXME: Doesn't this depend on endianness? (defbitfield (gpgme-signature-bitfield :unsigned-int) "The signature bitfield." (:wrong-key-usage 1) @@ -1683,7 +1683,7 @@ ;;; The release callback removes the stream from the *data-handles* ;;; hash and releases the CBS structure that is used as the key in -;;; that hash. It is implicitely invoked (through GPGME) by +;;; that hash. It is implicitly invoked (through GPGME) by ;;; gpgme-data-release. (defcallback data-release-cb :void ((handle :pointer)) (unwind-protect (remhash (pointer-address handle) *data-handles*) @@ -1783,7 +1783,7 @@ (when *debug* (format t "DEBUG: gpgme-data-new: ~A~%" dh)) dh)))) -;;; This function releases a GPGME data object. It implicitely +;;; This function releases a GPGME data object. It implicitly ;;; invokes the data-release-cb function to clean up associated junk. (defun gpgme-data-release (dh) "Release a GPGME data object." @@ -1907,7 +1907,7 @@ (:documentation "Set the protocol of CONTEXT to PROTOCOL.")) ;;; FIXME: Adjust translator to reject invalid protocols. Currently, -;;; specifing an invalid protocol throws a "NIL is not 32 signed int" +;;; specifying an invalid protocol throws a "NIL is not 32 signed int" ;;; error. This is suboptimal. (defmethod (setf protocol) (protocol (ctx context)) (gpgme-set-protocol ctx protocol)) diff --git a/lang/cpp/README b/lang/cpp/README index e142e371..16c9a4a1 100644 --- a/lang/cpp/README +++ b/lang/cpp/README @@ -43,7 +43,7 @@ pattern so the documentation for GPGME itself provides a good way to start. The context structure in GPGME is mapped to a Context object in -GpgMEpp. Additional convienience code provides Data objects and +GpgMEpp. Additional convenience code provides Data objects and a Dataprovider interface that can be used to implement GPGME's data with any subclass by implementing the right callbacks. diff --git a/lang/cpp/src/key.h b/lang/cpp/src/key.h index c4edba07..dd855aec 100644 --- a/lang/cpp/src/key.h +++ b/lang/cpp/src/key.h @@ -163,7 +163,7 @@ public: * Needs gnupg 2.1.13 and the key needs to be updated * afterwards to see the new uid. * - * @param uid should be fully formated and UTF-8 encoded. + * @param uid should be fully formatted and UTF-8 encoded. * * @returns a possible error. **/ diff --git a/lang/js/DemoExtension/maindemo.js b/lang/js/DemoExtension/maindemo.js index a9fdf28c..0c64860c 100644 --- a/lang/js/DemoExtension/maindemo.js +++ b/lang/js/DemoExtension/maindemo.js @@ -110,7 +110,7 @@ document.addEventListener('DOMContentLoaded', function () { document.getElementById( 'pubkey').value = keys[0].fingerprint; } else if (keys.length > 1) { - alert('The pattern was not unambigious enough for a Key. ' + alert('The pattern was not unambiguous enough for a Key. ' + keys.length + ' Keys were found'); } else { alert('No keys found'); diff --git a/lang/js/jsdoc_index.md b/lang/js/jsdoc_index.md index b7371ad5..e5cf2873 100644 --- a/lang/js/jsdoc_index.md +++ b/lang/js/jsdoc_index.md @@ -39,7 +39,7 @@ gnupg. **Due to security constraints, the javascript-binding currently only offers limited support for secret-Key interaction.** -The existance of secret Keys is not secret, and those secret Keys can be used +The existence of secret Keys is not secret, and those secret Keys can be used for signing, but Operations that may expose, modify or delete secret Keys are not supported. diff --git a/lang/js/src/Helpers.js b/lang/js/src/Helpers.js index f472b234..0b5ab7e8 100644 --- a/lang/js/src/Helpers.js +++ b/lang/js/src/Helpers.js @@ -171,7 +171,7 @@ export function atobArray (base64) { * Taken and slightly adapted from * https://www.onicos.com/staff/iz/amuse/javascript/expert/utf.txt * (original header: - * utf.js - UTF-8 <=> UTF-16 convertion + * utf.js - UTF-8 <=> UTF-16 conversion * * Copyright (C) 1999 Masanao Izumo <[email protected]> * Version: 1.0 diff --git a/lang/js/src/Key.js b/lang/js/src/Key.js index f5ee9656..a3f52044 100644 --- a/lang/js/src/Key.js +++ b/lang/js/src/Key.js @@ -94,7 +94,7 @@ class GPGME_Key { /** * Query any property of the Key listed in {@link validKeyProperties} - * @param {String} property property to be retreived + * @param {String} property property to be retrieved * @returns {Boolean| String | Date | Array | Object} * @returns {Promise<Boolean| String | Date | Array | Object>} (if in async * mode) @@ -708,4 +708,4 @@ function getGnupgState (fingerprint, property){ }); } }); -}
\ No newline at end of file +} diff --git a/lang/js/src/Keyring.js b/lang/js/src/Keyring.js index 850f9f18..9f313577 100644 --- a/lang/js/src/Keyring.js +++ b/lang/js/src/Keyring.js @@ -384,7 +384,7 @@ export class GPGME_Keyring { * @param {String} option.userId The user Id, e.g. 'Foo Bar <[email protected]>' * @param {String} option.algo (optional) algorithm (and optionally key * size) to be used. See {@link supportedKeyAlgos} below for supported - * values. If ommitted, 'default' is used. + * values. If omitted, 'default' is used. * @param {Number} option.expires (optional) Expiration time in seconds * from now. If not set or set to 0, expiration will be 'never' * diff --git a/lang/python/doc/meta/old-commits.log b/lang/python/doc/meta/old-commits.log index 93661e35..eb870cda 100644 --- a/lang/python/doc/meta/old-commits.log +++ b/lang/python/doc/meta/old-commits.log @@ -420,7 +420,7 @@ Date: Sat May 2 10:28:42 2015 +1000 Updated Makefile * set make to use python3 instead. - * This will mean a successful port may need to be maintained seperately + * This will mean a successful port may need to be maintained separately from the original python2 code instead of merged, but ought to be able to share most things. So maybe merge with separated make files or a pre-make script to set python2 or python3 prior to building ... decide @@ -1934,7 +1934,7 @@ commit 45e8a5f4e13d3ca797ec3b0037242874a6be5562 Author: belyi <devnull@localhost> Date: Sat Mar 26 19:44:18 2005 +0000 - Updated verion number to 0.6.2 in version.py + Updated version number to 0.6.2 in version.py Added examples/*.glade files into documentation package. pyme/debian/examples | 1 + @@ -1997,7 +1997,7 @@ Author: belyi <devnull@localhost> Date: Fri Mar 25 04:30:17 2005 +0000 Improved PyGtkGpgKeys example to manage owner_trust on keys. - Added another example inter-edit.py which is just a hepler to write + Added another example inter-edit.py which is just a helper to write scripts for Context.op_edit() command. pyme/examples/PyGtkGpgKeys.glade | 78 ++++++++++++++++++++++++++++++++++++++++ @@ -2011,7 +2011,7 @@ Author: belyi <devnull@localhost> Date: Fri Mar 25 00:30:39 2005 +0000 Updated PyGtkGpgKeys example to include import, export and reload - functionality. Also added ability to remove number of keys simultanously. + functionality. Also added ability to remove number of keys simultaneously. Rearanged how KeyColumn is used to avoid unnecessary sorts and duplication of information in different parts of the code. @@ -2035,7 +2035,7 @@ commit 59e23f32c3b46413c9ec09e23e1a385a110fb103 Author: belyi <devnull@localhost> Date: Thu Mar 24 05:44:58 2005 +0000 - Added wait method Context class which handles asynchornous calls a little + Added wait method Context class which handles asynchronous calls a little bit better than the one generated by SWIG. pyme/debian/changelog | 7 +++++++ @@ -2101,7 +2101,7 @@ Date: Fri Mar 18 19:09:33 2005 +0000 Added package building for python2.4 - Updated copyright notes to include myslef and avoid confusion who's the + Updated copyright notes to include myself and avoid confusion who's the maintainer. In John's own words: "I'd prefer to just step out of the picture". Jonh's copyright notice left intact. @@ -2182,7 +2182,7 @@ Date: Thu Apr 8 16:15:09 2004 +0000 Ensure that we support only python2.2 and up. :-) Use generators in core.Context class which makes pyme.aux obsolete - Remove importing future nested_scopes since they are standart starting + Remove importing future nested_scopes since they are standard starting with python2.2 pyme/pyme/__init__.py | 5 ++--- @@ -2293,7 +2293,7 @@ commit af7129baa8260697d85c2ddb434562e8a80b62d8 Author: belyi <devnull@localhost> Date: Sat Mar 20 20:15:53 2004 +0000 - Added minimum of formating and SF icon. + Added minimum of formatting and SF icon. pyme-web/index.html | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/lang/python/doc/rst/gpgme-python-howto.rst b/lang/python/doc/rst/gpgme-python-howto.rst index 3fd8a4d0..4cbb929a 100644 --- a/lang/python/doc/rst/gpgme-python-howto.rst +++ b/lang/python/doc/rst/gpgme-python-howto.rst @@ -1063,7 +1063,7 @@ obtained. #. Import from ProtonMail via HKP for Python Example no. 1 - The following script is avalable with the rest of the examples under + The following script is available with the rest of the examples under the somewhat less than original name, ``pmkey-import-hkp.py``. .. code:: python @@ -1814,7 +1814,7 @@ to any preconfigured keys set in the ``gpg.conf`` file: with open("secret_plans.txt.asc", "wb") as afile: afile.write(ciphertext) -If the ``recipients`` paramater is empty then the plaintext is encrypted +If the ``recipients`` parameter is empty then the plaintext is encrypted symmetrically. If no ``passphrase`` is supplied as a parameter or via a callback registered with the ``Context()`` then an out-of-band prompt for the passphrase via pinentry will be invoked. @@ -2592,7 +2592,7 @@ demonstrable. One of the better and easier examples being the one of the early examples in this HOWTO, the `key counting <#howto-keys-counting>`__ code. Running that example as an executable Python script, ``keycount.py`` (available in the -``examples/howto/`` directory), will take a noticable amount of time to +``examples/howto/`` directory), will take a noticeable amount of time to run on most systems where the public keybox or keyring contains a few thousand public keys. diff --git a/lang/python/doc/src/gpgme-python-howto b/lang/python/doc/src/gpgme-python-howto index 4ad5bc41..e12dc364 100644 --- a/lang/python/doc/src/gpgme-python-howto +++ b/lang/python/doc/src/gpgme-python-howto @@ -1108,7 +1108,7 @@ address can be obtained. :CUSTOM_ID: import-hkp4py-pm1 :END: -The following script is avalable with the rest of the examples under +The following script is available with the rest of the examples under the somewhat less than original name, =pmkey-import-hkp.py=. #+BEGIN_SRC python -i @@ -1869,7 +1869,7 @@ with open("secret_plans.txt.asc", "wb") as afile: afile.write(ciphertext) #+END_SRC -If the =recipients= paramater is empty then the plaintext is encrypted +If the =recipients= parameter is empty then the plaintext is encrypted symmetrically. If no =passphrase= is supplied as a parameter or via a callback registered with the =Context()= then an out-of-band prompt for the passphrase via pinentry will be invoked. @@ -2662,7 +2662,7 @@ Nevertheless, there are some situations where the benefits are demonstrable. One of the better and easier examples being the one of the early examples in this HOWTO, the [[#howto-keys-counting][key counting]] code. Running that example as an executable Python script, =keycount.py= (available in -the =examples/howto/= directory), will take a noticable amount of time +the =examples/howto/= directory), will take a noticeable amount of time to run on most systems where the public keybox or keyring contains a few thousand public keys. diff --git a/lang/python/doc/texinfo/gpgme-python-howto.texi b/lang/python/doc/texinfo/gpgme-python-howto.texi index d776f58d..4f10bc5b 100644 --- a/lang/python/doc/texinfo/gpgme-python-howto.texi +++ b/lang/python/doc/texinfo/gpgme-python-howto.texi @@ -1249,7 +1249,7 @@ address can be obtained. Import from ProtonMail via HKP for Python Example no. 1 -The following script is avalable with the rest of the examples under +The following script is available with the rest of the examples under the somewhat less than original name, @samp{pmkey-import-hkp.py}. @example @@ -2006,7 +2006,7 @@ with open("secret_plans.txt.asc", "wb") as afile: afile.write(ciphertext) @end example -If the @samp{recipients} paramater is empty then the plaintext is encrypted +If the @samp{recipients} parameter is empty then the plaintext is encrypted symmetrically. If no @samp{passphrase} is supplied as a parameter or via a callback registered with the @samp{Context()} then an out-of-band prompt for the passphrase via pinentry will be invoked. @@ -2774,7 +2774,7 @@ Nevertheless, there are some situations where the benefits are demonstrable. One of the better and easier examples being the one of the early examples in this HOWTO, the @ref{Counting keys, , key counting} code. Running that example as an executable Python script, @samp{keycount.py} (available in -the @samp{examples/howto/} directory), will take a noticable amount of time +the @samp{examples/howto/} directory), will take a noticeable amount of time to run on most systems where the public keybox or keyring contains a few thousand public keys. @@ -3089,4 +3089,4 @@ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. -@bye
\ No newline at end of file +@bye diff --git a/lang/python/helpers.c b/lang/python/helpers.c index 947819d2..d5d1fc99 100644 --- a/lang/python/helpers.c +++ b/lang/python/helpers.c @@ -914,7 +914,7 @@ static ssize_t pyDataWriteCb(void *hook, const void *buffer, size_t size) } /* Set the current position from where the next read or write starts - in the data object with the handle HOOK to OFFSET, relativ to + in the data object with the handle HOOK to OFFSET, relative to WHENCE. Returns the new offset in bytes from the beginning of the data object. */ static off_t pyDataSeekCb(void *hook, off_t offset, int whence) diff --git a/lang/python/tests/t-quick-key-manipulation.py b/lang/python/tests/t-quick-key-manipulation.py index 0cfaa9d1..73dce16d 100755 --- a/lang/python/tests/t-quick-key-manipulation.py +++ b/lang/python/tests/t-quick-key-manipulation.py @@ -82,7 +82,7 @@ with support.EphemeralContext() as ctx: # try to revoke a non-existent UID try: - ctx.key_revoke_uid(key, "i dont exist") + ctx.key_revoke_uid(key, "i don't exist") # IMHO this should fail. issue2963. # assert False, "Expected an error but got none" except gpg.errors.GpgError: diff --git a/lang/qt/README b/lang/qt/README index 4621d28c..450fb032 100644 --- a/lang/qt/README +++ b/lang/qt/README @@ -3,7 +3,7 @@ Qt API bindings/wrapper for GPGME Based on KF5gpgmepp QGpgME and libkleo/backends/qgpgme Please note that QGpgME has a different license (GPL only) -then GPGME itself. See the License secion in this +then GPGME itself. See the License section in this document for more information. Overview @@ -47,14 +47,14 @@ for API stability reasons. Some jobs like the verification or decryption jobs have dedicated result classes. Each result class at least has the member function error() that can be used -to check if a job failed. Additionally errors are emited +to check if a job failed. Additionally errors are emitted in the result signal. Jobs also provide progress signal whenever GnuPG emits a progress status line. Most jobs also provide a way synchronusly execute them. -Please not that synchronus use does not cause the autodeletion +Please not that synchronous use does not cause the autodeletion to take place so you have to manually delete them. Async usage: diff --git a/lang/qt/doc/Doxyfile.in b/lang/qt/doc/Doxyfile.in index c672c4c5..8ccd11c4 100644 --- a/lang/qt/doc/Doxyfile.in +++ b/lang/qt/doc/Doxyfile.in @@ -1092,7 +1092,7 @@ HTML_STYLESHEET = # cascading style sheets that are included after the standard style sheets # created by doxygen. Using this option one can overrule certain style aspects. # This is preferred over using HTML_STYLESHEET since it does not replace the -# standard style sheet and is therefor more robust against future updates. +# standard style sheet and is therefore more robust against future updates. # Doxygen will copy the style sheet files to the output directory. # Note: The order of the extra stylesheet files is of importance (e.g. the last # stylesheet in the list overrules the setting of the previous ones in the @@ -1635,8 +1635,8 @@ EXTRA_PACKAGES = # Note: Only use a user-defined header if you know what you are doing! The # following commands have a special meaning inside the header: $title, # $datetime, $date, $doxygenversion, $projectname, $projectnumber, -# $projectbrief, $projectlogo. Doxygen will replace $title with the empy string, -# for the replacement values of the other commands the user is refered to +# $projectbrief, $projectlogo. Doxygen will replace $title with the empty string, +# for the replacement values of the other commands the user is referred to # HTML_HEADER. # This tag requires that the tag GENERATE_LATEX is set to YES. diff --git a/lang/qt/src/dn.h b/lang/qt/src/dn.h index ef6fea0c..2d655c55 100644 --- a/lang/qt/src/dn.h +++ b/lang/qt/src/dn.h @@ -83,7 +83,7 @@ public: const_iterator begin() const; const_iterator end() const; - /** Set the order in which prettyDN will reorder the Attirbutes. */ + /** Set the order in which prettyDN will reorder the Attributes. */ void setAttributeOrder(const QStringList &order) const; /** Get the used attribute order. */ diff --git a/lang/qt/src/wkspublishjob.h b/lang/qt/src/wkspublishjob.h index 8d17e523..ff3f21e0 100644 --- a/lang/qt/src/wkspublishjob.h +++ b/lang/qt/src/wkspublishjob.h @@ -53,7 +53,7 @@ namespace QGpgME { * send the RFC822 mail returned in returnedData. * * When the response is received start a startRecieve with the - * RFC822 mail received as paramater response. Check for errors + * RFC822 mail received as parameter response. Check for errors * and then send again send the result from returnedData back to * the server. * @@ -87,7 +87,7 @@ public: */ virtual void startCreate(const char *fpr, const QString &mailbox) = 0; - /** Handle a submisson response. The returnedData in the result singnal + /** Handle a submission response. The returnedData in the result singnal * will contain the confirmation response as returned by gpg-wks-client --receive * * @param response The response of the server. diff --git a/lang/qt/tests/t-encrypt.cpp b/lang/qt/tests/t-encrypt.cpp index 5bd472af..f25da317 100644 --- a/lang/qt/tests/t-encrypt.cpp +++ b/lang/qt/tests/t-encrypt.cpp @@ -303,7 +303,7 @@ private: killAgent(mDir.path()); - /* Now create a new homedir which with we test symetric decrypt. */ + /* Now create a new homedir which with we test symmetric decrypt. */ QTemporaryDir tmp; qputenv("GNUPGHOME", tmp.path().toUtf8()); QFile agentConf(tmp.path() + QStringLiteral("/gpg-agent.conf")); |