nsinnovations/erpnext
2
0
Fork 0
mirror of https://github.com/frappe/erpnext.git synced 2026-02-19 09:35:03 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #36438 from ruthra-kumar/remove_merge_conflict_in_v14_hotfix

Browse Source 
chore: remove merge conflict in translation file 'tr.csv'
This commit is contained in:
ruthra kumar
2023-08-01 13:52:02 +05:30
committed by GitHub
parent 43b85c5711 14dc40360d
commit ee02cde58d
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
erpnext/translations/tr.csv
View File

@@ -3338,11 +3338,7 @@ You cannot delete Fiscal Year {0}. Fiscal Year {0} is set as default in Global S
You cannot delete Project Type 'External','Dış' Proje Türünü silemezsiniz.,
You cannot edit root node.,Kök düğümünü düzenleyemezsiniz.,
You cannot restart a Subscription that is not cancelled.,İptal edilmeyen bir Aboneliği başlatamazsınız.,
<<<<<<< HEAD
You don't have enought Loyalty Points to redeem,Kullanılması gereken sadakat puanlarına sahip değilsiniz,
=======
You don't have enough Loyalty Points to redeem,Kullanılması gereken sadakat puanlarına sahip olabilirsiniz,
>>>>>>> 4f473eb090 (fix: typo in loyalty program throw message (#36432))
You have already assessed for the assessment criteria {}.,Zaten değerlendirme kriteri {} için değerlendirdiniz.,
You have already selected items from {0} {1},Zaten öğeleri seçtiniz {0} {1},
You have been invited to collaborate on the project: {0},{0} projesine katkıda bulunmak için davet edildiniz,
Can't render this file because it is too large.