From 4c294445c63575e730978bd52847a368ea574329 Mon Sep 17 00:00:00 2001
From: Marco Tullney <marco.tullney@posteo.de>
Date: Fri, 29 Jan 2016 22:48:42 +0100
Subject: [PATCH] updated copyright, removed errors in tr_TR locale

---
 locale/tr_TR/locale.xml                               | 5 ++---
 plugins/blocks/languageToggle/locale/tr_TR/locale.xml | 2 +-
 plugins/blocks/rt/locale/tr_TR/locale.xml             | 2 +-
 plugins/blocks/user/locale/tr_TR/locale.xml           | 2 +-
 plugins/generic/ipban/locale/tr_TR/locale.xml         | 2 +-
 plugins/generic/mysqlIndex/locale/tr_TR/locale.xml    | 2 +-
 plugins/generic/sehl/locale/tr_TR/locale.xml          | 2 +-
 plugins/generic/tinymce/locale/tr_TR/locale.xml       | 2 +-
 plugins/harvesters/oai/locale/tr_TR/locale.xml        | 2 +-
 plugins/schemas/dc/locale/tr_TR/locale.xml            | 2 +-
 plugins/schemas/etdms/locale/tr_TR/locale.xml         | 2 +-
 plugins/schemas/marc/locale/tr_TR/locale.xml          | 2 +-
 plugins/schemas/mods/locale/tr_TR/locale.xml          | 2 +-
 registry/locales.xml                                  | 5 ++---
 14 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/locale/tr_TR/locale.xml b/locale/tr_TR/locale.xml
index 5747716e..96d466e8 100644
--- a/locale/tr_TR/locale.xml
+++ b/locale/tr_TR/locale.xml
@@ -2,9 +2,9 @@
 <!DOCTYPE locale SYSTEM "../../lib/pkp/dtd/locale.dtd">
 
 <!--
-  * locale.xml
+  * locale/tr_TR/locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
@@ -76,7 +76,6 @@
 	<!-- Installation Messages -->
 	<message key="installer.harvester2Installation">PKP Açık Harmanlama Sistemleri Kurulumu</message>
 	<message key="installer.harvester2Upgrade">Açık Harmanlama Sistemleri Güncellemesi</message>
-	<message key="installer.installationInstructions"><![CDATA[<h4>PKP Open Harvester Systems Version {$version}</h4>
 
 	<message key="installer.localeSettings">Dil Ayarları</message>
 	<message key="installer.additionalLocales">Ek diller</message>
diff --git a/plugins/blocks/languageToggle/locale/tr_TR/locale.xml b/plugins/blocks/languageToggle/locale/tr_TR/locale.xml
index f229dd94..cf1709ca 100644
--- a/plugins/blocks/languageToggle/locale/tr_TR/locale.xml
+++ b/plugins/blocks/languageToggle/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/blocks/rt/locale/tr_TR/locale.xml b/plugins/blocks/rt/locale/tr_TR/locale.xml
index 78b7bc2e..1b5a2270 100644
--- a/plugins/blocks/rt/locale/tr_TR/locale.xml
+++ b/plugins/blocks/rt/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/blocks/user/locale/tr_TR/locale.xml b/plugins/blocks/user/locale/tr_TR/locale.xml
index 61877f6b..c13edca9 100644
--- a/plugins/blocks/user/locale/tr_TR/locale.xml
+++ b/plugins/blocks/user/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/generic/ipban/locale/tr_TR/locale.xml b/plugins/generic/ipban/locale/tr_TR/locale.xml
index 9e523087..e19cd760 100644
--- a/plugins/generic/ipban/locale/tr_TR/locale.xml
+++ b/plugins/generic/ipban/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/generic/mysqlIndex/locale/tr_TR/locale.xml b/plugins/generic/mysqlIndex/locale/tr_TR/locale.xml
index 86ba6d83..68f27bf0 100644
--- a/plugins/generic/mysqlIndex/locale/tr_TR/locale.xml
+++ b/plugins/generic/mysqlIndex/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/generic/sehl/locale/tr_TR/locale.xml b/plugins/generic/sehl/locale/tr_TR/locale.xml
index 8b917ea0..47da7771 100644
--- a/plugins/generic/sehl/locale/tr_TR/locale.xml
+++ b/plugins/generic/sehl/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/generic/tinymce/locale/tr_TR/locale.xml b/plugins/generic/tinymce/locale/tr_TR/locale.xml
index 21a77ecb..09c7c05f 100644
--- a/plugins/generic/tinymce/locale/tr_TR/locale.xml
+++ b/plugins/generic/tinymce/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/harvesters/oai/locale/tr_TR/locale.xml b/plugins/harvesters/oai/locale/tr_TR/locale.xml
index 79ac5d40..a7a0cafa 100644
--- a/plugins/harvesters/oai/locale/tr_TR/locale.xml
+++ b/plugins/harvesters/oai/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/schemas/dc/locale/tr_TR/locale.xml b/plugins/schemas/dc/locale/tr_TR/locale.xml
index 8f3add04..7dbe734a 100644
--- a/plugins/schemas/dc/locale/tr_TR/locale.xml
+++ b/plugins/schemas/dc/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/schemas/etdms/locale/tr_TR/locale.xml b/plugins/schemas/etdms/locale/tr_TR/locale.xml
index 27e830ae..689d135c 100644
--- a/plugins/schemas/etdms/locale/tr_TR/locale.xml
+++ b/plugins/schemas/etdms/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   * * Edited and modified by Kennedy Onyancha - DoKS (KHK Kempen) (2007)
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/schemas/marc/locale/tr_TR/locale.xml b/plugins/schemas/marc/locale/tr_TR/locale.xml
index f6eddc56..276a942f 100644
--- a/plugins/schemas/marc/locale/tr_TR/locale.xml
+++ b/plugins/schemas/marc/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/plugins/schemas/mods/locale/tr_TR/locale.xml b/plugins/schemas/mods/locale/tr_TR/locale.xml
index 921e0f94..51ca87da 100644
--- a/plugins/schemas/mods/locale/tr_TR/locale.xml
+++ b/plugins/schemas/mods/locale/tr_TR/locale.xml
@@ -4,7 +4,7 @@
 <!--
   * locale.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Localization strings for the tr_TR (Türkçe) locale.
diff --git a/registry/locales.xml b/registry/locales.xml
index d0b65ff0..7878c5c1 100644
--- a/registry/locales.xml
+++ b/registry/locales.xml
@@ -1,9 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
 <!--
-  * locales.xml
+  * registry/locales.xml
   *
-  * Copyright (c) 2005-2012 Alec Smecher and John Willinsky
+  * Copyright (c) 2005-2016 Alec Smecher and John Willinsky
   * Distributed under the GNU GPL v2. For full terms see the file docs/COPYING.
   *
   * Locales registry file.
@@ -15,7 +15,6 @@
 <!DOCTYPE locales SYSTEM "../lib/pkp/dtd/locales.dtd">
 
 <locales>
-<<<<<<< HEAD
 	<locale key="en_US" name="English" iso639-2b="eng" />
 	<locale key="tr_TR" name="Türkçe" iso639-2b="tur"/>
 </locales>