add tr_TR locale to registry

Conflicts: registry/locales.xml
pkp · Jan 28, 2016 · a4ffb44 · a4ffb44
1 parent c2bd3a2
commit a4ffb44
Showing 1 changed file with 2 additions and 0 deletions.
diff --git a/registry/locales.xml b/registry/locales.xml
@@ -15,5 +15,7 @@
 <!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>