aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorGravatar un1versal2015-11-28 00:12:19 +0000
committerGravatar un1versal2015-11-28 00:27:43 +0000
commit973649f82e5543a84f71b384a3f1bc9741007874 (patch)
treeda8ca3d9bf9540e2f6682f1f4d3c34fdb80af954 /src
parentcopyright headers: cosmetic capitalization & consistecy fixes. (diff)
downloadKVIrc-973649f82e5543a84f71b384a3f1bc9741007874.tar.gz
KVIrc-973649f82e5543a84f71b384a3f1bc9741007874.tar.bz2
KVIrc-973649f82e5543a84f71b384a3f1bc9741007874.zip
copyright headers: fix broken boilerplate wording linkss -> terms and opinion -> option
Diffstat (limited to 'src')
-rw-r--r--src/kvilib/config/KviBuildInfo.cpp2
-rw-r--r--src/kvilib/config/KviBuildInfo.h2
-rw-r--r--src/kvilib/config/kvi_confignames.h2
-rw-r--r--src/kvilib/config/kvi_debug.h2
-rw-r--r--src/kvilib/config/kvi_defaults.h2
-rw-r--r--src/kvilib/config/kvi_fileextensions.h2
-rw-r--r--src/kvilib/config/kvi_settings.h2
-rw-r--r--src/kvilib/config/kvi_shortcuts.h2
-rw-r--r--src/kvilib/config/kvi_sourcesdate.h2
-rw-r--r--src/kvilib/core/KviCString.cpp2
-rw-r--r--src/kvilib/core/KviCString.h2
-rw-r--r--src/kvilib/core/KviError.cpp2
-rw-r--r--src/kvilib/core/KviError.h2
-rw-r--r--src/kvilib/core/KviHeapObject.cpp2
-rw-r--r--src/kvilib/core/KviHeapObject.h2
-rw-r--r--src/kvilib/core/KviMemory.cpp4
-rw-r--r--src/kvilib/core/KviMemory.h2
-rw-r--r--src/kvilib/core/KviPointerHashTable.h2
-rw-r--r--src/kvilib/core/KviPointerList.h2
-rw-r--r--src/kvilib/core/KviQString.cpp2
-rw-r--r--src/kvilib/core/KviQString.h2
-rw-r--r--src/kvilib/core/KviShortcut.cpp2
-rw-r--r--src/kvilib/core/KviShortcut.h2
-rw-r--r--src/kvilib/core/kvi_inttypes.h2
-rw-r--r--src/kvilib/ext/KviAnimatedPixmap.cpp2
-rw-r--r--src/kvilib/ext/KviAnimatedPixmap.h2
-rw-r--r--src/kvilib/ext/KviAnimatedPixmapCache.cpp2
-rw-r--r--src/kvilib/ext/KviAnimatedPixmapCache.h2
-rw-r--r--src/kvilib/ext/KviAnimatedPixmapInterface.h2
-rw-r--r--src/kvilib/ext/KviCommandFormatter.cpp2
-rw-r--r--src/kvilib/ext/KviCommandFormatter.h2
-rw-r--r--src/kvilib/ext/KviConfigurationFile.cpp2
-rw-r--r--src/kvilib/ext/KviConfigurationFile.h2
-rw-r--r--src/kvilib/ext/KviCryptEngine.cpp2
-rw-r--r--src/kvilib/ext/KviCryptEngine.h2
-rw-r--r--src/kvilib/ext/KviCryptEngineDescription.h2
-rw-r--r--src/kvilib/ext/KviCryptEngineManager.cpp2
-rw-r--r--src/kvilib/ext/KviCryptEngineManager.h2
-rw-r--r--src/kvilib/ext/KviDataBuffer.cpp2
-rw-r--r--src/kvilib/ext/KviDataBuffer.h2
-rw-r--r--src/kvilib/ext/KviDbusAdaptor.cpp2
-rw-r--r--src/kvilib/ext/KviDbusAdaptor.h2
-rw-r--r--src/kvilib/ext/KviDebugContext.h2
-rw-r--r--src/kvilib/ext/KviMediaManager.cpp2
-rw-r--r--src/kvilib/ext/KviMediaManager.h2
-rw-r--r--src/kvilib/ext/KviMediaType.h2
-rw-r--r--src/kvilib/ext/KviMessageTypeSettings.cpp2
-rw-r--r--src/kvilib/ext/KviMessageTypeSettings.h2
-rw-r--r--src/kvilib/ext/KviMiscUtils.cpp2
-rw-r--r--src/kvilib/ext/KviMiscUtils.h2
-rw-r--r--src/kvilib/ext/KviNickColors.cpp2
-rw-r--r--src/kvilib/ext/KviNickColors.h2
-rw-r--r--src/kvilib/ext/KviOggIrcText.h2
-rw-r--r--src/kvilib/ext/KviOggTheoraDecoder.cpp2
-rw-r--r--src/kvilib/ext/KviOggTheoraDecoder.h2
-rw-r--r--src/kvilib/ext/KviOggTheoraEncoder.cpp2
-rw-r--r--src/kvilib/ext/KviOggTheoraEncoder.h2
-rw-r--r--src/kvilib/ext/KviOggTheoraGeometry.h2
-rw-r--r--src/kvilib/ext/KviOsInfo.cpp2
-rw-r--r--src/kvilib/ext/KviOsInfo.h2
-rw-r--r--src/kvilib/ext/KviParameterList.cpp2
-rw-r--r--src/kvilib/ext/KviParameterList.h2
-rw-r--r--src/kvilib/ext/KviPixmap.cpp2
-rw-r--r--src/kvilib/ext/KviPixmap.h2
-rw-r--r--src/kvilib/ext/KviPixmapUtils.cpp2
-rw-r--r--src/kvilib/ext/KviPixmapUtils.h2
-rw-r--r--src/kvilib/ext/KviProxy.cpp2
-rw-r--r--src/kvilib/ext/KviProxy.h2
-rw-r--r--src/kvilib/ext/KviProxyDataBase.cpp2
-rw-r--r--src/kvilib/ext/KviProxyDataBase.h2
-rw-r--r--src/kvilib/ext/KviRegisteredChannel.cpp2
-rw-r--r--src/kvilib/ext/KviRegisteredChannel.h2
-rw-r--r--src/kvilib/ext/KviRegisteredChannelDataBase.cpp2
-rw-r--r--src/kvilib/ext/KviRegisteredChannelDataBase.h2
-rw-r--r--src/kvilib/ext/KviRegisteredUser.cpp2
-rw-r--r--src/kvilib/ext/KviRegisteredUser.h2
-rw-r--r--src/kvilib/ext/KviRegisteredUserDataBase.cpp2
-rw-r--r--src/kvilib/ext/KviRegisteredUserDataBase.h2
-rw-r--r--src/kvilib/ext/KviRegisteredUserGroup.cpp2
-rw-r--r--src/kvilib/ext/KviRegisteredUserGroup.h2
-rw-r--r--src/kvilib/ext/KviRegisteredUserMask.cpp2
-rw-r--r--src/kvilib/ext/KviRegisteredUserMask.h2
-rw-r--r--src/kvilib/ext/KviSharedFile.cpp2
-rw-r--r--src/kvilib/ext/KviSharedFile.h2
-rw-r--r--src/kvilib/ext/KviSharedFilesManager.cpp2
-rw-r--r--src/kvilib/ext/KviSharedFilesManager.h2
-rw-r--r--src/kvilib/ext/KviStringConversion.cpp2
-rw-r--r--src/kvilib/ext/KviStringConversion.h2
-rw-r--r--src/kvilib/ext/KviXlib.h2
-rw-r--r--src/kvilib/file/KviFile.cpp2
-rw-r--r--src/kvilib/file/KviFile.h2
-rw-r--r--src/kvilib/file/KviFileUtils.cpp2
-rw-r--r--src/kvilib/file/KviFileUtils.h2
-rw-r--r--src/kvilib/file/KviPackageIOEngine.cpp2
-rw-r--r--src/kvilib/file/KviPackageIOEngine.h2
-rw-r--r--src/kvilib/file/KviPackageReader.cpp2
-rw-r--r--src/kvilib/file/KviPackageReader.h2
-rw-r--r--src/kvilib/file/KviPackageWriter.cpp2
-rw-r--r--src/kvilib/file/KviPackageWriter.h2
-rw-r--r--src/kvilib/irc/KviAvatar.cpp2
-rw-r--r--src/kvilib/irc/KviAvatar.h2
-rw-r--r--src/kvilib/irc/KviAvatarCache.cpp2
-rw-r--r--src/kvilib/irc/KviAvatarCache.h2
-rw-r--r--src/kvilib/irc/KviControlCodes.cpp2
-rw-r--r--src/kvilib/irc/KviControlCodes.h2
-rw-r--r--src/kvilib/irc/KviIdentityProfile.cpp2
-rw-r--r--src/kvilib/irc/KviIdentityProfile.h2
-rw-r--r--src/kvilib/irc/KviIdentityProfileSet.cpp2
-rw-r--r--src/kvilib/irc/KviIdentityProfileSet.h2
-rw-r--r--src/kvilib/irc/KviIrcMask.cpp2
-rw-r--r--src/kvilib/irc/KviIrcMask.h2
-rw-r--r--src/kvilib/irc/KviIrcNetwork.cpp2
-rw-r--r--src/kvilib/irc/KviIrcNetwork.h2
-rw-r--r--src/kvilib/irc/KviIrcServer.cpp2
-rw-r--r--src/kvilib/irc/KviIrcServer.h2
-rw-r--r--src/kvilib/irc/KviIrcServerDataBase.cpp2
-rw-r--r--src/kvilib/irc/KviIrcServerDataBase.h2
-rw-r--r--src/kvilib/irc/KviIrcServerReconnectInfo.cpp2
-rw-r--r--src/kvilib/irc/KviIrcServerReconnectInfo.h2
-rw-r--r--src/kvilib/irc/KviIrcUserDataBase.cpp2
-rw-r--r--src/kvilib/irc/KviIrcUserDataBase.h2
-rw-r--r--src/kvilib/irc/KviIrcUserEntry.cpp2
-rw-r--r--src/kvilib/irc/KviIrcUserEntry.h2
-rw-r--r--src/kvilib/irc/KviNickServRule.cpp2
-rw-r--r--src/kvilib/irc/KviNickServRule.h2
-rw-r--r--src/kvilib/irc/KviNickServRuleSet.cpp2
-rw-r--r--src/kvilib/irc/KviNickServRuleSet.h2
-rw-r--r--src/kvilib/irc/KviUserIdentity.cpp2
-rw-r--r--src/kvilib/irc/KviUserIdentity.h2
-rw-r--r--src/kvilib/irc/KviUserIdentityManager.cpp2
-rw-r--r--src/kvilib/irc/KviUserIdentityManager.h2
-rw-r--r--src/kvilib/locale/KviLocale.cpp2
-rw-r--r--src/kvilib/locale/KviLocale.h2
-rw-r--r--src/kvilib/locale/KviMessageCatalogue.cpp2
-rw-r--r--src/kvilib/locale/KviMessageCatalogue.h2
-rw-r--r--src/kvilib/locale/KviTranslationEntry.cpp2
-rw-r--r--src/kvilib/locale/KviTranslationEntry.h2
-rw-r--r--src/kvilib/locale/KviTranslator.cpp2
-rw-r--r--src/kvilib/locale/KviTranslator.h2
-rw-r--r--src/kvilib/net/KviDnsResolver.cpp2
-rw-r--r--src/kvilib/net/KviDnsResolver.h2
-rw-r--r--src/kvilib/net/KviDnsResolverNew.cpp2
-rw-r--r--src/kvilib/net/KviDnsResolverNew.h2
-rw-r--r--src/kvilib/net/KviHttpRequest.cpp2
-rw-r--r--src/kvilib/net/KviHttpRequest.h2
-rw-r--r--src/kvilib/net/KviNetUtils.cpp2
-rw-r--r--src/kvilib/net/KviNetUtils.h2
-rw-r--r--src/kvilib/net/KviNetworkAccessManager.cpp2
-rw-r--r--src/kvilib/net/KviNetworkAccessManager.h2
-rw-r--r--src/kvilib/net/KviSASL.cpp2
-rw-r--r--src/kvilib/net/KviSASL.h2
-rw-r--r--src/kvilib/net/KviSSL.cpp2
-rw-r--r--src/kvilib/net/KviSSL.h2
-rw-r--r--src/kvilib/net/KviUrl.cpp2
-rw-r--r--src/kvilib/net/KviUrl.h2
-rw-r--r--src/kvilib/net/kvi_socket.cpp2
-rw-r--r--src/kvilib/net/kvi_socket.h2
-rw-r--r--src/kvilib/net/kvi_sockettype.h2
-rw-r--r--src/kvilib/system/KviByteOrder.h2
-rw-r--r--src/kvilib/system/KviEnvironment.cpp2
-rw-r--r--src/kvilib/system/KviEnvironment.h2
-rw-r--r--src/kvilib/system/KviThread.cpp2
-rw-r--r--src/kvilib/system/KviThread.h2
-rw-r--r--src/kvilib/system/KviTimeUtils.cpp2
-rw-r--r--src/kvilib/system/KviTimeUtils.h2
-rw-r--r--src/kvilib/system/kvi_stdarg.h2
-rw-r--r--src/kvilib/tal/KviTalApplication.cpp2
-rw-r--r--src/kvilib/tal/KviTalApplication.h2
-rw-r--r--src/kvilib/tal/KviTalFileDialog.cpp2
-rw-r--r--src/kvilib/tal/KviTalFileDialog.h2
-rw-r--r--src/kvilib/tal/KviTalGroupBox.cpp2
-rw-r--r--src/kvilib/tal/KviTalGroupBox.h2
-rw-r--r--src/kvilib/tal/KviTalHBox.cpp2
-rw-r--r--src/kvilib/tal/KviTalHBox.h2
-rw-r--r--src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp2
-rw-r--r--src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h2
-rw-r--r--src/kvilib/tal/KviTalListWidget.cpp2
-rw-r--r--src/kvilib/tal/KviTalListWidget.h2
-rw-r--r--src/kvilib/tal/KviTalMainWindow.cpp2
-rw-r--r--src/kvilib/tal/KviTalMainWindow.h2
-rw-r--r--src/kvilib/tal/KviTalMenuBar.cpp2
-rw-r--r--src/kvilib/tal/KviTalMenuBar.h2
-rw-r--r--src/kvilib/tal/KviTalSplitter.cpp2
-rw-r--r--src/kvilib/tal/KviTalSplitter.h2
-rw-r--r--src/kvilib/tal/KviTalTabDialog.cpp2
-rw-r--r--src/kvilib/tal/KviTalTabDialog.h2
-rw-r--r--src/kvilib/tal/KviTalTableWidget.cpp2
-rw-r--r--src/kvilib/tal/KviTalTableWidget.h2
-rw-r--r--src/kvilib/tal/KviTalToolTip.cpp2
-rw-r--r--src/kvilib/tal/KviTalToolTip.h2
-rw-r--r--src/kvilib/tal/KviTalVBox.cpp2
-rw-r--r--src/kvilib/tal/KviTalVBox.h2
-rw-r--r--src/kvilib/tal/KviTalWizard.cpp2
-rw-r--r--src/kvilib/tal/KviTalWizard.h2
-rw-r--r--src/kvirc/kernel/KviAction.cpp2
-rw-r--r--src/kvirc/kernel/KviAction.h2
-rw-r--r--src/kvirc/kernel/KviActionManager.cpp2
-rw-r--r--src/kvirc/kernel/KviActionManager.h2
-rw-r--r--src/kvirc/kernel/KviApplication.cpp2
-rw-r--r--src/kvirc/kernel/KviApplication.h2
-rw-r--r--src/kvirc/kernel/KviApplication_filesystem.cpp2
-rw-r--r--src/kvirc/kernel/KviApplication_setup.cpp2
-rw-r--r--src/kvirc/kernel/KviAsynchronousConnectionData.cpp2
-rw-r--r--src/kvirc/kernel/KviAsynchronousConnectionData.h2
-rw-r--r--src/kvirc/kernel/KviCoreActionNames.h2
-rw-r--r--src/kvirc/kernel/KviCoreActions.cpp2
-rw-r--r--src/kvirc/kernel/KviCoreActions.h2
-rw-r--r--src/kvirc/kernel/KviCustomToolBarDescriptor.cpp2
-rw-r--r--src/kvirc/kernel/KviCustomToolBarDescriptor.h2
-rw-r--r--src/kvirc/kernel/KviCustomToolBarManager.cpp2
-rw-r--r--src/kvirc/kernel/KviCustomToolBarManager.h2
-rw-r--r--src/kvirc/kernel/KviDefaultScript.cpp2
-rw-r--r--src/kvirc/kernel/KviDefaultScript.h2
-rw-r--r--src/kvirc/kernel/KviFileTransfer.cpp2
-rw-r--r--src/kvirc/kernel/KviFileTransfer.h2
-rw-r--r--src/kvirc/kernel/KviHtmlGenerator.cpp2
-rw-r--r--src/kvirc/kernel/KviHtmlGenerator.h2
-rw-r--r--src/kvirc/kernel/KviIconManager.cpp2
-rw-r--r--src/kvirc/kernel/KviIconManager.h2
-rw-r--r--src/kvirc/kernel/KviInternalCommand.cpp2
-rw-r--r--src/kvirc/kernel/KviInternalCommand.h2
-rw-r--r--src/kvirc/kernel/KviIpcSentinel.cpp2
-rw-r--r--src/kvirc/kernel/KviIpcSentinel.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnection.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnection.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionAsyncData.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionRequestQueue.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionRequestQueue.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionServerInfo.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionServerInfo.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionStateData.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionStateData.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionStatistics.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionStatistics.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionTarget.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionTarget.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionTargetResolver.h2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionUserInfo.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcConnectionUserInfo.h2
-rw-r--r--src/kvirc/kernel/KviIrcContext.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcContext.h2
-rw-r--r--src/kvirc/kernel/KviIrcDataStreamMonitor.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcDataStreamMonitor.h2
-rw-r--r--src/kvirc/kernel/KviIrcLink.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcLink.h2
-rw-r--r--src/kvirc/kernel/KviIrcSocket.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcSocket.h2
-rw-r--r--src/kvirc/kernel/KviIrcUrl.cpp2
-rw-r--r--src/kvirc/kernel/KviIrcUrl.h2
-rw-r--r--src/kvirc/kernel/KviLagMeter.cpp2
-rw-r--r--src/kvirc/kernel/KviLagMeter.h2
-rw-r--r--src/kvirc/kernel/KviMain.cpp2
-rw-r--r--src/kvirc/kernel/KviNotifyList.cpp2
-rw-r--r--src/kvirc/kernel/KviNotifyList.h2
-rw-r--r--src/kvirc/kernel/KviOptions.cpp2
-rw-r--r--src/kvirc/kernel/KviOptions.h2
-rw-r--r--src/kvirc/kernel/KviSSLMaster.cpp2
-rw-r--r--src/kvirc/kernel/KviSSLMaster.h2
-rw-r--r--src/kvirc/kernel/KviTextIconManager.cpp2
-rw-r--r--src/kvirc/kernel/KviTextIconManager.h2
-rw-r--r--src/kvirc/kernel/KviTheme.cpp2
-rw-r--r--src/kvirc/kernel/KviTheme.h2
-rw-r--r--src/kvirc/kernel/KviUserAction.cpp2
-rw-r--r--src/kvirc/kernel/KviUserAction.h2
-rw-r--r--src/kvirc/kernel/KviUserInput.cpp2
-rw-r--r--src/kvirc/kernel/KviUserInput.h2
-rw-r--r--src/kvirc/kernel/kvi_out.h2
-rw-r--r--src/kvirc/kvs/KviKvs.cpp2
-rw-r--r--src/kvirc/kvs/KviKvs.h2
-rw-r--r--src/kvirc/kvs/KviKvsAction.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsAction.h2
-rw-r--r--src/kvirc/kvs/KviKvsAliasManager.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsAliasManager.h2
-rw-r--r--src/kvirc/kvs/KviKvsArray.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsArray.h2
-rw-r--r--src/kvirc/kvs/KviKvsArrayCast.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsArrayCast.h2
-rw-r--r--src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsAsyncDnsOperation.h2
-rw-r--r--src/kvirc/kvs/KviKvsAsyncOperation.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsAsyncOperation.h2
-rw-r--r--src/kvirc/kvs/KviKvsCallbackObject.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCallbackObject.h2
-rw-r--r--src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreCallbackCommands.h2
-rw-r--r--src/kvirc/kvs/KviKvsCoreFunctions.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreFunctions.h2
-rw-r--r--src/kvirc/kvs/KviKvsCoreFunctions_af.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreSimpleCommands.h2
-rw-r--r--src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsDnsManager.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsDnsManager.h2
-rw-r--r--src/kvirc/kvs/KviKvsHash.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsHash.h2
-rw-r--r--src/kvirc/kvs/KviKvsKernel.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsKernel.h2
-rw-r--r--src/kvirc/kvs/KviKvsModuleInterface.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsModuleInterface.h2
-rw-r--r--src/kvirc/kvs/KviKvsParameterProcessor.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsParameterProcessor.h2
-rw-r--r--src/kvirc/kvs/KviKvsPopupManager.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsPopupManager.h2
-rw-r--r--src/kvirc/kvs/KviKvsPopupMenu.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsPopupMenu.h2
-rw-r--r--src/kvirc/kvs/KviKvsProcessManager.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsProcessManager.h2
-rw-r--r--src/kvirc/kvs/KviKvsRWEvaluationResult.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsRWEvaluationResult.h2
-rw-r--r--src/kvirc/kvs/KviKvsReport.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsReport.h2
-rw-r--r--src/kvirc/kvs/KviKvsRunTimeCall.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsRunTimeCall.h2
-rw-r--r--src/kvirc/kvs/KviKvsRunTimeContext.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsRunTimeContext.h2
-rw-r--r--src/kvirc/kvs/KviKvsScript.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsScript.h2
-rw-r--r--src/kvirc/kvs/KviKvsScriptAddonManager.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsScriptAddonManager.h2
-rw-r--r--src/kvirc/kvs/KviKvsSwitchList.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsSwitchList.h2
-rw-r--r--src/kvirc/kvs/KviKvsTimerManager.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsTimerManager.h2
-rw-r--r--src/kvirc/kvs/KviKvsTypes.h2
-rw-r--r--src/kvirc/kvs/KviKvsUserAction.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsUserAction.h2
-rw-r--r--src/kvirc/kvs/KviKvsVariant.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsVariant.h2
-rw-r--r--src/kvirc/kvs/KviKvsVariantList.cpp2
-rw-r--r--src/kvirc/kvs/KviKvsVariantList.h2
-rw-r--r--src/kvirc/kvs/event/KviKvsEvent.cpp2
-rw-r--r--src/kvirc/kvs/event/KviKvsEvent.h2
-rw-r--r--src/kvirc/kvs/event/KviKvsEventHandler.cpp2
-rw-r--r--src/kvirc/kvs/event/KviKvsEventHandler.h2
-rw-r--r--src/kvirc/kvs/event/KviKvsEventManager.cpp2
-rw-r--r--src/kvirc/kvs/event/KviKvsEventManager.h2
-rw-r--r--src/kvirc/kvs/event/KviKvsEventTable.cpp2
-rw-r--r--src/kvirc/kvs/event/KviKvsEventTable.h2
-rw-r--r--src/kvirc/kvs/event/KviKvsEventTriggers.h2
-rw-r--r--src/kvirc/kvs/object/KviKvsObject.cpp2
-rw-r--r--src/kvirc/kvs/object/KviKvsObject.h2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectClass.cpp2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectClass.h2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectController.cpp2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectController.h2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectFunctionCall.h2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectFunctionHandler.h2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp2
-rw-r--r--src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.h2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser.cpp2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser.h2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParserMacros.h2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_command.cpp2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_comment.cpp2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_dollar.cpp2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_expression.cpp2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_lside.cpp2
-rw-r--r--src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNode.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeBase.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeData.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeDataList.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeExpression.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeOperation.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeVariable.h2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.cpp2
-rw-r--r--src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.h2
-rw-r--r--src/kvirc/module/KviMexLinkFilter.cpp2
-rw-r--r--src/kvirc/module/KviMexLinkFilter.h2
-rw-r--r--src/kvirc/module/KviMexServerImport.cpp2
-rw-r--r--src/kvirc/module/KviMexServerImport.h2
-rw-r--r--src/kvirc/module/KviMexToolBar.cpp2
-rw-r--r--src/kvirc/module/KviMexToolBar.h2
-rw-r--r--src/kvirc/module/KviModule.cpp2
-rw-r--r--src/kvirc/module/KviModule.h2
-rw-r--r--src/kvirc/module/KviModuleExtension.cpp2
-rw-r--r--src/kvirc/module/KviModuleExtension.h2
-rw-r--r--src/kvirc/module/KviModuleManager.cpp2
-rw-r--r--src/kvirc/module/KviModuleManager.h2
-rw-r--r--src/kvirc/sparser/KviAntiSpam.cpp2
-rw-r--r--src/kvirc/sparser/KviAntiSpam.h2
-rw-r--r--src/kvirc/sparser/KviIrcMessage.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcMessage.h2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser.h2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_ctcp.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp2
-rw-r--r--src/kvirc/sparser/KviIrcServerParser_tables.cpp2
-rw-r--r--src/kvirc/ui/KviActionDrawer.cpp2
-rw-r--r--src/kvirc/ui/KviActionDrawer.h2
-rw-r--r--src/kvirc/ui/KviChannelWindow.cpp2
-rw-r--r--src/kvirc/ui/KviChannelWindow.h2
-rw-r--r--src/kvirc/ui/KviColorSelectionWindow.cpp2
-rw-r--r--src/kvirc/ui/KviColorSelectionWindow.h2
-rw-r--r--src/kvirc/ui/KviConsoleWindow.cpp2
-rw-r--r--src/kvirc/ui/KviConsoleWindow.h2
-rw-r--r--src/kvirc/ui/KviCryptController.cpp2
-rw-r--r--src/kvirc/ui/KviCryptController.h2
-rw-r--r--src/kvirc/ui/KviCtcpPageDialog.cpp2
-rw-r--r--src/kvirc/ui/KviCtcpPageDialog.h2
-rw-r--r--src/kvirc/ui/KviCustomToolBar.cpp2
-rw-r--r--src/kvirc/ui/KviCustomToolBar.h2
-rw-r--r--src/kvirc/ui/KviDebugWindow.cpp2
-rw-r--r--src/kvirc/ui/KviDebugWindow.h2
-rw-r--r--src/kvirc/ui/KviDynamicToolTip.cpp2
-rw-r--r--src/kvirc/ui/KviDynamicToolTip.h2
-rw-r--r--src/kvirc/ui/KviFileDialog.cpp2
-rw-r--r--src/kvirc/ui/KviFileDialog.h2
-rw-r--r--src/kvirc/ui/KviHistoryWindow.cpp2
-rw-r--r--src/kvirc/ui/KviHistoryWindow.h2
-rw-r--r--src/kvirc/ui/KviHtmlDialog.cpp2
-rw-r--r--src/kvirc/ui/KviHtmlDialog.h2
-rw-r--r--src/kvirc/ui/KviImageDialog.cpp2
-rw-r--r--src/kvirc/ui/KviImageDialog.h2
-rw-r--r--src/kvirc/ui/KviInput.cpp2
-rw-r--r--src/kvirc/ui/KviInput.h2
-rw-r--r--src/kvirc/ui/KviInputEditor.cpp2
-rw-r--r--src/kvirc/ui/KviInputEditor.h2
-rw-r--r--src/kvirc/ui/KviInputHistory.cpp2
-rw-r--r--src/kvirc/ui/KviInputHistory.h2
-rw-r--r--src/kvirc/ui/KviIpEditor.cpp2
-rw-r--r--src/kvirc/ui/KviIpEditor.h2
-rw-r--r--src/kvirc/ui/KviIrcToolBar.cpp2
-rw-r--r--src/kvirc/ui/KviIrcToolBar.h2
-rw-r--r--src/kvirc/ui/KviIrcView.cpp2
-rw-r--r--src/kvirc/ui/KviIrcView.h2
-rw-r--r--src/kvirc/ui/KviIrcView_events.cpp2
-rw-r--r--src/kvirc/ui/KviIrcView_getTextLine.cpp2
-rw-r--r--src/kvirc/ui/KviIrcView_loghandling.cpp2
-rw-r--r--src/kvirc/ui/KviIrcView_private.h2
-rw-r--r--src/kvirc/ui/KviIrcView_tools.cpp2
-rw-r--r--src/kvirc/ui/KviIrcView_tools.h2
-rw-r--r--src/kvirc/ui/KviMainWindow.cpp2
-rw-r--r--src/kvirc/ui/KviMainWindow.h2
-rw-r--r--src/kvirc/ui/KviMaskEditor.cpp2
-rw-r--r--src/kvirc/ui/KviMaskEditor.h2
-rw-r--r--src/kvirc/ui/KviMenuBar.cpp2
-rw-r--r--src/kvirc/ui/KviMenuBar.h2
-rw-r--r--src/kvirc/ui/KviMessageBox.cpp2
-rw-r--r--src/kvirc/ui/KviMessageBox.h2
-rw-r--r--src/kvirc/ui/KviModeEditor.cpp2
-rw-r--r--src/kvirc/ui/KviModeEditor.h2
-rw-r--r--src/kvirc/ui/KviModeWidget.cpp2
-rw-r--r--src/kvirc/ui/KviModeWidget.h2
-rw-r--r--src/kvirc/ui/KviOptionsWidget.cpp2
-rw-r--r--src/kvirc/ui/KviOptionsWidget.h2
-rw-r--r--src/kvirc/ui/KviQueryWindow.cpp2
-rw-r--r--src/kvirc/ui/KviQueryWindow.h2
-rw-r--r--src/kvirc/ui/KviScriptButton.cpp2
-rw-r--r--src/kvirc/ui/KviScriptButton.h2
-rw-r--r--src/kvirc/ui/KviScriptEditor.cpp2
-rw-r--r--src/kvirc/ui/KviScriptEditor.h2
-rw-r--r--src/kvirc/ui/KviSelectors.cpp2
-rw-r--r--src/kvirc/ui/KviSelectors.h2
-rw-r--r--src/kvirc/ui/KviSplashScreen.cpp2
-rw-r--r--src/kvirc/ui/KviSplashScreen.h2
-rw-r--r--src/kvirc/ui/KviStatusBar.cpp2
-rw-r--r--src/kvirc/ui/KviStatusBar.h2
-rw-r--r--src/kvirc/ui/KviStatusBarApplet.cpp2
-rw-r--r--src/kvirc/ui/KviStatusBarApplet.h2
-rw-r--r--src/kvirc/ui/KviTextIconWindow.cpp2
-rw-r--r--src/kvirc/ui/KviTextIconWindow.h2
-rw-r--r--src/kvirc/ui/KviThemedComboBox.cpp2
-rw-r--r--src/kvirc/ui/KviThemedComboBox.h2
-rw-r--r--src/kvirc/ui/KviThemedLabel.cpp2
-rw-r--r--src/kvirc/ui/KviThemedLabel.h2
-rw-r--r--src/kvirc/ui/KviThemedLineEdit.cpp2
-rw-r--r--src/kvirc/ui/KviThemedLineEdit.h2
-rw-r--r--src/kvirc/ui/KviThemedTreeWidget.cpp2
-rw-r--r--src/kvirc/ui/KviThemedTreeWidget.h2
-rw-r--r--src/kvirc/ui/KviToolBar.cpp2
-rw-r--r--src/kvirc/ui/KviToolBar.h2
-rw-r--r--src/kvirc/ui/KviTopicWidget.cpp2
-rw-r--r--src/kvirc/ui/KviTopicWidget.h2
-rw-r--r--src/kvirc/ui/KviTrayIcon.h2
-rw-r--r--src/kvirc/ui/KviTreeWindowList.cpp2
-rw-r--r--src/kvirc/ui/KviTreeWindowList.h2
-rw-r--r--src/kvirc/ui/KviUserListView.cpp2
-rw-r--r--src/kvirc/ui/KviUserListView.h2
-rw-r--r--src/kvirc/ui/KviWebPackageManagementDialog.cpp2
-rw-r--r--src/kvirc/ui/KviWebPackageManagementDialog.h2
-rw-r--r--src/kvirc/ui/KviWindow.cpp2
-rw-r--r--src/kvirc/ui/KviWindow.h2
-rw-r--r--src/kvirc/ui/KviWindowListBase.cpp2
-rw-r--r--src/kvirc/ui/KviWindowListBase.h2
-rw-r--r--src/kvirc/ui/KviWindowStack.cpp2
-rw-r--r--src/kvirc/ui/KviWindowStack.h2
-rw-r--r--src/kvirc/ui/KviWindowToolWidget.cpp2
-rw-r--r--src/kvirc/ui/KviWindowToolWidget.h2
-rw-r--r--src/modules/about/AboutDialog.cpp2
-rw-r--r--src/modules/about/AboutDialog.h2
-rw-r--r--src/modules/about/libkviabout.cpp2
-rw-r--r--src/modules/about/libkviabout.h2
-rw-r--r--src/modules/about/mkabouttext.pl2
-rw-r--r--src/modules/action/libkviaction.cpp2
-rw-r--r--src/modules/actioneditor/ActionEditor.cpp4
-rw-r--r--src/modules/actioneditor/ActionEditor.h4
-rw-r--r--src/modules/actioneditor/libkviactioneditor.cpp2
-rw-r--r--src/modules/addon/AddonFunctions.cpp2
-rw-r--r--src/modules/addon/AddonFunctions.h2
-rw-r--r--src/modules/addon/AddonManagementDialog.cpp2
-rw-r--r--src/modules/addon/AddonManagementDialog.h2
-rw-r--r--src/modules/addon/PackAddonDialog.cpp2
-rw-r--r--src/modules/addon/PackAddonDialog.h2
-rw-r--r--src/modules/addon/WebAddonInterfaceDialog.cpp2
-rw-r--r--src/modules/addon/WebAddonInterfaceDialog.h2
-rw-r--r--src/modules/addon/libkviaddon.cpp2
-rw-r--r--src/modules/aliaseditor/AliasEditorWindow.cpp4
-rw-r--r--src/modules/aliaseditor/AliasEditorWindow.h4
-rw-r--r--src/modules/aliaseditor/libkvialiaseditor.cpp2
-rw-r--r--src/modules/avatar/libkviavatar.cpp2
-rw-r--r--src/modules/avatar/libkviavatar.h2
-rw-r--r--src/modules/chan/libkvichan.cpp2
-rw-r--r--src/modules/channelsjoin/ChannelsJoinDialog.cpp4
-rw-r--r--src/modules/channelsjoin/ChannelsJoinDialog.h2
-rw-r--r--src/modules/channelsjoin/libkvichannelsjoin.cpp2
-rw-r--r--src/modules/classeditor/ClassEditorWindow.cpp2
-rw-r--r--src/modules/classeditor/ClassEditorWindow.h4
-rw-r--r--src/modules/classeditor/libkviclasseditor.cpp2
-rw-r--r--src/modules/codetester/CodeTesterWindow.cpp4
-rw-r--r--src/modules/codetester/CodeTesterWindow.h4
-rw-r--r--src/modules/codetester/libkvicodetester.cpp2
-rw-r--r--src/modules/config/libkviconfig.cpp2
-rw-r--r--src/modules/context/libkvicontext.cpp2
-rw-r--r--src/modules/dcc/DccBroker.cpp2
-rw-r--r--src/modules/dcc/DccBroker.h2
-rw-r--r--src/modules/dcc/DccCanvasWindow.cpp2
-rw-r--r--src/modules/dcc/DccCanvasWindow.h2
-rw-r--r--src/modules/dcc/DccChatWindow.cpp2
-rw-r--r--src/modules/dcc/DccChatWindow.h2
-rw-r--r--src/modules/dcc/DccDescriptor.cpp2
-rw-r--r--src/modules/dcc/DccDescriptor.h2
-rw-r--r--src/modules/dcc/DccDialog.cpp2
-rw-r--r--src/modules/dcc/DccDialog.h2
-rw-r--r--src/modules/dcc/DccFileTransfer.cpp2
-rw-r--r--src/modules/dcc/DccFileTransfer.h2
-rw-r--r--src/modules/dcc/DccMarshal.cpp2
-rw-r--r--src/modules/dcc/DccMarshal.h2
-rw-r--r--src/modules/dcc/DccThread.cpp2
-rw-r--r--src/modules/dcc/DccThread.h2
-rw-r--r--src/modules/dcc/DccUtils.cpp2
-rw-r--r--src/modules/dcc/DccUtils.h2
-rw-r--r--src/modules/dcc/DccVideoWindow.cpp2
-rw-r--r--src/modules/dcc/DccVideoWindow.h2
-rw-r--r--src/modules/dcc/DccVoiceAdpcmCodec.cpp2
-rw-r--r--src/modules/dcc/DccVoiceAdpcmCodec.h2
-rw-r--r--src/modules/dcc/DccVoiceCodec.cpp2
-rw-r--r--src/modules/dcc/DccVoiceCodec.h2
-rw-r--r--src/modules/dcc/DccVoiceGsmCodec.cpp2
-rw-r--r--src/modules/dcc/DccVoiceGsmCodec.h2
-rw-r--r--src/modules/dcc/DccVoiceWindow.cpp2
-rw-r--r--src/modules/dcc/DccVoiceWindow.h2
-rw-r--r--src/modules/dcc/DccWindow.cpp2
-rw-r--r--src/modules/dcc/DccWindow.h2
-rw-r--r--src/modules/dcc/canvaswidget.cpp2
-rw-r--r--src/modules/dcc/canvaswidget.h2
-rw-r--r--src/modules/dcc/libkvidcc.cpp2
-rw-r--r--src/modules/dcc/requests.cpp2
-rw-r--r--src/modules/dialog/libkvidialog.cpp2
-rw-r--r--src/modules/dialog/libkvidialog.h2
-rw-r--r--src/modules/editor/ScriptEditorImplementation.cpp2
-rw-r--r--src/modules/editor/ScriptEditorImplementation.h2
-rw-r--r--src/modules/editor/libkvieditor.cpp2
-rw-r--r--src/modules/eventeditor/EventEditorWindow.cpp4
-rw-r--r--src/modules/eventeditor/EventEditorWindow.h4
-rw-r--r--src/modules/eventeditor/libkvieventeditor.cpp2
-rw-r--r--src/modules/file/libkvifile.cpp2
-rw-r--r--src/modules/filetransferwindow/FileTransferWindow.cpp4
-rw-r--r--src/modules/filetransferwindow/FileTransferWindow.h4
-rw-r--r--src/modules/filetransferwindow/libkvifiletransferwindow.cpp2
-rw-r--r--src/modules/fish/libkvifish.cpp2
-rw-r--r--src/modules/fish/libkvifish.h2
-rw-r--r--src/modules/help/HelpWidget.cpp2
-rw-r--r--src/modules/help/HelpWidget.h2
-rw-r--r--src/modules/help/HelpWindow.cpp2
-rw-r--r--src/modules/help/HelpWindow.h2
-rw-r--r--src/modules/help/libkvihelp.cpp2
-rw-r--r--src/modules/http/HttpFileTransfer.cpp2
-rw-r--r--src/modules/http/HttpFileTransfer.h2
-rw-r--r--src/modules/http/libkvihttp.cpp2
-rw-r--r--src/modules/ident/libkviident.cpp2
-rw-r--r--src/modules/ident/libkviident.h2
-rw-r--r--src/modules/iograph/libkviiograph.cpp2
-rw-r--r--src/modules/iograph/libkviiograph.h2
-rw-r--r--src/modules/lamerizer/libkvilamerizer.cpp2
-rw-r--r--src/modules/lamerizer/libkvilamerizer.h2
-rw-r--r--src/modules/language/detector.cpp2
-rw-r--r--src/modules/language/detector.h2
-rwxr-xr-xsrc/modules/language/detector/build_detector.pl4
-rw-r--r--src/modules/language/libkvilanguage.cpp2
-rw-r--r--src/modules/links/LinksWindow.cpp2
-rw-r--r--src/modules/links/LinksWindow.h4
-rw-r--r--src/modules/links/libkvilinks.cpp2
-rw-r--r--src/modules/list/ListWindow.cpp2
-rw-r--r--src/modules/list/ListWindow.h2
-rw-r--r--src/modules/list/libkvilist.cpp2
-rw-r--r--src/modules/log/libkvilog.cpp2
-rw-r--r--src/modules/logview/LogFile.cpp2
-rw-r--r--src/modules/logview/LogFile.h2
-rw-r--r--src/modules/logview/LogViewWidget.cpp2
-rw-r--r--src/modules/logview/LogViewWidget.h2
-rw-r--r--src/modules/logview/LogViewWindow.cpp2
-rw-r--r--src/modules/logview/LogViewWindow.h2
-rw-r--r--src/modules/logview/libkvilogview.cpp2
-rw-r--r--src/modules/mask/libkvimask.cpp2
-rw-r--r--src/modules/math/libkvimath.cpp2
-rw-r--r--src/modules/mediaplayer/MpAmipInterface.cpp2
-rw-r--r--src/modules/mediaplayer/MpAmipInterface.h2
-rw-r--r--src/modules/mediaplayer/MpInterface.cpp2
-rw-r--r--src/modules/mediaplayer/MpInterface.h2
-rw-r--r--src/modules/mediaplayer/MpMprisInterface.cpp2
-rw-r--r--src/modules/mediaplayer/MpMprisInterface.h2
-rw-r--r--src/modules/mediaplayer/MpSpotifyInterface.cpp2
-rw-r--r--src/modules/mediaplayer/MpSpotifyInterface.h2
-rw-r--r--src/modules/mediaplayer/MpWinampInterface.cpp2
-rw-r--r--src/modules/mediaplayer/MpWinampInterface.h2
-rw-r--r--src/modules/mediaplayer/MpXmmsInterface.cpp2
-rw-r--r--src/modules/mediaplayer/MpXmmsInterface.h2
-rw-r--r--src/modules/mediaplayer/libkvimediaplayer.cpp2
-rw-r--r--src/modules/mediaplayer/winamp.cpp2
-rw-r--r--src/modules/mircimport/libkvimircimport.cpp2
-rw-r--r--src/modules/mircimport/libkvimircimport.h2
-rw-r--r--src/modules/my/libkvimy.cpp2
-rw-r--r--src/modules/notifier/NotifierMessage.cpp2
-rw-r--r--src/modules/notifier/NotifierMessage.h2
-rw-r--r--src/modules/notifier/NotifierSettings.h2
-rw-r--r--src/modules/notifier/NotifierWindow.cpp4
-rw-r--r--src/modules/notifier/NotifierWindow.h4
-rw-r--r--src/modules/notifier/NotifierWindowBorder.cpp2
-rw-r--r--src/modules/notifier/NotifierWindowBorder.h2
-rw-r--r--src/modules/notifier/NotifierWindowTab.cpp2
-rw-r--r--src/modules/notifier/NotifierWindowTab.h2
-rw-r--r--src/modules/notifier/libkvinotifier.cpp2
-rw-r--r--src/modules/objects/KvsObject_button.cpp2
-rw-r--r--src/modules/objects/KvsObject_button.h2
-rw-r--r--src/modules/objects/KvsObject_buttonGroup.cpp2
-rw-r--r--src/modules/objects/KvsObject_buttonGroup.h2
-rw-r--r--src/modules/objects/KvsObject_checkBox.cpp2
-rw-r--r--src/modules/objects/KvsObject_checkBox.h2
-rw-r--r--src/modules/objects/KvsObject_colorDialog.cpp2
-rw-r--r--src/modules/objects/KvsObject_colorDialog.h2
-rw-r--r--src/modules/objects/KvsObject_comboBox.cpp2
-rw-r--r--src/modules/objects/KvsObject_comboBox.h2
-rw-r--r--src/modules/objects/KvsObject_dateTimeEdit.cpp2
-rw-r--r--src/modules/objects/KvsObject_dateTimeEdit.h2
-rw-r--r--src/modules/objects/KvsObject_dialog.cpp2
-rw-r--r--src/modules/objects/KvsObject_dialog.h2
-rw-r--r--src/modules/objects/KvsObject_dockWindow.cpp2
-rw-r--r--src/modules/objects/KvsObject_dockWindow.h2
-rw-r--r--src/modules/objects/KvsObject_file.cpp2
-rw-r--r--src/modules/objects/KvsObject_file.h2
-rw-r--r--src/modules/objects/KvsObject_ftp.cpp2
-rw-r--r--src/modules/objects/KvsObject_ftp.h2
-rw-r--r--src/modules/objects/KvsObject_groupBox.cpp2
-rw-r--r--src/modules/objects/KvsObject_groupBox.h2
-rw-r--r--src/modules/objects/KvsObject_hBox.cpp2
-rw-r--r--src/modules/objects/KvsObject_hBox.h2
-rw-r--r--src/modules/objects/KvsObject_http.cpp2
-rw-r--r--src/modules/objects/KvsObject_http.h2
-rw-r--r--src/modules/objects/KvsObject_label.cpp2
-rw-r--r--src/modules/objects/KvsObject_label.h2
-rw-r--r--src/modules/objects/KvsObject_layout.cpp2
-rw-r--r--src/modules/objects/KvsObject_layout.h2
-rw-r--r--src/modules/objects/KvsObject_lcd.cpp2
-rw-r--r--src/modules/objects/KvsObject_lcd.h2
-rw-r--r--src/modules/objects/KvsObject_lineEdit.cpp2
-rw-r--r--src/modules/objects/KvsObject_lineEdit.h2
-rw-r--r--src/modules/objects/KvsObject_list.cpp2
-rw-r--r--src/modules/objects/KvsObject_list.h2
-rw-r--r--src/modules/objects/KvsObject_listWidget.cpp2
-rw-r--r--src/modules/objects/KvsObject_listWidget.h2
-rw-r--r--src/modules/objects/KvsObject_mainWindow.cpp2
-rw-r--r--src/modules/objects/KvsObject_mainWindow.h2
-rw-r--r--src/modules/objects/KvsObject_memoryBuffer.cpp2
-rw-r--r--src/modules/objects/KvsObject_memoryBuffer.h2
-rw-r--r--src/modules/objects/KvsObject_menuBar.cpp2
-rw-r--r--src/modules/objects/KvsObject_menuBar.h2
-rw-r--r--src/modules/objects/KvsObject_multiLineEdit.cpp2
-rw-r--r--src/modules/objects/KvsObject_multiLineEdit.h2
-rw-r--r--src/modules/objects/KvsObject_painter.cpp2
-rw-r--r--src/modules/objects/KvsObject_painter.h2
-rw-r--r--src/modules/objects/KvsObject_pixmap.cpp2
-rw-r--r--src/modules/objects/KvsObject_pixmap.h2
-rw-r--r--src/modules/objects/KvsObject_popupMenu.cpp2
-rw-r--r--src/modules/objects/KvsObject_popupMenu.h2
-rw-r--r--src/modules/objects/KvsObject_process.cpp2
-rw-r--r--src/modules/objects/KvsObject_process.h2
-rw-r--r--src/modules/objects/KvsObject_progressBar.cpp2
-rw-r--r--src/modules/objects/KvsObject_progressBar.h2
-rw-r--r--src/modules/objects/KvsObject_radioButton.cpp2
-rw-r--r--src/modules/objects/KvsObject_radioButton.h2
-rw-r--r--src/modules/objects/KvsObject_slider.cpp2
-rw-r--r--src/modules/objects/KvsObject_slider.h2
-rw-r--r--src/modules/objects/KvsObject_socket.cpp2
-rw-r--r--src/modules/objects/KvsObject_socket.h2
-rw-r--r--src/modules/objects/KvsObject_spinBox.cpp2
-rw-r--r--src/modules/objects/KvsObject_spinBox.h2
-rw-r--r--src/modules/objects/KvsObject_sql.cpp2
-rw-r--r--src/modules/objects/KvsObject_sql.h2
-rw-r--r--src/modules/objects/KvsObject_tabWidget.cpp2
-rw-r--r--src/modules/objects/KvsObject_tabWidget.h2
-rw-r--r--src/modules/objects/KvsObject_tableWidget.cpp2
-rw-r--r--src/modules/objects/KvsObject_tableWidget.h2
-rw-r--r--src/modules/objects/KvsObject_textBrowser.cpp2
-rw-r--r--src/modules/objects/KvsObject_textBrowser.h2
-rw-r--r--src/modules/objects/KvsObject_toolBar.cpp2
-rw-r--r--src/modules/objects/KvsObject_toolBar.h2
-rw-r--r--src/modules/objects/KvsObject_toolButton.cpp2
-rw-r--r--src/modules/objects/KvsObject_toolButton.h2
-rw-r--r--src/modules/objects/KvsObject_trayIcon.cpp2
-rw-r--r--src/modules/objects/KvsObject_trayIcon.h2
-rw-r--r--src/modules/objects/KvsObject_treeWidget.cpp2
-rw-r--r--src/modules/objects/KvsObject_treeWidget.h2
-rw-r--r--src/modules/objects/KvsObject_treeWidgeteItem.cpp2
-rw-r--r--src/modules/objects/KvsObject_treeWidgeteItem.h2
-rw-r--r--src/modules/objects/KvsObject_vBox.cpp2
-rw-r--r--src/modules/objects/KvsObject_vBox.h2
-rw-r--r--src/modules/objects/KvsObject_webView.cpp2
-rw-r--r--src/modules/objects/KvsObject_webView.h2
-rw-r--r--src/modules/objects/KvsObject_widget.cpp2
-rw-r--r--src/modules/objects/KvsObject_widget.h2
-rw-r--r--src/modules/objects/KvsObject_window.cpp2
-rw-r--r--src/modules/objects/KvsObject_window.h2
-rw-r--r--src/modules/objects/KvsObject_wizard.cpp2
-rw-r--r--src/modules/objects/KvsObject_wizard.h2
-rw-r--r--src/modules/objects/KvsObject_workspace.cpp2
-rw-r--r--src/modules/objects/KvsObject_workspace.h2
-rw-r--r--src/modules/objects/KvsObject_wrapper.cpp2
-rw-r--r--src/modules/objects/KvsObject_wrapper.h2
-rw-r--r--src/modules/objects/KvsObject_xmlreader.cpp2
-rw-r--r--src/modules/objects/KvsObject_xmlreader.h2
-rw-r--r--src/modules/objects/libkviobjects.cpp2
-rw-r--r--src/modules/objects/object_macros.h2
-rw-r--r--src/modules/options/OptionsDialog.cpp2
-rw-r--r--src/modules/options/OptionsDialog.h2
-rw-r--r--src/modules/options/OptionsInstanceManager.cpp2
-rw-r--r--src/modules/options/OptionsInstanceManager.h2
-rw-r--r--src/modules/options/OptionsWidgetContainer.cpp2
-rw-r--r--src/modules/options/OptionsWidgetContainer.h2
-rw-r--r--src/modules/options/OptionsWidget_alertsAndHighlighting.cpp2
-rw-r--r--src/modules/options/OptionsWidget_alertsAndHighlighting.h2
-rw-r--r--src/modules/options/OptionsWidget_antiSpam.cpp2
-rw-r--r--src/modules/options/OptionsWidget_antiSpam.h2
-rw-r--r--src/modules/options/OptionsWidget_avatar.cpp2
-rw-r--r--src/modules/options/OptionsWidget_avatar.h2
-rw-r--r--src/modules/options/OptionsWidget_away.cpp2
-rw-r--r--src/modules/options/OptionsWidget_away.h2
-rw-r--r--src/modules/options/OptionsWidget_channel.cpp2
-rw-r--r--src/modules/options/OptionsWidget_channel.h2
-rw-r--r--src/modules/options/OptionsWidget_connection.cpp2
-rw-r--r--src/modules/options/OptionsWidget_connection.h2
-rw-r--r--src/modules/options/OptionsWidget_ctcp.cpp2
-rw-r--r--src/modules/options/OptionsWidget_ctcp.h2
-rw-r--r--src/modules/options/OptionsWidget_ctcpFloodProtection.cpp2
-rw-r--r--src/modules/options/OptionsWidget_ctcpFloodProtection.h2
-rw-r--r--src/modules/options/OptionsWidget_dcc.cpp2
-rw-r--r--src/modules/options/OptionsWidget_dcc.h2
-rw-r--r--src/modules/options/OptionsWidget_general.cpp2
-rw-r--r--src/modules/options/OptionsWidget_general.h2
-rw-r--r--src/modules/options/OptionsWidget_identity.cpp2
-rw-r--r--src/modules/options/OptionsWidget_identity.h2
-rw-r--r--src/modules/options/OptionsWidget_ignore.cpp2
-rw-r--r--src/modules/options/OptionsWidget_ignore.h2
-rw-r--r--src/modules/options/OptionsWidget_input.cpp2
-rw-r--r--src/modules/options/OptionsWidget_input.h2
-rw-r--r--src/modules/options/OptionsWidget_interfaceFeatures.cpp2
-rw-r--r--src/modules/options/OptionsWidget_interfaceFeatures.h2
-rw-r--r--src/modules/options/OptionsWidget_irc.cpp2
-rw-r--r--src/modules/options/OptionsWidget_irc.h2
-rw-r--r--src/modules/options/OptionsWidget_ircOutput.cpp2
-rw-r--r--src/modules/options/OptionsWidget_ircOutput.h2
-rw-r--r--src/modules/options/OptionsWidget_ircView.cpp2
-rw-r--r--src/modules/options/OptionsWidget_ircView.h2
-rw-r--r--src/modules/options/OptionsWidget_lag.cpp2
-rw-r--r--src/modules/options/OptionsWidget_lag.h2
-rw-r--r--src/modules/options/OptionsWidget_logging.cpp2
-rw-r--r--src/modules/options/OptionsWidget_logging.h2
-rw-r--r--src/modules/options/OptionsWidget_mediaTypes.cpp2
-rw-r--r--src/modules/options/OptionsWidget_mediaTypes.h2
-rw-r--r--src/modules/options/OptionsWidget_message.cpp2
-rw-r--r--src/modules/options/OptionsWidget_message.h2
-rw-r--r--src/modules/options/OptionsWidget_nickserv.cpp2
-rw-r--r--src/modules/options/OptionsWidget_nickserv.h2
-rw-r--r--src/modules/options/OptionsWidget_notifier.cpp2
-rw-r--r--src/modules/options/OptionsWidget_notifier.h2
-rw-r--r--src/modules/options/OptionsWidget_notify.cpp2
-rw-r--r--src/modules/options/OptionsWidget_notify.h2
-rw-r--r--src/modules/options/OptionsWidget_protection.cpp2
-rw-r--r--src/modules/options/OptionsWidget_protection.h2
-rw-r--r--src/modules/options/OptionsWidget_proxy.cpp2
-rw-r--r--src/modules/options/OptionsWidget_proxy.h2
-rw-r--r--src/modules/options/OptionsWidget_query.cpp2
-rw-r--r--src/modules/options/OptionsWidget_query.h2
-rw-r--r--src/modules/options/OptionsWidget_servers.cpp2
-rw-r--r--src/modules/options/OptionsWidget_servers.h2
-rw-r--r--src/modules/options/OptionsWidget_sound.cpp2
-rw-r--r--src/modules/options/OptionsWidget_sound.h2
-rw-r--r--src/modules/options/OptionsWidget_textEncoding.cpp2
-rw-r--r--src/modules/options/OptionsWidget_textEncoding.h2
-rw-r--r--src/modules/options/OptionsWidget_textIcons.cpp2
-rw-r--r--src/modules/options/OptionsWidget_textIcons.h2
-rw-r--r--src/modules/options/OptionsWidget_theme.cpp2
-rw-r--r--src/modules/options/OptionsWidget_theme.h2
-rw-r--r--src/modules/options/OptionsWidget_tools.cpp2
-rw-r--r--src/modules/options/OptionsWidget_tools.h2
-rw-r--r--src/modules/options/OptionsWidget_topicLabel.cpp2
-rw-r--r--src/modules/options/OptionsWidget_topicLabel.h2
-rw-r--r--src/modules/options/OptionsWidget_tray.cpp2
-rw-r--r--src/modules/options/OptionsWidget_tray.h2
-rw-r--r--src/modules/options/OptionsWidget_uparser.cpp2
-rw-r--r--src/modules/options/OptionsWidget_uparser.h2
-rw-r--r--src/modules/options/OptionsWidget_urlHandlers.cpp2
-rw-r--r--src/modules/options/OptionsWidget_urlHandlers.h2
-rw-r--r--src/modules/options/OptionsWidget_userList.cpp2
-rw-r--r--src/modules/options/OptionsWidget_userList.h2
-rw-r--r--src/modules/options/OptionsWidget_windowList.cpp2
-rw-r--r--src/modules/options/OptionsWidget_windowList.h2
-rw-r--r--src/modules/options/libkvioptions.cpp2
-rwxr-xr-xsrc/modules/options/mkcreateinstanceproc.sh4
-rw-r--r--src/modules/package/libkvipackage.cpp2
-rw-r--r--src/modules/perl/libkviperl.cpp2
-rw-r--r--src/modules/perlcore/KVIrc.xs2
-rw-r--r--src/modules/perlcore/libkviperlcore.cpp2
-rw-r--r--src/modules/perlcore/perlcoreinterface.h2
-rw-r--r--src/modules/perlcore/xs.inc2
-rw-r--r--src/modules/popup/libkvipopup.cpp2
-rw-r--r--src/modules/popupeditor/PopupEditorWindow.cpp4
-rw-r--r--src/modules/popupeditor/PopupEditorWindow.h4
-rw-r--r--src/modules/popupeditor/libkvipopupeditor.cpp2
-rw-r--r--src/modules/proxydb/libkviproxydb.cpp2
-rw-r--r--src/modules/python/libkvipython.cpp2
-rw-r--r--src/modules/pythoncore/kvircmodule.cpp2
-rw-r--r--src/modules/pythoncore/kvircmodule.h2
-rw-r--r--src/modules/pythoncore/libkvipythoncore.cpp2
-rw-r--r--src/modules/pythoncore/pythoncoreinterface.h2
-rw-r--r--src/modules/raweditor/RawEditorWindow.cpp4
-rw-r--r--src/modules/raweditor/RawEditorWindow.h4
-rw-r--r--src/modules/raweditor/libkviraweditor.cpp2
-rw-r--r--src/modules/regchan/libkviregchan.cpp2
-rw-r--r--src/modules/reguser/RegisteredUserEntryDialog.cpp2
-rw-r--r--src/modules/reguser/RegisteredUserEntryDialog.h2
-rw-r--r--src/modules/reguser/RegisteredUsersDialog.cpp2
-rw-r--r--src/modules/reguser/RegisteredUsersDialog.h2
-rw-r--r--src/modules/reguser/RegistrationWizard.cpp2
-rw-r--r--src/modules/reguser/RegistrationWizard.h2
-rw-r--r--src/modules/reguser/libkvireguser.cpp2
-rw-r--r--src/modules/rijndael/BlowFish.cpp2
-rw-r--r--src/modules/rijndael/BlowFish.h2
-rw-r--r--src/modules/rijndael/InitVectorEngine.cpp2
-rw-r--r--src/modules/rijndael/InitVectorEngine.h2
-rw-r--r--src/modules/rijndael/Rijndael.cpp2
-rw-r--r--src/modules/rijndael/Rijndael.h2
-rw-r--r--src/modules/rijndael/UglyBase64.cpp2
-rw-r--r--src/modules/rijndael/UglyBase64.h2
-rw-r--r--src/modules/rijndael/libkvirijndael.cpp2
-rw-r--r--src/modules/rijndael/libkvirijndael.h2
-rw-r--r--src/modules/rot13/libkvirot13.cpp2
-rw-r--r--src/modules/rot13/libkvirot13.h2
-rw-r--r--src/modules/serverdb/libkviserverdb.cpp2
-rw-r--r--src/modules/setup/SetupWizard.cpp2
-rw-r--r--src/modules/setup/SetupWizard.h2
-rw-r--r--src/modules/setup/libkvisetup.cpp2
-rw-r--r--src/modules/sharedfile/libkvisharedfile.cpp2
-rw-r--r--src/modules/sharedfileswindow/SharedFilesWindow.cpp4
-rw-r--r--src/modules/sharedfileswindow/SharedFilesWindow.h4
-rw-r--r--src/modules/sharedfileswindow/libkvisharedfileswindow.cpp2
-rw-r--r--src/modules/snd/libkvisnd.cpp2
-rw-r--r--src/modules/snd/libkvisnd.h2
-rw-r--r--src/modules/socketspy/SocketSpyWindow.cpp2
-rw-r--r--src/modules/socketspy/SocketSpyWindow.h2
-rw-r--r--src/modules/socketspy/libkvisocketspy.cpp2
-rw-r--r--src/modules/spaste/SlowPasteController.cpp2
-rw-r--r--src/modules/spaste/SlowPasteController.h2
-rw-r--r--src/modules/spaste/libkvispaste.cpp2
-rw-r--r--src/modules/spaste/libkvispaste.h2
-rw-r--r--src/modules/spellchecker/libkvispellchecker.cpp2
-rw-r--r--src/modules/str/libkvistr.cpp2
-rw-r--r--src/modules/system/Plugin.cpp2
-rw-r--r--src/modules/system/Plugin.h2
-rw-r--r--src/modules/system/libkvisystem.cpp2
-rw-r--r--src/modules/term/TermWidget.cpp2
-rw-r--r--src/modules/term/TermWidget.h2
-rw-r--r--src/modules/term/TermWindow.cpp2
-rw-r--r--src/modules/term/TermWindow.h2
-rw-r--r--src/modules/term/libkviterm.cpp2
-rw-r--r--src/modules/texticons/libkvitexticons.cpp2
-rw-r--r--src/modules/theme/PackThemeDialog.cpp2
-rw-r--r--src/modules/theme/PackThemeDialog.h2
-rw-r--r--src/modules/theme/SaveThemeDialog.cpp2
-rw-r--r--src/modules/theme/SaveThemeDialog.h2
-rw-r--r--src/modules/theme/ThemeFunctions.cpp2
-rw-r--r--src/modules/theme/ThemeFunctions.h2
-rw-r--r--src/modules/theme/ThemeManagementDialog.cpp2
-rw-r--r--src/modules/theme/ThemeManagementDialog.h2
-rw-r--r--src/modules/theme/WebThemeInterfaceDialog.cpp2
-rw-r--r--src/modules/theme/WebThemeInterfaceDialog.h2
-rw-r--r--src/modules/theme/libkvitheme.cpp2
-rw-r--r--src/modules/tip/libkvitip.cpp2
-rw-r--r--src/modules/tip/libkvitip.h2
-rw-r--r--src/modules/tmphighlight/libkvitmphighlight.cpp2
-rw-r--r--src/modules/toolbar/libkvitoolbar.cpp2
-rw-r--r--src/modules/toolbareditor/CustomizeToolBarsDialog.cpp2
-rw-r--r--src/modules/toolbareditor/CustomizeToolBarsDialog.h2
-rw-r--r--src/modules/toolbareditor/libkvitoolbareditor.cpp2
-rw-r--r--src/modules/torrent/KTorrentDbusInterface.cpp2
-rw-r--r--src/modules/torrent/KTorrentDbusInterface.h2
-rw-r--r--src/modules/torrent/StatusBarApplet.cpp2
-rw-r--r--src/modules/torrent/StatusBarApplet.h2
-rw-r--r--src/modules/torrent/TorrentInterface.cpp2
-rw-r--r--src/modules/torrent/TorrentInterface.h2
-rw-r--r--src/modules/torrent/libkvitorrent.cpp2
-rw-r--r--src/modules/trayicon/libkvitrayicon.cpp2
-rw-r--r--src/modules/trayicon/libkvitrayicon.h2
-rw-r--r--src/modules/upnp/Manager.cpp2
-rw-r--r--src/modules/upnp/Manager.h2
-rw-r--r--src/modules/upnp/RootService.cpp2
-rw-r--r--src/modules/upnp/RootService.h2
-rw-r--r--src/modules/upnp/Service.cpp2
-rw-r--r--src/modules/upnp/Service.h2
-rw-r--r--src/modules/upnp/SsdpConnection.cpp2
-rw-r--r--src/modules/upnp/SsdpConnection.h2
-rw-r--r--src/modules/upnp/WanConnectionService.cpp2
-rw-r--r--src/modules/upnp/WanConnectionService.h2
-rw-r--r--src/modules/upnp/XmlFunctions.cpp2
-rw-r--r--src/modules/upnp/XmlFunctions.h2
-rw-r--r--src/modules/upnp/igdcontrolpoint.cpp2
-rw-r--r--src/modules/upnp/igdcontrolpoint.h2
-rw-r--r--src/modules/upnp/libkviupnp.cpp2
-rw-r--r--src/modules/url/libkviurl.cpp2
-rw-r--r--src/modules/url/libkviurl.h2
-rw-r--r--src/modules/userlist/libkviuserlist.cpp2
-rw-r--r--src/modules/window/UserWindow.cpp2
-rw-r--r--src/modules/window/UserWindow.h2
-rw-r--r--src/modules/window/libkviwindow.cpp2
1064 files changed, 1088 insertions, 1088 deletions
diff --git a/src/kvilib/config/KviBuildInfo.cpp b/src/kvilib/config/KviBuildInfo.cpp
index 4431cde62..a2607954c 100644
--- a/src/kvilib/config/KviBuildInfo.cpp
+++ b/src/kvilib/config/KviBuildInfo.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/config/KviBuildInfo.h b/src/kvilib/config/KviBuildInfo.h
index 03308ddb2..34f079577 100644
--- a/src/kvilib/config/KviBuildInfo.h
+++ b/src/kvilib/config/KviBuildInfo.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/config/kvi_confignames.h b/src/kvilib/config/kvi_confignames.h
index e9e3692a9..94530bd19 100644
--- a/src/kvilib/config/kvi_confignames.h
+++ b/src/kvilib/config/kvi_confignames.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/config/kvi_debug.h b/src/kvilib/config/kvi_debug.h
index 64bafbd87..caf2b0c35 100644
--- a/src/kvilib/config/kvi_debug.h
+++ b/src/kvilib/config/kvi_debug.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/config/kvi_defaults.h b/src/kvilib/config/kvi_defaults.h
index dc6b98f39..a94b297f3 100644
--- a/src/kvilib/config/kvi_defaults.h
+++ b/src/kvilib/config/kvi_defaults.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/config/kvi_fileextensions.h b/src/kvilib/config/kvi_fileextensions.h
index 9a2cdfd2a..67b9933fa 100644
--- a/src/kvilib/config/kvi_fileextensions.h
+++ b/src/kvilib/config/kvi_fileextensions.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index 4b5e93222..aa0f7516a 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/config/kvi_shortcuts.h b/src/kvilib/config/kvi_shortcuts.h
index 59679e2a0..fe88dd1e8 100644
--- a/src/kvilib/config/kvi_shortcuts.h
+++ b/src/kvilib/config/kvi_shortcuts.h
@@ -14,7 +14,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/config/kvi_sourcesdate.h b/src/kvilib/config/kvi_sourcesdate.h
index f21ef331c..6000968a6 100644
--- a/src/kvilib/config/kvi_sourcesdate.h
+++ b/src/kvilib/config/kvi_sourcesdate.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviCString.cpp b/src/kvilib/core/KviCString.cpp
index df3dff92d..177910acc 100644
--- a/src/kvilib/core/KviCString.cpp
+++ b/src/kvilib/core/KviCString.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviCString.h b/src/kvilib/core/KviCString.h
index c70065121..260ba6bb2 100644
--- a/src/kvilib/core/KviCString.h
+++ b/src/kvilib/core/KviCString.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviError.cpp b/src/kvilib/core/KviError.cpp
index 11cf375fd..c4c32f7a5 100644
--- a/src/kvilib/core/KviError.cpp
+++ b/src/kvilib/core/KviError.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviError.h b/src/kvilib/core/KviError.h
index a7431fb8a..57310146c 100644
--- a/src/kvilib/core/KviError.h
+++ b/src/kvilib/core/KviError.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviHeapObject.cpp b/src/kvilib/core/KviHeapObject.cpp
index 9db837839..420271c99 100644
--- a/src/kvilib/core/KviHeapObject.cpp
+++ b/src/kvilib/core/KviHeapObject.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviHeapObject.h b/src/kvilib/core/KviHeapObject.h
index fca302a55..b8434cdc9 100644
--- a/src/kvilib/core/KviHeapObject.h
+++ b/src/kvilib/core/KviHeapObject.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviMemory.cpp b/src/kvilib/core/KviMemory.cpp
index 469fdec39..97ca92621 100644
--- a/src/kvilib/core/KviMemory.cpp
+++ b/src/kvilib/core/KviMemory.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -408,7 +408,7 @@ namespace KviMemory
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
- // of the License, or (at your opinion) any later version.
+ // of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviMemory.h b/src/kvilib/core/KviMemory.h
index d868c8d23..c73d58258 100644
--- a/src/kvilib/core/KviMemory.h
+++ b/src/kvilib/core/KviMemory.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviPointerHashTable.h b/src/kvilib/core/KviPointerHashTable.h
index becc9c110..1d95ab3c5 100644
--- a/src/kvilib/core/KviPointerHashTable.h
+++ b/src/kvilib/core/KviPointerHashTable.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviPointerList.h b/src/kvilib/core/KviPointerList.h
index a9d6578cb..2b56e6f96 100644
--- a/src/kvilib/core/KviPointerList.h
+++ b/src/kvilib/core/KviPointerList.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviQString.cpp b/src/kvilib/core/KviQString.cpp
index b3c0af6c4..630704047 100644
--- a/src/kvilib/core/KviQString.cpp
+++ b/src/kvilib/core/KviQString.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviQString.h b/src/kvilib/core/KviQString.h
index 3d4f82c2f..63150747a 100644
--- a/src/kvilib/core/KviQString.h
+++ b/src/kvilib/core/KviQString.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviShortcut.cpp b/src/kvilib/core/KviShortcut.cpp
index b742c7f2b..f948f8a8a 100644
--- a/src/kvilib/core/KviShortcut.cpp
+++ b/src/kvilib/core/KviShortcut.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/KviShortcut.h b/src/kvilib/core/KviShortcut.h
index dec1b14a1..3baae459e 100644
--- a/src/kvilib/core/KviShortcut.h
+++ b/src/kvilib/core/KviShortcut.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/core/kvi_inttypes.h b/src/kvilib/core/kvi_inttypes.h
index 77c0e7dba..e8bd874be 100644
--- a/src/kvilib/core/kvi_inttypes.h
+++ b/src/kvilib/core/kvi_inttypes.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviAnimatedPixmap.cpp b/src/kvilib/ext/KviAnimatedPixmap.cpp
index 20968a16b..40002984e 100644
--- a/src/kvilib/ext/KviAnimatedPixmap.cpp
+++ b/src/kvilib/ext/KviAnimatedPixmap.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviAnimatedPixmap.h b/src/kvilib/ext/KviAnimatedPixmap.h
index 3257cb736..a7978e470 100644
--- a/src/kvilib/ext/KviAnimatedPixmap.h
+++ b/src/kvilib/ext/KviAnimatedPixmap.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.cpp b/src/kvilib/ext/KviAnimatedPixmapCache.cpp
index ecb43cfed..329d368b5 100644
--- a/src/kvilib/ext/KviAnimatedPixmapCache.cpp
+++ b/src/kvilib/ext/KviAnimatedPixmapCache.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviAnimatedPixmapCache.h b/src/kvilib/ext/KviAnimatedPixmapCache.h
index 31f5ef21e..8e1229c13 100644
--- a/src/kvilib/ext/KviAnimatedPixmapCache.h
+++ b/src/kvilib/ext/KviAnimatedPixmapCache.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviAnimatedPixmapInterface.h b/src/kvilib/ext/KviAnimatedPixmapInterface.h
index f9bfd546e..40b6c267a 100644
--- a/src/kvilib/ext/KviAnimatedPixmapInterface.h
+++ b/src/kvilib/ext/KviAnimatedPixmapInterface.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviCommandFormatter.cpp b/src/kvilib/ext/KviCommandFormatter.cpp
index c52f1c1af..744e92513 100644
--- a/src/kvilib/ext/KviCommandFormatter.cpp
+++ b/src/kvilib/ext/KviCommandFormatter.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviCommandFormatter.h b/src/kvilib/ext/KviCommandFormatter.h
index 4e3419666..ef99ba24a 100644
--- a/src/kvilib/ext/KviCommandFormatter.h
+++ b/src/kvilib/ext/KviCommandFormatter.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviConfigurationFile.cpp b/src/kvilib/ext/KviConfigurationFile.cpp
index 904779fe1..b0c139c17 100644
--- a/src/kvilib/ext/KviConfigurationFile.cpp
+++ b/src/kvilib/ext/KviConfigurationFile.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviConfigurationFile.h b/src/kvilib/ext/KviConfigurationFile.h
index 80dcc26ee..5b89cac7f 100644
--- a/src/kvilib/ext/KviConfigurationFile.h
+++ b/src/kvilib/ext/KviConfigurationFile.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviCryptEngine.cpp b/src/kvilib/ext/KviCryptEngine.cpp
index 28b722621..812dd14f4 100644
--- a/src/kvilib/ext/KviCryptEngine.cpp
+++ b/src/kvilib/ext/KviCryptEngine.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviCryptEngine.h b/src/kvilib/ext/KviCryptEngine.h
index f69812ec5..b98ab3070 100644
--- a/src/kvilib/ext/KviCryptEngine.h
+++ b/src/kvilib/ext/KviCryptEngine.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviCryptEngineDescription.h b/src/kvilib/ext/KviCryptEngineDescription.h
index 2cbbced39..5467fdfb7 100644
--- a/src/kvilib/ext/KviCryptEngineDescription.h
+++ b/src/kvilib/ext/KviCryptEngineDescription.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviCryptEngineManager.cpp b/src/kvilib/ext/KviCryptEngineManager.cpp
index 599f931da..22e4c9eea 100644
--- a/src/kvilib/ext/KviCryptEngineManager.cpp
+++ b/src/kvilib/ext/KviCryptEngineManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviCryptEngineManager.h b/src/kvilib/ext/KviCryptEngineManager.h
index 306ff5bc9..bc4856cdc 100644
--- a/src/kvilib/ext/KviCryptEngineManager.h
+++ b/src/kvilib/ext/KviCryptEngineManager.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviDataBuffer.cpp b/src/kvilib/ext/KviDataBuffer.cpp
index 19814cbc8..6448e0e3f 100644
--- a/src/kvilib/ext/KviDataBuffer.cpp
+++ b/src/kvilib/ext/KviDataBuffer.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviDataBuffer.h b/src/kvilib/ext/KviDataBuffer.h
index f03e4751e..429a5ba03 100644
--- a/src/kvilib/ext/KviDataBuffer.h
+++ b/src/kvilib/ext/KviDataBuffer.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviDbusAdaptor.cpp b/src/kvilib/ext/KviDbusAdaptor.cpp
index cbd062729..519260c98 100644
--- a/src/kvilib/ext/KviDbusAdaptor.cpp
+++ b/src/kvilib/ext/KviDbusAdaptor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviDbusAdaptor.h b/src/kvilib/ext/KviDbusAdaptor.h
index c674baf0c..263207e11 100644
--- a/src/kvilib/ext/KviDbusAdaptor.h
+++ b/src/kvilib/ext/KviDbusAdaptor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviDebugContext.h b/src/kvilib/ext/KviDebugContext.h
index d38638699..3b527ffdf 100644
--- a/src/kvilib/ext/KviDebugContext.h
+++ b/src/kvilib/ext/KviDebugContext.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviMediaManager.cpp b/src/kvilib/ext/KviMediaManager.cpp
index 03be57120..b128810ba 100644
--- a/src/kvilib/ext/KviMediaManager.cpp
+++ b/src/kvilib/ext/KviMediaManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviMediaManager.h b/src/kvilib/ext/KviMediaManager.h
index 46502fac5..4020b7366 100644
--- a/src/kvilib/ext/KviMediaManager.h
+++ b/src/kvilib/ext/KviMediaManager.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviMediaType.h b/src/kvilib/ext/KviMediaType.h
index 4dad6c658..dc1f1bc0b 100644
--- a/src/kvilib/ext/KviMediaType.h
+++ b/src/kvilib/ext/KviMediaType.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviMessageTypeSettings.cpp b/src/kvilib/ext/KviMessageTypeSettings.cpp
index a8b7ca283..ed061065e 100644
--- a/src/kvilib/ext/KviMessageTypeSettings.cpp
+++ b/src/kvilib/ext/KviMessageTypeSettings.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviMessageTypeSettings.h b/src/kvilib/ext/KviMessageTypeSettings.h
index 3ba7ac60d..29db5dfac 100644
--- a/src/kvilib/ext/KviMessageTypeSettings.h
+++ b/src/kvilib/ext/KviMessageTypeSettings.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviMiscUtils.cpp b/src/kvilib/ext/KviMiscUtils.cpp
index 6de7d93bb..202a7eb10 100644
--- a/src/kvilib/ext/KviMiscUtils.cpp
+++ b/src/kvilib/ext/KviMiscUtils.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviMiscUtils.h b/src/kvilib/ext/KviMiscUtils.h
index 90a7b26c4..5291e2c6f 100644
--- a/src/kvilib/ext/KviMiscUtils.h
+++ b/src/kvilib/ext/KviMiscUtils.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviNickColors.cpp b/src/kvilib/ext/KviNickColors.cpp
index 00d7c1a9d..8ac9b7299 100644
--- a/src/kvilib/ext/KviNickColors.cpp
+++ b/src/kvilib/ext/KviNickColors.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviNickColors.h b/src/kvilib/ext/KviNickColors.h
index ef69d929d..5bf1c1e6f 100644
--- a/src/kvilib/ext/KviNickColors.h
+++ b/src/kvilib/ext/KviNickColors.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviOggIrcText.h b/src/kvilib/ext/KviOggIrcText.h
index 4f9cdec5f..ce9c9fceb 100644
--- a/src/kvilib/ext/KviOggIrcText.h
+++ b/src/kvilib/ext/KviOggIrcText.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviOggTheoraDecoder.cpp b/src/kvilib/ext/KviOggTheoraDecoder.cpp
index 47a3fa217..245422fd3 100644
--- a/src/kvilib/ext/KviOggTheoraDecoder.cpp
+++ b/src/kvilib/ext/KviOggTheoraDecoder.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviOggTheoraDecoder.h b/src/kvilib/ext/KviOggTheoraDecoder.h
index bf6fb4e17..d6a442ff8 100644
--- a/src/kvilib/ext/KviOggTheoraDecoder.h
+++ b/src/kvilib/ext/KviOggTheoraDecoder.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviOggTheoraEncoder.cpp b/src/kvilib/ext/KviOggTheoraEncoder.cpp
index da426ea93..a63e111af 100644
--- a/src/kvilib/ext/KviOggTheoraEncoder.cpp
+++ b/src/kvilib/ext/KviOggTheoraEncoder.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviOggTheoraEncoder.h b/src/kvilib/ext/KviOggTheoraEncoder.h
index 77491ff1b..f0c0addd2 100644
--- a/src/kvilib/ext/KviOggTheoraEncoder.h
+++ b/src/kvilib/ext/KviOggTheoraEncoder.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviOggTheoraGeometry.h b/src/kvilib/ext/KviOggTheoraGeometry.h
index d2c724cd6..29b06bd3c 100644
--- a/src/kvilib/ext/KviOggTheoraGeometry.h
+++ b/src/kvilib/ext/KviOggTheoraGeometry.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviOsInfo.cpp b/src/kvilib/ext/KviOsInfo.cpp
index fe79c2fce..2e1d2e307 100644
--- a/src/kvilib/ext/KviOsInfo.cpp
+++ b/src/kvilib/ext/KviOsInfo.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviOsInfo.h b/src/kvilib/ext/KviOsInfo.h
index cfa0abbd1..125a65cdb 100644
--- a/src/kvilib/ext/KviOsInfo.h
+++ b/src/kvilib/ext/KviOsInfo.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviParameterList.cpp b/src/kvilib/ext/KviParameterList.cpp
index a5f40579d..00f261d55 100644
--- a/src/kvilib/ext/KviParameterList.cpp
+++ b/src/kvilib/ext/KviParameterList.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviParameterList.h b/src/kvilib/ext/KviParameterList.h
index 947f40baf..acae32ab7 100644
--- a/src/kvilib/ext/KviParameterList.h
+++ b/src/kvilib/ext/KviParameterList.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviPixmap.cpp b/src/kvilib/ext/KviPixmap.cpp
index 29b343453..d18a79eec 100644
--- a/src/kvilib/ext/KviPixmap.cpp
+++ b/src/kvilib/ext/KviPixmap.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviPixmap.h b/src/kvilib/ext/KviPixmap.h
index 5906b8e88..99d9fdac9 100644
--- a/src/kvilib/ext/KviPixmap.h
+++ b/src/kvilib/ext/KviPixmap.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviPixmapUtils.cpp b/src/kvilib/ext/KviPixmapUtils.cpp
index e6808b72a..265777846 100644
--- a/src/kvilib/ext/KviPixmapUtils.cpp
+++ b/src/kvilib/ext/KviPixmapUtils.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviPixmapUtils.h b/src/kvilib/ext/KviPixmapUtils.h
index ec681ee9a..ccc025fdb 100644
--- a/src/kvilib/ext/KviPixmapUtils.h
+++ b/src/kvilib/ext/KviPixmapUtils.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviProxy.cpp b/src/kvilib/ext/KviProxy.cpp
index 5b6e6415c..e01b93f56 100644
--- a/src/kvilib/ext/KviProxy.cpp
+++ b/src/kvilib/ext/KviProxy.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviProxy.h b/src/kvilib/ext/KviProxy.h
index c5a4084bf..a9bfc491a 100644
--- a/src/kvilib/ext/KviProxy.h
+++ b/src/kvilib/ext/KviProxy.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviProxyDataBase.cpp b/src/kvilib/ext/KviProxyDataBase.cpp
index 2fea250ab..48d529cbc 100644
--- a/src/kvilib/ext/KviProxyDataBase.cpp
+++ b/src/kvilib/ext/KviProxyDataBase.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviProxyDataBase.h b/src/kvilib/ext/KviProxyDataBase.h
index e0e7a0c9c..5311e0b82 100644
--- a/src/kvilib/ext/KviProxyDataBase.h
+++ b/src/kvilib/ext/KviProxyDataBase.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredChannel.cpp b/src/kvilib/ext/KviRegisteredChannel.cpp
index 732c77128..6709c04bd 100644
--- a/src/kvilib/ext/KviRegisteredChannel.cpp
+++ b/src/kvilib/ext/KviRegisteredChannel.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredChannel.h b/src/kvilib/ext/KviRegisteredChannel.h
index f4a1f6fcf..5d8e8e5f9 100644
--- a/src/kvilib/ext/KviRegisteredChannel.h
+++ b/src/kvilib/ext/KviRegisteredChannel.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
index fbb9383d2..0bea7366a 100644
--- a/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredChannelDataBase.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredChannelDataBase.h b/src/kvilib/ext/KviRegisteredChannelDataBase.h
index 86078ec2d..02496d96d 100644
--- a/src/kvilib/ext/KviRegisteredChannelDataBase.h
+++ b/src/kvilib/ext/KviRegisteredChannelDataBase.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredUser.cpp b/src/kvilib/ext/KviRegisteredUser.cpp
index e3580fb6e..8283b17ab 100644
--- a/src/kvilib/ext/KviRegisteredUser.cpp
+++ b/src/kvilib/ext/KviRegisteredUser.cpp
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredUser.h b/src/kvilib/ext/KviRegisteredUser.h
index f675977bc..195e23ab3 100644
--- a/src/kvilib/ext/KviRegisteredUser.h
+++ b/src/kvilib/ext/KviRegisteredUser.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.cpp b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
index 6c5d9c8b3..18d8cb151 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.cpp
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredUserDataBase.h b/src/kvilib/ext/KviRegisteredUserDataBase.h
index 5f4d06240..75354764f 100644
--- a/src/kvilib/ext/KviRegisteredUserDataBase.h
+++ b/src/kvilib/ext/KviRegisteredUserDataBase.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredUserGroup.cpp b/src/kvilib/ext/KviRegisteredUserGroup.cpp
index b43a06a06..f7254ced0 100644
--- a/src/kvilib/ext/KviRegisteredUserGroup.cpp
+++ b/src/kvilib/ext/KviRegisteredUserGroup.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredUserGroup.h b/src/kvilib/ext/KviRegisteredUserGroup.h
index fa31a811d..67987665d 100644
--- a/src/kvilib/ext/KviRegisteredUserGroup.h
+++ b/src/kvilib/ext/KviRegisteredUserGroup.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredUserMask.cpp b/src/kvilib/ext/KviRegisteredUserMask.cpp
index 7489764c1..03a5c0a0e 100644
--- a/src/kvilib/ext/KviRegisteredUserMask.cpp
+++ b/src/kvilib/ext/KviRegisteredUserMask.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviRegisteredUserMask.h b/src/kvilib/ext/KviRegisteredUserMask.h
index f813b82e8..5f811d52a 100644
--- a/src/kvilib/ext/KviRegisteredUserMask.h
+++ b/src/kvilib/ext/KviRegisteredUserMask.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviSharedFile.cpp b/src/kvilib/ext/KviSharedFile.cpp
index dea7811b4..c074cb60c 100644
--- a/src/kvilib/ext/KviSharedFile.cpp
+++ b/src/kvilib/ext/KviSharedFile.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviSharedFile.h b/src/kvilib/ext/KviSharedFile.h
index e8cbe5acd..df6e9d9ab 100644
--- a/src/kvilib/ext/KviSharedFile.h
+++ b/src/kvilib/ext/KviSharedFile.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviSharedFilesManager.cpp b/src/kvilib/ext/KviSharedFilesManager.cpp
index 26cef3256..e11ff0114 100644
--- a/src/kvilib/ext/KviSharedFilesManager.cpp
+++ b/src/kvilib/ext/KviSharedFilesManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviSharedFilesManager.h b/src/kvilib/ext/KviSharedFilesManager.h
index 9942b9fca..48d6892c8 100644
--- a/src/kvilib/ext/KviSharedFilesManager.h
+++ b/src/kvilib/ext/KviSharedFilesManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviStringConversion.cpp b/src/kvilib/ext/KviStringConversion.cpp
index cf045c288..ada7f5fab 100644
--- a/src/kvilib/ext/KviStringConversion.cpp
+++ b/src/kvilib/ext/KviStringConversion.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviStringConversion.h b/src/kvilib/ext/KviStringConversion.h
index d6a051562..01ce11795 100644
--- a/src/kvilib/ext/KviStringConversion.h
+++ b/src/kvilib/ext/KviStringConversion.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/ext/KviXlib.h b/src/kvilib/ext/KviXlib.h
index 40b996638..a5f2e0815 100644
--- a/src/kvilib/ext/KviXlib.h
+++ b/src/kvilib/ext/KviXlib.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviFile.cpp b/src/kvilib/file/KviFile.cpp
index c9fa2380e..98213aedc 100644
--- a/src/kvilib/file/KviFile.cpp
+++ b/src/kvilib/file/KviFile.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviFile.h b/src/kvilib/file/KviFile.h
index da4121f80..abda51c68 100644
--- a/src/kvilib/file/KviFile.h
+++ b/src/kvilib/file/KviFile.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviFileUtils.cpp b/src/kvilib/file/KviFileUtils.cpp
index 5a7c37c6f..dbba633ae 100644
--- a/src/kvilib/file/KviFileUtils.cpp
+++ b/src/kvilib/file/KviFileUtils.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviFileUtils.h b/src/kvilib/file/KviFileUtils.h
index aaad4d715..01bd40782 100644
--- a/src/kvilib/file/KviFileUtils.h
+++ b/src/kvilib/file/KviFileUtils.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviPackageIOEngine.cpp b/src/kvilib/file/KviPackageIOEngine.cpp
index 07bdd69a6..ecfd00810 100644
--- a/src/kvilib/file/KviPackageIOEngine.cpp
+++ b/src/kvilib/file/KviPackageIOEngine.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviPackageIOEngine.h b/src/kvilib/file/KviPackageIOEngine.h
index 1bba81aec..09af7fedf 100644
--- a/src/kvilib/file/KviPackageIOEngine.h
+++ b/src/kvilib/file/KviPackageIOEngine.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviPackageReader.cpp b/src/kvilib/file/KviPackageReader.cpp
index 49d1641b7..2a4c574fc 100644
--- a/src/kvilib/file/KviPackageReader.cpp
+++ b/src/kvilib/file/KviPackageReader.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviPackageReader.h b/src/kvilib/file/KviPackageReader.h
index fcdece01d..0e0f8793d 100644
--- a/src/kvilib/file/KviPackageReader.h
+++ b/src/kvilib/file/KviPackageReader.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviPackageWriter.cpp b/src/kvilib/file/KviPackageWriter.cpp
index 60f06081e..382f2a1ab 100644
--- a/src/kvilib/file/KviPackageWriter.cpp
+++ b/src/kvilib/file/KviPackageWriter.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/file/KviPackageWriter.h b/src/kvilib/file/KviPackageWriter.h
index bf82dd1a9..74afdd4a3 100644
--- a/src/kvilib/file/KviPackageWriter.h
+++ b/src/kvilib/file/KviPackageWriter.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviAvatar.cpp b/src/kvilib/irc/KviAvatar.cpp
index 5d2fb4f05..ca4f1fe6d 100644
--- a/src/kvilib/irc/KviAvatar.cpp
+++ b/src/kvilib/irc/KviAvatar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviAvatar.h b/src/kvilib/irc/KviAvatar.h
index 64cb70f78..04a7e751f 100644
--- a/src/kvilib/irc/KviAvatar.h
+++ b/src/kvilib/irc/KviAvatar.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviAvatarCache.cpp b/src/kvilib/irc/KviAvatarCache.cpp
index 5080130e0..48462fb6f 100644
--- a/src/kvilib/irc/KviAvatarCache.cpp
+++ b/src/kvilib/irc/KviAvatarCache.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviAvatarCache.h b/src/kvilib/irc/KviAvatarCache.h
index 9b04b60d1..bf641b5de 100644
--- a/src/kvilib/irc/KviAvatarCache.h
+++ b/src/kvilib/irc/KviAvatarCache.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviControlCodes.cpp b/src/kvilib/irc/KviControlCodes.cpp
index 84e93ee01..3d5891a1e 100644
--- a/src/kvilib/irc/KviControlCodes.cpp
+++ b/src/kvilib/irc/KviControlCodes.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviControlCodes.h b/src/kvilib/irc/KviControlCodes.h
index f9c7ad1ca..df71c2393 100644
--- a/src/kvilib/irc/KviControlCodes.h
+++ b/src/kvilib/irc/KviControlCodes.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIdentityProfile.cpp b/src/kvilib/irc/KviIdentityProfile.cpp
index ad22d55cb..8225cc41c 100644
--- a/src/kvilib/irc/KviIdentityProfile.cpp
+++ b/src/kvilib/irc/KviIdentityProfile.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIdentityProfile.h b/src/kvilib/irc/KviIdentityProfile.h
index 93ba55761..00e5e047d 100644
--- a/src/kvilib/irc/KviIdentityProfile.h
+++ b/src/kvilib/irc/KviIdentityProfile.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIdentityProfileSet.cpp b/src/kvilib/irc/KviIdentityProfileSet.cpp
index d8cbfa314..2b8121ac1 100644
--- a/src/kvilib/irc/KviIdentityProfileSet.cpp
+++ b/src/kvilib/irc/KviIdentityProfileSet.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIdentityProfileSet.h b/src/kvilib/irc/KviIdentityProfileSet.h
index 541cbdcae..dc778789e 100644
--- a/src/kvilib/irc/KviIdentityProfileSet.h
+++ b/src/kvilib/irc/KviIdentityProfileSet.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcMask.cpp b/src/kvilib/irc/KviIrcMask.cpp
index 28d17c854..d0d9820ff 100644
--- a/src/kvilib/irc/KviIrcMask.cpp
+++ b/src/kvilib/irc/KviIrcMask.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcMask.h b/src/kvilib/irc/KviIrcMask.h
index 2f0cbb178..4aa2600c9 100644
--- a/src/kvilib/irc/KviIrcMask.h
+++ b/src/kvilib/irc/KviIrcMask.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcNetwork.cpp b/src/kvilib/irc/KviIrcNetwork.cpp
index d22d2b07a..4dc1a31d0 100644
--- a/src/kvilib/irc/KviIrcNetwork.cpp
+++ b/src/kvilib/irc/KviIrcNetwork.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcNetwork.h b/src/kvilib/irc/KviIrcNetwork.h
index bd706016f..bf9eb3d70 100644
--- a/src/kvilib/irc/KviIrcNetwork.h
+++ b/src/kvilib/irc/KviIrcNetwork.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcServer.cpp b/src/kvilib/irc/KviIrcServer.cpp
index 8462c33e8..a4c177813 100644
--- a/src/kvilib/irc/KviIrcServer.cpp
+++ b/src/kvilib/irc/KviIrcServer.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcServer.h b/src/kvilib/irc/KviIrcServer.h
index 33bf2402f..7fba82e2d 100644
--- a/src/kvilib/irc/KviIrcServer.h
+++ b/src/kvilib/irc/KviIrcServer.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcServerDataBase.cpp b/src/kvilib/irc/KviIrcServerDataBase.cpp
index dd7fc0972..f1e9ce589 100644
--- a/src/kvilib/irc/KviIrcServerDataBase.cpp
+++ b/src/kvilib/irc/KviIrcServerDataBase.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcServerDataBase.h b/src/kvilib/irc/KviIrcServerDataBase.h
index 4cbc19ce9..816fa5037 100644
--- a/src/kvilib/irc/KviIrcServerDataBase.h
+++ b/src/kvilib/irc/KviIrcServerDataBase.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcServerReconnectInfo.cpp b/src/kvilib/irc/KviIrcServerReconnectInfo.cpp
index dd2642409..2912f24cf 100644
--- a/src/kvilib/irc/KviIrcServerReconnectInfo.cpp
+++ b/src/kvilib/irc/KviIrcServerReconnectInfo.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcServerReconnectInfo.h b/src/kvilib/irc/KviIrcServerReconnectInfo.h
index 96278dbfb..9d11c3bb3 100644
--- a/src/kvilib/irc/KviIrcServerReconnectInfo.h
+++ b/src/kvilib/irc/KviIrcServerReconnectInfo.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcUserDataBase.cpp b/src/kvilib/irc/KviIrcUserDataBase.cpp
index 986a6cc3a..d1b99a0e9 100644
--- a/src/kvilib/irc/KviIrcUserDataBase.cpp
+++ b/src/kvilib/irc/KviIrcUserDataBase.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcUserDataBase.h b/src/kvilib/irc/KviIrcUserDataBase.h
index 823f725fe..0e809a2bf 100644
--- a/src/kvilib/irc/KviIrcUserDataBase.h
+++ b/src/kvilib/irc/KviIrcUserDataBase.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcUserEntry.cpp b/src/kvilib/irc/KviIrcUserEntry.cpp
index ed1775e7c..825166d41 100644
--- a/src/kvilib/irc/KviIrcUserEntry.cpp
+++ b/src/kvilib/irc/KviIrcUserEntry.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviIrcUserEntry.h b/src/kvilib/irc/KviIrcUserEntry.h
index b111c7606..fa365d6f3 100644
--- a/src/kvilib/irc/KviIrcUserEntry.h
+++ b/src/kvilib/irc/KviIrcUserEntry.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviNickServRule.cpp b/src/kvilib/irc/KviNickServRule.cpp
index 3d954b506..0bb2813d6 100644
--- a/src/kvilib/irc/KviNickServRule.cpp
+++ b/src/kvilib/irc/KviNickServRule.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviNickServRule.h b/src/kvilib/irc/KviNickServRule.h
index 16b052b3a..0812faca1 100644
--- a/src/kvilib/irc/KviNickServRule.h
+++ b/src/kvilib/irc/KviNickServRule.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviNickServRuleSet.cpp b/src/kvilib/irc/KviNickServRuleSet.cpp
index 10e161c38..38707f62f 100644
--- a/src/kvilib/irc/KviNickServRuleSet.cpp
+++ b/src/kvilib/irc/KviNickServRuleSet.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviNickServRuleSet.h b/src/kvilib/irc/KviNickServRuleSet.h
index bc2f9d26b..f680b0d9d 100644
--- a/src/kvilib/irc/KviNickServRuleSet.h
+++ b/src/kvilib/irc/KviNickServRuleSet.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviUserIdentity.cpp b/src/kvilib/irc/KviUserIdentity.cpp
index b323e5caa..a944af6db 100644
--- a/src/kvilib/irc/KviUserIdentity.cpp
+++ b/src/kvilib/irc/KviUserIdentity.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviUserIdentity.h b/src/kvilib/irc/KviUserIdentity.h
index 5b5a727a2..5caa45697 100644
--- a/src/kvilib/irc/KviUserIdentity.h
+++ b/src/kvilib/irc/KviUserIdentity.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviUserIdentityManager.cpp b/src/kvilib/irc/KviUserIdentityManager.cpp
index 0568cb39b..4a7253ad1 100644
--- a/src/kvilib/irc/KviUserIdentityManager.cpp
+++ b/src/kvilib/irc/KviUserIdentityManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/irc/KviUserIdentityManager.h b/src/kvilib/irc/KviUserIdentityManager.h
index 8f59c3818..ca137d71e 100644
--- a/src/kvilib/irc/KviUserIdentityManager.h
+++ b/src/kvilib/irc/KviUserIdentityManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/locale/KviLocale.cpp b/src/kvilib/locale/KviLocale.cpp
index befa9a183..758402089 100644
--- a/src/kvilib/locale/KviLocale.cpp
+++ b/src/kvilib/locale/KviLocale.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/locale/KviLocale.h b/src/kvilib/locale/KviLocale.h
index b2ee9b415..29b48faf3 100644
--- a/src/kvilib/locale/KviLocale.h
+++ b/src/kvilib/locale/KviLocale.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/locale/KviMessageCatalogue.cpp b/src/kvilib/locale/KviMessageCatalogue.cpp
index 8c6a57984..27edd6a54 100644
--- a/src/kvilib/locale/KviMessageCatalogue.cpp
+++ b/src/kvilib/locale/KviMessageCatalogue.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/locale/KviMessageCatalogue.h b/src/kvilib/locale/KviMessageCatalogue.h
index 260e042ab..c021ed23d 100644
--- a/src/kvilib/locale/KviMessageCatalogue.h
+++ b/src/kvilib/locale/KviMessageCatalogue.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/locale/KviTranslationEntry.cpp b/src/kvilib/locale/KviTranslationEntry.cpp
index d24cd04f3..25c726a9c 100644
--- a/src/kvilib/locale/KviTranslationEntry.cpp
+++ b/src/kvilib/locale/KviTranslationEntry.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/locale/KviTranslationEntry.h b/src/kvilib/locale/KviTranslationEntry.h
index 0489d6a1d..4f4cd9607 100644
--- a/src/kvilib/locale/KviTranslationEntry.h
+++ b/src/kvilib/locale/KviTranslationEntry.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/locale/KviTranslator.cpp b/src/kvilib/locale/KviTranslator.cpp
index 4d78336e6..8f31eaa7e 100644
--- a/src/kvilib/locale/KviTranslator.cpp
+++ b/src/kvilib/locale/KviTranslator.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/locale/KviTranslator.h b/src/kvilib/locale/KviTranslator.h
index 8e09f63e2..68fc18146 100644
--- a/src/kvilib/locale/KviTranslator.h
+++ b/src/kvilib/locale/KviTranslator.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviDnsResolver.cpp b/src/kvilib/net/KviDnsResolver.cpp
index 08ff9da1a..fab77d6ef 100644
--- a/src/kvilib/net/KviDnsResolver.cpp
+++ b/src/kvilib/net/KviDnsResolver.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviDnsResolver.h b/src/kvilib/net/KviDnsResolver.h
index d0b3b8a32..43e7e8475 100644
--- a/src/kvilib/net/KviDnsResolver.h
+++ b/src/kvilib/net/KviDnsResolver.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviDnsResolverNew.cpp b/src/kvilib/net/KviDnsResolverNew.cpp
index f1647035c..0bdefbb87 100644
--- a/src/kvilib/net/KviDnsResolverNew.cpp
+++ b/src/kvilib/net/KviDnsResolverNew.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviDnsResolverNew.h b/src/kvilib/net/KviDnsResolverNew.h
index c16f9ed54..ab7db8870 100644
--- a/src/kvilib/net/KviDnsResolverNew.h
+++ b/src/kvilib/net/KviDnsResolverNew.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviHttpRequest.cpp b/src/kvilib/net/KviHttpRequest.cpp
index c0ab29669..59cd4d498 100644
--- a/src/kvilib/net/KviHttpRequest.cpp
+++ b/src/kvilib/net/KviHttpRequest.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviHttpRequest.h b/src/kvilib/net/KviHttpRequest.h
index 24661e4b3..b25e26c27 100644
--- a/src/kvilib/net/KviHttpRequest.h
+++ b/src/kvilib/net/KviHttpRequest.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviNetUtils.cpp b/src/kvilib/net/KviNetUtils.cpp
index 3e98c63ac..c7df3bc48 100644
--- a/src/kvilib/net/KviNetUtils.cpp
+++ b/src/kvilib/net/KviNetUtils.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviNetUtils.h b/src/kvilib/net/KviNetUtils.h
index f83fde302..e2aef2251 100644
--- a/src/kvilib/net/KviNetUtils.h
+++ b/src/kvilib/net/KviNetUtils.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviNetworkAccessManager.cpp b/src/kvilib/net/KviNetworkAccessManager.cpp
index 21756482e..1142c355b 100644
--- a/src/kvilib/net/KviNetworkAccessManager.cpp
+++ b/src/kvilib/net/KviNetworkAccessManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviNetworkAccessManager.h b/src/kvilib/net/KviNetworkAccessManager.h
index 14b4e0e71..83c18ece9 100644
--- a/src/kvilib/net/KviNetworkAccessManager.h
+++ b/src/kvilib/net/KviNetworkAccessManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviSASL.cpp b/src/kvilib/net/KviSASL.cpp
index a33406881..2ecba10cb 100644
--- a/src/kvilib/net/KviSASL.cpp
+++ b/src/kvilib/net/KviSASL.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviSASL.h b/src/kvilib/net/KviSASL.h
index 1a1656a99..86f7aa0f5 100644
--- a/src/kvilib/net/KviSASL.h
+++ b/src/kvilib/net/KviSASL.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviSSL.cpp b/src/kvilib/net/KviSSL.cpp
index 4407b9b36..e9a52732c 100644
--- a/src/kvilib/net/KviSSL.cpp
+++ b/src/kvilib/net/KviSSL.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviSSL.h b/src/kvilib/net/KviSSL.h
index eeb252ac5..265bf9abf 100644
--- a/src/kvilib/net/KviSSL.h
+++ b/src/kvilib/net/KviSSL.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviUrl.cpp b/src/kvilib/net/KviUrl.cpp
index 2b9e048fd..c1da5b79e 100644
--- a/src/kvilib/net/KviUrl.cpp
+++ b/src/kvilib/net/KviUrl.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/KviUrl.h b/src/kvilib/net/KviUrl.h
index db70fb7c6..12a086473 100644
--- a/src/kvilib/net/KviUrl.h
+++ b/src/kvilib/net/KviUrl.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/kvi_socket.cpp b/src/kvilib/net/kvi_socket.cpp
index 4fe3b126e..918396fd3 100644
--- a/src/kvilib/net/kvi_socket.cpp
+++ b/src/kvilib/net/kvi_socket.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/kvi_socket.h b/src/kvilib/net/kvi_socket.h
index 5d34cd4d4..6cbc6398e 100644
--- a/src/kvilib/net/kvi_socket.h
+++ b/src/kvilib/net/kvi_socket.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/net/kvi_sockettype.h b/src/kvilib/net/kvi_sockettype.h
index e3d99f1e0..7e0518443 100644
--- a/src/kvilib/net/kvi_sockettype.h
+++ b/src/kvilib/net/kvi_sockettype.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/system/KviByteOrder.h b/src/kvilib/system/KviByteOrder.h
index 3fb173fa6..2ad9b7b86 100644
--- a/src/kvilib/system/KviByteOrder.h
+++ b/src/kvilib/system/KviByteOrder.h
@@ -14,7 +14,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/system/KviEnvironment.cpp b/src/kvilib/system/KviEnvironment.cpp
index c6593c442..9615484cd 100644
--- a/src/kvilib/system/KviEnvironment.cpp
+++ b/src/kvilib/system/KviEnvironment.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/system/KviEnvironment.h b/src/kvilib/system/KviEnvironment.h
index 5af0b34da..b339d2386 100644
--- a/src/kvilib/system/KviEnvironment.h
+++ b/src/kvilib/system/KviEnvironment.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/system/KviThread.cpp b/src/kvilib/system/KviThread.cpp
index 7bc833181..bacc0c89e 100644
--- a/src/kvilib/system/KviThread.cpp
+++ b/src/kvilib/system/KviThread.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/system/KviThread.h b/src/kvilib/system/KviThread.h
index 4c63ad841..cdd339ad7 100644
--- a/src/kvilib/system/KviThread.h
+++ b/src/kvilib/system/KviThread.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/system/KviTimeUtils.cpp b/src/kvilib/system/KviTimeUtils.cpp
index df1283d5d..55024e40c 100644
--- a/src/kvilib/system/KviTimeUtils.cpp
+++ b/src/kvilib/system/KviTimeUtils.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/system/KviTimeUtils.h b/src/kvilib/system/KviTimeUtils.h
index 61c942aac..490a202b4 100644
--- a/src/kvilib/system/KviTimeUtils.h
+++ b/src/kvilib/system/KviTimeUtils.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/system/kvi_stdarg.h b/src/kvilib/system/kvi_stdarg.h
index 6bf3e9a27..06f05479c 100644
--- a/src/kvilib/system/kvi_stdarg.h
+++ b/src/kvilib/system/kvi_stdarg.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalApplication.cpp b/src/kvilib/tal/KviTalApplication.cpp
index 83736a96b..6b21f7a48 100644
--- a/src/kvilib/tal/KviTalApplication.cpp
+++ b/src/kvilib/tal/KviTalApplication.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalApplication.h b/src/kvilib/tal/KviTalApplication.h
index f5b01009c..94253d12d 100644
--- a/src/kvilib/tal/KviTalApplication.h
+++ b/src/kvilib/tal/KviTalApplication.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalFileDialog.cpp b/src/kvilib/tal/KviTalFileDialog.cpp
index 4889f3215..bdb65e515 100644
--- a/src/kvilib/tal/KviTalFileDialog.cpp
+++ b/src/kvilib/tal/KviTalFileDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalFileDialog.h b/src/kvilib/tal/KviTalFileDialog.h
index 26598336d..992119e28 100644
--- a/src/kvilib/tal/KviTalFileDialog.h
+++ b/src/kvilib/tal/KviTalFileDialog.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalGroupBox.cpp b/src/kvilib/tal/KviTalGroupBox.cpp
index 09b5dcfd2..4c4fc1ff0 100644
--- a/src/kvilib/tal/KviTalGroupBox.cpp
+++ b/src/kvilib/tal/KviTalGroupBox.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalGroupBox.h b/src/kvilib/tal/KviTalGroupBox.h
index 8317e55ea..fa25f99ef 100644
--- a/src/kvilib/tal/KviTalGroupBox.h
+++ b/src/kvilib/tal/KviTalGroupBox.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalHBox.cpp b/src/kvilib/tal/KviTalHBox.cpp
index d96cf5f3d..015e424dd 100644
--- a/src/kvilib/tal/KviTalHBox.cpp
+++ b/src/kvilib/tal/KviTalHBox.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalHBox.h b/src/kvilib/tal/KviTalHBox.h
index e63bbafc2..2447398bd 100644
--- a/src/kvilib/tal/KviTalHBox.h
+++ b/src/kvilib/tal/KviTalHBox.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp
index b44719e91..c229e2226 100644
--- a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp
+++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h
index 8cd65c24e..2b7ae64d4 100644
--- a/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h
+++ b/src/kvilib/tal/KviTalIconAndRichTextItemDelegate.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalListWidget.cpp b/src/kvilib/tal/KviTalListWidget.cpp
index 6d9da8315..79d84c702 100644
--- a/src/kvilib/tal/KviTalListWidget.cpp
+++ b/src/kvilib/tal/KviTalListWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalListWidget.h b/src/kvilib/tal/KviTalListWidget.h
index b8174e526..803ed3db1 100644
--- a/src/kvilib/tal/KviTalListWidget.h
+++ b/src/kvilib/tal/KviTalListWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalMainWindow.cpp b/src/kvilib/tal/KviTalMainWindow.cpp
index 67925111e..539f453ed 100644
--- a/src/kvilib/tal/KviTalMainWindow.cpp
+++ b/src/kvilib/tal/KviTalMainWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalMainWindow.h b/src/kvilib/tal/KviTalMainWindow.h
index 86fee32ca..55df44619 100644
--- a/src/kvilib/tal/KviTalMainWindow.h
+++ b/src/kvilib/tal/KviTalMainWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalMenuBar.cpp b/src/kvilib/tal/KviTalMenuBar.cpp
index df7df4176..75c23c5a6 100644
--- a/src/kvilib/tal/KviTalMenuBar.cpp
+++ b/src/kvilib/tal/KviTalMenuBar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalMenuBar.h b/src/kvilib/tal/KviTalMenuBar.h
index a14b2293f..ffec73e10 100644
--- a/src/kvilib/tal/KviTalMenuBar.h
+++ b/src/kvilib/tal/KviTalMenuBar.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalSplitter.cpp b/src/kvilib/tal/KviTalSplitter.cpp
index e6c83e394..74cb97202 100644
--- a/src/kvilib/tal/KviTalSplitter.cpp
+++ b/src/kvilib/tal/KviTalSplitter.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalSplitter.h b/src/kvilib/tal/KviTalSplitter.h
index 01da80cc9..968e3aab7 100644
--- a/src/kvilib/tal/KviTalSplitter.h
+++ b/src/kvilib/tal/KviTalSplitter.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalTabDialog.cpp b/src/kvilib/tal/KviTalTabDialog.cpp
index 44526deb6..aafc08cf3 100644
--- a/src/kvilib/tal/KviTalTabDialog.cpp
+++ b/src/kvilib/tal/KviTalTabDialog.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalTabDialog.h b/src/kvilib/tal/KviTalTabDialog.h
index a71558575..184fefff6 100644
--- a/src/kvilib/tal/KviTalTabDialog.h
+++ b/src/kvilib/tal/KviTalTabDialog.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalTableWidget.cpp b/src/kvilib/tal/KviTalTableWidget.cpp
index 7649d1d03..376ba734c 100644
--- a/src/kvilib/tal/KviTalTableWidget.cpp
+++ b/src/kvilib/tal/KviTalTableWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalTableWidget.h b/src/kvilib/tal/KviTalTableWidget.h
index 84470daa1..144dcd0b8 100644
--- a/src/kvilib/tal/KviTalTableWidget.h
+++ b/src/kvilib/tal/KviTalTableWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalToolTip.cpp b/src/kvilib/tal/KviTalToolTip.cpp
index 74f784777..ade2e850a 100644
--- a/src/kvilib/tal/KviTalToolTip.cpp
+++ b/src/kvilib/tal/KviTalToolTip.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalToolTip.h b/src/kvilib/tal/KviTalToolTip.h
index 8cd0e2042..cc2aedc4f 100644
--- a/src/kvilib/tal/KviTalToolTip.h
+++ b/src/kvilib/tal/KviTalToolTip.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalVBox.cpp b/src/kvilib/tal/KviTalVBox.cpp
index b481452e8..be53e211f 100644
--- a/src/kvilib/tal/KviTalVBox.cpp
+++ b/src/kvilib/tal/KviTalVBox.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalVBox.h b/src/kvilib/tal/KviTalVBox.h
index 2f53ae25b..e2509802b 100644
--- a/src/kvilib/tal/KviTalVBox.h
+++ b/src/kvilib/tal/KviTalVBox.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalWizard.cpp b/src/kvilib/tal/KviTalWizard.cpp
index aa91d6938..9d9621ca3 100644
--- a/src/kvilib/tal/KviTalWizard.cpp
+++ b/src/kvilib/tal/KviTalWizard.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvilib/tal/KviTalWizard.h b/src/kvilib/tal/KviTalWizard.h
index 0f42c7def..a5b2c870c 100644
--- a/src/kvilib/tal/KviTalWizard.h
+++ b/src/kvilib/tal/KviTalWizard.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviAction.cpp b/src/kvirc/kernel/KviAction.cpp
index d7a112319..f67b171b1 100644
--- a/src/kvirc/kernel/KviAction.cpp
+++ b/src/kvirc/kernel/KviAction.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviAction.h b/src/kvirc/kernel/KviAction.h
index dd0f7b256..4b3b3dd05 100644
--- a/src/kvirc/kernel/KviAction.h
+++ b/src/kvirc/kernel/KviAction.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviActionManager.cpp b/src/kvirc/kernel/KviActionManager.cpp
index 55ea5665e..715876e12 100644
--- a/src/kvirc/kernel/KviActionManager.cpp
+++ b/src/kvirc/kernel/KviActionManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviActionManager.h b/src/kvirc/kernel/KviActionManager.h
index 14ea3928b..1087e273d 100644
--- a/src/kvirc/kernel/KviActionManager.h
+++ b/src/kvirc/kernel/KviActionManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index d6d69dd54..3e3fe4601 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviApplication.h b/src/kvirc/kernel/KviApplication.h
index b47f41c1c..1d25ec68b 100644
--- a/src/kvirc/kernel/KviApplication.h
+++ b/src/kvirc/kernel/KviApplication.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviApplication_filesystem.cpp b/src/kvirc/kernel/KviApplication_filesystem.cpp
index a098a3dbf..328ac6515 100644
--- a/src/kvirc/kernel/KviApplication_filesystem.cpp
+++ b/src/kvirc/kernel/KviApplication_filesystem.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviApplication_setup.cpp b/src/kvirc/kernel/KviApplication_setup.cpp
index aa402ac10..4ac072f36 100644
--- a/src/kvirc/kernel/KviApplication_setup.cpp
+++ b/src/kvirc/kernel/KviApplication_setup.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviAsynchronousConnectionData.cpp b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
index bd4cbfaa1..36ffb0c32 100644
--- a/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
+++ b/src/kvirc/kernel/KviAsynchronousConnectionData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviAsynchronousConnectionData.h b/src/kvirc/kernel/KviAsynchronousConnectionData.h
index 03062832d..df97a086d 100644
--- a/src/kvirc/kernel/KviAsynchronousConnectionData.h
+++ b/src/kvirc/kernel/KviAsynchronousConnectionData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviCoreActionNames.h b/src/kvirc/kernel/KviCoreActionNames.h
index f57b3b710..75325f4ef 100644
--- a/src/kvirc/kernel/KviCoreActionNames.h
+++ b/src/kvirc/kernel/KviCoreActionNames.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviCoreActions.cpp b/src/kvirc/kernel/KviCoreActions.cpp
index ae099268d..1447f2cd6 100644
--- a/src/kvirc/kernel/KviCoreActions.cpp
+++ b/src/kvirc/kernel/KviCoreActions.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviCoreActions.h b/src/kvirc/kernel/KviCoreActions.h
index 7715b6810..4d635a9ab 100644
--- a/src/kvirc/kernel/KviCoreActions.h
+++ b/src/kvirc/kernel/KviCoreActions.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp
index f554cb42b..e68a29b28 100644
--- a/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp
+++ b/src/kvirc/kernel/KviCustomToolBarDescriptor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviCustomToolBarDescriptor.h b/src/kvirc/kernel/KviCustomToolBarDescriptor.h
index 8fb8359b0..aca9be7b3 100644
--- a/src/kvirc/kernel/KviCustomToolBarDescriptor.h
+++ b/src/kvirc/kernel/KviCustomToolBarDescriptor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviCustomToolBarManager.cpp b/src/kvirc/kernel/KviCustomToolBarManager.cpp
index fe52719f8..9d8ade9c8 100644
--- a/src/kvirc/kernel/KviCustomToolBarManager.cpp
+++ b/src/kvirc/kernel/KviCustomToolBarManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviCustomToolBarManager.h b/src/kvirc/kernel/KviCustomToolBarManager.h
index d25b24546..f47dd4c40 100644
--- a/src/kvirc/kernel/KviCustomToolBarManager.h
+++ b/src/kvirc/kernel/KviCustomToolBarManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviDefaultScript.cpp b/src/kvirc/kernel/KviDefaultScript.cpp
index 755d0dbb2..28900efce 100644
--- a/src/kvirc/kernel/KviDefaultScript.cpp
+++ b/src/kvirc/kernel/KviDefaultScript.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviDefaultScript.h b/src/kvirc/kernel/KviDefaultScript.h
index feaf298a0..843d2168b 100644
--- a/src/kvirc/kernel/KviDefaultScript.h
+++ b/src/kvirc/kernel/KviDefaultScript.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviFileTransfer.cpp b/src/kvirc/kernel/KviFileTransfer.cpp
index 9c1128c37..14edba353 100644
--- a/src/kvirc/kernel/KviFileTransfer.cpp
+++ b/src/kvirc/kernel/KviFileTransfer.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviFileTransfer.h b/src/kvirc/kernel/KviFileTransfer.h
index 9505cfdf8..faafc21f4 100644
--- a/src/kvirc/kernel/KviFileTransfer.h
+++ b/src/kvirc/kernel/KviFileTransfer.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviHtmlGenerator.cpp b/src/kvirc/kernel/KviHtmlGenerator.cpp
index 0e33d8aec..8ff72fd4a 100644
--- a/src/kvirc/kernel/KviHtmlGenerator.cpp
+++ b/src/kvirc/kernel/KviHtmlGenerator.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviHtmlGenerator.h b/src/kvirc/kernel/KviHtmlGenerator.h
index 92b66da27..93eecbe6a 100644
--- a/src/kvirc/kernel/KviHtmlGenerator.h
+++ b/src/kvirc/kernel/KviHtmlGenerator.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIconManager.cpp b/src/kvirc/kernel/KviIconManager.cpp
index 73f74e694..76019c8ba 100644
--- a/src/kvirc/kernel/KviIconManager.cpp
+++ b/src/kvirc/kernel/KviIconManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIconManager.h b/src/kvirc/kernel/KviIconManager.h
index 3cc561a49..15313d588 100644
--- a/src/kvirc/kernel/KviIconManager.h
+++ b/src/kvirc/kernel/KviIconManager.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviInternalCommand.cpp b/src/kvirc/kernel/KviInternalCommand.cpp
index 8e4b62309..a4be5073a 100644
--- a/src/kvirc/kernel/KviInternalCommand.cpp
+++ b/src/kvirc/kernel/KviInternalCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviInternalCommand.h b/src/kvirc/kernel/KviInternalCommand.h
index 9278ef60a..1c36dbaee 100644
--- a/src/kvirc/kernel/KviInternalCommand.h
+++ b/src/kvirc/kernel/KviInternalCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp
index 882628fd6..8fe3b2f42 100644
--- a/src/kvirc/kernel/KviIpcSentinel.cpp
+++ b/src/kvirc/kernel/KviIpcSentinel.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIpcSentinel.h b/src/kvirc/kernel/KviIpcSentinel.h
index 745e2aa40..0be2baffc 100644
--- a/src/kvirc/kernel/KviIpcSentinel.h
+++ b/src/kvirc/kernel/KviIpcSentinel.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnection.cpp b/src/kvirc/kernel/KviIrcConnection.cpp
index 30557e6a5..c3b614592 100644
--- a/src/kvirc/kernel/KviIrcConnection.cpp
+++ b/src/kvirc/kernel/KviIrcConnection.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnection.h b/src/kvirc/kernel/KviIrcConnection.h
index f473dd61a..f5b68ba1e 100644
--- a/src/kvirc/kernel/KviIrcConnection.h
+++ b/src/kvirc/kernel/KviIrcConnection.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp
index 978dbd5a2..43f72434f 100644
--- a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.h b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.h
index 10c4ce4cf..f1cf3e7ed 100644
--- a/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.h
+++ b/src/kvirc/kernel/KviIrcConnectionAntiCtcpFloodData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncData.h b/src/kvirc/kernel/KviIrcConnectionAsyncData.h
index c1ac268e8..98b0c7482 100644
--- a/src/kvirc/kernel/KviIrcConnectionAsyncData.h
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
index 57d6ca250..0524d03ab 100644
--- a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h
index 861e0deae..9218f0506 100644
--- a/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h
+++ b/src/kvirc/kernel/KviIrcConnectionAsyncWhoisData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp
index de84181a4..95179ea5d 100644
--- a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.h b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.h
index 98439df8f..ef949a87c 100644
--- a/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.h
+++ b/src/kvirc/kernel/KviIrcConnectionNetsplitDetectorData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionRequestQueue.cpp b/src/kvirc/kernel/KviIrcConnectionRequestQueue.cpp
index 5cbfa3145..99a09b394 100644
--- a/src/kvirc/kernel/KviIrcConnectionRequestQueue.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionRequestQueue.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionRequestQueue.h b/src/kvirc/kernel/KviIrcConnectionRequestQueue.h
index afed73e1e..857e8e60a 100644
--- a/src/kvirc/kernel/KviIrcConnectionRequestQueue.h
+++ b/src/kvirc/kernel/KviIrcConnectionRequestQueue.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
index b1ac2a848..4e11cfdce 100644
--- a/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionServerInfo.h b/src/kvirc/kernel/KviIrcConnectionServerInfo.h
index acb40d09a..4ac7c45cc 100644
--- a/src/kvirc/kernel/KviIrcConnectionServerInfo.h
+++ b/src/kvirc/kernel/KviIrcConnectionServerInfo.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionStateData.cpp b/src/kvirc/kernel/KviIrcConnectionStateData.cpp
index c1e0bcbb9..389f4aaac 100644
--- a/src/kvirc/kernel/KviIrcConnectionStateData.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionStateData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionStateData.h b/src/kvirc/kernel/KviIrcConnectionStateData.h
index 4b9f6e9d9..e0052ae53 100644
--- a/src/kvirc/kernel/KviIrcConnectionStateData.h
+++ b/src/kvirc/kernel/KviIrcConnectionStateData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionStatistics.cpp b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp
index 188be6184..dbe2af134 100644
--- a/src/kvirc/kernel/KviIrcConnectionStatistics.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionStatistics.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionStatistics.h b/src/kvirc/kernel/KviIrcConnectionStatistics.h
index 84ad1521f..8a16f6ce8 100644
--- a/src/kvirc/kernel/KviIrcConnectionStatistics.h
+++ b/src/kvirc/kernel/KviIrcConnectionStatistics.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionTarget.cpp b/src/kvirc/kernel/KviIrcConnectionTarget.cpp
index c569dcae0..9fdee532b 100644
--- a/src/kvirc/kernel/KviIrcConnectionTarget.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionTarget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionTarget.h b/src/kvirc/kernel/KviIrcConnectionTarget.h
index 5549e862e..216a320d7 100644
--- a/src/kvirc/kernel/KviIrcConnectionTarget.h
+++ b/src/kvirc/kernel/KviIrcConnectionTarget.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
index c39071073..9f880b8d8 100644
--- a/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionTargetResolver.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionTargetResolver.h b/src/kvirc/kernel/KviIrcConnectionTargetResolver.h
index 175bfdb79..776d95112 100644
--- a/src/kvirc/kernel/KviIrcConnectionTargetResolver.h
+++ b/src/kvirc/kernel/KviIrcConnectionTargetResolver.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp b/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp
index 954059dc6..4f4216f53 100644
--- a/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp
+++ b/src/kvirc/kernel/KviIrcConnectionUserInfo.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcConnectionUserInfo.h b/src/kvirc/kernel/KviIrcConnectionUserInfo.h
index 2aaa33138..995f54b16 100644
--- a/src/kvirc/kernel/KviIrcConnectionUserInfo.h
+++ b/src/kvirc/kernel/KviIrcConnectionUserInfo.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcContext.cpp b/src/kvirc/kernel/KviIrcContext.cpp
index cb37309c1..9e32633a1 100644
--- a/src/kvirc/kernel/KviIrcContext.cpp
+++ b/src/kvirc/kernel/KviIrcContext.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcContext.h b/src/kvirc/kernel/KviIrcContext.h
index fd375f883..83cfaecfa 100644
--- a/src/kvirc/kernel/KviIrcContext.h
+++ b/src/kvirc/kernel/KviIrcContext.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcDataStreamMonitor.cpp b/src/kvirc/kernel/KviIrcDataStreamMonitor.cpp
index fca864521..4a78b011b 100644
--- a/src/kvirc/kernel/KviIrcDataStreamMonitor.cpp
+++ b/src/kvirc/kernel/KviIrcDataStreamMonitor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcDataStreamMonitor.h b/src/kvirc/kernel/KviIrcDataStreamMonitor.h
index dfc8d1ddf..c63149e4d 100644
--- a/src/kvirc/kernel/KviIrcDataStreamMonitor.h
+++ b/src/kvirc/kernel/KviIrcDataStreamMonitor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcLink.cpp b/src/kvirc/kernel/KviIrcLink.cpp
index 70b65cce4..5994b508b 100644
--- a/src/kvirc/kernel/KviIrcLink.cpp
+++ b/src/kvirc/kernel/KviIrcLink.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcLink.h b/src/kvirc/kernel/KviIrcLink.h
index 0362eaef3..ac82ea52d 100644
--- a/src/kvirc/kernel/KviIrcLink.h
+++ b/src/kvirc/kernel/KviIrcLink.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcSocket.cpp b/src/kvirc/kernel/KviIrcSocket.cpp
index f777e6257..6e22303df 100644
--- a/src/kvirc/kernel/KviIrcSocket.cpp
+++ b/src/kvirc/kernel/KviIrcSocket.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcSocket.h b/src/kvirc/kernel/KviIrcSocket.h
index 4ef3f1d1a..58e66f374 100644
--- a/src/kvirc/kernel/KviIrcSocket.h
+++ b/src/kvirc/kernel/KviIrcSocket.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcUrl.cpp b/src/kvirc/kernel/KviIrcUrl.cpp
index db7f11f37..7380e3b64 100644
--- a/src/kvirc/kernel/KviIrcUrl.cpp
+++ b/src/kvirc/kernel/KviIrcUrl.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviIrcUrl.h b/src/kvirc/kernel/KviIrcUrl.h
index 0ddee98f1..24edda466 100644
--- a/src/kvirc/kernel/KviIrcUrl.h
+++ b/src/kvirc/kernel/KviIrcUrl.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviLagMeter.cpp b/src/kvirc/kernel/KviLagMeter.cpp
index e45974d7b..e71798ab3 100644
--- a/src/kvirc/kernel/KviLagMeter.cpp
+++ b/src/kvirc/kernel/KviLagMeter.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviLagMeter.h b/src/kvirc/kernel/KviLagMeter.h
index 5a936cbf0..b73140299 100644
--- a/src/kvirc/kernel/KviLagMeter.h
+++ b/src/kvirc/kernel/KviLagMeter.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviMain.cpp b/src/kvirc/kernel/KviMain.cpp
index 12a1f42d7..93677b875 100644
--- a/src/kvirc/kernel/KviMain.cpp
+++ b/src/kvirc/kernel/KviMain.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviNotifyList.cpp b/src/kvirc/kernel/KviNotifyList.cpp
index 01388ed1b..af621867f 100644
--- a/src/kvirc/kernel/KviNotifyList.cpp
+++ b/src/kvirc/kernel/KviNotifyList.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviNotifyList.h b/src/kvirc/kernel/KviNotifyList.h
index 57f32065c..efe192548 100644
--- a/src/kvirc/kernel/KviNotifyList.h
+++ b/src/kvirc/kernel/KviNotifyList.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviOptions.cpp b/src/kvirc/kernel/KviOptions.cpp
index cd71e1332..0c71f7a7b 100644
--- a/src/kvirc/kernel/KviOptions.cpp
+++ b/src/kvirc/kernel/KviOptions.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviOptions.h b/src/kvirc/kernel/KviOptions.h
index 45a35f1dd..f230df05a 100644
--- a/src/kvirc/kernel/KviOptions.h
+++ b/src/kvirc/kernel/KviOptions.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviSSLMaster.cpp b/src/kvirc/kernel/KviSSLMaster.cpp
index ff84cd359..acce4dd55 100644
--- a/src/kvirc/kernel/KviSSLMaster.cpp
+++ b/src/kvirc/kernel/KviSSLMaster.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviSSLMaster.h b/src/kvirc/kernel/KviSSLMaster.h
index 75325b63f..16876661e 100644
--- a/src/kvirc/kernel/KviSSLMaster.h
+++ b/src/kvirc/kernel/KviSSLMaster.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviTextIconManager.cpp b/src/kvirc/kernel/KviTextIconManager.cpp
index 38afb2885..9514ebc45 100644
--- a/src/kvirc/kernel/KviTextIconManager.cpp
+++ b/src/kvirc/kernel/KviTextIconManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviTextIconManager.h b/src/kvirc/kernel/KviTextIconManager.h
index b1aa0a3f8..a4a32b612 100644
--- a/src/kvirc/kernel/KviTextIconManager.h
+++ b/src/kvirc/kernel/KviTextIconManager.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviTheme.cpp b/src/kvirc/kernel/KviTheme.cpp
index 76e2111fd..ac37a6540 100644
--- a/src/kvirc/kernel/KviTheme.cpp
+++ b/src/kvirc/kernel/KviTheme.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviTheme.h b/src/kvirc/kernel/KviTheme.h
index 494eb037e..b20d4ea6f 100644
--- a/src/kvirc/kernel/KviTheme.h
+++ b/src/kvirc/kernel/KviTheme.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviUserAction.cpp b/src/kvirc/kernel/KviUserAction.cpp
index 0d5042b3f..46990cf47 100644
--- a/src/kvirc/kernel/KviUserAction.cpp
+++ b/src/kvirc/kernel/KviUserAction.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviUserAction.h b/src/kvirc/kernel/KviUserAction.h
index 110edbf00..b8b9ea566 100644
--- a/src/kvirc/kernel/KviUserAction.h
+++ b/src/kvirc/kernel/KviUserAction.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviUserInput.cpp b/src/kvirc/kernel/KviUserInput.cpp
index 333f991b3..2a25e0ff8 100644
--- a/src/kvirc/kernel/KviUserInput.cpp
+++ b/src/kvirc/kernel/KviUserInput.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/KviUserInput.h b/src/kvirc/kernel/KviUserInput.h
index bd3409a36..d9aca7c56 100644
--- a/src/kvirc/kernel/KviUserInput.h
+++ b/src/kvirc/kernel/KviUserInput.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kernel/kvi_out.h b/src/kvirc/kernel/kvi_out.h
index b545d92c4..29c8b78de 100644
--- a/src/kvirc/kernel/kvi_out.h
+++ b/src/kvirc/kernel/kvi_out.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvs.cpp b/src/kvirc/kvs/KviKvs.cpp
index b65fee8a4..b0db7267c 100644
--- a/src/kvirc/kvs/KviKvs.cpp
+++ b/src/kvirc/kvs/KviKvs.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvs.h b/src/kvirc/kvs/KviKvs.h
index a75761d24..b7b5297d1 100644
--- a/src/kvirc/kvs/KviKvs.h
+++ b/src/kvirc/kvs/KviKvs.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsAction.cpp b/src/kvirc/kvs/KviKvsAction.cpp
index 00a47fab9..23b14a112 100644
--- a/src/kvirc/kvs/KviKvsAction.cpp
+++ b/src/kvirc/kvs/KviKvsAction.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsAction.h b/src/kvirc/kvs/KviKvsAction.h
index 0031e28a2..58eeef4cf 100644
--- a/src/kvirc/kvs/KviKvsAction.h
+++ b/src/kvirc/kvs/KviKvsAction.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsAliasManager.cpp b/src/kvirc/kvs/KviKvsAliasManager.cpp
index 6d42b6048..5d71a17c6 100644
--- a/src/kvirc/kvs/KviKvsAliasManager.cpp
+++ b/src/kvirc/kvs/KviKvsAliasManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsAliasManager.h b/src/kvirc/kvs/KviKvsAliasManager.h
index 2c94ca331..62c8c3633 100644
--- a/src/kvirc/kvs/KviKvsAliasManager.h
+++ b/src/kvirc/kvs/KviKvsAliasManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsArray.cpp b/src/kvirc/kvs/KviKvsArray.cpp
index 7e1028871..9637dfe62 100644
--- a/src/kvirc/kvs/KviKvsArray.cpp
+++ b/src/kvirc/kvs/KviKvsArray.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsArray.h b/src/kvirc/kvs/KviKvsArray.h
index 3c74cd7ce..033401675 100644
--- a/src/kvirc/kvs/KviKvsArray.h
+++ b/src/kvirc/kvs/KviKvsArray.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsArrayCast.cpp b/src/kvirc/kvs/KviKvsArrayCast.cpp
index 16d392dd2..3400f5974 100644
--- a/src/kvirc/kvs/KviKvsArrayCast.cpp
+++ b/src/kvirc/kvs/KviKvsArrayCast.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsArrayCast.h b/src/kvirc/kvs/KviKvsArrayCast.h
index 65fb139be..bea03d85f 100644
--- a/src/kvirc/kvs/KviKvsArrayCast.h
+++ b/src/kvirc/kvs/KviKvsArrayCast.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp b/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp
index 8b3374ffb..fa6396582 100644
--- a/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp
+++ b/src/kvirc/kvs/KviKvsAsyncDnsOperation.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsAsyncDnsOperation.h b/src/kvirc/kvs/KviKvsAsyncDnsOperation.h
index 5beb05d28..849165d0b 100644
--- a/src/kvirc/kvs/KviKvsAsyncDnsOperation.h
+++ b/src/kvirc/kvs/KviKvsAsyncDnsOperation.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsAsyncOperation.cpp b/src/kvirc/kvs/KviKvsAsyncOperation.cpp
index f82304bc8..f3fcdcc18 100644
--- a/src/kvirc/kvs/KviKvsAsyncOperation.cpp
+++ b/src/kvirc/kvs/KviKvsAsyncOperation.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsAsyncOperation.h b/src/kvirc/kvs/KviKvsAsyncOperation.h
index 4c7d3c0ce..81eed72fa 100644
--- a/src/kvirc/kvs/KviKvsAsyncOperation.h
+++ b/src/kvirc/kvs/KviKvsAsyncOperation.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCallbackObject.cpp b/src/kvirc/kvs/KviKvsCallbackObject.cpp
index 8c94c1197..6c23c0f3d 100644
--- a/src/kvirc/kvs/KviKvsCallbackObject.cpp
+++ b/src/kvirc/kvs/KviKvsCallbackObject.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCallbackObject.h b/src/kvirc/kvs/KviKvsCallbackObject.h
index fa725d627..8b0655ac7 100644
--- a/src/kvirc/kvs/KviKvsCallbackObject.h
+++ b/src/kvirc/kvs/KviKvsCallbackObject.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
index 23bc9d030..7fb5fefa3 100644
--- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
+++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreCallbackCommands.h b/src/kvirc/kvs/KviKvsCoreCallbackCommands.h
index 039786fab..f796394b7 100644
--- a/src/kvirc/kvs/KviKvsCoreCallbackCommands.h
+++ b/src/kvirc/kvs/KviKvsCoreCallbackCommands.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions.cpp b/src/kvirc/kvs/KviKvsCoreFunctions.cpp
index 4f48981e5..9f68d6fdf 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions.h b/src/kvirc/kvs/KviKvsCoreFunctions.h
index 8d6ff8f82..d979d3817 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions.h
+++ b/src/kvirc/kvs/KviKvsCoreFunctions.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
index 7c1fe40d8..526e4a33f 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
index 6060f3ba3..b73467114 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_gl.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
index d5c495fe3..23c7ccbd9 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_mr.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
index e29dec441..c7ef070d7 100644
--- a/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreFunctions_sz.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp
index f2b520c0d..db739b0e9 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands.h b/src/kvirc/kvs/KviKvsCoreSimpleCommands.h
index 813d49337..efcc4c9d0 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands.h
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
index 5df318e98..e3b88552a 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp
index 6d24c06fa..c0c610167 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_gl.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
index b19fb8aef..cd442f857 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_mr.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
index ea575c273..b70cd2605 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_sz.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsDnsManager.cpp b/src/kvirc/kvs/KviKvsDnsManager.cpp
index ae907b6ab..c50706cee 100644
--- a/src/kvirc/kvs/KviKvsDnsManager.cpp
+++ b/src/kvirc/kvs/KviKvsDnsManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsDnsManager.h b/src/kvirc/kvs/KviKvsDnsManager.h
index 9a54f0a4d..845ed1cd9 100644
--- a/src/kvirc/kvs/KviKvsDnsManager.h
+++ b/src/kvirc/kvs/KviKvsDnsManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsHash.cpp b/src/kvirc/kvs/KviKvsHash.cpp
index 196b347cd..72da9e0b9 100644
--- a/src/kvirc/kvs/KviKvsHash.cpp
+++ b/src/kvirc/kvs/KviKvsHash.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsHash.h b/src/kvirc/kvs/KviKvsHash.h
index b022e8959..112298a08 100644
--- a/src/kvirc/kvs/KviKvsHash.h
+++ b/src/kvirc/kvs/KviKvsHash.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsKernel.cpp b/src/kvirc/kvs/KviKvsKernel.cpp
index dcb50a6cb..5ae09b6e8 100644
--- a/src/kvirc/kvs/KviKvsKernel.cpp
+++ b/src/kvirc/kvs/KviKvsKernel.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsKernel.h b/src/kvirc/kvs/KviKvsKernel.h
index f761a5156..5e7cfb142 100644
--- a/src/kvirc/kvs/KviKvsKernel.h
+++ b/src/kvirc/kvs/KviKvsKernel.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsModuleInterface.cpp b/src/kvirc/kvs/KviKvsModuleInterface.cpp
index d8621b86a..1ab976b55 100644
--- a/src/kvirc/kvs/KviKvsModuleInterface.cpp
+++ b/src/kvirc/kvs/KviKvsModuleInterface.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsModuleInterface.h b/src/kvirc/kvs/KviKvsModuleInterface.h
index 49910ba04..85971f73b 100644
--- a/src/kvirc/kvs/KviKvsModuleInterface.h
+++ b/src/kvirc/kvs/KviKvsModuleInterface.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsParameterProcessor.cpp b/src/kvirc/kvs/KviKvsParameterProcessor.cpp
index a59e7543a..ed315151c 100644
--- a/src/kvirc/kvs/KviKvsParameterProcessor.cpp
+++ b/src/kvirc/kvs/KviKvsParameterProcessor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsParameterProcessor.h b/src/kvirc/kvs/KviKvsParameterProcessor.h
index 9b297fe00..6e91fced4 100644
--- a/src/kvirc/kvs/KviKvsParameterProcessor.h
+++ b/src/kvirc/kvs/KviKvsParameterProcessor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsPopupManager.cpp b/src/kvirc/kvs/KviKvsPopupManager.cpp
index a2d1caf0d..6cc660bba 100644
--- a/src/kvirc/kvs/KviKvsPopupManager.cpp
+++ b/src/kvirc/kvs/KviKvsPopupManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsPopupManager.h b/src/kvirc/kvs/KviKvsPopupManager.h
index 2f17e78d8..afedcf67f 100644
--- a/src/kvirc/kvs/KviKvsPopupManager.h
+++ b/src/kvirc/kvs/KviKvsPopupManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsPopupMenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp
index 67a2dab10..e0405ff04 100644
--- a/src/kvirc/kvs/KviKvsPopupMenu.cpp
+++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsPopupMenu.h b/src/kvirc/kvs/KviKvsPopupMenu.h
index ee0fea74f..8e7ddb5eb 100644
--- a/src/kvirc/kvs/KviKvsPopupMenu.h
+++ b/src/kvirc/kvs/KviKvsPopupMenu.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsProcessManager.cpp b/src/kvirc/kvs/KviKvsProcessManager.cpp
index 398c6e5d4..d76833aac 100644
--- a/src/kvirc/kvs/KviKvsProcessManager.cpp
+++ b/src/kvirc/kvs/KviKvsProcessManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsProcessManager.h b/src/kvirc/kvs/KviKvsProcessManager.h
index 3b2b380a1..d531d53bc 100644
--- a/src/kvirc/kvs/KviKvsProcessManager.h
+++ b/src/kvirc/kvs/KviKvsProcessManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp
index 2df00abe7..9b7917f9a 100644
--- a/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp
+++ b/src/kvirc/kvs/KviKvsRWEvaluationResult.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsRWEvaluationResult.h b/src/kvirc/kvs/KviKvsRWEvaluationResult.h
index 71c882ab3..7dcb8f305 100644
--- a/src/kvirc/kvs/KviKvsRWEvaluationResult.h
+++ b/src/kvirc/kvs/KviKvsRWEvaluationResult.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsReport.cpp b/src/kvirc/kvs/KviKvsReport.cpp
index 02b145fb0..4783197dd 100644
--- a/src/kvirc/kvs/KviKvsReport.cpp
+++ b/src/kvirc/kvs/KviKvsReport.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsReport.h b/src/kvirc/kvs/KviKvsReport.h
index 6ad68e6f0..03685faf4 100644
--- a/src/kvirc/kvs/KviKvsReport.h
+++ b/src/kvirc/kvs/KviKvsReport.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsRunTimeCall.cpp b/src/kvirc/kvs/KviKvsRunTimeCall.cpp
index 17b503cb0..9f3970add 100644
--- a/src/kvirc/kvs/KviKvsRunTimeCall.cpp
+++ b/src/kvirc/kvs/KviKvsRunTimeCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsRunTimeCall.h b/src/kvirc/kvs/KviKvsRunTimeCall.h
index d4fe3f8aa..d1138ad9a 100644
--- a/src/kvirc/kvs/KviKvsRunTimeCall.h
+++ b/src/kvirc/kvs/KviKvsRunTimeCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsRunTimeContext.cpp b/src/kvirc/kvs/KviKvsRunTimeContext.cpp
index 219878444..836105383 100644
--- a/src/kvirc/kvs/KviKvsRunTimeContext.cpp
+++ b/src/kvirc/kvs/KviKvsRunTimeContext.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsRunTimeContext.h b/src/kvirc/kvs/KviKvsRunTimeContext.h
index a70643be4..7cbcc284c 100644
--- a/src/kvirc/kvs/KviKvsRunTimeContext.h
+++ b/src/kvirc/kvs/KviKvsRunTimeContext.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsScript.cpp b/src/kvirc/kvs/KviKvsScript.cpp
index 0f970e177..3f765c6dd 100644
--- a/src/kvirc/kvs/KviKvsScript.cpp
+++ b/src/kvirc/kvs/KviKvsScript.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsScript.h b/src/kvirc/kvs/KviKvsScript.h
index 52db02079..ed8a9c38d 100644
--- a/src/kvirc/kvs/KviKvsScript.h
+++ b/src/kvirc/kvs/KviKvsScript.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
index c046b3358..923e63e2a 100644
--- a/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
+++ b/src/kvirc/kvs/KviKvsScriptAddonManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsScriptAddonManager.h b/src/kvirc/kvs/KviKvsScriptAddonManager.h
index 2022bc094..54da61f19 100644
--- a/src/kvirc/kvs/KviKvsScriptAddonManager.h
+++ b/src/kvirc/kvs/KviKvsScriptAddonManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsSwitchList.cpp b/src/kvirc/kvs/KviKvsSwitchList.cpp
index 49b40d2a2..59827f0f5 100644
--- a/src/kvirc/kvs/KviKvsSwitchList.cpp
+++ b/src/kvirc/kvs/KviKvsSwitchList.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsSwitchList.h b/src/kvirc/kvs/KviKvsSwitchList.h
index caa155075..d70633a1b 100644
--- a/src/kvirc/kvs/KviKvsSwitchList.h
+++ b/src/kvirc/kvs/KviKvsSwitchList.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsTimerManager.cpp b/src/kvirc/kvs/KviKvsTimerManager.cpp
index fc7635d51..dd984a8e7 100644
--- a/src/kvirc/kvs/KviKvsTimerManager.cpp
+++ b/src/kvirc/kvs/KviKvsTimerManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsTimerManager.h b/src/kvirc/kvs/KviKvsTimerManager.h
index 268e9f9e2..e353a8705 100644
--- a/src/kvirc/kvs/KviKvsTimerManager.h
+++ b/src/kvirc/kvs/KviKvsTimerManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsTypes.h b/src/kvirc/kvs/KviKvsTypes.h
index 9ee9faa8e..be5d33553 100644
--- a/src/kvirc/kvs/KviKvsTypes.h
+++ b/src/kvirc/kvs/KviKvsTypes.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsUserAction.cpp b/src/kvirc/kvs/KviKvsUserAction.cpp
index 9a5ca2f03..ca2a36397 100644
--- a/src/kvirc/kvs/KviKvsUserAction.cpp
+++ b/src/kvirc/kvs/KviKvsUserAction.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsUserAction.h b/src/kvirc/kvs/KviKvsUserAction.h
index 70cc144ab..4ec8a2842 100644
--- a/src/kvirc/kvs/KviKvsUserAction.h
+++ b/src/kvirc/kvs/KviKvsUserAction.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsVariant.cpp b/src/kvirc/kvs/KviKvsVariant.cpp
index 10f1fb92a..131452e5c 100644
--- a/src/kvirc/kvs/KviKvsVariant.cpp
+++ b/src/kvirc/kvs/KviKvsVariant.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsVariant.h b/src/kvirc/kvs/KviKvsVariant.h
index 54e20c7ca..375c42ed3 100644
--- a/src/kvirc/kvs/KviKvsVariant.h
+++ b/src/kvirc/kvs/KviKvsVariant.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsVariantList.cpp b/src/kvirc/kvs/KviKvsVariantList.cpp
index 18c0a6729..5dd7b9238 100644
--- a/src/kvirc/kvs/KviKvsVariantList.cpp
+++ b/src/kvirc/kvs/KviKvsVariantList.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/KviKvsVariantList.h b/src/kvirc/kvs/KviKvsVariantList.h
index f5bc8685e..0a1ae2a55 100644
--- a/src/kvirc/kvs/KviKvsVariantList.h
+++ b/src/kvirc/kvs/KviKvsVariantList.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEvent.cpp b/src/kvirc/kvs/event/KviKvsEvent.cpp
index 5d170ce89..f53dcbb63 100644
--- a/src/kvirc/kvs/event/KviKvsEvent.cpp
+++ b/src/kvirc/kvs/event/KviKvsEvent.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEvent.h b/src/kvirc/kvs/event/KviKvsEvent.h
index 1495a4fea..0e80da38e 100644
--- a/src/kvirc/kvs/event/KviKvsEvent.h
+++ b/src/kvirc/kvs/event/KviKvsEvent.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEventHandler.cpp b/src/kvirc/kvs/event/KviKvsEventHandler.cpp
index b29f3ba9a..4e08d9871 100644
--- a/src/kvirc/kvs/event/KviKvsEventHandler.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventHandler.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEventHandler.h b/src/kvirc/kvs/event/KviKvsEventHandler.h
index 148c8bbee..dd8c62f70 100644
--- a/src/kvirc/kvs/event/KviKvsEventHandler.h
+++ b/src/kvirc/kvs/event/KviKvsEventHandler.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEventManager.cpp b/src/kvirc/kvs/event/KviKvsEventManager.cpp
index e65c87928..9a5bff56a 100644
--- a/src/kvirc/kvs/event/KviKvsEventManager.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEventManager.h b/src/kvirc/kvs/event/KviKvsEventManager.h
index a601b4a62..0c2b12d7e 100644
--- a/src/kvirc/kvs/event/KviKvsEventManager.h
+++ b/src/kvirc/kvs/event/KviKvsEventManager.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEventTable.cpp b/src/kvirc/kvs/event/KviKvsEventTable.cpp
index 6762ae667..c446300b6 100644
--- a/src/kvirc/kvs/event/KviKvsEventTable.cpp
+++ b/src/kvirc/kvs/event/KviKvsEventTable.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEventTable.h b/src/kvirc/kvs/event/KviKvsEventTable.h
index 4bfd65790..10d9c8c3a 100644
--- a/src/kvirc/kvs/event/KviKvsEventTable.h
+++ b/src/kvirc/kvs/event/KviKvsEventTable.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/event/KviKvsEventTriggers.h b/src/kvirc/kvs/event/KviKvsEventTriggers.h
index 73898c3c2..1149d2878 100644
--- a/src/kvirc/kvs/event/KviKvsEventTriggers.h
+++ b/src/kvirc/kvs/event/KviKvsEventTriggers.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObject.cpp b/src/kvirc/kvs/object/KviKvsObject.cpp
index c0c9f1864..472920fac 100644
--- a/src/kvirc/kvs/object/KviKvsObject.cpp
+++ b/src/kvirc/kvs/object/KviKvsObject.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObject.h b/src/kvirc/kvs/object/KviKvsObject.h
index 60bc44433..94ea76408 100644
--- a/src/kvirc/kvs/object/KviKvsObject.h
+++ b/src/kvirc/kvs/object/KviKvsObject.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectClass.cpp b/src/kvirc/kvs/object/KviKvsObjectClass.cpp
index d29d045b8..522ce2579 100644
--- a/src/kvirc/kvs/object/KviKvsObjectClass.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectClass.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectClass.h b/src/kvirc/kvs/object/KviKvsObjectClass.h
index 58048ccad..0511f8e80 100644
--- a/src/kvirc/kvs/object/KviKvsObjectClass.h
+++ b/src/kvirc/kvs/object/KviKvsObjectClass.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectController.cpp b/src/kvirc/kvs/object/KviKvsObjectController.cpp
index 0b1fe052c..50a273f00 100644
--- a/src/kvirc/kvs/object/KviKvsObjectController.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectController.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectController.h b/src/kvirc/kvs/object/KviKvsObjectController.h
index 9e4b5b790..b11b3f641 100644
--- a/src/kvirc/kvs/object/KviKvsObjectController.h
+++ b/src/kvirc/kvs/object/KviKvsObjectController.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp
index cfa7673c4..be492abab 100644
--- a/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionCall.h b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.h
index 86cb2a3f5..28c31dc20 100644
--- a/src/kvirc/kvs/object/KviKvsObjectFunctionCall.h
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp
index 032f7aa73..222076ddf 100644
--- a/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.h b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.h
index 05a23173c..9cdfb2a3b 100644
--- a/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.h
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandler.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
index e885cf843..c83c5cd2b 100644
--- a/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.h b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.h
index fb4d824ff..81ff349a2 100644
--- a/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.h
+++ b/src/kvirc/kvs/object/KviKvsObjectFunctionHandlerImpl.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParser.cpp b/src/kvirc/kvs/parser/KviKvsParser.cpp
index f1bdeecbd..f6ea42c12 100644
--- a/src/kvirc/kvs/parser/KviKvsParser.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParser.h b/src/kvirc/kvs/parser/KviKvsParser.h
index 5518235e1..553829ad7 100644
--- a/src/kvirc/kvs/parser/KviKvsParser.h
+++ b/src/kvirc/kvs/parser/KviKvsParser.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParserMacros.h b/src/kvirc/kvs/parser/KviKvsParserMacros.h
index 8b181e9f4..9a19627dc 100644
--- a/src/kvirc/kvs/parser/KviKvsParserMacros.h
+++ b/src/kvirc/kvs/parser/KviKvsParserMacros.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParser_command.cpp b/src/kvirc/kvs/parser/KviKvsParser_command.cpp
index faf2bb870..8a795a367 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_command.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_command.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParser_comment.cpp b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp
index 13e9b0bf6..e661bdce5 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_comment.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_comment.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
index e7c644d49..7b84dd402 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_dollar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
index 6c5087d50..d6916a8b8 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_expression.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParser_lside.cpp b/src/kvirc/kvs/parser/KviKvsParser_lside.cpp
index e3deec28f..eb246c3a1 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_lside.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_lside.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
index d75fb77ac..4fa5c83f8 100644
--- a/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
+++ b/src/kvirc/kvs/parser/KviKvsParser_specialCommands.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNode.h b/src/kvirc/kvs/tree/KviKvsTreeNode.h
index aa108bb29..7ec137364 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNode.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNode.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
index f9d687d32..c87de801a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.h
index e2024aa6d..cd29e63b1 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
index 3e9d02680..8ffa76412 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.h
index e6e15c102..275788387 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeAliasSimpleCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp
index 85b65f624..f993dc65a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.h b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.h
index fd590a2e3..6ee77cfdc 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayCount.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
index b934e5061..62a58a7aa 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.h b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.h
index c39658a69..9e2d98edc 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayElement.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
index 4a8b59436..a96700ae3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.h b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.h
index 2f5039542..867a9f774 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayOrHashElement.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
index e897a19d7..d7855a4e0 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.h b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.h
index 3e91f9835..1ccb65bb2 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeArrayReferenceAssert.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp
index af34fa7e0..a85a488bd 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeBase.h b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.h
index f87b034df..4efd1ff5a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeBase.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBase.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
index 20c9d8b41..b5ea66f61 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.h
index f9580b49e..cbd628353 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeBaseObjectFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.cpp
index fc5784f85..61fabdd08 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.h
index 89fc230da..cefc30fa9 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCallbackCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp
index a2910ed81..2b686ce82 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.h
index 403700f07..b114fe8a5 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.cpp
index cc97bac04..660de58a2 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.h
index 18899af74..a232486e6 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandEvaluation.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.cpp
index 931f00791..2fc6b2da2 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.h
index 94825965d..01b349bba 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCommandWithParameters.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.cpp
index a3d1df66a..dbfa98ba3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.h
index 64a738fc2..ec32818c0 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCompositeData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.cpp
index 80c573b37..4d9734a69 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.h b/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.h
index 58d0ccc68..42b35ccb9 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeConstantData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
index 308eaae67..bdd0a03fa 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.h
index 2af5dc293..887cff0b3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreCallbackCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
index 845b59f38..e0ccad60c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.h
index ef7e4d813..d579c1588 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
index a908a9522..eec3678c3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.h
index 973622656..a1650cc55 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeCoreSimpleCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp
index ac2add95b..de85b1c00 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeData.h b/src/kvirc/kvs/tree/KviKvsTreeNodeData.h
index 4be1c637e..51382fea3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeData.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp
index 6ccb92ee7..8a3e4d487 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.h b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.h
index 88b197a34..30307fdd7 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeDataList.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp
index 88db6e57a..8b859a75e 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.h b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.h
index 4db717366..1202eae60 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpression.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.cpp
index 152ee766a..dafe328cd 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.h b/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.h
index 671322276..a395f7d1e 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExpressionReturn.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
index 96bd92657..4c8316206 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.h b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.h
index a100144a5..2ba6e3504 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeExtendedScopeVariable.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.cpp
index 94634a09f..be629edb1 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.h
index f04a655f7..b902b65d4 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
index b34ec2992..e7fd1b1f5 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.h b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.h
index 54311b7b3..b791ede0f 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeGlobalVariable.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp
index 42b076b1d..bfe4ef04d 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.h b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.h
index 42a3d35a8..878d801de 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashCount.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp
index 3f721a266..9432bbb7b 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.h b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.h
index 8b414c914..45a4217fb 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashElement.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
index 9612e53d1..2fd899c57 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.h b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.h
index d76aee621..937eac05f 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeHashReferenceAssert.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.cpp
index b616b6d79..f5cc39682 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.h b/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.h
index e46a06c0d..81f50a4b2 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeIndirectData.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.cpp
index cab05e3b1..96c4dce65 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.h b/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.h
index 9414fe543..55db5ad9c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstruction.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
index 40646686a..78cf6bbd3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.h b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.h
index 637023f23..d89cdfad3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeInstructionBlock.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp
index 33f29696c..a08e4521f 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.h b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.h
index 8f6814e45..5162b243c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeLocalVariable.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
index aeacb7e69..1c7d0fd92 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.h
index 15e5e10df..25c5cafcf 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleCallbackCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
index f1ed023f6..26ef48e56 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.h
index 9867c4981..438f07da1 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
index a177aee8b..a50d00b81 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.h
index 5896bf4e5..a2c101ed0 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeModuleSimpleCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
index 197db1888..10a39c3b6 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.h b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.h
index 60840f86f..cd7b5ccdf 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeMultipleParameterIdentifier.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp
index d9e59d408..3d32a014c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.h b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.h
index 6adbf7bf0..5618bcb79 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectField.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
index ef4047507..a78c01c77 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.h
index b16bac392..30607ff0d 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeObjectFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp
index 874993ec0..d6474fd5a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.h b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.h
index a8269c353..4522c87c3 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeOperation.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp
index a49bf1297..94174a5cf 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.h b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.h
index 779559bac..279b0d379 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterCount.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.cpp
index 2e64e5f07..441151de4 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.h b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.h
index fe35361e6..ba0466993 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeParameterReturn.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
index 17e7e2861..bfa7e64ce 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.h b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.h
index 152968d33..282470f9f 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeRebindingSwitch.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp
index 83d30c62a..80ba880f8 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.h b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.h
index 600d41203..c23e75c2e 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeScopeOperator.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
index 1c2ccb994..cddc0a20c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.h
index 7e728e4e5..b000b29b9 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSimpleCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
index 2bdc48828..c814356fe 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.h
index c85474419..e556e2ec8 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSingleParameterIdentifier.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
index f466f8595..e8f7cf1fd 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.h
index adab44972..e92944b8f 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommand.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
index 8ee4858a7..d55b92104 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.h
index 5236722fa..abeb30f5c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandBreak.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
index 64d5907c7..4725e895e 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.h
index 4aee82c70..c984db232 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandClass.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
index ee98e5ca4..26d02b9d4 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.h
index 761fd7a6d..18607c760 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandContinue.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp
index 7e69ba1e5..93b6a198b 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.h
index b8821594f..3a2965124 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDefpopup.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.cpp
index 0d6787bae..b30f37bff 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.h
index 3c3220b31..9aa4a1821 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandDo.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.cpp
index 7bf6f9b26..057e43835 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.h
index 135c7ad61..7f8af3ac8 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandFor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
index 6f8355242..337eb577c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.h
index 45e4d3e49..6aecff9db 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandForeach.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.cpp
index 8aa6318e8..758b1d944 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.h
index f9d893b11..96483b3e7 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandIf.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
index 34327951e..4a6ddb39f 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.h
index 45dd2a09f..b13731bc5 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandSwitch.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.cpp
index 8899c597f..111a0d26d 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.h
index 050893819..1397ff334 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandUnset.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.cpp
index 1cf83f581..ab868ab7e 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.h
index ac616a801..bbc907462 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSpecialCommandWhile.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.cpp
index e2f0fead7..96620ff1a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.h b/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.h
index 52f19bb69..f09f4e495 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeStringCase.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp
index 94d898336..202772535 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.h b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.h
index b37ae5f0e..6cb2a8e4e 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeSwitchList.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
index c0f122c0c..74e416b8a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.h
index 149492db9..19059625a 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeThisObjectFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp
index f5fffdd79..61a18719d 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.h b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.h
index 3eee3ad43..4464d7324 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVariable.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.cpp b/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.cpp
index cfc20a123..cd47d959c 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.cpp
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.h b/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.h
index 2f38978ad..b9e33ce83 100644
--- a/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.h
+++ b/src/kvirc/kvs/tree/KviKvsTreeNodeVoidFunctionCall.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviMexLinkFilter.cpp b/src/kvirc/module/KviMexLinkFilter.cpp
index 8ee3dece6..ef84cf9ce 100644
--- a/src/kvirc/module/KviMexLinkFilter.cpp
+++ b/src/kvirc/module/KviMexLinkFilter.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviMexLinkFilter.h b/src/kvirc/module/KviMexLinkFilter.h
index a6311d700..6790e3815 100644
--- a/src/kvirc/module/KviMexLinkFilter.h
+++ b/src/kvirc/module/KviMexLinkFilter.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviMexServerImport.cpp b/src/kvirc/module/KviMexServerImport.cpp
index 3043dfa21..bae352d5a 100644
--- a/src/kvirc/module/KviMexServerImport.cpp
+++ b/src/kvirc/module/KviMexServerImport.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviMexServerImport.h b/src/kvirc/module/KviMexServerImport.h
index 6ed9ef84f..cfd9d5d4d 100644
--- a/src/kvirc/module/KviMexServerImport.h
+++ b/src/kvirc/module/KviMexServerImport.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviMexToolBar.cpp b/src/kvirc/module/KviMexToolBar.cpp
index c9d0fe476..59744664a 100644
--- a/src/kvirc/module/KviMexToolBar.cpp
+++ b/src/kvirc/module/KviMexToolBar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviMexToolBar.h b/src/kvirc/module/KviMexToolBar.h
index 425557a24..a96828034 100644
--- a/src/kvirc/module/KviMexToolBar.h
+++ b/src/kvirc/module/KviMexToolBar.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviModule.cpp b/src/kvirc/module/KviModule.cpp
index 5a32e330b..4cff7e571 100644
--- a/src/kvirc/module/KviModule.cpp
+++ b/src/kvirc/module/KviModule.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviModule.h b/src/kvirc/module/KviModule.h
index ea739bbdc..10773ff37 100644
--- a/src/kvirc/module/KviModule.h
+++ b/src/kvirc/module/KviModule.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviModuleExtension.cpp b/src/kvirc/module/KviModuleExtension.cpp
index 8246cfa34..559fe76e9 100644
--- a/src/kvirc/module/KviModuleExtension.cpp
+++ b/src/kvirc/module/KviModuleExtension.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviModuleExtension.h b/src/kvirc/module/KviModuleExtension.h
index 0ed226c00..fa9a05fdf 100644
--- a/src/kvirc/module/KviModuleExtension.h
+++ b/src/kvirc/module/KviModuleExtension.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviModuleManager.cpp b/src/kvirc/module/KviModuleManager.cpp
index 2bcad3b2a..9cea4f142 100644
--- a/src/kvirc/module/KviModuleManager.cpp
+++ b/src/kvirc/module/KviModuleManager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/module/KviModuleManager.h b/src/kvirc/module/KviModuleManager.h
index a817aac67..845d46d3a 100644
--- a/src/kvirc/module/KviModuleManager.h
+++ b/src/kvirc/module/KviModuleManager.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviAntiSpam.cpp b/src/kvirc/sparser/KviAntiSpam.cpp
index 7aaadff99..963987d4a 100644
--- a/src/kvirc/sparser/KviAntiSpam.cpp
+++ b/src/kvirc/sparser/KviAntiSpam.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviAntiSpam.h b/src/kvirc/sparser/KviAntiSpam.h
index 9c2269bf3..a5bb1781c 100644
--- a/src/kvirc/sparser/KviAntiSpam.h
+++ b/src/kvirc/sparser/KviAntiSpam.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviIrcMessage.cpp b/src/kvirc/sparser/KviIrcMessage.cpp
index f1534dd75..d41c454ec 100644
--- a/src/kvirc/sparser/KviIrcMessage.cpp
+++ b/src/kvirc/sparser/KviIrcMessage.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviIrcMessage.h b/src/kvirc/sparser/KviIrcMessage.h
index fd429a17c..fbe17daad 100644
--- a/src/kvirc/sparser/KviIrcMessage.h
+++ b/src/kvirc/sparser/KviIrcMessage.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviIrcServerParser.cpp b/src/kvirc/sparser/KviIrcServerParser.cpp
index 0de4254f0..67e88176d 100644
--- a/src/kvirc/sparser/KviIrcServerParser.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviIrcServerParser.h b/src/kvirc/sparser/KviIrcServerParser.h
index 62e4d3aa0..ea195ae51 100644
--- a/src/kvirc/sparser/KviIrcServerParser.h
+++ b/src/kvirc/sparser/KviIrcServerParser.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
index 9a1752241..030ec6305 100644
--- a/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_ctcp.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
index e6e1a3d31..af2da88ac 100644
--- a/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_literalHandlers.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
index ec6d7f5c2..96a1eba68 100644
--- a/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_numericHandlers.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/sparser/KviIrcServerParser_tables.cpp b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
index 283868829..5051ac19b 100644
--- a/src/kvirc/sparser/KviIrcServerParser_tables.cpp
+++ b/src/kvirc/sparser/KviIrcServerParser_tables.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviActionDrawer.cpp b/src/kvirc/ui/KviActionDrawer.cpp
index 10698f710..460f7744c 100644
--- a/src/kvirc/ui/KviActionDrawer.cpp
+++ b/src/kvirc/ui/KviActionDrawer.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviActionDrawer.h b/src/kvirc/ui/KviActionDrawer.h
index 8df7fbc55..e7cef239d 100644
--- a/src/kvirc/ui/KviActionDrawer.h
+++ b/src/kvirc/ui/KviActionDrawer.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviChannelWindow.cpp b/src/kvirc/ui/KviChannelWindow.cpp
index bce36cfbb..4e465d5f3 100644
--- a/src/kvirc/ui/KviChannelWindow.cpp
+++ b/src/kvirc/ui/KviChannelWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviChannelWindow.h b/src/kvirc/ui/KviChannelWindow.h
index 8e334a2a4..e8eefaeb2 100644
--- a/src/kvirc/ui/KviChannelWindow.h
+++ b/src/kvirc/ui/KviChannelWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviColorSelectionWindow.cpp b/src/kvirc/ui/KviColorSelectionWindow.cpp
index f4583076e..6398c90fd 100644
--- a/src/kvirc/ui/KviColorSelectionWindow.cpp
+++ b/src/kvirc/ui/KviColorSelectionWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviColorSelectionWindow.h b/src/kvirc/ui/KviColorSelectionWindow.h
index 0c7723ca4..4ee955f10 100644
--- a/src/kvirc/ui/KviColorSelectionWindow.h
+++ b/src/kvirc/ui/KviColorSelectionWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviConsoleWindow.cpp b/src/kvirc/ui/KviConsoleWindow.cpp
index 4cfa0f60d..5dff02e62 100644
--- a/src/kvirc/ui/KviConsoleWindow.cpp
+++ b/src/kvirc/ui/KviConsoleWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviConsoleWindow.h b/src/kvirc/ui/KviConsoleWindow.h
index 4c1d51211..15918fa5d 100644
--- a/src/kvirc/ui/KviConsoleWindow.h
+++ b/src/kvirc/ui/KviConsoleWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviCryptController.cpp b/src/kvirc/ui/KviCryptController.cpp
index 5773ae450..8315c492d 100644
--- a/src/kvirc/ui/KviCryptController.cpp
+++ b/src/kvirc/ui/KviCryptController.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviCryptController.h b/src/kvirc/ui/KviCryptController.h
index 3ac1da4e9..a50565614 100644
--- a/src/kvirc/ui/KviCryptController.h
+++ b/src/kvirc/ui/KviCryptController.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviCtcpPageDialog.cpp b/src/kvirc/ui/KviCtcpPageDialog.cpp
index e85d76840..94d0ad303 100644
--- a/src/kvirc/ui/KviCtcpPageDialog.cpp
+++ b/src/kvirc/ui/KviCtcpPageDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviCtcpPageDialog.h b/src/kvirc/ui/KviCtcpPageDialog.h
index 1b220f232..103e5e0e4 100644
--- a/src/kvirc/ui/KviCtcpPageDialog.h
+++ b/src/kvirc/ui/KviCtcpPageDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviCustomToolBar.cpp b/src/kvirc/ui/KviCustomToolBar.cpp
index 9f9af4a89..fc7065dbb 100644
--- a/src/kvirc/ui/KviCustomToolBar.cpp
+++ b/src/kvirc/ui/KviCustomToolBar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviCustomToolBar.h b/src/kvirc/ui/KviCustomToolBar.h
index 3d6c52455..aecb38b76 100644
--- a/src/kvirc/ui/KviCustomToolBar.h
+++ b/src/kvirc/ui/KviCustomToolBar.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviDebugWindow.cpp b/src/kvirc/ui/KviDebugWindow.cpp
index 82bb85c61..e9819f919 100644
--- a/src/kvirc/ui/KviDebugWindow.cpp
+++ b/src/kvirc/ui/KviDebugWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviDebugWindow.h b/src/kvirc/ui/KviDebugWindow.h
index e2da2e80f..cf8edbfbf 100644
--- a/src/kvirc/ui/KviDebugWindow.h
+++ b/src/kvirc/ui/KviDebugWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviDynamicToolTip.cpp b/src/kvirc/ui/KviDynamicToolTip.cpp
index a2f4dd45b..cf92f995a 100644
--- a/src/kvirc/ui/KviDynamicToolTip.cpp
+++ b/src/kvirc/ui/KviDynamicToolTip.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviDynamicToolTip.h b/src/kvirc/ui/KviDynamicToolTip.h
index 6904506c0..96aca3335 100644
--- a/src/kvirc/ui/KviDynamicToolTip.h
+++ b/src/kvirc/ui/KviDynamicToolTip.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviFileDialog.cpp b/src/kvirc/ui/KviFileDialog.cpp
index ab1ffd433..bf0bb3ad1 100644
--- a/src/kvirc/ui/KviFileDialog.cpp
+++ b/src/kvirc/ui/KviFileDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviFileDialog.h b/src/kvirc/ui/KviFileDialog.h
index 5b3b0b6e7..dcaf1240b 100644
--- a/src/kvirc/ui/KviFileDialog.h
+++ b/src/kvirc/ui/KviFileDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviHistoryWindow.cpp b/src/kvirc/ui/KviHistoryWindow.cpp
index 65e683b3b..4dc6d6476 100644
--- a/src/kvirc/ui/KviHistoryWindow.cpp
+++ b/src/kvirc/ui/KviHistoryWindow.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviHistoryWindow.h b/src/kvirc/ui/KviHistoryWindow.h
index cb46ff90f..ef786d070 100644
--- a/src/kvirc/ui/KviHistoryWindow.h
+++ b/src/kvirc/ui/KviHistoryWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviHtmlDialog.cpp b/src/kvirc/ui/KviHtmlDialog.cpp
index bb0c7bd57..cb9c01cc8 100644
--- a/src/kvirc/ui/KviHtmlDialog.cpp
+++ b/src/kvirc/ui/KviHtmlDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviHtmlDialog.h b/src/kvirc/ui/KviHtmlDialog.h
index 406ff83d3..027566324 100644
--- a/src/kvirc/ui/KviHtmlDialog.h
+++ b/src/kvirc/ui/KviHtmlDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviImageDialog.cpp b/src/kvirc/ui/KviImageDialog.cpp
index 58732bd08..7ab70d461 100644
--- a/src/kvirc/ui/KviImageDialog.cpp
+++ b/src/kvirc/ui/KviImageDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviImageDialog.h b/src/kvirc/ui/KviImageDialog.h
index ab62b3d4f..e4af3a04f 100644
--- a/src/kvirc/ui/KviImageDialog.h
+++ b/src/kvirc/ui/KviImageDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp
index 895545954..5d4667369 100644
--- a/src/kvirc/ui/KviInput.cpp
+++ b/src/kvirc/ui/KviInput.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviInput.h b/src/kvirc/ui/KviInput.h
index 227b65ba1..68ad2f036 100644
--- a/src/kvirc/ui/KviInput.h
+++ b/src/kvirc/ui/KviInput.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 8ec1e82b8..b0ac13bfa 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviInputEditor.h b/src/kvirc/ui/KviInputEditor.h
index 312762c7d..44a6630ef 100644
--- a/src/kvirc/ui/KviInputEditor.h
+++ b/src/kvirc/ui/KviInputEditor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviInputHistory.cpp b/src/kvirc/ui/KviInputHistory.cpp
index e4a4c7aa7..aa74a5dcd 100644
--- a/src/kvirc/ui/KviInputHistory.cpp
+++ b/src/kvirc/ui/KviInputHistory.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviInputHistory.h b/src/kvirc/ui/KviInputHistory.h
index 561bf12ff..c1815a75b 100644
--- a/src/kvirc/ui/KviInputHistory.h
+++ b/src/kvirc/ui/KviInputHistory.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIpEditor.cpp b/src/kvirc/ui/KviIpEditor.cpp
index 8b52fdf0f..525d7b15e 100644
--- a/src/kvirc/ui/KviIpEditor.cpp
+++ b/src/kvirc/ui/KviIpEditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIpEditor.h b/src/kvirc/ui/KviIpEditor.h
index 7b742a26d..2caf5787c 100644
--- a/src/kvirc/ui/KviIpEditor.h
+++ b/src/kvirc/ui/KviIpEditor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcToolBar.cpp b/src/kvirc/ui/KviIrcToolBar.cpp
index a7eaa0853..a0e601092 100644
--- a/src/kvirc/ui/KviIrcToolBar.cpp
+++ b/src/kvirc/ui/KviIrcToolBar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcToolBar.h b/src/kvirc/ui/KviIrcToolBar.h
index 45d5c4dae..62a7e4dda 100644
--- a/src/kvirc/ui/KviIrcToolBar.h
+++ b/src/kvirc/ui/KviIrcToolBar.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcView.cpp b/src/kvirc/ui/KviIrcView.cpp
index fdd938992..ca36906f1 100644
--- a/src/kvirc/ui/KviIrcView.cpp
+++ b/src/kvirc/ui/KviIrcView.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcView.h b/src/kvirc/ui/KviIrcView.h
index 5e950e6ec..52eb5f379 100644
--- a/src/kvirc/ui/KviIrcView.h
+++ b/src/kvirc/ui/KviIrcView.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcView_events.cpp b/src/kvirc/ui/KviIrcView_events.cpp
index b977c065b..abe34c6b0 100644
--- a/src/kvirc/ui/KviIrcView_events.cpp
+++ b/src/kvirc/ui/KviIrcView_events.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcView_getTextLine.cpp b/src/kvirc/ui/KviIrcView_getTextLine.cpp
index c9cfab71f..aad1d889c 100644
--- a/src/kvirc/ui/KviIrcView_getTextLine.cpp
+++ b/src/kvirc/ui/KviIrcView_getTextLine.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcView_loghandling.cpp b/src/kvirc/ui/KviIrcView_loghandling.cpp
index 7f9ce1a5a..973957626 100644
--- a/src/kvirc/ui/KviIrcView_loghandling.cpp
+++ b/src/kvirc/ui/KviIrcView_loghandling.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcView_private.h b/src/kvirc/ui/KviIrcView_private.h
index fa3c108e9..7e7c90b9a 100644
--- a/src/kvirc/ui/KviIrcView_private.h
+++ b/src/kvirc/ui/KviIrcView_private.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcView_tools.cpp b/src/kvirc/ui/KviIrcView_tools.cpp
index ba946b2ba..4ffa110a2 100644
--- a/src/kvirc/ui/KviIrcView_tools.cpp
+++ b/src/kvirc/ui/KviIrcView_tools.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviIrcView_tools.h b/src/kvirc/ui/KviIrcView_tools.h
index de1ea5442..ac6684b32 100644
--- a/src/kvirc/ui/KviIrcView_tools.h
+++ b/src/kvirc/ui/KviIrcView_tools.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviMainWindow.cpp b/src/kvirc/ui/KviMainWindow.cpp
index 910cecf13..53a644ec8 100644
--- a/src/kvirc/ui/KviMainWindow.cpp
+++ b/src/kvirc/ui/KviMainWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviMainWindow.h b/src/kvirc/ui/KviMainWindow.h
index ebf76d12a..ab5afa5f3 100644
--- a/src/kvirc/ui/KviMainWindow.h
+++ b/src/kvirc/ui/KviMainWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviMaskEditor.cpp b/src/kvirc/ui/KviMaskEditor.cpp
index 7defe9d3e..6b1fedba8 100644
--- a/src/kvirc/ui/KviMaskEditor.cpp
+++ b/src/kvirc/ui/KviMaskEditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviMaskEditor.h b/src/kvirc/ui/KviMaskEditor.h
index b14f6a2ae..14ed153ad 100644
--- a/src/kvirc/ui/KviMaskEditor.h
+++ b/src/kvirc/ui/KviMaskEditor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviMenuBar.cpp b/src/kvirc/ui/KviMenuBar.cpp
index 2d88ef336..90650656a 100644
--- a/src/kvirc/ui/KviMenuBar.cpp
+++ b/src/kvirc/ui/KviMenuBar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviMenuBar.h b/src/kvirc/ui/KviMenuBar.h
index cfb1ba09e..8cfbfba82 100644
--- a/src/kvirc/ui/KviMenuBar.h
+++ b/src/kvirc/ui/KviMenuBar.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviMessageBox.cpp b/src/kvirc/ui/KviMessageBox.cpp
index ee617b057..628e0dcef 100644
--- a/src/kvirc/ui/KviMessageBox.cpp
+++ b/src/kvirc/ui/KviMessageBox.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviMessageBox.h b/src/kvirc/ui/KviMessageBox.h
index d961e1c5d..bf53eb398 100644
--- a/src/kvirc/ui/KviMessageBox.h
+++ b/src/kvirc/ui/KviMessageBox.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviModeEditor.cpp b/src/kvirc/ui/KviModeEditor.cpp
index 9edfc8e09..e3488799c 100644
--- a/src/kvirc/ui/KviModeEditor.cpp
+++ b/src/kvirc/ui/KviModeEditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviModeEditor.h b/src/kvirc/ui/KviModeEditor.h
index 8f92f6953..f6f0b4d6c 100644
--- a/src/kvirc/ui/KviModeEditor.h
+++ b/src/kvirc/ui/KviModeEditor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviModeWidget.cpp b/src/kvirc/ui/KviModeWidget.cpp
index 00a6c31d5..9fec2644d 100644
--- a/src/kvirc/ui/KviModeWidget.cpp
+++ b/src/kvirc/ui/KviModeWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviModeWidget.h b/src/kvirc/ui/KviModeWidget.h
index a25f17ad4..d48f9e3b7 100644
--- a/src/kvirc/ui/KviModeWidget.h
+++ b/src/kvirc/ui/KviModeWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviOptionsWidget.cpp b/src/kvirc/ui/KviOptionsWidget.cpp
index e7b995397..813c88b7b 100644
--- a/src/kvirc/ui/KviOptionsWidget.cpp
+++ b/src/kvirc/ui/KviOptionsWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviOptionsWidget.h b/src/kvirc/ui/KviOptionsWidget.h
index 81acb57c7..ba7217622 100644
--- a/src/kvirc/ui/KviOptionsWidget.h
+++ b/src/kvirc/ui/KviOptionsWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviQueryWindow.cpp b/src/kvirc/ui/KviQueryWindow.cpp
index 20350f86d..fdca3539c 100644
--- a/src/kvirc/ui/KviQueryWindow.cpp
+++ b/src/kvirc/ui/KviQueryWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviQueryWindow.h b/src/kvirc/ui/KviQueryWindow.h
index f98e0fd0b..7ff9e9ffc 100644
--- a/src/kvirc/ui/KviQueryWindow.h
+++ b/src/kvirc/ui/KviQueryWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviScriptButton.cpp b/src/kvirc/ui/KviScriptButton.cpp
index de0ded2f5..ceda1e6a7 100644
--- a/src/kvirc/ui/KviScriptButton.cpp
+++ b/src/kvirc/ui/KviScriptButton.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviScriptButton.h b/src/kvirc/ui/KviScriptButton.h
index 483aac76a..055b4b9df 100644
--- a/src/kvirc/ui/KviScriptButton.h
+++ b/src/kvirc/ui/KviScriptButton.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviScriptEditor.cpp b/src/kvirc/ui/KviScriptEditor.cpp
index 7b73345a1..1ef09bb35 100644
--- a/src/kvirc/ui/KviScriptEditor.cpp
+++ b/src/kvirc/ui/KviScriptEditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviScriptEditor.h b/src/kvirc/ui/KviScriptEditor.h
index 78e729289..df29495b0 100644
--- a/src/kvirc/ui/KviScriptEditor.h
+++ b/src/kvirc/ui/KviScriptEditor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index e4cb7d4b7..ef9e460fc 100644
--- a/src/kvirc/ui/KviSelectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviSelectors.h b/src/kvirc/ui/KviSelectors.h
index a99c11116..17a64ea20 100644
--- a/src/kvirc/ui/KviSelectors.h
+++ b/src/kvirc/ui/KviSelectors.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviSplashScreen.cpp b/src/kvirc/ui/KviSplashScreen.cpp
index 08c9538b5..1ce19dabf 100644
--- a/src/kvirc/ui/KviSplashScreen.cpp
+++ b/src/kvirc/ui/KviSplashScreen.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviSplashScreen.h b/src/kvirc/ui/KviSplashScreen.h
index 07852a87d..acf118795 100644
--- a/src/kvirc/ui/KviSplashScreen.h
+++ b/src/kvirc/ui/KviSplashScreen.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviStatusBar.cpp b/src/kvirc/ui/KviStatusBar.cpp
index 4410572ce..8a0d76f76 100644
--- a/src/kvirc/ui/KviStatusBar.cpp
+++ b/src/kvirc/ui/KviStatusBar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviStatusBar.h b/src/kvirc/ui/KviStatusBar.h
index 4440cd396..9deed493b 100644
--- a/src/kvirc/ui/KviStatusBar.h
+++ b/src/kvirc/ui/KviStatusBar.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviStatusBarApplet.cpp b/src/kvirc/ui/KviStatusBarApplet.cpp
index 617040983..b0ae839f2 100644
--- a/src/kvirc/ui/KviStatusBarApplet.cpp
+++ b/src/kvirc/ui/KviStatusBarApplet.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviStatusBarApplet.h b/src/kvirc/ui/KviStatusBarApplet.h
index 18724c5a6..8b0b3b988 100644
--- a/src/kvirc/ui/KviStatusBarApplet.h
+++ b/src/kvirc/ui/KviStatusBarApplet.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviTextIconWindow.cpp b/src/kvirc/ui/KviTextIconWindow.cpp
index b02b4c335..1e18a3c34 100644
--- a/src/kvirc/ui/KviTextIconWindow.cpp
+++ b/src/kvirc/ui/KviTextIconWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviTextIconWindow.h b/src/kvirc/ui/KviTextIconWindow.h
index 5991c503a..3177529c6 100644
--- a/src/kvirc/ui/KviTextIconWindow.h
+++ b/src/kvirc/ui/KviTextIconWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviThemedComboBox.cpp b/src/kvirc/ui/KviThemedComboBox.cpp
index 071f25a9d..dada01040 100644
--- a/src/kvirc/ui/KviThemedComboBox.cpp
+++ b/src/kvirc/ui/KviThemedComboBox.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviThemedComboBox.h b/src/kvirc/ui/KviThemedComboBox.h
index dad24ef1b..17d5c8299 100644
--- a/src/kvirc/ui/KviThemedComboBox.h
+++ b/src/kvirc/ui/KviThemedComboBox.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviThemedLabel.cpp b/src/kvirc/ui/KviThemedLabel.cpp
index 42d0bc96d..74c133106 100644
--- a/src/kvirc/ui/KviThemedLabel.cpp
+++ b/src/kvirc/ui/KviThemedLabel.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviThemedLabel.h b/src/kvirc/ui/KviThemedLabel.h
index 53742331f..df981251f 100644
--- a/src/kvirc/ui/KviThemedLabel.h
+++ b/src/kvirc/ui/KviThemedLabel.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviThemedLineEdit.cpp b/src/kvirc/ui/KviThemedLineEdit.cpp
index c3fe401e6..cfe1f943a 100644
--- a/src/kvirc/ui/KviThemedLineEdit.cpp
+++ b/src/kvirc/ui/KviThemedLineEdit.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviThemedLineEdit.h b/src/kvirc/ui/KviThemedLineEdit.h
index d9c4c2561..7355441df 100644
--- a/src/kvirc/ui/KviThemedLineEdit.h
+++ b/src/kvirc/ui/KviThemedLineEdit.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviThemedTreeWidget.cpp b/src/kvirc/ui/KviThemedTreeWidget.cpp
index 6e51290dd..a3ae84c72 100644
--- a/src/kvirc/ui/KviThemedTreeWidget.cpp
+++ b/src/kvirc/ui/KviThemedTreeWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviThemedTreeWidget.h b/src/kvirc/ui/KviThemedTreeWidget.h
index 9edd88685..340968545 100644
--- a/src/kvirc/ui/KviThemedTreeWidget.h
+++ b/src/kvirc/ui/KviThemedTreeWidget.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviToolBar.cpp b/src/kvirc/ui/KviToolBar.cpp
index 55c0abef8..11e6591db 100644
--- a/src/kvirc/ui/KviToolBar.cpp
+++ b/src/kvirc/ui/KviToolBar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviToolBar.h b/src/kvirc/ui/KviToolBar.h
index 83966ea5e..22c66ae04 100644
--- a/src/kvirc/ui/KviToolBar.h
+++ b/src/kvirc/ui/KviToolBar.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp
index 32a39d2f3..d329a5a86 100644
--- a/src/kvirc/ui/KviTopicWidget.cpp
+++ b/src/kvirc/ui/KviTopicWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviTopicWidget.h b/src/kvirc/ui/KviTopicWidget.h
index 9314f0e7d..98e3469f2 100644
--- a/src/kvirc/ui/KviTopicWidget.h
+++ b/src/kvirc/ui/KviTopicWidget.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviTrayIcon.h b/src/kvirc/ui/KviTrayIcon.h
index 931cdae82..204d10be1 100644
--- a/src/kvirc/ui/KviTrayIcon.h
+++ b/src/kvirc/ui/KviTrayIcon.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviTreeWindowList.cpp b/src/kvirc/ui/KviTreeWindowList.cpp
index 197c60ee3..7a4d81f71 100644
--- a/src/kvirc/ui/KviTreeWindowList.cpp
+++ b/src/kvirc/ui/KviTreeWindowList.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviTreeWindowList.h b/src/kvirc/ui/KviTreeWindowList.h
index 758bf29cd..291006c30 100644
--- a/src/kvirc/ui/KviTreeWindowList.h
+++ b/src/kvirc/ui/KviTreeWindowList.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviUserListView.cpp b/src/kvirc/ui/KviUserListView.cpp
index 6813d849e..6a13b2bec 100644
--- a/src/kvirc/ui/KviUserListView.cpp
+++ b/src/kvirc/ui/KviUserListView.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviUserListView.h b/src/kvirc/ui/KviUserListView.h
index 10ce35dc8..c93de6e28 100644
--- a/src/kvirc/ui/KviUserListView.h
+++ b/src/kvirc/ui/KviUserListView.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.cpp b/src/kvirc/ui/KviWebPackageManagementDialog.cpp
index fa4de8ef3..56e28d96d 100644
--- a/src/kvirc/ui/KviWebPackageManagementDialog.cpp
+++ b/src/kvirc/ui/KviWebPackageManagementDialog.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWebPackageManagementDialog.h b/src/kvirc/ui/KviWebPackageManagementDialog.h
index 4fecd701d..016d303c3 100644
--- a/src/kvirc/ui/KviWebPackageManagementDialog.h
+++ b/src/kvirc/ui/KviWebPackageManagementDialog.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWindow.cpp b/src/kvirc/ui/KviWindow.cpp
index bf58f41cd..a6b911e4a 100644
--- a/src/kvirc/ui/KviWindow.cpp
+++ b/src/kvirc/ui/KviWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWindow.h b/src/kvirc/ui/KviWindow.h
index ba51f8c8a..895c406d7 100644
--- a/src/kvirc/ui/KviWindow.h
+++ b/src/kvirc/ui/KviWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWindowListBase.cpp b/src/kvirc/ui/KviWindowListBase.cpp
index a5e47a29b..6acb681ee 100644
--- a/src/kvirc/ui/KviWindowListBase.cpp
+++ b/src/kvirc/ui/KviWindowListBase.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWindowListBase.h b/src/kvirc/ui/KviWindowListBase.h
index 7e2a315cc..cf5ba1f1c 100644
--- a/src/kvirc/ui/KviWindowListBase.h
+++ b/src/kvirc/ui/KviWindowListBase.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWindowStack.cpp b/src/kvirc/ui/KviWindowStack.cpp
index b1988d4c9..dbc2229b9 100644
--- a/src/kvirc/ui/KviWindowStack.cpp
+++ b/src/kvirc/ui/KviWindowStack.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWindowStack.h b/src/kvirc/ui/KviWindowStack.h
index 62b1ab5e1..30ad0f362 100644
--- a/src/kvirc/ui/KviWindowStack.h
+++ b/src/kvirc/ui/KviWindowStack.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWindowToolWidget.cpp b/src/kvirc/ui/KviWindowToolWidget.cpp
index 1fc84ac18..fdf628115 100644
--- a/src/kvirc/ui/KviWindowToolWidget.cpp
+++ b/src/kvirc/ui/KviWindowToolWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/kvirc/ui/KviWindowToolWidget.h b/src/kvirc/ui/KviWindowToolWidget.h
index 854cb5674..1013478c2 100644
--- a/src/kvirc/ui/KviWindowToolWidget.h
+++ b/src/kvirc/ui/KviWindowToolWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/about/AboutDialog.cpp b/src/modules/about/AboutDialog.cpp
index 49c9ef32f..931b6ab9d 100644
--- a/src/modules/about/AboutDialog.cpp
+++ b/src/modules/about/AboutDialog.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/about/AboutDialog.h b/src/modules/about/AboutDialog.h
index f9863379f..7a94667cf 100644
--- a/src/modules/about/AboutDialog.h
+++ b/src/modules/about/AboutDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/about/libkviabout.cpp b/src/modules/about/libkviabout.cpp
index e29dde3ad..f73d02c7e 100644
--- a/src/modules/about/libkviabout.cpp
+++ b/src/modules/about/libkviabout.cpp
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/about/libkviabout.h b/src/modules/about/libkviabout.h
index 134169d0a..b396f64eb 100644
--- a/src/modules/about/libkviabout.h
+++ b/src/modules/about/libkviabout.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/about/mkabouttext.pl b/src/modules/about/mkabouttext.pl
index 62d237443..a5c0da76f 100644
--- a/src/modules/about/mkabouttext.pl
+++ b/src/modules/about/mkabouttext.pl
@@ -12,7 +12,7 @@
# This program is FREE software. You can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
-# of the License, or (at your opinion) any later version.
+# of the License, or (at your option) any later version.
#
# This program is distributed in the HOPE that it will be USEFUL,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/action/libkviaction.cpp b/src/modules/action/libkviaction.cpp
index af70709d4..e608a4f3e 100644
--- a/src/modules/action/libkviaction.cpp
+++ b/src/modules/action/libkviaction.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/actioneditor/ActionEditor.cpp b/src/modules/actioneditor/ActionEditor.cpp
index 61f2791b7..dcd1d53e3 100644
--- a/src/modules/actioneditor/ActionEditor.cpp
+++ b/src/modules/actioneditor/ActionEditor.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2004-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/actioneditor/ActionEditor.h b/src/modules/actioneditor/ActionEditor.h
index 6df6c670d..32639399c 100644
--- a/src/modules/actioneditor/ActionEditor.h
+++ b/src/modules/actioneditor/ActionEditor.h
@@ -9,9 +9,9 @@
// Copyright (C) 2004-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/actioneditor/libkviactioneditor.cpp b/src/modules/actioneditor/libkviactioneditor.cpp
index 3ef3d3fb6..7714b2cd6 100644
--- a/src/modules/actioneditor/libkviactioneditor.cpp
+++ b/src/modules/actioneditor/libkviactioneditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/AddonFunctions.cpp b/src/modules/addon/AddonFunctions.cpp
index 815d35334..2aa1d6ae0 100644
--- a/src/modules/addon/AddonFunctions.cpp
+++ b/src/modules/addon/AddonFunctions.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/AddonFunctions.h b/src/modules/addon/AddonFunctions.h
index 6c9825f0e..27b27673f 100644
--- a/src/modules/addon/AddonFunctions.h
+++ b/src/modules/addon/AddonFunctions.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/AddonManagementDialog.cpp b/src/modules/addon/AddonManagementDialog.cpp
index 10b3d5f46..01f5f55c7 100644
--- a/src/modules/addon/AddonManagementDialog.cpp
+++ b/src/modules/addon/AddonManagementDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/AddonManagementDialog.h b/src/modules/addon/AddonManagementDialog.h
index b68299c55..d39cf845a 100644
--- a/src/modules/addon/AddonManagementDialog.h
+++ b/src/modules/addon/AddonManagementDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/PackAddonDialog.cpp b/src/modules/addon/PackAddonDialog.cpp
index 52faeb280..fec43fc9f 100644
--- a/src/modules/addon/PackAddonDialog.cpp
+++ b/src/modules/addon/PackAddonDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/PackAddonDialog.h b/src/modules/addon/PackAddonDialog.h
index 09e1303d5..e3d254aee 100644
--- a/src/modules/addon/PackAddonDialog.h
+++ b/src/modules/addon/PackAddonDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/WebAddonInterfaceDialog.cpp b/src/modules/addon/WebAddonInterfaceDialog.cpp
index 4102f1b18..d67aa0aa0 100644
--- a/src/modules/addon/WebAddonInterfaceDialog.cpp
+++ b/src/modules/addon/WebAddonInterfaceDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/WebAddonInterfaceDialog.h b/src/modules/addon/WebAddonInterfaceDialog.h
index 8a7835987..0a5a5cf40 100644
--- a/src/modules/addon/WebAddonInterfaceDialog.h
+++ b/src/modules/addon/WebAddonInterfaceDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/addon/libkviaddon.cpp b/src/modules/addon/libkviaddon.cpp
index c955cb8fe..ffb5f7683 100644
--- a/src/modules/addon/libkviaddon.cpp
+++ b/src/modules/addon/libkviaddon.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/aliaseditor/AliasEditorWindow.cpp b/src/modules/aliaseditor/AliasEditorWindow.cpp
index f628eaa6e..1515eb326 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.cpp
+++ b/src/modules/aliaseditor/AliasEditorWindow.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/aliaseditor/AliasEditorWindow.h b/src/modules/aliaseditor/AliasEditorWindow.h
index aca554995..f750f51a6 100644
--- a/src/modules/aliaseditor/AliasEditorWindow.h
+++ b/src/modules/aliaseditor/AliasEditorWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/aliaseditor/libkvialiaseditor.cpp b/src/modules/aliaseditor/libkvialiaseditor.cpp
index 1f87b40e4..079312cc5 100644
--- a/src/modules/aliaseditor/libkvialiaseditor.cpp
+++ b/src/modules/aliaseditor/libkvialiaseditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 0cadbdc7e..947d2ab93 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/avatar/libkviavatar.h b/src/modules/avatar/libkviavatar.h
index 2de2620c3..ed9bf4163 100644
--- a/src/modules/avatar/libkviavatar.h
+++ b/src/modules/avatar/libkviavatar.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 4da273514..af1b75f38 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.cpp b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
index 699d698e8..bf5cd2ec5 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.cpp
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2001-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/channelsjoin/ChannelsJoinDialog.h b/src/modules/channelsjoin/ChannelsJoinDialog.h
index e6948eb5b..5ce69d59d 100644
--- a/src/modules/channelsjoin/ChannelsJoinDialog.h
+++ b/src/modules/channelsjoin/ChannelsJoinDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/channelsjoin/libkvichannelsjoin.cpp b/src/modules/channelsjoin/libkvichannelsjoin.cpp
index a9f8baf1f..44ce08d55 100644
--- a/src/modules/channelsjoin/libkvichannelsjoin.cpp
+++ b/src/modules/channelsjoin/libkvichannelsjoin.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/classeditor/ClassEditorWindow.cpp b/src/modules/classeditor/ClassEditorWindow.cpp
index 107042d08..8ae00773d 100644
--- a/src/modules/classeditor/ClassEditorWindow.cpp
+++ b/src/modules/classeditor/ClassEditorWindow.cpp
@@ -7,7 +7,7 @@
// Copyright (C) 2010 Alessandro Carbone (elfonol at gmail dot com)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
// of the License, or (at your opinion) any later version.
//
diff --git a/src/modules/classeditor/ClassEditorWindow.h b/src/modules/classeditor/ClassEditorWindow.h
index 204e55c12..df7d15bd3 100644
--- a/src/modules/classeditor/ClassEditorWindow.h
+++ b/src/modules/classeditor/ClassEditorWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2010 Alessandro Carbone (elfonol at gmail dot com)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/classeditor/libkviclasseditor.cpp b/src/modules/classeditor/libkviclasseditor.cpp
index a98afaa4f..f0a5e1b44 100644
--- a/src/modules/classeditor/libkviclasseditor.cpp
+++ b/src/modules/classeditor/libkviclasseditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/codetester/CodeTesterWindow.cpp b/src/modules/codetester/CodeTesterWindow.cpp
index dda8ff9fe..3ed12bf9b 100644
--- a/src/modules/codetester/CodeTesterWindow.cpp
+++ b/src/modules/codetester/CodeTesterWindow.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/codetester/CodeTesterWindow.h b/src/modules/codetester/CodeTesterWindow.h
index 67dc95ceb..167c5acec 100644
--- a/src/modules/codetester/CodeTesterWindow.h
+++ b/src/modules/codetester/CodeTesterWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/codetester/libkvicodetester.cpp b/src/modules/codetester/libkvicodetester.cpp
index a0a215fda..eeb0d2c18 100644
--- a/src/modules/codetester/libkvicodetester.cpp
+++ b/src/modules/codetester/libkvicodetester.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/config/libkviconfig.cpp b/src/modules/config/libkviconfig.cpp
index 067d869ee..3d6a6e1c8 100644
--- a/src/modules/config/libkviconfig.cpp
+++ b/src/modules/config/libkviconfig.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/context/libkvicontext.cpp b/src/modules/context/libkvicontext.cpp
index 7cce80018..7142f0e94 100644
--- a/src/modules/context/libkvicontext.cpp
+++ b/src/modules/context/libkvicontext.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccBroker.cpp b/src/modules/dcc/DccBroker.cpp
index c985da562..877e7aa83 100644
--- a/src/modules/dcc/DccBroker.cpp
+++ b/src/modules/dcc/DccBroker.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccBroker.h b/src/modules/dcc/DccBroker.h
index 3c6505842..92421d428 100644
--- a/src/modules/dcc/DccBroker.h
+++ b/src/modules/dcc/DccBroker.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccCanvasWindow.cpp b/src/modules/dcc/DccCanvasWindow.cpp
index 433a86054..83a196623 100644
--- a/src/modules/dcc/DccCanvasWindow.cpp
+++ b/src/modules/dcc/DccCanvasWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccCanvasWindow.h b/src/modules/dcc/DccCanvasWindow.h
index a763aed54..f34a5717f 100644
--- a/src/modules/dcc/DccCanvasWindow.h
+++ b/src/modules/dcc/DccCanvasWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccChatWindow.cpp b/src/modules/dcc/DccChatWindow.cpp
index 5ea3b7a89..2d2c78db6 100644
--- a/src/modules/dcc/DccChatWindow.cpp
+++ b/src/modules/dcc/DccChatWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccChatWindow.h b/src/modules/dcc/DccChatWindow.h
index 406254a67..bb03c0840 100644
--- a/src/modules/dcc/DccChatWindow.h
+++ b/src/modules/dcc/DccChatWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccDescriptor.cpp b/src/modules/dcc/DccDescriptor.cpp
index 49ab77a45..330e92381 100644
--- a/src/modules/dcc/DccDescriptor.cpp
+++ b/src/modules/dcc/DccDescriptor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccDescriptor.h b/src/modules/dcc/DccDescriptor.h
index 355649b7d..58d9d94e5 100644
--- a/src/modules/dcc/DccDescriptor.h
+++ b/src/modules/dcc/DccDescriptor.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccDialog.cpp b/src/modules/dcc/DccDialog.cpp
index deeaa0685..01704e529 100644
--- a/src/modules/dcc/DccDialog.cpp
+++ b/src/modules/dcc/DccDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccDialog.h b/src/modules/dcc/DccDialog.h
index 281ef5140..3c57e2d22 100644
--- a/src/modules/dcc/DccDialog.h
+++ b/src/modules/dcc/DccDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccFileTransfer.cpp b/src/modules/dcc/DccFileTransfer.cpp
index 603c0df02..9d99f6f96 100644
--- a/src/modules/dcc/DccFileTransfer.cpp
+++ b/src/modules/dcc/DccFileTransfer.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccFileTransfer.h b/src/modules/dcc/DccFileTransfer.h
index d6d72e6ba..fea2d6467 100644
--- a/src/modules/dcc/DccFileTransfer.h
+++ b/src/modules/dcc/DccFileTransfer.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccMarshal.cpp b/src/modules/dcc/DccMarshal.cpp
index dcca21373..bac473efb 100644
--- a/src/modules/dcc/DccMarshal.cpp
+++ b/src/modules/dcc/DccMarshal.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccMarshal.h b/src/modules/dcc/DccMarshal.h
index 52ee66209..d60e86342 100644
--- a/src/modules/dcc/DccMarshal.h
+++ b/src/modules/dcc/DccMarshal.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccThread.cpp b/src/modules/dcc/DccThread.cpp
index eea784eb9..a2ace585e 100644
--- a/src/modules/dcc/DccThread.cpp
+++ b/src/modules/dcc/DccThread.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccThread.h b/src/modules/dcc/DccThread.h
index 596703819..55041ed6e 100644
--- a/src/modules/dcc/DccThread.h
+++ b/src/modules/dcc/DccThread.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccUtils.cpp b/src/modules/dcc/DccUtils.cpp
index c62ab743d..bbdf4989b 100644
--- a/src/modules/dcc/DccUtils.cpp
+++ b/src/modules/dcc/DccUtils.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccUtils.h b/src/modules/dcc/DccUtils.h
index 60a955209..150e88de6 100644
--- a/src/modules/dcc/DccUtils.h
+++ b/src/modules/dcc/DccUtils.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVideoWindow.cpp b/src/modules/dcc/DccVideoWindow.cpp
index a8c3ca1af..9b6176a15 100644
--- a/src/modules/dcc/DccVideoWindow.cpp
+++ b/src/modules/dcc/DccVideoWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVideoWindow.h b/src/modules/dcc/DccVideoWindow.h
index 5466f9905..8f7e846c7 100644
--- a/src/modules/dcc/DccVideoWindow.h
+++ b/src/modules/dcc/DccVideoWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVoiceAdpcmCodec.cpp b/src/modules/dcc/DccVoiceAdpcmCodec.cpp
index 3c55b8651..0d4907313 100644
--- a/src/modules/dcc/DccVoiceAdpcmCodec.cpp
+++ b/src/modules/dcc/DccVoiceAdpcmCodec.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVoiceAdpcmCodec.h b/src/modules/dcc/DccVoiceAdpcmCodec.h
index 8594fb66a..4e9ece4ff 100644
--- a/src/modules/dcc/DccVoiceAdpcmCodec.h
+++ b/src/modules/dcc/DccVoiceAdpcmCodec.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVoiceCodec.cpp b/src/modules/dcc/DccVoiceCodec.cpp
index 753907b2e..0784c54b3 100644
--- a/src/modules/dcc/DccVoiceCodec.cpp
+++ b/src/modules/dcc/DccVoiceCodec.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVoiceCodec.h b/src/modules/dcc/DccVoiceCodec.h
index bb1dd821f..85c97de42 100644
--- a/src/modules/dcc/DccVoiceCodec.h
+++ b/src/modules/dcc/DccVoiceCodec.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVoiceGsmCodec.cpp b/src/modules/dcc/DccVoiceGsmCodec.cpp
index 05851cc21..8f7fb6534 100644
--- a/src/modules/dcc/DccVoiceGsmCodec.cpp
+++ b/src/modules/dcc/DccVoiceGsmCodec.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVoiceGsmCodec.h b/src/modules/dcc/DccVoiceGsmCodec.h
index 3c07efc55..36cc1ae95 100644
--- a/src/modules/dcc/DccVoiceGsmCodec.h
+++ b/src/modules/dcc/DccVoiceGsmCodec.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVoiceWindow.cpp b/src/modules/dcc/DccVoiceWindow.cpp
index bcccb5f56..43b974f34 100644
--- a/src/modules/dcc/DccVoiceWindow.cpp
+++ b/src/modules/dcc/DccVoiceWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccVoiceWindow.h b/src/modules/dcc/DccVoiceWindow.h
index bd0e8bf9b..d641c766e 100644
--- a/src/modules/dcc/DccVoiceWindow.h
+++ b/src/modules/dcc/DccVoiceWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccWindow.cpp b/src/modules/dcc/DccWindow.cpp
index c1b029e5a..3f4b47994 100644
--- a/src/modules/dcc/DccWindow.cpp
+++ b/src/modules/dcc/DccWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/DccWindow.h b/src/modules/dcc/DccWindow.h
index 9ad7ab57a..58d6f3355 100644
--- a/src/modules/dcc/DccWindow.h
+++ b/src/modules/dcc/DccWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index e39f64a2d..8e751e6c7 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h
index 56f75df1f..da40016e7 100644
--- a/src/modules/dcc/canvaswidget.h
+++ b/src/modules/dcc/canvaswidget.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index 15a78086b..43a15f372 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index b8d5cda7f..f37ece845 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index 56dc66967..828075d09 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/dialog/libkvidialog.h b/src/modules/dialog/libkvidialog.h
index 2caa88ec7..07a15784e 100644
--- a/src/modules/dialog/libkvidialog.h
+++ b/src/modules/dialog/libkvidialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/editor/ScriptEditorImplementation.cpp b/src/modules/editor/ScriptEditorImplementation.cpp
index 1a80efa84..0b8dead2a 100644
--- a/src/modules/editor/ScriptEditorImplementation.cpp
+++ b/src/modules/editor/ScriptEditorImplementation.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/editor/ScriptEditorImplementation.h b/src/modules/editor/ScriptEditorImplementation.h
index ec58669b2..ce22c98ba 100644
--- a/src/modules/editor/ScriptEditorImplementation.h
+++ b/src/modules/editor/ScriptEditorImplementation.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/editor/libkvieditor.cpp b/src/modules/editor/libkvieditor.cpp
index 53b824a60..5b3b15ba2 100644
--- a/src/modules/editor/libkvieditor.cpp
+++ b/src/modules/editor/libkvieditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/eventeditor/EventEditorWindow.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 9efa9f83f..1c332ea31 100644
--- a/src/modules/eventeditor/EventEditorWindow.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/eventeditor/EventEditorWindow.h b/src/modules/eventeditor/EventEditorWindow.h
index 75ec01fa0..84594951f 100644
--- a/src/modules/eventeditor/EventEditorWindow.h
+++ b/src/modules/eventeditor/EventEditorWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index f44ad49c5..7480f8bc9 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/file/libkvifile.cpp b/src/modules/file/libkvifile.cpp
index 25d2e32c0..3cc9bfac7 100644
--- a/src/modules/file/libkvifile.cpp
+++ b/src/modules/file/libkvifile.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/filetransferwindow/FileTransferWindow.cpp b/src/modules/filetransferwindow/FileTransferWindow.cpp
index 9fdf2f1dd..6d2f9bc2c 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.cpp
+++ b/src/modules/filetransferwindow/FileTransferWindow.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/filetransferwindow/FileTransferWindow.h b/src/modules/filetransferwindow/FileTransferWindow.h
index 55616163b..9127616d1 100644
--- a/src/modules/filetransferwindow/FileTransferWindow.h
+++ b/src/modules/filetransferwindow/FileTransferWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
index 07a474f5a..8e7aa83a4 100644
--- a/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
+++ b/src/modules/filetransferwindow/libkvifiletransferwindow.cpp
@@ -8,7 +8,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/fish/libkvifish.cpp b/src/modules/fish/libkvifish.cpp
index ffc64d248..5fbf7ec42 100644
--- a/src/modules/fish/libkvifish.cpp
+++ b/src/modules/fish/libkvifish.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/fish/libkvifish.h b/src/modules/fish/libkvifish.h
index 35a2c8873..b0255b4c9 100644
--- a/src/modules/fish/libkvifish.h
+++ b/src/modules/fish/libkvifish.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/help/HelpWidget.cpp b/src/modules/help/HelpWidget.cpp
index 042365b6a..9f29343dd 100644
--- a/src/modules/help/HelpWidget.cpp
+++ b/src/modules/help/HelpWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/help/HelpWidget.h b/src/modules/help/HelpWidget.h
index 0fe716371..7d22fb9d4 100644
--- a/src/modules/help/HelpWidget.h
+++ b/src/modules/help/HelpWidget.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index 194cd2b02..c62e628c5 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the m_terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/help/HelpWindow.h b/src/modules/help/HelpWindow.h
index ad5878ac7..6c6996be7 100644
--- a/src/modules/help/HelpWindow.h
+++ b/src/modules/help/HelpWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/help/libkvihelp.cpp b/src/modules/help/libkvihelp.cpp
index 9e33751d2..b17fe9344 100644
--- a/src/modules/help/libkvihelp.cpp
+++ b/src/modules/help/libkvihelp.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/http/HttpFileTransfer.cpp b/src/modules/http/HttpFileTransfer.cpp
index 0c263fca9..57bc92eb7 100644
--- a/src/modules/http/HttpFileTransfer.cpp
+++ b/src/modules/http/HttpFileTransfer.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/http/HttpFileTransfer.h b/src/modules/http/HttpFileTransfer.h
index 6f731be40..7e08a1f91 100644
--- a/src/modules/http/HttpFileTransfer.h
+++ b/src/modules/http/HttpFileTransfer.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/http/libkvihttp.cpp b/src/modules/http/libkvihttp.cpp
index afda963cc..10d378b34 100644
--- a/src/modules/http/libkvihttp.cpp
+++ b/src/modules/http/libkvihttp.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/ident/libkviident.cpp b/src/modules/ident/libkviident.cpp
index 006a4205d..d79924bf7 100644
--- a/src/modules/ident/libkviident.cpp
+++ b/src/modules/ident/libkviident.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/ident/libkviident.h b/src/modules/ident/libkviident.h
index dbe0b4bd3..0dab6afd4 100644
--- a/src/modules/ident/libkviident.h
+++ b/src/modules/ident/libkviident.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/iograph/libkviiograph.cpp b/src/modules/iograph/libkviiograph.cpp
index f0f9a8aae..e77e8dcc7 100644
--- a/src/modules/iograph/libkviiograph.cpp
+++ b/src/modules/iograph/libkviiograph.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/iograph/libkviiograph.h b/src/modules/iograph/libkviiograph.h
index 8af4a885d..2fd34bb38 100644
--- a/src/modules/iograph/libkviiograph.h
+++ b/src/modules/iograph/libkviiograph.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/lamerizer/libkvilamerizer.cpp b/src/modules/lamerizer/libkvilamerizer.cpp
index 483ba9884..96ed3cf44 100644
--- a/src/modules/lamerizer/libkvilamerizer.cpp
+++ b/src/modules/lamerizer/libkvilamerizer.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/lamerizer/libkvilamerizer.h b/src/modules/lamerizer/libkvilamerizer.h
index 5c73b58ef..9d3946e39 100644
--- a/src/modules/lamerizer/libkvilamerizer.h
+++ b/src/modules/lamerizer/libkvilamerizer.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/language/detector.cpp b/src/modules/language/detector.cpp
index 03439f68e..8646369f2 100644
--- a/src/modules/language/detector.cpp
+++ b/src/modules/language/detector.cpp
@@ -7,7 +7,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/language/detector.h b/src/modules/language/detector.h
index 0ac24c120..eedf2303b 100644
--- a/src/modules/language/detector.h
+++ b/src/modules/language/detector.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/language/detector/build_detector.pl b/src/modules/language/detector/build_detector.pl
index 7ac54b276..b67c41b86 100755
--- a/src/modules/language/detector/build_detector.pl
+++ b/src/modules/language/detector/build_detector.pl
@@ -9,7 +9,7 @@
# This program is FREE software. You can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
-# of the License, or (at your opinion) any later version.
+# of the License, or (at your option) any later version.
#
# This program is distributed in the HOPE that it will be USEFUL,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -78,7 +78,7 @@ print OUTPUT "//\n";
print OUTPUT "// This program is FREE software. You can redistribute it and/or\n";
print OUTPUT "// modify it under the terms of the GNU General Public License\n";
print OUTPUT "// as published by the Free Software Foundation; either version 2\n";
-print OUTPUT "// of the License, or (at your opinion) any later version.\n";
+print OUTPUT "// of the License, or (at your option) any later version.\n";
print OUTPUT "//\n";
print OUTPUT "// This program is distributed in the HOPE that it will be USEFUL,\n";
print OUTPUT "// but WITHOUT ANY WARRANTY; without even the implied warranty of\n";
diff --git a/src/modules/language/libkvilanguage.cpp b/src/modules/language/libkvilanguage.cpp
index 9bc1dad60..6f800d614 100644
--- a/src/modules/language/libkvilanguage.cpp
+++ b/src/modules/language/libkvilanguage.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/links/LinksWindow.cpp b/src/modules/links/LinksWindow.cpp
index 4abcf1aa8..eede9e0a2 100644
--- a/src/modules/links/LinksWindow.cpp
+++ b/src/modules/links/LinksWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/links/LinksWindow.h b/src/modules/links/LinksWindow.h
index cb3e0f051..1a9faddb8 100644
--- a/src/modules/links/LinksWindow.h
+++ b/src/modules/links/LinksWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2000-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/links/libkvilinks.cpp b/src/modules/links/libkvilinks.cpp
index 3c6ab7128..24c265222 100644
--- a/src/modules/links/libkvilinks.cpp
+++ b/src/modules/links/libkvilinks.cpp
@@ -8,7 +8,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 86d05ffb1..80a51d18c 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the lists of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/list/ListWindow.h b/src/modules/list/ListWindow.h
index ca6feeb38..963adb285 100644
--- a/src/modules/list/ListWindow.h
+++ b/src/modules/list/ListWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the lists of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/list/libkvilist.cpp b/src/modules/list/libkvilist.cpp
index 9d8d6a2f7..4d85a12f9 100644
--- a/src/modules/list/libkvilist.cpp
+++ b/src/modules/list/libkvilist.cpp
@@ -8,7 +8,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/log/libkvilog.cpp b/src/modules/log/libkvilog.cpp
index aa39d1b51..96a28244b 100644
--- a/src/modules/log/libkvilog.cpp
+++ b/src/modules/log/libkvilog.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/logview/LogFile.cpp b/src/modules/logview/LogFile.cpp
index 7ed766b99..8d31549d3 100644
--- a/src/modules/logview/LogFile.cpp
+++ b/src/modules/logview/LogFile.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/logview/LogFile.h b/src/modules/logview/LogFile.h
index 33bbf6268..a5091ca84 100644
--- a/src/modules/logview/LogFile.h
+++ b/src/modules/logview/LogFile.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/logview/LogViewWidget.cpp b/src/modules/logview/LogViewWidget.cpp
index 14dd758ec..c7e870ef7 100644
--- a/src/modules/logview/LogViewWidget.cpp
+++ b/src/modules/logview/LogViewWidget.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/logview/LogViewWidget.h b/src/modules/logview/LogViewWidget.h
index 04e094a86..d48604247 100644
--- a/src/modules/logview/LogViewWidget.h
+++ b/src/modules/logview/LogViewWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/logview/LogViewWindow.cpp b/src/modules/logview/LogViewWindow.cpp
index ae5e6a93d..416935208 100644
--- a/src/modules/logview/LogViewWindow.cpp
+++ b/src/modules/logview/LogViewWindow.cpp
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/logview/LogViewWindow.h b/src/modules/logview/LogViewWindow.h
index dc66e3059..72accda18 100644
--- a/src/modules/logview/LogViewWindow.h
+++ b/src/modules/logview/LogViewWindow.h
@@ -14,7 +14,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/logview/libkvilogview.cpp b/src/modules/logview/libkvilogview.cpp
index b981362c5..b505547e4 100644
--- a/src/modules/logview/libkvilogview.cpp
+++ b/src/modules/logview/libkvilogview.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mask/libkvimask.cpp b/src/modules/mask/libkvimask.cpp
index b09d638af..c2cbde4aa 100644
--- a/src/modules/mask/libkvimask.cpp
+++ b/src/modules/mask/libkvimask.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/math/libkvimath.cpp b/src/modules/math/libkvimath.cpp
index 874a6c690..e8660a787 100644
--- a/src/modules/math/libkvimath.cpp
+++ b/src/modules/math/libkvimath.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpAmipInterface.cpp b/src/modules/mediaplayer/MpAmipInterface.cpp
index 3ec1ec0a3..c3bba45cb 100644
--- a/src/modules/mediaplayer/MpAmipInterface.cpp
+++ b/src/modules/mediaplayer/MpAmipInterface.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpAmipInterface.h b/src/modules/mediaplayer/MpAmipInterface.h
index e8a9fac34..57ec57138 100644
--- a/src/modules/mediaplayer/MpAmipInterface.h
+++ b/src/modules/mediaplayer/MpAmipInterface.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpInterface.cpp b/src/modules/mediaplayer/MpInterface.cpp
index 27137af89..d646389a5 100644
--- a/src/modules/mediaplayer/MpInterface.cpp
+++ b/src/modules/mediaplayer/MpInterface.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpInterface.h b/src/modules/mediaplayer/MpInterface.h
index 1f23a595f..42c1374a4 100644
--- a/src/modules/mediaplayer/MpInterface.h
+++ b/src/modules/mediaplayer/MpInterface.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpMprisInterface.cpp b/src/modules/mediaplayer/MpMprisInterface.cpp
index 5f3a19bde..75f14e7d5 100644
--- a/src/modules/mediaplayer/MpMprisInterface.cpp
+++ b/src/modules/mediaplayer/MpMprisInterface.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpMprisInterface.h b/src/modules/mediaplayer/MpMprisInterface.h
index f1f76be4e..480fd01e1 100644
--- a/src/modules/mediaplayer/MpMprisInterface.h
+++ b/src/modules/mediaplayer/MpMprisInterface.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpSpotifyInterface.cpp b/src/modules/mediaplayer/MpSpotifyInterface.cpp
index acaeb9013..ba1e8fa5e 100644
--- a/src/modules/mediaplayer/MpSpotifyInterface.cpp
+++ b/src/modules/mediaplayer/MpSpotifyInterface.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpSpotifyInterface.h b/src/modules/mediaplayer/MpSpotifyInterface.h
index 1c856dd6d..dc9355dfb 100644
--- a/src/modules/mediaplayer/MpSpotifyInterface.h
+++ b/src/modules/mediaplayer/MpSpotifyInterface.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpWinampInterface.cpp b/src/modules/mediaplayer/MpWinampInterface.cpp
index afe8805c6..e31880746 100644
--- a/src/modules/mediaplayer/MpWinampInterface.cpp
+++ b/src/modules/mediaplayer/MpWinampInterface.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpWinampInterface.h b/src/modules/mediaplayer/MpWinampInterface.h
index 623e5f7fe..cb853a09a 100644
--- a/src/modules/mediaplayer/MpWinampInterface.h
+++ b/src/modules/mediaplayer/MpWinampInterface.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpXmmsInterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp
index d2afabbfa..b5217fad8 100644
--- a/src/modules/mediaplayer/MpXmmsInterface.cpp
+++ b/src/modules/mediaplayer/MpXmmsInterface.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/MpXmmsInterface.h b/src/modules/mediaplayer/MpXmmsInterface.h
index 3c49c036b..3b89cd8a2 100644
--- a/src/modules/mediaplayer/MpXmmsInterface.h
+++ b/src/modules/mediaplayer/MpXmmsInterface.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/libkvimediaplayer.cpp b/src/modules/mediaplayer/libkvimediaplayer.cpp
index 03507f0f5..2445f2d1a 100644
--- a/src/modules/mediaplayer/libkvimediaplayer.cpp
+++ b/src/modules/mediaplayer/libkvimediaplayer.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp
index de0f18bec..a1ee7003d 100644
--- a/src/modules/mediaplayer/winamp.cpp
+++ b/src/modules/mediaplayer/winamp.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index dabf1c547..3af86b695 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/mircimport/libkvimircimport.h b/src/modules/mircimport/libkvimircimport.h
index 7f138c473..076790c8c 100644
--- a/src/modules/mircimport/libkvimircimport.h
+++ b/src/modules/mircimport/libkvimircimport.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/my/libkvimy.cpp b/src/modules/my/libkvimy.cpp
index fa589ce79..0fbe9f5b2 100644
--- a/src/modules/my/libkvimy.cpp
+++ b/src/modules/my/libkvimy.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierMessage.cpp b/src/modules/notifier/NotifierMessage.cpp
index f2560b91d..3456a3db6 100644
--- a/src/modules/notifier/NotifierMessage.cpp
+++ b/src/modules/notifier/NotifierMessage.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierMessage.h b/src/modules/notifier/NotifierMessage.h
index 9129cdf37..55a12c8f9 100644
--- a/src/modules/notifier/NotifierMessage.h
+++ b/src/modules/notifier/NotifierMessage.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierSettings.h b/src/modules/notifier/NotifierSettings.h
index 28e53ef3b..9bc3f6c94 100644
--- a/src/modules/notifier/NotifierSettings.h
+++ b/src/modules/notifier/NotifierSettings.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierWindow.cpp b/src/modules/notifier/NotifierWindow.cpp
index 4113b016d..ebd9e40e8 100644
--- a/src/modules/notifier/NotifierWindow.cpp
+++ b/src/modules/notifier/NotifierWindow.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2004-2008 Iacopo Palazzi < iakko(at)siena.linux.it >
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierWindow.h b/src/modules/notifier/NotifierWindow.h
index afeea2756..f48ec1688 100644
--- a/src/modules/notifier/NotifierWindow.h
+++ b/src/modules/notifier/NotifierWindow.h
@@ -10,9 +10,9 @@
// Copyright (C) 2005-2008 Iacopo Palazzi < iakko(at)siena(dot)linux(dot)it >
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierWindowBorder.cpp b/src/modules/notifier/NotifierWindowBorder.cpp
index a47d3a64c..19628acbb 100644
--- a/src/modules/notifier/NotifierWindowBorder.cpp
+++ b/src/modules/notifier/NotifierWindowBorder.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierWindowBorder.h b/src/modules/notifier/NotifierWindowBorder.h
index b59d90b74..f450f3853 100644
--- a/src/modules/notifier/NotifierWindowBorder.h
+++ b/src/modules/notifier/NotifierWindowBorder.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierWindowTab.cpp b/src/modules/notifier/NotifierWindowTab.cpp
index 3862529fd..61c8e9707 100644
--- a/src/modules/notifier/NotifierWindowTab.cpp
+++ b/src/modules/notifier/NotifierWindowTab.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/NotifierWindowTab.h b/src/modules/notifier/NotifierWindowTab.h
index be2163e20..7f36a1307 100644
--- a/src/modules/notifier/NotifierWindowTab.h
+++ b/src/modules/notifier/NotifierWindowTab.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/notifier/libkvinotifier.cpp b/src/modules/notifier/libkvinotifier.cpp
index b9b51cfe0..6aa77690c 100644
--- a/src/modules/notifier/libkvinotifier.cpp
+++ b/src/modules/notifier/libkvinotifier.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_button.cpp b/src/modules/objects/KvsObject_button.cpp
index b2b8c3d69..40401ed12 100644
--- a/src/modules/objects/KvsObject_button.cpp
+++ b/src/modules/objects/KvsObject_button.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_button.h b/src/modules/objects/KvsObject_button.h
index 18b40a5ba..e61385fc0 100644
--- a/src/modules/objects/KvsObject_button.h
+++ b/src/modules/objects/KvsObject_button.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_buttonGroup.cpp b/src/modules/objects/KvsObject_buttonGroup.cpp
index 1c0b7b12d..60fe86439 100644
--- a/src/modules/objects/KvsObject_buttonGroup.cpp
+++ b/src/modules/objects/KvsObject_buttonGroup.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_buttonGroup.h b/src/modules/objects/KvsObject_buttonGroup.h
index bc2f77b6c..286c26440 100644
--- a/src/modules/objects/KvsObject_buttonGroup.h
+++ b/src/modules/objects/KvsObject_buttonGroup.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_checkBox.cpp b/src/modules/objects/KvsObject_checkBox.cpp
index 26052712b..3056ae91f 100644
--- a/src/modules/objects/KvsObject_checkBox.cpp
+++ b/src/modules/objects/KvsObject_checkBox.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_checkBox.h b/src/modules/objects/KvsObject_checkBox.h
index 0c15045c4..e44bf00b9 100644
--- a/src/modules/objects/KvsObject_checkBox.h
+++ b/src/modules/objects/KvsObject_checkBox.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_colorDialog.cpp b/src/modules/objects/KvsObject_colorDialog.cpp
index 2723a93c2..89b3f3673 100644
--- a/src/modules/objects/KvsObject_colorDialog.cpp
+++ b/src/modules/objects/KvsObject_colorDialog.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_colorDialog.h b/src/modules/objects/KvsObject_colorDialog.h
index 35503f87d..fbb92bb0d 100644
--- a/src/modules/objects/KvsObject_colorDialog.h
+++ b/src/modules/objects/KvsObject_colorDialog.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_comboBox.cpp b/src/modules/objects/KvsObject_comboBox.cpp
index 450569c62..3a1eb9e90 100644
--- a/src/modules/objects/KvsObject_comboBox.cpp
+++ b/src/modules/objects/KvsObject_comboBox.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_comboBox.h b/src/modules/objects/KvsObject_comboBox.h
index 448e3d785..ed3133232 100644
--- a/src/modules/objects/KvsObject_comboBox.h
+++ b/src/modules/objects/KvsObject_comboBox.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_dateTimeEdit.cpp b/src/modules/objects/KvsObject_dateTimeEdit.cpp
index f04530b2f..7cea13fae 100644
--- a/src/modules/objects/KvsObject_dateTimeEdit.cpp
+++ b/src/modules/objects/KvsObject_dateTimeEdit.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_dateTimeEdit.h b/src/modules/objects/KvsObject_dateTimeEdit.h
index 31be3813d..7ea89ef58 100644
--- a/src/modules/objects/KvsObject_dateTimeEdit.h
+++ b/src/modules/objects/KvsObject_dateTimeEdit.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_dialog.cpp b/src/modules/objects/KvsObject_dialog.cpp
index 720f1283d..d2ed0cf6a 100644
--- a/src/modules/objects/KvsObject_dialog.cpp
+++ b/src/modules/objects/KvsObject_dialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_dialog.h b/src/modules/objects/KvsObject_dialog.h
index dd5109858..6c99d0cd8 100644
--- a/src/modules/objects/KvsObject_dialog.h
+++ b/src/modules/objects/KvsObject_dialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_dockWindow.cpp b/src/modules/objects/KvsObject_dockWindow.cpp
index 6a3628856..2c0661f00 100644
--- a/src/modules/objects/KvsObject_dockWindow.cpp
+++ b/src/modules/objects/KvsObject_dockWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_dockWindow.h b/src/modules/objects/KvsObject_dockWindow.h
index 38ab7a006..c94c36a2a 100644
--- a/src/modules/objects/KvsObject_dockWindow.h
+++ b/src/modules/objects/KvsObject_dockWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_file.cpp b/src/modules/objects/KvsObject_file.cpp
index c7e874cc6..ef13cac74 100644
--- a/src/modules/objects/KvsObject_file.cpp
+++ b/src/modules/objects/KvsObject_file.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_file.h b/src/modules/objects/KvsObject_file.h
index 661ad45d5..b28d19588 100644
--- a/src/modules/objects/KvsObject_file.h
+++ b/src/modules/objects/KvsObject_file.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_ftp.cpp b/src/modules/objects/KvsObject_ftp.cpp
index cba762964..6b9445269 100644
--- a/src/modules/objects/KvsObject_ftp.cpp
+++ b/src/modules/objects/KvsObject_ftp.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_ftp.h b/src/modules/objects/KvsObject_ftp.h
index bc2c8c6d8..653a382fe 100644
--- a/src/modules/objects/KvsObject_ftp.h
+++ b/src/modules/objects/KvsObject_ftp.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_groupBox.cpp b/src/modules/objects/KvsObject_groupBox.cpp
index 90d031213..51575049d 100644
--- a/src/modules/objects/KvsObject_groupBox.cpp
+++ b/src/modules/objects/KvsObject_groupBox.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_groupBox.h b/src/modules/objects/KvsObject_groupBox.h
index 67fc6759a..a54a300a8 100644
--- a/src/modules/objects/KvsObject_groupBox.h
+++ b/src/modules/objects/KvsObject_groupBox.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_hBox.cpp b/src/modules/objects/KvsObject_hBox.cpp
index 7eea31272..44d0089bb 100644
--- a/src/modules/objects/KvsObject_hBox.cpp
+++ b/src/modules/objects/KvsObject_hBox.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_hBox.h b/src/modules/objects/KvsObject_hBox.h
index c3d65c65d..862aebf3b 100644
--- a/src/modules/objects/KvsObject_hBox.h
+++ b/src/modules/objects/KvsObject_hBox.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_http.cpp b/src/modules/objects/KvsObject_http.cpp
index d8dcf4a55..7f126922e 100644
--- a/src/modules/objects/KvsObject_http.cpp
+++ b/src/modules/objects/KvsObject_http.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_http.h b/src/modules/objects/KvsObject_http.h
index 77c682f08..2813bd730 100644
--- a/src/modules/objects/KvsObject_http.h
+++ b/src/modules/objects/KvsObject_http.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_label.cpp b/src/modules/objects/KvsObject_label.cpp
index 483cd17c4..570dfb5ba 100644
--- a/src/modules/objects/KvsObject_label.cpp
+++ b/src/modules/objects/KvsObject_label.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_label.h b/src/modules/objects/KvsObject_label.h
index 99987fa56..7b626cc46 100644
--- a/src/modules/objects/KvsObject_label.h
+++ b/src/modules/objects/KvsObject_label.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_layout.cpp b/src/modules/objects/KvsObject_layout.cpp
index c5be86a4b..39ade29a3 100644
--- a/src/modules/objects/KvsObject_layout.cpp
+++ b/src/modules/objects/KvsObject_layout.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_layout.h b/src/modules/objects/KvsObject_layout.h
index 29a7b1d4a..830ce3e3a 100644
--- a/src/modules/objects/KvsObject_layout.h
+++ b/src/modules/objects/KvsObject_layout.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_lcd.cpp b/src/modules/objects/KvsObject_lcd.cpp
index 5c6473b36..0abe4bbc9 100644
--- a/src/modules/objects/KvsObject_lcd.cpp
+++ b/src/modules/objects/KvsObject_lcd.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_lcd.h b/src/modules/objects/KvsObject_lcd.h
index 6d4e80333..3738f1f5f 100644
--- a/src/modules/objects/KvsObject_lcd.h
+++ b/src/modules/objects/KvsObject_lcd.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_lineEdit.cpp b/src/modules/objects/KvsObject_lineEdit.cpp
index 1e60a9eca..eebb863f3 100644
--- a/src/modules/objects/KvsObject_lineEdit.cpp
+++ b/src/modules/objects/KvsObject_lineEdit.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_lineEdit.h b/src/modules/objects/KvsObject_lineEdit.h
index 57d674a49..d6dbe87bc 100644
--- a/src/modules/objects/KvsObject_lineEdit.h
+++ b/src/modules/objects/KvsObject_lineEdit.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_list.cpp b/src/modules/objects/KvsObject_list.cpp
index 9deafecae..79688eed2 100644
--- a/src/modules/objects/KvsObject_list.cpp
+++ b/src/modules/objects/KvsObject_list.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_list.h b/src/modules/objects/KvsObject_list.h
index 42766aed1..0403b0418 100644
--- a/src/modules/objects/KvsObject_list.h
+++ b/src/modules/objects/KvsObject_list.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index fe3307366..981542476 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_listWidget.h b/src/modules/objects/KvsObject_listWidget.h
index d6e2ec3f4..4b300a1c8 100644
--- a/src/modules/objects/KvsObject_listWidget.h
+++ b/src/modules/objects/KvsObject_listWidget.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_mainWindow.cpp b/src/modules/objects/KvsObject_mainWindow.cpp
index 21a17c2aa..35dc96908 100644
--- a/src/modules/objects/KvsObject_mainWindow.cpp
+++ b/src/modules/objects/KvsObject_mainWindow.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_mainWindow.h b/src/modules/objects/KvsObject_mainWindow.h
index e1693d5df..9c227630e 100644
--- a/src/modules/objects/KvsObject_mainWindow.h
+++ b/src/modules/objects/KvsObject_mainWindow.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_memoryBuffer.cpp b/src/modules/objects/KvsObject_memoryBuffer.cpp
index 8311954bd..3be853bb5 100644
--- a/src/modules/objects/KvsObject_memoryBuffer.cpp
+++ b/src/modules/objects/KvsObject_memoryBuffer.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_memoryBuffer.h b/src/modules/objects/KvsObject_memoryBuffer.h
index 28f19d065..18522e469 100644
--- a/src/modules/objects/KvsObject_memoryBuffer.h
+++ b/src/modules/objects/KvsObject_memoryBuffer.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_menuBar.cpp b/src/modules/objects/KvsObject_menuBar.cpp
index 289ebd776..c47da7cb6 100644
--- a/src/modules/objects/KvsObject_menuBar.cpp
+++ b/src/modules/objects/KvsObject_menuBar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_menuBar.h b/src/modules/objects/KvsObject_menuBar.h
index 6850a9177..8a04d742c 100644
--- a/src/modules/objects/KvsObject_menuBar.h
+++ b/src/modules/objects/KvsObject_menuBar.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp
index 4e90a849f..8f16aa94d 100644
--- a/src/modules/objects/KvsObject_multiLineEdit.cpp
+++ b/src/modules/objects/KvsObject_multiLineEdit.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_multiLineEdit.h b/src/modules/objects/KvsObject_multiLineEdit.h
index b12f06925..9f8123655 100644
--- a/src/modules/objects/KvsObject_multiLineEdit.h
+++ b/src/modules/objects/KvsObject_multiLineEdit.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index f80ad760a..745fc6c2d 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_painter.h b/src/modules/objects/KvsObject_painter.h
index 180b062fd..1af33b31c 100644
--- a/src/modules/objects/KvsObject_painter.h
+++ b/src/modules/objects/KvsObject_painter.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp
index 23e1527ab..a25cbf586 100644
--- a/src/modules/objects/KvsObject_pixmap.cpp
+++ b/src/modules/objects/KvsObject_pixmap.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_pixmap.h b/src/modules/objects/KvsObject_pixmap.h
index 9d7e7cdd2..29c2562c7 100644
--- a/src/modules/objects/KvsObject_pixmap.h
+++ b/src/modules/objects/KvsObject_pixmap.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_popupMenu.cpp b/src/modules/objects/KvsObject_popupMenu.cpp
index b26aede29..32835fe24 100644
--- a/src/modules/objects/KvsObject_popupMenu.cpp
+++ b/src/modules/objects/KvsObject_popupMenu.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_popupMenu.h b/src/modules/objects/KvsObject_popupMenu.h
index 15cf2f471..799f8f9ce 100644
--- a/src/modules/objects/KvsObject_popupMenu.h
+++ b/src/modules/objects/KvsObject_popupMenu.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp
index 5bbbdcba3..6958aa9ff 100644
--- a/src/modules/objects/KvsObject_process.cpp
+++ b/src/modules/objects/KvsObject_process.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_process.h b/src/modules/objects/KvsObject_process.h
index 60559bc86..0124c6e4c 100644
--- a/src/modules/objects/KvsObject_process.h
+++ b/src/modules/objects/KvsObject_process.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_progressBar.cpp b/src/modules/objects/KvsObject_progressBar.cpp
index ed56ddb07..27fc1f287 100644
--- a/src/modules/objects/KvsObject_progressBar.cpp
+++ b/src/modules/objects/KvsObject_progressBar.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_progressBar.h b/src/modules/objects/KvsObject_progressBar.h
index bb0b5a717..c22fa1116 100644
--- a/src/modules/objects/KvsObject_progressBar.h
+++ b/src/modules/objects/KvsObject_progressBar.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_radioButton.cpp b/src/modules/objects/KvsObject_radioButton.cpp
index 719ff3ef4..787a7a270 100644
--- a/src/modules/objects/KvsObject_radioButton.cpp
+++ b/src/modules/objects/KvsObject_radioButton.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_radioButton.h b/src/modules/objects/KvsObject_radioButton.h
index 887631928..96c65d8b3 100644
--- a/src/modules/objects/KvsObject_radioButton.h
+++ b/src/modules/objects/KvsObject_radioButton.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_slider.cpp b/src/modules/objects/KvsObject_slider.cpp
index 2250156bb..60e8b2c62 100644
--- a/src/modules/objects/KvsObject_slider.cpp
+++ b/src/modules/objects/KvsObject_slider.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_slider.h b/src/modules/objects/KvsObject_slider.h
index 820ad5c67..5b91589b3 100644
--- a/src/modules/objects/KvsObject_slider.h
+++ b/src/modules/objects/KvsObject_slider.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_socket.cpp b/src/modules/objects/KvsObject_socket.cpp
index 6566a28c8..02220d3d0 100644
--- a/src/modules/objects/KvsObject_socket.cpp
+++ b/src/modules/objects/KvsObject_socket.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_socket.h b/src/modules/objects/KvsObject_socket.h
index c6e189b52..d4ec6a625 100644
--- a/src/modules/objects/KvsObject_socket.h
+++ b/src/modules/objects/KvsObject_socket.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_spinBox.cpp b/src/modules/objects/KvsObject_spinBox.cpp
index d0634ec11..60fe55c20 100644
--- a/src/modules/objects/KvsObject_spinBox.cpp
+++ b/src/modules/objects/KvsObject_spinBox.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_spinBox.h b/src/modules/objects/KvsObject_spinBox.h
index f2dcd1352..20069d06c 100644
--- a/src/modules/objects/KvsObject_spinBox.h
+++ b/src/modules/objects/KvsObject_spinBox.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_sql.cpp b/src/modules/objects/KvsObject_sql.cpp
index f954d2688..3bb2016ca 100644
--- a/src/modules/objects/KvsObject_sql.cpp
+++ b/src/modules/objects/KvsObject_sql.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_sql.h b/src/modules/objects/KvsObject_sql.h
index bffe59996..ac8ebf2b5 100644
--- a/src/modules/objects/KvsObject_sql.h
+++ b/src/modules/objects/KvsObject_sql.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_tabWidget.cpp b/src/modules/objects/KvsObject_tabWidget.cpp
index 2844f6520..043100718 100644
--- a/src/modules/objects/KvsObject_tabWidget.cpp
+++ b/src/modules/objects/KvsObject_tabWidget.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_tabWidget.h b/src/modules/objects/KvsObject_tabWidget.h
index 6eda136a2..48db4ba78 100644
--- a/src/modules/objects/KvsObject_tabWidget.h
+++ b/src/modules/objects/KvsObject_tabWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index e65086b5b..9e1e12b76 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_tableWidget.h b/src/modules/objects/KvsObject_tableWidget.h
index 6965d6e04..4b7455d42 100644
--- a/src/modules/objects/KvsObject_tableWidget.h
+++ b/src/modules/objects/KvsObject_tableWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_textBrowser.cpp b/src/modules/objects/KvsObject_textBrowser.cpp
index de5a57ea0..fbd2628ef 100644
--- a/src/modules/objects/KvsObject_textBrowser.cpp
+++ b/src/modules/objects/KvsObject_textBrowser.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_textBrowser.h b/src/modules/objects/KvsObject_textBrowser.h
index 03a0314a6..2adcc36f3 100644
--- a/src/modules/objects/KvsObject_textBrowser.h
+++ b/src/modules/objects/KvsObject_textBrowser.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_toolBar.cpp b/src/modules/objects/KvsObject_toolBar.cpp
index 8ee1d56d2..263f1a5c6 100644
--- a/src/modules/objects/KvsObject_toolBar.cpp
+++ b/src/modules/objects/KvsObject_toolBar.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_toolBar.h b/src/modules/objects/KvsObject_toolBar.h
index f0770bb2d..d4f0be8d7 100644
--- a/src/modules/objects/KvsObject_toolBar.h
+++ b/src/modules/objects/KvsObject_toolBar.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index 3035ec6d5..a827f2816 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_toolButton.h b/src/modules/objects/KvsObject_toolButton.h
index 63fdebb5a..0be4e2681 100644
--- a/src/modules/objects/KvsObject_toolButton.h
+++ b/src/modules/objects/KvsObject_toolButton.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_trayIcon.cpp b/src/modules/objects/KvsObject_trayIcon.cpp
index 5ba066ecb..3e7728ee1 100644
--- a/src/modules/objects/KvsObject_trayIcon.cpp
+++ b/src/modules/objects/KvsObject_trayIcon.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_trayIcon.h b/src/modules/objects/KvsObject_trayIcon.h
index 44fa2d88e..fa9019750 100644
--- a/src/modules/objects/KvsObject_trayIcon.h
+++ b/src/modules/objects/KvsObject_trayIcon.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_treeWidget.cpp b/src/modules/objects/KvsObject_treeWidget.cpp
index 4dad7a2cf..bc7ceac28 100644
--- a/src/modules/objects/KvsObject_treeWidget.cpp
+++ b/src/modules/objects/KvsObject_treeWidget.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_treeWidget.h b/src/modules/objects/KvsObject_treeWidget.h
index 81c884428..cdd5a75bd 100644
--- a/src/modules/objects/KvsObject_treeWidget.h
+++ b/src/modules/objects/KvsObject_treeWidget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index e84b000a9..3005f5f28 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.h b/src/modules/objects/KvsObject_treeWidgeteItem.h
index ad6658cff..821b8579a 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.h
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_vBox.cpp b/src/modules/objects/KvsObject_vBox.cpp
index ea95a90be..0411cfe86 100644
--- a/src/modules/objects/KvsObject_vBox.cpp
+++ b/src/modules/objects/KvsObject_vBox.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_vBox.h b/src/modules/objects/KvsObject_vBox.h
index 20ed05d89..8c1ed4a48 100644
--- a/src/modules/objects/KvsObject_vBox.h
+++ b/src/modules/objects/KvsObject_vBox.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_webView.cpp b/src/modules/objects/KvsObject_webView.cpp
index 1f9ae5451..8cce6fd47 100644
--- a/src/modules/objects/KvsObject_webView.cpp
+++ b/src/modules/objects/KvsObject_webView.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_webView.h b/src/modules/objects/KvsObject_webView.h
index 2695a6cba..107d8d8c8 100644
--- a/src/modules/objects/KvsObject_webView.h
+++ b/src/modules/objects/KvsObject_webView.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 04e41d844..c4d7e2004 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_widget.h b/src/modules/objects/KvsObject_widget.h
index e861aede1..054f1af2e 100644
--- a/src/modules/objects/KvsObject_widget.h
+++ b/src/modules/objects/KvsObject_widget.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_window.cpp b/src/modules/objects/KvsObject_window.cpp
index 4c82df5ef..eb7fab173 100644
--- a/src/modules/objects/KvsObject_window.cpp
+++ b/src/modules/objects/KvsObject_window.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_window.h b/src/modules/objects/KvsObject_window.h
index 40b8aad8d..f05e29b97 100644
--- a/src/modules/objects/KvsObject_window.h
+++ b/src/modules/objects/KvsObject_window.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_wizard.cpp b/src/modules/objects/KvsObject_wizard.cpp
index 2fd733115..5883cf40d 100644
--- a/src/modules/objects/KvsObject_wizard.cpp
+++ b/src/modules/objects/KvsObject_wizard.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_wizard.h b/src/modules/objects/KvsObject_wizard.h
index 0ea194de8..ec5ab8e06 100644
--- a/src/modules/objects/KvsObject_wizard.h
+++ b/src/modules/objects/KvsObject_wizard.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp
index ab88d3cd8..d715a05c6 100644
--- a/src/modules/objects/KvsObject_workspace.cpp
+++ b/src/modules/objects/KvsObject_workspace.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_workspace.h b/src/modules/objects/KvsObject_workspace.h
index be05d7922..3657f3b56 100644
--- a/src/modules/objects/KvsObject_workspace.h
+++ b/src/modules/objects/KvsObject_workspace.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_wrapper.cpp b/src/modules/objects/KvsObject_wrapper.cpp
index 001a4dd21..11c4d00a6 100644
--- a/src/modules/objects/KvsObject_wrapper.cpp
+++ b/src/modules/objects/KvsObject_wrapper.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_wrapper.h b/src/modules/objects/KvsObject_wrapper.h
index 2f7829b76..813373401 100644
--- a/src/modules/objects/KvsObject_wrapper.h
+++ b/src/modules/objects/KvsObject_wrapper.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index 1111a18f7..8cf692938 100644
--- a/src/modules/objects/KvsObject_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/KvsObject_xmlreader.h b/src/modules/objects/KvsObject_xmlreader.h
index 2c702e327..ea9b38ff1 100644
--- a/src/modules/objects/KvsObject_xmlreader.h
+++ b/src/modules/objects/KvsObject_xmlreader.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 69bcc9b63..d9663b619 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index 1dbd08d40..d6225dfb1 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsDialog.cpp b/src/modules/options/OptionsDialog.cpp
index 0b5c19527..7e91abc56 100644
--- a/src/modules/options/OptionsDialog.cpp
+++ b/src/modules/options/OptionsDialog.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsDialog.h b/src/modules/options/OptionsDialog.h
index c218486e2..db30dbee9 100644
--- a/src/modules/options/OptionsDialog.h
+++ b/src/modules/options/OptionsDialog.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsInstanceManager.cpp b/src/modules/options/OptionsInstanceManager.cpp
index a2359a36e..1c2d3dd58 100644
--- a/src/modules/options/OptionsInstanceManager.cpp
+++ b/src/modules/options/OptionsInstanceManager.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsInstanceManager.h b/src/modules/options/OptionsInstanceManager.h
index 813354c4b..82b2de9a8 100644
--- a/src/modules/options/OptionsInstanceManager.h
+++ b/src/modules/options/OptionsInstanceManager.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidgetContainer.cpp b/src/modules/options/OptionsWidgetContainer.cpp
index 875420b7f..68cdd96bf 100644
--- a/src/modules/options/OptionsWidgetContainer.cpp
+++ b/src/modules/options/OptionsWidgetContainer.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidgetContainer.h b/src/modules/options/OptionsWidgetContainer.h
index 42880ce16..d733a9b23 100644
--- a/src/modules/options/OptionsWidgetContainer.h
+++ b/src/modules/options/OptionsWidgetContainer.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
index 355b672e9..dfcf265b7 100644
--- a/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_alertsAndHighlighting.h b/src/modules/options/OptionsWidget_alertsAndHighlighting.h
index 9cd18539e..c7e45a724 100644
--- a/src/modules/options/OptionsWidget_alertsAndHighlighting.h
+++ b/src/modules/options/OptionsWidget_alertsAndHighlighting.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_antiSpam.cpp b/src/modules/options/OptionsWidget_antiSpam.cpp
index e37bb2a34..18bdbc224 100644
--- a/src/modules/options/OptionsWidget_antiSpam.cpp
+++ b/src/modules/options/OptionsWidget_antiSpam.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_antiSpam.h b/src/modules/options/OptionsWidget_antiSpam.h
index 8e0c9ce3a..51a65c695 100644
--- a/src/modules/options/OptionsWidget_antiSpam.h
+++ b/src/modules/options/OptionsWidget_antiSpam.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_avatar.cpp b/src/modules/options/OptionsWidget_avatar.cpp
index 8cc123eb0..0b5b2dd5a 100644
--- a/src/modules/options/OptionsWidget_avatar.cpp
+++ b/src/modules/options/OptionsWidget_avatar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_avatar.h b/src/modules/options/OptionsWidget_avatar.h
index 62d443b6b..a5360a366 100644
--- a/src/modules/options/OptionsWidget_avatar.h
+++ b/src/modules/options/OptionsWidget_avatar.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_away.cpp b/src/modules/options/OptionsWidget_away.cpp
index 2be648107..7e10e4171 100644
--- a/src/modules/options/OptionsWidget_away.cpp
+++ b/src/modules/options/OptionsWidget_away.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_away.h b/src/modules/options/OptionsWidget_away.h
index 69a1cfecf..966165771 100644
--- a/src/modules/options/OptionsWidget_away.h
+++ b/src/modules/options/OptionsWidget_away.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_channel.cpp b/src/modules/options/OptionsWidget_channel.cpp
index 2f45b9486..67a7da030 100644
--- a/src/modules/options/OptionsWidget_channel.cpp
+++ b/src/modules/options/OptionsWidget_channel.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_channel.h b/src/modules/options/OptionsWidget_channel.h
index 82b1e2e4c..0bd4cc3a5 100644
--- a/src/modules/options/OptionsWidget_channel.h
+++ b/src/modules/options/OptionsWidget_channel.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_connection.cpp b/src/modules/options/OptionsWidget_connection.cpp
index 4242d3235..efdb83916 100644
--- a/src/modules/options/OptionsWidget_connection.cpp
+++ b/src/modules/options/OptionsWidget_connection.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_connection.h b/src/modules/options/OptionsWidget_connection.h
index 78d27ed0e..ab1d44c1d 100644
--- a/src/modules/options/OptionsWidget_connection.h
+++ b/src/modules/options/OptionsWidget_connection.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ctcp.cpp b/src/modules/options/OptionsWidget_ctcp.cpp
index 8ff9c8409..a799a5e4e 100644
--- a/src/modules/options/OptionsWidget_ctcp.cpp
+++ b/src/modules/options/OptionsWidget_ctcp.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ctcp.h b/src/modules/options/OptionsWidget_ctcp.h
index fbb76e6f1..82c483921 100644
--- a/src/modules/options/OptionsWidget_ctcp.h
+++ b/src/modules/options/OptionsWidget_ctcp.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
index fcc561714..b26d8e2df 100644
--- a/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ctcpFloodProtection.h b/src/modules/options/OptionsWidget_ctcpFloodProtection.h
index dc48f346c..751746de6 100644
--- a/src/modules/options/OptionsWidget_ctcpFloodProtection.h
+++ b/src/modules/options/OptionsWidget_ctcpFloodProtection.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_dcc.cpp b/src/modules/options/OptionsWidget_dcc.cpp
index 1abd6a5ac..28564cb24 100644
--- a/src/modules/options/OptionsWidget_dcc.cpp
+++ b/src/modules/options/OptionsWidget_dcc.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_dcc.h b/src/modules/options/OptionsWidget_dcc.h
index 9ff5fcd53..2fa1158e9 100644
--- a/src/modules/options/OptionsWidget_dcc.h
+++ b/src/modules/options/OptionsWidget_dcc.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_general.cpp b/src/modules/options/OptionsWidget_general.cpp
index 372beb2c1..afa7dffb9 100644
--- a/src/modules/options/OptionsWidget_general.cpp
+++ b/src/modules/options/OptionsWidget_general.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_general.h b/src/modules/options/OptionsWidget_general.h
index 16a6abf60..444ab6d10 100644
--- a/src/modules/options/OptionsWidget_general.h
+++ b/src/modules/options/OptionsWidget_general.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_identity.cpp b/src/modules/options/OptionsWidget_identity.cpp
index af03e4598..4db01563c 100644
--- a/src/modules/options/OptionsWidget_identity.cpp
+++ b/src/modules/options/OptionsWidget_identity.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_identity.h b/src/modules/options/OptionsWidget_identity.h
index 399b5d7bb..a79a98392 100644
--- a/src/modules/options/OptionsWidget_identity.h
+++ b/src/modules/options/OptionsWidget_identity.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ignore.cpp b/src/modules/options/OptionsWidget_ignore.cpp
index 1ae40bd10..704c488f5 100644
--- a/src/modules/options/OptionsWidget_ignore.cpp
+++ b/src/modules/options/OptionsWidget_ignore.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ignore.h b/src/modules/options/OptionsWidget_ignore.h
index 24aae1208..55669aa10 100644
--- a/src/modules/options/OptionsWidget_ignore.h
+++ b/src/modules/options/OptionsWidget_ignore.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_input.cpp b/src/modules/options/OptionsWidget_input.cpp
index a900a8f3b..89f7be96f 100644
--- a/src/modules/options/OptionsWidget_input.cpp
+++ b/src/modules/options/OptionsWidget_input.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_input.h b/src/modules/options/OptionsWidget_input.h
index f9eeda1f5..48e743966 100644
--- a/src/modules/options/OptionsWidget_input.h
+++ b/src/modules/options/OptionsWidget_input.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.cpp b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
index cc23a36b1..891abc3b7 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.cpp
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_interfaceFeatures.h b/src/modules/options/OptionsWidget_interfaceFeatures.h
index 85adcb7b7..ec54a80e3 100644
--- a/src/modules/options/OptionsWidget_interfaceFeatures.h
+++ b/src/modules/options/OptionsWidget_interfaceFeatures.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_irc.cpp b/src/modules/options/OptionsWidget_irc.cpp
index 65c86b5d5..40634db03 100644
--- a/src/modules/options/OptionsWidget_irc.cpp
+++ b/src/modules/options/OptionsWidget_irc.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_irc.h b/src/modules/options/OptionsWidget_irc.h
index f7151fc5e..9ec41d709 100644
--- a/src/modules/options/OptionsWidget_irc.h
+++ b/src/modules/options/OptionsWidget_irc.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ircOutput.cpp b/src/modules/options/OptionsWidget_ircOutput.cpp
index e934d74df..50345464c 100644
--- a/src/modules/options/OptionsWidget_ircOutput.cpp
+++ b/src/modules/options/OptionsWidget_ircOutput.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ircOutput.h b/src/modules/options/OptionsWidget_ircOutput.h
index 153955773..dcdb95cd3 100644
--- a/src/modules/options/OptionsWidget_ircOutput.h
+++ b/src/modules/options/OptionsWidget_ircOutput.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ircView.cpp b/src/modules/options/OptionsWidget_ircView.cpp
index 1b08142ee..9f21edf82 100644
--- a/src/modules/options/OptionsWidget_ircView.cpp
+++ b/src/modules/options/OptionsWidget_ircView.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_ircView.h b/src/modules/options/OptionsWidget_ircView.h
index af5cacc7a..6bf50f1aa 100644
--- a/src/modules/options/OptionsWidget_ircView.h
+++ b/src/modules/options/OptionsWidget_ircView.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_lag.cpp b/src/modules/options/OptionsWidget_lag.cpp
index 9014dc59c..673ca5246 100644
--- a/src/modules/options/OptionsWidget_lag.cpp
+++ b/src/modules/options/OptionsWidget_lag.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_lag.h b/src/modules/options/OptionsWidget_lag.h
index df3f1ae33..4f561b083 100644
--- a/src/modules/options/OptionsWidget_lag.h
+++ b/src/modules/options/OptionsWidget_lag.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_logging.cpp b/src/modules/options/OptionsWidget_logging.cpp
index 3251b86e8..4c525dfaa 100644
--- a/src/modules/options/OptionsWidget_logging.cpp
+++ b/src/modules/options/OptionsWidget_logging.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_logging.h b/src/modules/options/OptionsWidget_logging.h
index ce4ea9c4c..1aa779efc 100644
--- a/src/modules/options/OptionsWidget_logging.h
+++ b/src/modules/options/OptionsWidget_logging.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_mediaTypes.cpp b/src/modules/options/OptionsWidget_mediaTypes.cpp
index d10f20d0f..935731d1d 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.cpp
+++ b/src/modules/options/OptionsWidget_mediaTypes.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_mediaTypes.h b/src/modules/options/OptionsWidget_mediaTypes.h
index ea1c8e067..785922df4 100644
--- a/src/modules/options/OptionsWidget_mediaTypes.h
+++ b/src/modules/options/OptionsWidget_mediaTypes.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_message.cpp b/src/modules/options/OptionsWidget_message.cpp
index 06ffce87d..8d49075d1 100644
--- a/src/modules/options/OptionsWidget_message.cpp
+++ b/src/modules/options/OptionsWidget_message.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_message.h b/src/modules/options/OptionsWidget_message.h
index 02233615d..d2385c8c1 100644
--- a/src/modules/options/OptionsWidget_message.h
+++ b/src/modules/options/OptionsWidget_message.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_nickserv.cpp b/src/modules/options/OptionsWidget_nickserv.cpp
index 0fa5ee833..26e450dc8 100644
--- a/src/modules/options/OptionsWidget_nickserv.cpp
+++ b/src/modules/options/OptionsWidget_nickserv.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_nickserv.h b/src/modules/options/OptionsWidget_nickserv.h
index 7820382e8..fc0658cdd 100644
--- a/src/modules/options/OptionsWidget_nickserv.h
+++ b/src/modules/options/OptionsWidget_nickserv.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_notifier.cpp b/src/modules/options/OptionsWidget_notifier.cpp
index 909fe9287..9350818ee 100644
--- a/src/modules/options/OptionsWidget_notifier.cpp
+++ b/src/modules/options/OptionsWidget_notifier.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_notifier.h b/src/modules/options/OptionsWidget_notifier.h
index acdbb9000..be2549b6a 100644
--- a/src/modules/options/OptionsWidget_notifier.h
+++ b/src/modules/options/OptionsWidget_notifier.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_notify.cpp b/src/modules/options/OptionsWidget_notify.cpp
index 8811615ac..051bfbe6c 100644
--- a/src/modules/options/OptionsWidget_notify.cpp
+++ b/src/modules/options/OptionsWidget_notify.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_notify.h b/src/modules/options/OptionsWidget_notify.h
index e32511779..413b81b2e 100644
--- a/src/modules/options/OptionsWidget_notify.h
+++ b/src/modules/options/OptionsWidget_notify.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_protection.cpp b/src/modules/options/OptionsWidget_protection.cpp
index 67dc5a4eb..2590b8f64 100644
--- a/src/modules/options/OptionsWidget_protection.cpp
+++ b/src/modules/options/OptionsWidget_protection.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_protection.h b/src/modules/options/OptionsWidget_protection.h
index f58b14734..31f8c7008 100644
--- a/src/modules/options/OptionsWidget_protection.h
+++ b/src/modules/options/OptionsWidget_protection.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_proxy.cpp b/src/modules/options/OptionsWidget_proxy.cpp
index 1035bf203..e2905cc38 100644
--- a/src/modules/options/OptionsWidget_proxy.cpp
+++ b/src/modules/options/OptionsWidget_proxy.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_proxy.h b/src/modules/options/OptionsWidget_proxy.h
index c33c3b6c0..f6f53c542 100644
--- a/src/modules/options/OptionsWidget_proxy.h
+++ b/src/modules/options/OptionsWidget_proxy.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_query.cpp b/src/modules/options/OptionsWidget_query.cpp
index 4236acdcc..3a13b3802 100644
--- a/src/modules/options/OptionsWidget_query.cpp
+++ b/src/modules/options/OptionsWidget_query.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_query.h b/src/modules/options/OptionsWidget_query.h
index d1f5f7b30..ef3e0ebb4 100644
--- a/src/modules/options/OptionsWidget_query.h
+++ b/src/modules/options/OptionsWidget_query.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_servers.cpp b/src/modules/options/OptionsWidget_servers.cpp
index 562e9ea8a..d48c4d131 100644
--- a/src/modules/options/OptionsWidget_servers.cpp
+++ b/src/modules/options/OptionsWidget_servers.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_servers.h b/src/modules/options/OptionsWidget_servers.h
index ca330ac03..e76171ab5 100644
--- a/src/modules/options/OptionsWidget_servers.h
+++ b/src/modules/options/OptionsWidget_servers.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_sound.cpp b/src/modules/options/OptionsWidget_sound.cpp
index f3bfc5c4e..76d286e67 100644
--- a/src/modules/options/OptionsWidget_sound.cpp
+++ b/src/modules/options/OptionsWidget_sound.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_sound.h b/src/modules/options/OptionsWidget_sound.h
index 232c85de7..9fe90d5f9 100644
--- a/src/modules/options/OptionsWidget_sound.h
+++ b/src/modules/options/OptionsWidget_sound.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_textEncoding.cpp b/src/modules/options/OptionsWidget_textEncoding.cpp
index 12e3491ab..e57a6df30 100644
--- a/src/modules/options/OptionsWidget_textEncoding.cpp
+++ b/src/modules/options/OptionsWidget_textEncoding.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_textEncoding.h b/src/modules/options/OptionsWidget_textEncoding.h
index 334c431e5..e6fa7cae1 100644
--- a/src/modules/options/OptionsWidget_textEncoding.h
+++ b/src/modules/options/OptionsWidget_textEncoding.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_textIcons.cpp b/src/modules/options/OptionsWidget_textIcons.cpp
index df956733e..0a3faf99a 100644
--- a/src/modules/options/OptionsWidget_textIcons.cpp
+++ b/src/modules/options/OptionsWidget_textIcons.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_textIcons.h b/src/modules/options/OptionsWidget_textIcons.h
index 2ad20241b..25bf97299 100644
--- a/src/modules/options/OptionsWidget_textIcons.h
+++ b/src/modules/options/OptionsWidget_textIcons.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_theme.cpp b/src/modules/options/OptionsWidget_theme.cpp
index 0673de0a8..c96a11d2b 100644
--- a/src/modules/options/OptionsWidget_theme.cpp
+++ b/src/modules/options/OptionsWidget_theme.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_theme.h b/src/modules/options/OptionsWidget_theme.h
index 2cbbf3efb..0c9097bd9 100644
--- a/src/modules/options/OptionsWidget_theme.h
+++ b/src/modules/options/OptionsWidget_theme.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_tools.cpp b/src/modules/options/OptionsWidget_tools.cpp
index cf2065867..37b17faf6 100644
--- a/src/modules/options/OptionsWidget_tools.cpp
+++ b/src/modules/options/OptionsWidget_tools.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_tools.h b/src/modules/options/OptionsWidget_tools.h
index 44ca9881f..2fc59e0b4 100644
--- a/src/modules/options/OptionsWidget_tools.h
+++ b/src/modules/options/OptionsWidget_tools.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_topicLabel.cpp b/src/modules/options/OptionsWidget_topicLabel.cpp
index 6c3c7b611..abe9992b0 100644
--- a/src/modules/options/OptionsWidget_topicLabel.cpp
+++ b/src/modules/options/OptionsWidget_topicLabel.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_topicLabel.h b/src/modules/options/OptionsWidget_topicLabel.h
index 1d9777fa9..5c24fcde5 100644
--- a/src/modules/options/OptionsWidget_topicLabel.h
+++ b/src/modules/options/OptionsWidget_topicLabel.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_tray.cpp b/src/modules/options/OptionsWidget_tray.cpp
index dbc2f6e28..5c75c84f2 100644
--- a/src/modules/options/OptionsWidget_tray.cpp
+++ b/src/modules/options/OptionsWidget_tray.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_tray.h b/src/modules/options/OptionsWidget_tray.h
index d1fbad6ba..0785f21c9 100644
--- a/src/modules/options/OptionsWidget_tray.h
+++ b/src/modules/options/OptionsWidget_tray.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_uparser.cpp b/src/modules/options/OptionsWidget_uparser.cpp
index 9ed0d61c4..127bbdc22 100644
--- a/src/modules/options/OptionsWidget_uparser.cpp
+++ b/src/modules/options/OptionsWidget_uparser.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_uparser.h b/src/modules/options/OptionsWidget_uparser.h
index 47e49874d..4b942f299 100644
--- a/src/modules/options/OptionsWidget_uparser.h
+++ b/src/modules/options/OptionsWidget_uparser.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_urlHandlers.cpp b/src/modules/options/OptionsWidget_urlHandlers.cpp
index 4576f9e96..5574b797e 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.cpp
+++ b/src/modules/options/OptionsWidget_urlHandlers.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_urlHandlers.h b/src/modules/options/OptionsWidget_urlHandlers.h
index 9670438a0..6768cddc9 100644
--- a/src/modules/options/OptionsWidget_urlHandlers.h
+++ b/src/modules/options/OptionsWidget_urlHandlers.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_userList.cpp b/src/modules/options/OptionsWidget_userList.cpp
index f7997f49b..ccf252bb1 100644
--- a/src/modules/options/OptionsWidget_userList.cpp
+++ b/src/modules/options/OptionsWidget_userList.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_userList.h b/src/modules/options/OptionsWidget_userList.h
index f3cfd0f79..1a4bd8e3e 100644
--- a/src/modules/options/OptionsWidget_userList.h
+++ b/src/modules/options/OptionsWidget_userList.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_windowList.cpp b/src/modules/options/OptionsWidget_windowList.cpp
index 1d17d47a0..fb625be7a 100644
--- a/src/modules/options/OptionsWidget_windowList.cpp
+++ b/src/modules/options/OptionsWidget_windowList.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/OptionsWidget_windowList.h b/src/modules/options/OptionsWidget_windowList.h
index b9acffea0..8e7f64edf 100644
--- a/src/modules/options/OptionsWidget_windowList.h
+++ b/src/modules/options/OptionsWidget_windowList.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 6ac21a499..03feb47b8 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/options/mkcreateinstanceproc.sh b/src/modules/options/mkcreateinstanceproc.sh
index 04a920090..96701c316 100755
--- a/src/modules/options/mkcreateinstanceproc.sh
+++ b/src/modules/options/mkcreateinstanceproc.sh
@@ -28,7 +28,7 @@ cat >> OptionsInstanceManager.h <<EOF
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -122,7 +122,7 @@ cat >> OptionsInstanceManager.cpp <<EOF
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/package/libkvipackage.cpp b/src/modules/package/libkvipackage.cpp
index 877d58d9e..8986463aa 100644
--- a/src/modules/package/libkvipackage.cpp
+++ b/src/modules/package/libkvipackage.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/perl/libkviperl.cpp b/src/modules/perl/libkviperl.cpp
index 851d523db..a6015a852 100644
--- a/src/modules/perl/libkviperl.cpp
+++ b/src/modules/perl/libkviperl.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/perlcore/KVIrc.xs b/src/modules/perlcore/KVIrc.xs
index cb39440cb..538402f33 100644
--- a/src/modules/perlcore/KVIrc.xs
+++ b/src/modules/perlcore/KVIrc.xs
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 5fe4aab9a..5ba013f4e 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/perlcore/perlcoreinterface.h b/src/modules/perlcore/perlcoreinterface.h
index cc51ec01a..e0f63e5b6 100644
--- a/src/modules/perlcore/perlcoreinterface.h
+++ b/src/modules/perlcore/perlcoreinterface.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/perlcore/xs.inc b/src/modules/perlcore/xs.inc
index 4bdf7f680..2638dde2e 100644
--- a/src/modules/perlcore/xs.inc
+++ b/src/modules/perlcore/xs.inc
@@ -18,7 +18,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/popup/libkvipopup.cpp b/src/modules/popup/libkvipopup.cpp
index 3025965db..eda165ad2 100644
--- a/src/modules/popup/libkvipopup.cpp
+++ b/src/modules/popup/libkvipopup.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/popupeditor/PopupEditorWindow.cpp b/src/modules/popupeditor/PopupEditorWindow.cpp
index 43d05ae61..3b559fd6f 100644
--- a/src/modules/popupeditor/PopupEditorWindow.cpp
+++ b/src/modules/popupeditor/PopupEditorWindow.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/popupeditor/PopupEditorWindow.h b/src/modules/popupeditor/PopupEditorWindow.h
index 05fe113ef..6a8dfaa91 100644
--- a/src/modules/popupeditor/PopupEditorWindow.h
+++ b/src/modules/popupeditor/PopupEditorWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/popupeditor/libkvipopupeditor.cpp b/src/modules/popupeditor/libkvipopupeditor.cpp
index 4622ef2da..e467dfc7c 100644
--- a/src/modules/popupeditor/libkvipopupeditor.cpp
+++ b/src/modules/popupeditor/libkvipopupeditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/proxydb/libkviproxydb.cpp b/src/modules/proxydb/libkviproxydb.cpp
index 9f68f9c77..7b907de37 100644
--- a/src/modules/proxydb/libkviproxydb.cpp
+++ b/src/modules/proxydb/libkviproxydb.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/python/libkvipython.cpp b/src/modules/python/libkvipython.cpp
index 1d47bec02..6e0fdb2f6 100644
--- a/src/modules/python/libkvipython.cpp
+++ b/src/modules/python/libkvipython.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/pythoncore/kvircmodule.cpp b/src/modules/pythoncore/kvircmodule.cpp
index b25c3ce44..eac16903c 100644
--- a/src/modules/pythoncore/kvircmodule.cpp
+++ b/src/modules/pythoncore/kvircmodule.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/pythoncore/kvircmodule.h b/src/modules/pythoncore/kvircmodule.h
index 939a1908b..32b30e2f0 100644
--- a/src/modules/pythoncore/kvircmodule.h
+++ b/src/modules/pythoncore/kvircmodule.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/pythoncore/libkvipythoncore.cpp b/src/modules/pythoncore/libkvipythoncore.cpp
index 1d826bd68..4f413b382 100644
--- a/src/modules/pythoncore/libkvipythoncore.cpp
+++ b/src/modules/pythoncore/libkvipythoncore.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/pythoncore/pythoncoreinterface.h b/src/modules/pythoncore/pythoncoreinterface.h
index 427336393..f3aa03a18 100644
--- a/src/modules/pythoncore/pythoncoreinterface.h
+++ b/src/modules/pythoncore/pythoncoreinterface.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/raweditor/RawEditorWindow.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 9142ac5a7..02dffde52 100644
--- a/src/modules/raweditor/RawEditorWindow.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/raweditor/RawEditorWindow.h b/src/modules/raweditor/RawEditorWindow.h
index d7492a7ea..9de743b31 100644
--- a/src/modules/raweditor/RawEditorWindow.h
+++ b/src/modules/raweditor/RawEditorWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2002-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index 82202228d..2f1222b30 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/regchan/libkviregchan.cpp b/src/modules/regchan/libkviregchan.cpp
index d55c12254..e9fb7e7cd 100644
--- a/src/modules/regchan/libkviregchan.cpp
+++ b/src/modules/regchan/libkviregchan.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index 99d64e7d7..097079993 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/reguser/RegisteredUserEntryDialog.h b/src/modules/reguser/RegisteredUserEntryDialog.h
index 985f4a91b..8d32f133b 100644
--- a/src/modules/reguser/RegisteredUserEntryDialog.h
+++ b/src/modules/reguser/RegisteredUserEntryDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index 89c273692..23bca582c 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/reguser/RegisteredUsersDialog.h b/src/modules/reguser/RegisteredUsersDialog.h
index 00a32ad21..119e45ea4 100644
--- a/src/modules/reguser/RegisteredUsersDialog.h
+++ b/src/modules/reguser/RegisteredUsersDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/reguser/RegistrationWizard.cpp b/src/modules/reguser/RegistrationWizard.cpp
index 032288fe1..bdf4ab34b 100644
--- a/src/modules/reguser/RegistrationWizard.cpp
+++ b/src/modules/reguser/RegistrationWizard.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/reguser/RegistrationWizard.h b/src/modules/reguser/RegistrationWizard.h
index 73663f1f7..ded14e67c 100644
--- a/src/modules/reguser/RegistrationWizard.h
+++ b/src/modules/reguser/RegistrationWizard.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 298252556..37f3f2db4 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/BlowFish.cpp b/src/modules/rijndael/BlowFish.cpp
index 14d47683b..3dbd8f0b2 100644
--- a/src/modules/rijndael/BlowFish.cpp
+++ b/src/modules/rijndael/BlowFish.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/BlowFish.h b/src/modules/rijndael/BlowFish.h
index acf270286..ccf464213 100644
--- a/src/modules/rijndael/BlowFish.h
+++ b/src/modules/rijndael/BlowFish.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/InitVectorEngine.cpp b/src/modules/rijndael/InitVectorEngine.cpp
index 9a2b6292e..651b7b8f3 100644
--- a/src/modules/rijndael/InitVectorEngine.cpp
+++ b/src/modules/rijndael/InitVectorEngine.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/InitVectorEngine.h b/src/modules/rijndael/InitVectorEngine.h
index 231517991..04ab29a8d 100644
--- a/src/modules/rijndael/InitVectorEngine.h
+++ b/src/modules/rijndael/InitVectorEngine.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/Rijndael.cpp b/src/modules/rijndael/Rijndael.cpp
index 2b1258cc2..2aebb8a84 100644
--- a/src/modules/rijndael/Rijndael.cpp
+++ b/src/modules/rijndael/Rijndael.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/Rijndael.h b/src/modules/rijndael/Rijndael.h
index f917d3666..7a3faed10 100644
--- a/src/modules/rijndael/Rijndael.h
+++ b/src/modules/rijndael/Rijndael.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/UglyBase64.cpp b/src/modules/rijndael/UglyBase64.cpp
index 23db29d7f..604aaf6b0 100644
--- a/src/modules/rijndael/UglyBase64.cpp
+++ b/src/modules/rijndael/UglyBase64.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/UglyBase64.h b/src/modules/rijndael/UglyBase64.h
index 08d7e6271..aab8bcfbb 100644
--- a/src/modules/rijndael/UglyBase64.h
+++ b/src/modules/rijndael/UglyBase64.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 00b10d294..48e158462 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rijndael/libkvirijndael.h b/src/modules/rijndael/libkvirijndael.h
index 661b3c7dc..b69a02541 100644
--- a/src/modules/rijndael/libkvirijndael.h
+++ b/src/modules/rijndael/libkvirijndael.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rot13/libkvirot13.cpp b/src/modules/rot13/libkvirot13.cpp
index d9ecc835f..81a0a83a0 100644
--- a/src/modules/rot13/libkvirot13.cpp
+++ b/src/modules/rot13/libkvirot13.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/rot13/libkvirot13.h b/src/modules/rot13/libkvirot13.h
index fdb2496fd..11f740baf 100644
--- a/src/modules/rot13/libkvirot13.h
+++ b/src/modules/rot13/libkvirot13.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/serverdb/libkviserverdb.cpp b/src/modules/serverdb/libkviserverdb.cpp
index 0bfd24f76..07d367fa9 100644
--- a/src/modules/serverdb/libkviserverdb.cpp
+++ b/src/modules/serverdb/libkviserverdb.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index dfbdd3444..97fc0e933 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/setup/SetupWizard.h b/src/modules/setup/SetupWizard.h
index c931b265d..f5596a70c 100644
--- a/src/modules/setup/SetupWizard.h
+++ b/src/modules/setup/SetupWizard.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 0fd02da77..509bd1d3c 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/sharedfile/libkvisharedfile.cpp b/src/modules/sharedfile/libkvisharedfile.cpp
index 13f385733..5a5fdaea8 100644
--- a/src/modules/sharedfile/libkvisharedfile.cpp
+++ b/src/modules/sharedfile/libkvisharedfile.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.cpp b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
index 463a7f7e2..3ee6cabcf 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.cpp
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.cpp
@@ -7,9 +7,9 @@
// Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/sharedfileswindow/SharedFilesWindow.h b/src/modules/sharedfileswindow/SharedFilesWindow.h
index 7898975e2..dc2a04662 100644
--- a/src/modules/sharedfileswindow/SharedFilesWindow.h
+++ b/src/modules/sharedfileswindow/SharedFilesWindow.h
@@ -9,9 +9,9 @@
// Copyright (C) 2003-2010 Szymon Stefanek (pragma at kvirc dot net)
//
// This program is FREE software. You can redistribute it and/or
-// modify it under the linkss of the GNU General Public License
+// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
index 04ed4eb0d..6877f62d5 100644
--- a/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/libkvisharedfileswindow.cpp
@@ -8,7 +8,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index fbab67c01..7664f8209 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/snd/libkvisnd.h b/src/modules/snd/libkvisnd.h
index 5fc49983f..c42572a0b 100644
--- a/src/modules/snd/libkvisnd.h
+++ b/src/modules/snd/libkvisnd.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/socketspy/SocketSpyWindow.cpp b/src/modules/socketspy/SocketSpyWindow.cpp
index 43515e22c..5e69a087f 100644
--- a/src/modules/socketspy/SocketSpyWindow.cpp
+++ b/src/modules/socketspy/SocketSpyWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the socketspys of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/socketspy/SocketSpyWindow.h b/src/modules/socketspy/SocketSpyWindow.h
index c4ad07784..859a8d498 100644
--- a/src/modules/socketspy/SocketSpyWindow.h
+++ b/src/modules/socketspy/SocketSpyWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the socketspys of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/socketspy/libkvisocketspy.cpp b/src/modules/socketspy/libkvisocketspy.cpp
index 1d9854bec..bcc417cda 100644
--- a/src/modules/socketspy/libkvisocketspy.cpp
+++ b/src/modules/socketspy/libkvisocketspy.cpp
@@ -8,7 +8,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/spaste/SlowPasteController.cpp b/src/modules/spaste/SlowPasteController.cpp
index a46566d42..f3598237e 100644
--- a/src/modules/spaste/SlowPasteController.cpp
+++ b/src/modules/spaste/SlowPasteController.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/spaste/SlowPasteController.h b/src/modules/spaste/SlowPasteController.h
index c0ed4c45e..7d99fb0a0 100644
--- a/src/modules/spaste/SlowPasteController.h
+++ b/src/modules/spaste/SlowPasteController.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 7bf607989..0f072a9b1 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/spaste/libkvispaste.h b/src/modules/spaste/libkvispaste.h
index 69df32bae..2d8aa2605 100644
--- a/src/modules/spaste/libkvispaste.h
+++ b/src/modules/spaste/libkvispaste.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/spellchecker/libkvispellchecker.cpp b/src/modules/spellchecker/libkvispellchecker.cpp
index 669d4f283..9dad1a719 100644
--- a/src/modules/spellchecker/libkvispellchecker.cpp
+++ b/src/modules/spellchecker/libkvispellchecker.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index 4afa16fe0..85b44b2ac 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/system/Plugin.cpp b/src/modules/system/Plugin.cpp
index 01da82742..48da58d09 100644
--- a/src/modules/system/Plugin.cpp
+++ b/src/modules/system/Plugin.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/system/Plugin.h b/src/modules/system/Plugin.h
index b14a65931..749d58a70 100644
--- a/src/modules/system/Plugin.h
+++ b/src/modules/system/Plugin.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 188e20c9c..700d112ab 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/term/TermWidget.cpp b/src/modules/term/TermWidget.cpp
index 433ee9ea9..522381235 100644
--- a/src/modules/term/TermWidget.cpp
+++ b/src/modules/term/TermWidget.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/term/TermWidget.h b/src/modules/term/TermWidget.h
index 2081b0c3b..47240d229 100644
--- a/src/modules/term/TermWidget.h
+++ b/src/modules/term/TermWidget.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/term/TermWindow.cpp b/src/modules/term/TermWindow.cpp
index 16315e54d..606f91696 100644
--- a/src/modules/term/TermWindow.cpp
+++ b/src/modules/term/TermWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/term/TermWindow.h b/src/modules/term/TermWindow.h
index 301da29c3..08a136632 100644
--- a/src/modules/term/TermWindow.h
+++ b/src/modules/term/TermWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/term/libkviterm.cpp b/src/modules/term/libkviterm.cpp
index 689caf57c..b91a08afc 100644
--- a/src/modules/term/libkviterm.cpp
+++ b/src/modules/term/libkviterm.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/texticons/libkvitexticons.cpp b/src/modules/texticons/libkvitexticons.cpp
index dc4cfe51f..0e9ad358d 100644
--- a/src/modules/texticons/libkvitexticons.cpp
+++ b/src/modules/texticons/libkvitexticons.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/PackThemeDialog.cpp b/src/modules/theme/PackThemeDialog.cpp
index 4394c0913..e12a125e3 100644
--- a/src/modules/theme/PackThemeDialog.cpp
+++ b/src/modules/theme/PackThemeDialog.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/PackThemeDialog.h b/src/modules/theme/PackThemeDialog.h
index 15f8e83d2..efe7a66f5 100644
--- a/src/modules/theme/PackThemeDialog.h
+++ b/src/modules/theme/PackThemeDialog.h
@@ -12,7 +12,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/SaveThemeDialog.cpp b/src/modules/theme/SaveThemeDialog.cpp
index cefcbf5df..ce767c274 100644
--- a/src/modules/theme/SaveThemeDialog.cpp
+++ b/src/modules/theme/SaveThemeDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/SaveThemeDialog.h b/src/modules/theme/SaveThemeDialog.h
index 747b80ede..f9913e883 100644
--- a/src/modules/theme/SaveThemeDialog.h
+++ b/src/modules/theme/SaveThemeDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/ThemeFunctions.cpp b/src/modules/theme/ThemeFunctions.cpp
index 604477170..1af4319f9 100644
--- a/src/modules/theme/ThemeFunctions.cpp
+++ b/src/modules/theme/ThemeFunctions.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/ThemeFunctions.h b/src/modules/theme/ThemeFunctions.h
index 630fefda7..e427db83e 100644
--- a/src/modules/theme/ThemeFunctions.h
+++ b/src/modules/theme/ThemeFunctions.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/ThemeManagementDialog.cpp b/src/modules/theme/ThemeManagementDialog.cpp
index f88a29b87..06b85485d 100644
--- a/src/modules/theme/ThemeManagementDialog.cpp
+++ b/src/modules/theme/ThemeManagementDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/ThemeManagementDialog.h b/src/modules/theme/ThemeManagementDialog.h
index 9fbdb1ff7..b991c76c0 100644
--- a/src/modules/theme/ThemeManagementDialog.h
+++ b/src/modules/theme/ThemeManagementDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/WebThemeInterfaceDialog.cpp b/src/modules/theme/WebThemeInterfaceDialog.cpp
index 1d5a53ead..7ba7c8a27 100644
--- a/src/modules/theme/WebThemeInterfaceDialog.cpp
+++ b/src/modules/theme/WebThemeInterfaceDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/WebThemeInterfaceDialog.h b/src/modules/theme/WebThemeInterfaceDialog.h
index 83fd7b0fc..7b2569391 100644
--- a/src/modules/theme/WebThemeInterfaceDialog.h
+++ b/src/modules/theme/WebThemeInterfaceDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/theme/libkvitheme.cpp b/src/modules/theme/libkvitheme.cpp
index 555926cf1..333c078c6 100644
--- a/src/modules/theme/libkvitheme.cpp
+++ b/src/modules/theme/libkvitheme.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index b0dd8371b..bdf984bd5 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/tip/libkvitip.h b/src/modules/tip/libkvitip.h
index 8499e116b..15e3754a5 100644
--- a/src/modules/tip/libkvitip.h
+++ b/src/modules/tip/libkvitip.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/tmphighlight/libkvitmphighlight.cpp b/src/modules/tmphighlight/libkvitmphighlight.cpp
index b3aafd9e3..c995d34d2 100644
--- a/src/modules/tmphighlight/libkvitmphighlight.cpp
+++ b/src/modules/tmphighlight/libkvitmphighlight.cpp
@@ -10,7 +10,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/toolbar/libkvitoolbar.cpp b/src/modules/toolbar/libkvitoolbar.cpp
index f1a7c6998..4371ea657 100644
--- a/src/modules/toolbar/libkvitoolbar.cpp
+++ b/src/modules/toolbar/libkvitoolbar.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
index 65da7f42f..0b66564d5 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/toolbareditor/CustomizeToolBarsDialog.h b/src/modules/toolbareditor/CustomizeToolBarsDialog.h
index 71a49f92d..2abccceb5 100644
--- a/src/modules/toolbareditor/CustomizeToolBarsDialog.h
+++ b/src/modules/toolbareditor/CustomizeToolBarsDialog.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/toolbareditor/libkvitoolbareditor.cpp b/src/modules/toolbareditor/libkvitoolbareditor.cpp
index f15f90585..6af5148e3 100644
--- a/src/modules/toolbareditor/libkvitoolbareditor.cpp
+++ b/src/modules/toolbareditor/libkvitoolbareditor.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/torrent/KTorrentDbusInterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp
index bb73afb0e..dc7160860 100644
--- a/src/modules/torrent/KTorrentDbusInterface.cpp
+++ b/src/modules/torrent/KTorrentDbusInterface.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/torrent/KTorrentDbusInterface.h b/src/modules/torrent/KTorrentDbusInterface.h
index a51d7630a..8ecaa44f0 100644
--- a/src/modules/torrent/KTorrentDbusInterface.h
+++ b/src/modules/torrent/KTorrentDbusInterface.h
@@ -14,7 +14,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/torrent/StatusBarApplet.cpp b/src/modules/torrent/StatusBarApplet.cpp
index 95028f71b..917599595 100644
--- a/src/modules/torrent/StatusBarApplet.cpp
+++ b/src/modules/torrent/StatusBarApplet.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/torrent/StatusBarApplet.h b/src/modules/torrent/StatusBarApplet.h
index d1cf3175f..331ea6c26 100644
--- a/src/modules/torrent/StatusBarApplet.h
+++ b/src/modules/torrent/StatusBarApplet.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/torrent/TorrentInterface.cpp b/src/modules/torrent/TorrentInterface.cpp
index a17ab6866..95bdeca78 100644
--- a/src/modules/torrent/TorrentInterface.cpp
+++ b/src/modules/torrent/TorrentInterface.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/torrent/TorrentInterface.h b/src/modules/torrent/TorrentInterface.h
index fa2a5a265..f913b1a59 100644
--- a/src/modules/torrent/TorrentInterface.h
+++ b/src/modules/torrent/TorrentInterface.h
@@ -14,7 +14,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/torrent/libkvitorrent.cpp b/src/modules/torrent/libkvitorrent.cpp
index 774446fa9..071a50c99 100644
--- a/src/modules/torrent/libkvitorrent.cpp
+++ b/src/modules/torrent/libkvitorrent.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/trayicon/libkvitrayicon.cpp b/src/modules/trayicon/libkvitrayicon.cpp
index 68be41ee1..b87d35ac1 100644
--- a/src/modules/trayicon/libkvitrayicon.cpp
+++ b/src/modules/trayicon/libkvitrayicon.cpp
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/trayicon/libkvitrayicon.h b/src/modules/trayicon/libkvitrayicon.h
index e07c69298..43e437618 100644
--- a/src/modules/trayicon/libkvitrayicon.h
+++ b/src/modules/trayicon/libkvitrayicon.h
@@ -13,7 +13,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/Manager.cpp b/src/modules/upnp/Manager.cpp
index ed2ea3fee..7d80ae177 100644
--- a/src/modules/upnp/Manager.cpp
+++ b/src/modules/upnp/Manager.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/Manager.h b/src/modules/upnp/Manager.h
index 16287b311..43af04818 100644
--- a/src/modules/upnp/Manager.h
+++ b/src/modules/upnp/Manager.h
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/RootService.cpp b/src/modules/upnp/RootService.cpp
index 648611ce6..08fc3b7cd 100644
--- a/src/modules/upnp/RootService.cpp
+++ b/src/modules/upnp/RootService.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/RootService.h b/src/modules/upnp/RootService.h
index 178f6da17..750ce5a9f 100644
--- a/src/modules/upnp/RootService.h
+++ b/src/modules/upnp/RootService.h
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/Service.cpp b/src/modules/upnp/Service.cpp
index 0d64796e1..6d44d3dbf 100644
--- a/src/modules/upnp/Service.cpp
+++ b/src/modules/upnp/Service.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/Service.h b/src/modules/upnp/Service.h
index 0902307ef..a4d77bf84 100644
--- a/src/modules/upnp/Service.h
+++ b/src/modules/upnp/Service.h
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/SsdpConnection.cpp b/src/modules/upnp/SsdpConnection.cpp
index e7d14929e..d4fdaf717 100644
--- a/src/modules/upnp/SsdpConnection.cpp
+++ b/src/modules/upnp/SsdpConnection.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/SsdpConnection.h b/src/modules/upnp/SsdpConnection.h
index 5f8e50a02..d9a279060 100644
--- a/src/modules/upnp/SsdpConnection.h
+++ b/src/modules/upnp/SsdpConnection.h
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/WanConnectionService.cpp b/src/modules/upnp/WanConnectionService.cpp
index 1c75a549a..9c900f9b6 100644
--- a/src/modules/upnp/WanConnectionService.cpp
+++ b/src/modules/upnp/WanConnectionService.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/WanConnectionService.h b/src/modules/upnp/WanConnectionService.h
index 717e80223..c39c06a85 100644
--- a/src/modules/upnp/WanConnectionService.h
+++ b/src/modules/upnp/WanConnectionService.h
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/XmlFunctions.cpp b/src/modules/upnp/XmlFunctions.cpp
index 3ffbbc93c..1fe7d0a7a 100644
--- a/src/modules/upnp/XmlFunctions.cpp
+++ b/src/modules/upnp/XmlFunctions.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/XmlFunctions.h b/src/modules/upnp/XmlFunctions.h
index 493a0068c..b57361b2d 100644
--- a/src/modules/upnp/XmlFunctions.h
+++ b/src/modules/upnp/XmlFunctions.h
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/igdcontrolpoint.cpp b/src/modules/upnp/igdcontrolpoint.cpp
index df3cfbcfa..b34ade01f 100644
--- a/src/modules/upnp/igdcontrolpoint.cpp
+++ b/src/modules/upnp/igdcontrolpoint.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/igdcontrolpoint.h b/src/modules/upnp/igdcontrolpoint.h
index 66d6f8765..7968aa949 100644
--- a/src/modules/upnp/igdcontrolpoint.h
+++ b/src/modules/upnp/igdcontrolpoint.h
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/upnp/libkviupnp.cpp b/src/modules/upnp/libkviupnp.cpp
index 703325300..dfaae6aff 100644
--- a/src/modules/upnp/libkviupnp.cpp
+++ b/src/modules/upnp/libkviupnp.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 27438df90..c40f4c1d6 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index c3c913b3b..e92abf680 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/userlist/libkviuserlist.cpp b/src/modules/userlist/libkviuserlist.cpp
index 38d736aae..627d9303c 100644
--- a/src/modules/userlist/libkviuserlist.cpp
+++ b/src/modules/userlist/libkviuserlist.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/window/UserWindow.cpp b/src/modules/window/UserWindow.cpp
index 0a347a2cb..d9e7c073f 100644
--- a/src/modules/window/UserWindow.cpp
+++ b/src/modules/window/UserWindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/window/UserWindow.h b/src/modules/window/UserWindow.h
index de66b099f..26c8e41e8 100644
--- a/src/modules/window/UserWindow.h
+++ b/src/modules/window/UserWindow.h
@@ -11,7 +11,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
diff --git a/src/modules/window/libkviwindow.cpp b/src/modules/window/libkviwindow.cpp
index d3a26c64e..036c43dbf 100644
--- a/src/modules/window/libkviwindow.cpp
+++ b/src/modules/window/libkviwindow.cpp
@@ -9,7 +9,7 @@
// This program is FREE software. You can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2
-// of the License, or (at your opinion) any later version.
+// of the License, or (at your option) any later version.
//
// This program is distributed in the HOPE that it will be USEFUL,
// but WITHOUT ANY WARRANTY; without even the implied warranty of