summaryrefslogtreecommitdiffstats
path: root/po/tr.po
diff options
context:
space:
mode:
Diffstat (limited to 'po/tr.po')
-rw-r--r--po/tr.po33
1 files changed, 0 insertions, 33 deletions
diff --git a/po/tr.po b/po/tr.po
index ddf8595..10eb35b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -8,15 +8,10 @@
# tarakbumba <tarakbumba@gmail.com>, 2013-2016
# tarakbumba <tarakbumba@gmail.com>, 2013
# mahmut özcan <faradundamarti@yandex.com>, 2015
-<<<<<<< HEAD
-# Muha Aliss <muhaaliss@gmail.com>, 2019
-# tarakbumba <tarakbumba@gmail.com>, 2018
-=======
# mahmut özcan <faradundamarti@yandex.com>, 2015
# Muha Aliss <muhaaliss@gmail.com>, 2019
# Serdar Sağlam <teknomobil@msn.com>, 2019
# tarakbumba <tarakbumba@gmail.com>, 2013,2015,2018
->>>>>>> master
msgid ""
msgstr ""
"Project-Id-Version: Mageia\n"
@@ -85,11 +80,7 @@ msgctxt "ConfList|"
msgid "You have no network connection"
msgstr "Ağ bağlantınız yok"
-<<<<<<< HEAD
-#: mageiawelcome.py:188
-=======
#: mageiawelcome.py:183
->>>>>>> master
msgctxt "app|"
msgid "Welcome to Mageia"
msgstr "Mageia' ya hoş geldiniz"
@@ -413,11 +404,7 @@ msgstr "Mageia resmi depoları şunları içerir:"
#: qml/mw-ui.qml:137
msgctxt "mw-ui|"
msgid "core"
-<<<<<<< HEAD
msgstr "core"
-=======
-msgstr "çekirdek"
->>>>>>> master
#: qml/mw-ui.qml:155
msgctxt "mw-ui|"
@@ -428,11 +415,7 @@ msgstr "- özgür-açık kaynaklı paketler"
#: qml/mw-ui.qml:168
msgctxt "mw-ui|"
msgid "nonfree"
-<<<<<<< HEAD
-msgstr "nonfree"
-=======
msgstr "özgür olmayan"
->>>>>>> master
#: qml/mw-ui.qml:187
msgctxt "mw-ui|"
@@ -569,21 +552,13 @@ msgstr "Güncelleme tavsiyeleri (en)"
#: qml/mw-ui.qml:345
msgctxt "mw-ui|"
msgid "(*) User password is needed"
-<<<<<<< HEAD
-msgstr "(*) Kullanıcı şifresi gerekli"
-=======
msgstr "(*) Kullanıcı parolası gerekli"
->>>>>>> master
#. The button in the buttons bar, shortcut for Mageia Control Center
#: qml/mw-ui.qml:354
msgctxt "mw-ui|"
msgid "MCC"
-<<<<<<< HEAD
-msgstr "MCC"
-=======
msgstr "MDM"
->>>>>>> master
#: qml/mw-ui.qml:363
msgctxt "mw-ui|"
@@ -591,11 +566,7 @@ msgid ""
"<b>Mageia Control Center</b> (aka drakconf) is a set of tools to help you "
"configure your system."
msgstr ""
-<<<<<<< HEAD
-"<b>Mageia Kontrol Merkezi</b> (aka drakconf), sisteminizi yapılandırmanıza "
-=======
"<b>Mageia Denetim Merkezi</b> (aka drakconf), sisteminizi yapılandırmanıza "
->>>>>>> master
"yardımcı olacak bir araç setidir."
#: qml/mw-ui.qml:373
@@ -840,11 +811,7 @@ msgstr "Forum"
#: qml/mw-ui.qml:813
msgctxt "mw-ui|"
msgid "https://forums.mageia.org/en/"
-<<<<<<< HEAD
-msgstr "http://forum.mandriva-tr.org/"
-=======
msgstr "https://forums.mageia.org/en/"
->>>>>>> master
#: qml/mw-ui.qml:814
msgctxt "mw-ui|"