Add Turkish to README

This adds a link to Turkish translation on README and fixes an issue with lang.js where a merge conflict was squashed into a rebase.
2026-05-28 08:11:54 +08:00 · 2014-10-03 09:38:20 -04:00
parent 23a6376b9b
commit 3203f490fc
2 changed files with 6 additions and 9 deletions
@@ -6,11 +6,7 @@ var langs = {
 	'uk':'українська',
 	//'jp':'日本語',
 	'ru':'русский',
-<<<<<<< HEAD
 	'sv':'svenska',
 	'pl':'polski',
-	'tr':'Türkçe'
-=======
 	'tr':'türkçe'
->>>>>>> lowercase correction for lang string.
 };