convert all files exept curl and new_gpg to utf-8 BOM

45 files changed, 45 insertions, 45 deletions

diff --git a/plugins/MirOTR/Libgpg-error/code-from-errno.c b/plugins/MirOTR/Libgpg-error/code-from-errno.c
index 6064270594..89414e150b 100644
--- a/plugins/MirOTR/Libgpg-error/code-from-errno.c
+++ b/plugins/MirOTR/Libgpg-error/code-from-errno.c
@@ -1,4 +1,4 @@
-/* code-from-errno.c - Mapping errnos to error codes.
+/* code-from-errno.c - Mapping errnos to error codes.
    Copyright (C) 2003 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/code-from-errno.h b/plugins/MirOTR/Libgpg-error/code-from-errno.h
index 124eff2a80..e618849ca5 100644
--- a/plugins/MirOTR/Libgpg-error/code-from-errno.h
+++ b/plugins/MirOTR/Libgpg-error/code-from-errno.h
@@ -1,4 +1,4 @@
-/* Output of mkerrcodes2.awk.  DO NOT EDIT.  */
+/* Output of mkerrcodes2.awk.  DO NOT EDIT.  */
 
 /* errnos.h - List of system error values.
    Copyright (C) 2004 g10 Code GmbH
diff --git a/plugins/MirOTR/Libgpg-error/code-to-errno.c b/plugins/MirOTR/Libgpg-error/code-to-errno.c
index 6ba6d8788d..b3c8f973a6 100644
--- a/plugins/MirOTR/Libgpg-error/code-to-errno.c
+++ b/plugins/MirOTR/Libgpg-error/code-to-errno.c
@@ -1,4 +1,4 @@
-/* code-to-errno.c - Mapping error codes to errnos.
+/* code-to-errno.c - Mapping error codes to errnos.
    Copyright (C) 2003 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/code-to-errno.h b/plugins/MirOTR/Libgpg-error/code-to-errno.h
index 8907fc0943..914ea46463 100644
--- a/plugins/MirOTR/Libgpg-error/code-to-errno.h
+++ b/plugins/MirOTR/Libgpg-error/code-to-errno.h
@@ -1,4 +1,4 @@
-/* Output of mkerrnos.awk.  DO NOT EDIT.  */
+/* Output of mkerrnos.awk.  DO NOT EDIT.  */
 
 /* errnos.in - List of system error values.
    Copyright (C) 2003, 2004 g10 Code GmbH
diff --git a/plugins/MirOTR/Libgpg-error/err-codes-sym.h b/plugins/MirOTR/Libgpg-error/err-codes-sym.h
index c36da03b8c..49324b508a 100644
--- a/plugins/MirOTR/Libgpg-error/err-codes-sym.h
+++ b/plugins/MirOTR/Libgpg-error/err-codes-sym.h
@@ -1,4 +1,4 @@
-/* Output of mkstrtable.awk.  DO NOT EDIT.  */
+/* Output of mkstrtable.awk.  DO NOT EDIT.  */
 
 /* err-codes.h - List of error codes and their description.
    Copyright (C) 2003, 2004 g10 Code GmbH
diff --git a/plugins/MirOTR/Libgpg-error/err-codes.h b/plugins/MirOTR/Libgpg-error/err-codes.h
index 64ff57d215..e118ab88ad 100644
--- a/plugins/MirOTR/Libgpg-error/err-codes.h
+++ b/plugins/MirOTR/Libgpg-error/err-codes.h
@@ -1,4 +1,4 @@
-/* Output of mkstrtable.awk.  DO NOT EDIT.  */
+/* Output of mkstrtable.awk.  DO NOT EDIT.  */
 
 /* err-codes.h - List of error codes and their description.
    Copyright (C) 2003, 2004 g10 Code GmbH
diff --git a/plugins/MirOTR/Libgpg-error/err-sources-sym.h b/plugins/MirOTR/Libgpg-error/err-sources-sym.h
index 98388e9da3..4cf76499a0 100644
--- a/plugins/MirOTR/Libgpg-error/err-sources-sym.h
+++ b/plugins/MirOTR/Libgpg-error/err-sources-sym.h
@@ -1,4 +1,4 @@
-/* Output of mkstrtable.awk.  DO NOT EDIT.  */
+/* Output of mkstrtable.awk.  DO NOT EDIT.  */
 
 /* err-sources.h - List of error sources and their description.
    Copyright (C) 2003, 2004 g10 Code GmbH
diff --git a/plugins/MirOTR/Libgpg-error/err-sources.h b/plugins/MirOTR/Libgpg-error/err-sources.h
index 5160fd791f..6ca7f173f4 100644
--- a/plugins/MirOTR/Libgpg-error/err-sources.h
+++ b/plugins/MirOTR/Libgpg-error/err-sources.h
@@ -1,4 +1,4 @@
-/* Output of mkstrtable.awk.  DO NOT EDIT.  */
+/* Output of mkstrtable.awk.  DO NOT EDIT.  */
 
 /* err-sources.h - List of error sources and their description.
    Copyright (C) 2003, 2004 g10 Code GmbH
diff --git a/plugins/MirOTR/Libgpg-error/err-visibility.c b/plugins/MirOTR/Libgpg-error/err-visibility.c
index 9213ce92f5..ec2173b14b 100644
--- a/plugins/MirOTR/Libgpg-error/err-visibility.c
+++ b/plugins/MirOTR/Libgpg-error/err-visibility.c
@@ -1,4 +1,4 @@
-/* visibility.c - Wrapper for all public functions.
+/* visibility.c - Wrapper for all public functions.
  * Copyright (C) 2014  g10 Code GmbH
  *
  * This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/err-visibility.h b/plugins/MirOTR/Libgpg-error/err-visibility.h
index a75bb9b857..c33d3b2fe2 100644
--- a/plugins/MirOTR/Libgpg-error/err-visibility.h
+++ b/plugins/MirOTR/Libgpg-error/err-visibility.h
@@ -1,4 +1,4 @@
-/* err-visibility.h - Set visibility attribute
+/* err-visibility.h - Set visibility attribute
  * Copyright (C) 2014  g10 Code GmbH
  *
  * This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/errnos-sym.h b/plugins/MirOTR/Libgpg-error/errnos-sym.h
index 42804ae216..6e5b29d939 100644
--- a/plugins/MirOTR/Libgpg-error/errnos-sym.h
+++ b/plugins/MirOTR/Libgpg-error/errnos-sym.h
@@ -1,4 +1,4 @@
-/* Output of mkstrtable.awk.  DO NOT EDIT.  */
+/* Output of mkstrtable.awk.  DO NOT EDIT.  */
 
 /* errnos.in - List of system error values.
    Copyright (C) 2003, 2004 g10 Code GmbH
diff --git a/plugins/MirOTR/Libgpg-error/estream-printf.c b/plugins/MirOTR/Libgpg-error/estream-printf.c
index 39a813feef..fbfb2934ba 100644
--- a/plugins/MirOTR/Libgpg-error/estream-printf.c
+++ b/plugins/MirOTR/Libgpg-error/estream-printf.c
@@ -1,4 +1,4 @@
-/* estream-printf.c - Versatile mostly C-99 compliant printf formatting
+/* estream-printf.c - Versatile mostly C-99 compliant printf formatting
  * Copyright (C) 2007, 2008, 2009, 2010, 2012, 2014 g10 Code GmbH
  *
  * This file is part of Libestream.
diff --git a/plugins/MirOTR/Libgpg-error/estream-printf.h b/plugins/MirOTR/Libgpg-error/estream-printf.h
index e82d8fbcb4..94975c3118 100644
--- a/plugins/MirOTR/Libgpg-error/estream-printf.h
+++ b/plugins/MirOTR/Libgpg-error/estream-printf.h
@@ -1,4 +1,4 @@
-/* estream-printf.h - Versatile mostly C-99 compliant printf formatting.
+/* estream-printf.h - Versatile mostly C-99 compliant printf formatting.
  * Copyright (C) 2007, 2010, 2012 g10 Code GmbH
  *
  * This file is part of Libestream.
diff --git a/plugins/MirOTR/Libgpg-error/estream.c b/plugins/MirOTR/Libgpg-error/estream.c
index f4bda2a1c0..4bcb26cceb 100644
--- a/plugins/MirOTR/Libgpg-error/estream.c
+++ b/plugins/MirOTR/Libgpg-error/estream.c
@@ -1,4 +1,4 @@
-/* estream.c - Extended Stream I/O Library
+/* estream.c - Extended Stream I/O Library
  * Copyright (C) 2004, 2005, 2006, 2007, 2009, 2010, 2011,
  *               2014 g10 Code GmbH
  *
diff --git a/plugins/MirOTR/Libgpg-error/gen-posix-lock-obj.c b/plugins/MirOTR/Libgpg-error/gen-posix-lock-obj.c
index d2bc645947..10241bb6d1 100644
--- a/plugins/MirOTR/Libgpg-error/gen-posix-lock-obj.c
+++ b/plugins/MirOTR/Libgpg-error/gen-posix-lock-obj.c
@@ -1,4 +1,4 @@
-/* gen-posix-lock-obj.c - Build tool to construct the lock object.
+/* gen-posix-lock-obj.c - Build tool to construct the lock object.
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/gen-w32-lock-obj.c b/plugins/MirOTR/Libgpg-error/gen-w32-lock-obj.c
index 9e49d1e1df..146a0ba683 100644
--- a/plugins/MirOTR/Libgpg-error/gen-w32-lock-obj.c
+++ b/plugins/MirOTR/Libgpg-error/gen-w32-lock-obj.c
@@ -1,4 +1,4 @@
-/* gen-w32-lock-obj.c - Build tool to get the size of the lock object.
+/* gen-w32-lock-obj.c - Build tool to get the size of the lock object.
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/gettext.h b/plugins/MirOTR/Libgpg-error/gettext.h
index aba29db6dd..c4e2e1799b 100644
--- a/plugins/MirOTR/Libgpg-error/gettext.h
+++ b/plugins/MirOTR/Libgpg-error/gettext.h
@@ -1,4 +1,4 @@
-/* Convenience header for conditional use of GNU <libintl.h>.
+/* Convenience header for conditional use of GNU <libintl.h>.
    Copyright (C) 1995-1998, 2000-2002 Free Software Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify it
diff --git a/plugins/MirOTR/Libgpg-error/gpg-error.c b/plugins/MirOTR/Libgpg-error/gpg-error.c
index 034a61b6e0..4f5e18810a 100644
--- a/plugins/MirOTR/Libgpg-error/gpg-error.c
+++ b/plugins/MirOTR/Libgpg-error/gpg-error.c
@@ -1,4 +1,4 @@
-/* gpg-error.c - Determining gpg-error error codes.
+/* gpg-error.c - Determining gpg-error error codes.
    Copyright (C) 2004 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/gpg-error.def b/plugins/MirOTR/Libgpg-error/gpg-error.def
index 290bc27877..0d50df0573 100644
--- a/plugins/MirOTR/Libgpg-error/gpg-error.def
+++ b/plugins/MirOTR/Libgpg-error/gpg-error.def
@@ -1,4 +1,4 @@
-
+
 EXPORTS
  gpg_strerror @1
  gpg_strerror_r @2
diff --git a/plugins/MirOTR/Libgpg-error/gpg-error.h b/plugins/MirOTR/Libgpg-error/gpg-error.h
index c94d4f99dc..07dc49bf52 100644
--- a/plugins/MirOTR/Libgpg-error/gpg-error.h
+++ b/plugins/MirOTR/Libgpg-error/gpg-error.h
@@ -1,4 +1,4 @@
-/* gpg-error.h - Public interface to libgpg-error.               -*- c -*-

+/* gpg-error.h - Public interface to libgpg-error.               -*- c -*-

    Copyright (C) 2003, 2004, 2010, 2013, 2014, 2015 g10 Code GmbH

 

    This file is part of libgpg-error.

diff --git a/plugins/MirOTR/Libgpg-error/gpgrt-int.h b/plugins/MirOTR/Libgpg-error/gpgrt-int.h
index 5a05b9968b..f491485c56 100644
--- a/plugins/MirOTR/Libgpg-error/gpgrt-int.h
+++ b/plugins/MirOTR/Libgpg-error/gpgrt-int.h
@@ -1,4 +1,4 @@
-/* gpgrt-int.h - Internal definitions
+/* gpgrt-int.h - Internal definitions
  * Copyright (C) 2014 g10 Code GmbH
  *
  * This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/init.c b/plugins/MirOTR/Libgpg-error/init.c
index 6305fe31af..45595adfc7 100644
--- a/plugins/MirOTR/Libgpg-error/init.c
+++ b/plugins/MirOTR/Libgpg-error/init.c
@@ -1,4 +1,4 @@
-/* init.c - Initialize the GnuPG error library.
+/* init.c - Initialize the GnuPG error library.
    Copyright (C) 2005, 2010 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/init.h b/plugins/MirOTR/Libgpg-error/init.h
index 0a31fd72c4..1d16037e80 100644
--- a/plugins/MirOTR/Libgpg-error/init.h
+++ b/plugins/MirOTR/Libgpg-error/init.h
@@ -1,4 +1,4 @@
-/* init.h - Declarations for init.c
+/* init.h - Declarations for init.c
    Copyright (C) 2010 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/lock.h b/plugins/MirOTR/Libgpg-error/lock.h
index b60f2c2401..2979bcc201 100644
--- a/plugins/MirOTR/Libgpg-error/lock.h
+++ b/plugins/MirOTR/Libgpg-error/lock.h
@@ -1,4 +1,4 @@
-/* lock.h - Declarations for *-lock.c
+/* lock.h - Declarations for *-lock.c
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/mkerrcodes.c b/plugins/MirOTR/Libgpg-error/mkerrcodes.c
index 29c1cc270b..4a36219cc6 100644
--- a/plugins/MirOTR/Libgpg-error/mkerrcodes.c
+++ b/plugins/MirOTR/Libgpg-error/mkerrcodes.c
@@ -1,4 +1,4 @@
-/* mkerrcodes.c - Generate list of system error values.
+/* mkerrcodes.c - Generate list of system error values.
    Copyright (C) 2004 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/mkerrcodes.h b/plugins/MirOTR/Libgpg-error/mkerrcodes.h
index e7b8c62ac7..11dfc9f85a 100644
--- a/plugins/MirOTR/Libgpg-error/mkerrcodes.h
+++ b/plugins/MirOTR/Libgpg-error/mkerrcodes.h
@@ -1,4 +1,4 @@
-/* Output of mkerrcodes.awk.  DO NOT EDIT.  */
+/* Output of mkerrcodes.awk.  DO NOT EDIT.  */
 
 static struct
   {
diff --git a/plugins/MirOTR/Libgpg-error/mkheader.c b/plugins/MirOTR/Libgpg-error/mkheader.c
index 9fe0695c7a..64fec4c79f 100644
--- a/plugins/MirOTR/Libgpg-error/mkheader.c
+++ b/plugins/MirOTR/Libgpg-error/mkheader.c
@@ -1,4 +1,4 @@
-/* mkheader.c - Create a header file for libgpg-error
+/* mkheader.c - Create a header file for libgpg-error
  * Copyright (C) 2010 Free Software Foundation, Inc.
  * Copyright (C) 2014 g10 Code GmbH
  *
diff --git a/plugins/MirOTR/Libgpg-error/mkw32errmap.c b/plugins/MirOTR/Libgpg-error/mkw32errmap.c
index 68d0f05de7..60bb6bbf0f 100644
--- a/plugins/MirOTR/Libgpg-error/mkw32errmap.c
+++ b/plugins/MirOTR/Libgpg-error/mkw32errmap.c
@@ -1,4 +1,4 @@
-/* mkw32errmap.c - Generate mapping sources for Windows.
+/* mkw32errmap.c - Generate mapping sources for Windows.
    Copyright (C) 2010 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/mkw32errmap.map.c b/plugins/MirOTR/Libgpg-error/mkw32errmap.map.c
index c65491e927..315a4e98c3 100644
--- a/plugins/MirOTR/Libgpg-error/mkw32errmap.map.c
+++ b/plugins/MirOTR/Libgpg-error/mkw32errmap.map.c
@@ -1 +1 @@
-/*dummy*/
+/*dummy*/
diff --git a/plugins/MirOTR/Libgpg-error/posix-lock-obj.h b/plugins/MirOTR/Libgpg-error/posix-lock-obj.h
index 7714d3ccc2..1a5eb30c6d 100644
--- a/plugins/MirOTR/Libgpg-error/posix-lock-obj.h
+++ b/plugins/MirOTR/Libgpg-error/posix-lock-obj.h
@@ -1,4 +1,4 @@
-/* posic-lock-obj.h - Declaration of the POSIX lock object
+/* posic-lock-obj.h - Declaration of the POSIX lock object
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/posix-lock.c b/plugins/MirOTR/Libgpg-error/posix-lock.c
index 7f20347250..dc43cfb22b 100644
--- a/plugins/MirOTR/Libgpg-error/posix-lock.c
+++ b/plugins/MirOTR/Libgpg-error/posix-lock.c
@@ -1,4 +1,4 @@
-/* posix-lock.c - GPGRT lock functions for POSIX systems
+/* posix-lock.c - GPGRT lock functions for POSIX systems
    Copyright (C) 2005-2009 Free Software Foundation, Inc.
    Copyright (C) 2014 g10 Code GmbH
 
diff --git a/plugins/MirOTR/Libgpg-error/posix-thread.c b/plugins/MirOTR/Libgpg-error/posix-thread.c
index bef0386295..8ffd8e2b88 100644
--- a/plugins/MirOTR/Libgpg-error/posix-thread.c
+++ b/plugins/MirOTR/Libgpg-error/posix-thread.c
@@ -1,4 +1,4 @@
-/* posix-thread.c - GPGRT thread functions for POSIX systems
+/* posix-thread.c - GPGRT thread functions for POSIX systems
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/strerror-sym.c b/plugins/MirOTR/Libgpg-error/strerror-sym.c
index 3d79f40bb5..59f8711797 100644
--- a/plugins/MirOTR/Libgpg-error/strerror-sym.c
+++ b/plugins/MirOTR/Libgpg-error/strerror-sym.c
@@ -1,4 +1,4 @@
-/* strerror-sym.c - Describing an error code with its symbol name.
+/* strerror-sym.c - Describing an error code with its symbol name.
    Copyright (C) 2003, 2004 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/strerror.c b/plugins/MirOTR/Libgpg-error/strerror.c
index 4013e7ae26..14d9311a2e 100644
--- a/plugins/MirOTR/Libgpg-error/strerror.c
+++ b/plugins/MirOTR/Libgpg-error/strerror.c
@@ -1,4 +1,4 @@
-/* strerror.c - Describing an error code.
+/* strerror.c - Describing an error code.
    Copyright (C) 2003 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/strsource-sym.c b/plugins/MirOTR/Libgpg-error/strsource-sym.c
index a191310e95..ec60ef32d8 100644
--- a/plugins/MirOTR/Libgpg-error/strsource-sym.c
+++ b/plugins/MirOTR/Libgpg-error/strsource-sym.c
@@ -1,4 +1,4 @@
-/* strsource-sym.c - Describing an error source with its symbol name.
+/* strsource-sym.c - Describing an error source with its symbol name.
    Copyright (C) 2003, 2004 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/strsource.c b/plugins/MirOTR/Libgpg-error/strsource.c
index 6604eb0a80..029a47f7a1 100644
--- a/plugins/MirOTR/Libgpg-error/strsource.c
+++ b/plugins/MirOTR/Libgpg-error/strsource.c
@@ -1,4 +1,4 @@
-/* strsource.c - Describing an error source.
+/* strsource.c - Describing an error source.
    Copyright (C) 2003 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/thread.h b/plugins/MirOTR/Libgpg-error/thread.h
index 0b2cf0414f..5869e740c1 100644
--- a/plugins/MirOTR/Libgpg-error/thread.h
+++ b/plugins/MirOTR/Libgpg-error/thread.h
@@ -1,4 +1,4 @@
-/* thread.h - Declarations for *-thread.c
+/* thread.h - Declarations for *-thread.c
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/version.c b/plugins/MirOTR/Libgpg-error/version.c
index 216fee4e5c..81613b2337 100644
--- a/plugins/MirOTR/Libgpg-error/version.c
+++ b/plugins/MirOTR/Libgpg-error/version.c
@@ -1,4 +1,4 @@
-/* version.c - Version checking
+/* version.c - Version checking
  * Copyright (C) 2001, 2002, 2012, 2013, 2014 g10 Code GmbH
  *
  * This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/versioninfo.rc b/plugins/MirOTR/Libgpg-error/versioninfo.rc
index 617bb335b3..0ae5a0aa18 100644
--- a/plugins/MirOTR/Libgpg-error/versioninfo.rc
+++ b/plugins/MirOTR/Libgpg-error/versioninfo.rc
@@ -1,4 +1,4 @@
-/* versioninfo.rc.in - for libgpg-error
+/* versioninfo.rc.in - for libgpg-error
  *    Copyright (C) 2005 g10 Code GmbH
  *
  * This file is free software; as a special exception the author gives
diff --git a/plugins/MirOTR/Libgpg-error/w32-add.h b/plugins/MirOTR/Libgpg-error/w32-add.h
index 02848acf73..7c5d272cb0 100644
--- a/plugins/MirOTR/Libgpg-error/w32-add.h
+++ b/plugins/MirOTR/Libgpg-error/w32-add.h
@@ -1,4 +1,4 @@
-## w32-add.h - Snippet to be be included into gpg-error.h.
+## w32-add.h - Snippet to be be included into gpg-error.h.
 ## Comments are indicated by a double hash mark.  Due to a
 ## peculiarity of the script the first used line must not
 ## start with a hash mark.
diff --git a/plugins/MirOTR/Libgpg-error/w32-gettext.c b/plugins/MirOTR/Libgpg-error/w32-gettext.c
index 89f505d91d..e55307c867 100644
--- a/plugins/MirOTR/Libgpg-error/w32-gettext.c
+++ b/plugins/MirOTR/Libgpg-error/w32-gettext.c
@@ -1,4 +1,4 @@
-/* w32-gettext.h - A simple gettext implementation for Windows targets.
+/* w32-gettext.h - A simple gettext implementation for Windows targets.
    Copyright (C) 1995, 1996, 1997, 1999, 2005, 2007,
                  2008, 2010 Free Software Foundation, Inc.
 
diff --git a/plugins/MirOTR/Libgpg-error/w32-lock-obj.h b/plugins/MirOTR/Libgpg-error/w32-lock-obj.h
index ef53546d90..1f4732a1c0 100644
--- a/plugins/MirOTR/Libgpg-error/w32-lock-obj.h
+++ b/plugins/MirOTR/Libgpg-error/w32-lock-obj.h
@@ -1,4 +1,4 @@
-/* w32-lock-obj.h - Declaration of the Windows lock object
+/* w32-lock-obj.h - Declaration of the Windows lock object
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/w32-lock.c b/plugins/MirOTR/Libgpg-error/w32-lock.c
index 8c086f976d..20fa1a8bd7 100644
--- a/plugins/MirOTR/Libgpg-error/w32-lock.c
+++ b/plugins/MirOTR/Libgpg-error/w32-lock.c
@@ -1,4 +1,4 @@
-/* w32-lock.c - GPGRT lock functions for Windows
+/* w32-lock.c - GPGRT lock functions for Windows
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/w32-thread.c b/plugins/MirOTR/Libgpg-error/w32-thread.c
index 53d26b4d5d..972526b778 100644
--- a/plugins/MirOTR/Libgpg-error/w32-thread.c
+++ b/plugins/MirOTR/Libgpg-error/w32-thread.c
@@ -1,4 +1,4 @@
-/* w32-thread.c - GPGRT thread functions for Windows
+/* w32-thread.c - GPGRT thread functions for Windows
    Copyright (C) 2014 g10 Code GmbH
 
    This file is part of libgpg-error.
diff --git a/plugins/MirOTR/Libgpg-error/w32ce-add.h b/plugins/MirOTR/Libgpg-error/w32ce-add.h
index c6207bb2bb..ff35c29a66 100644
--- a/plugins/MirOTR/Libgpg-error/w32ce-add.h
+++ b/plugins/MirOTR/Libgpg-error/w32ce-add.h
@@ -1,4 +1,4 @@
-## w32ce-add.h - Snippet to be be included into gpg-error.h.
+## w32ce-add.h - Snippet to be be included into gpg-error.h.
 ## (Comments are indicated by a double hash mark)
 
 /* Substitute for strerror - this one is thread safe.  */