Merge pull request #1178

587e6e8 add turkish localization
2018-03-13 23:39:41 -04:00
parent a8ba815fb3 587e6e8c24
commit c5363da1e8
5 changed files with 2506 additions and 6 deletions
--- a/monero-wallet-gui.pro
+++ b/monero-wallet-gui.pro
@@ -347,11 +347,9 @@ TRANSLATIONS =  \ # English is default language, no explicit translation file
                $$PWD/translations/monero-core_sk.ts \ # Slovak
                $$PWD/translations/monero-core_ar.ts \ # Arabic
                $$PWD/translations/monero-core_sl.ts \ # Slovenian
-<<<<<<< HEAD
                $$PWD/translations/monero-core_rs.ts \ # Serbian
-=======
                $$PWD/translations/monero-core_cat.ts \ # Catalan
->>>>>>> Catalan translation
+                $$PWD/translations/monero-core_tr.ts \ # Turkish

 CONFIG(release, debug|release) {
    DESTDIR = release/bin