aboutsummaryrefslogtreecommitdiffstats
path: root/tr
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-25 18:38:09 +0200
commit984a084705f358bc9799d634eb81427e81982051 (patch)
tree73c16dffc5c3134cdf85a94c26c8564b972789e1 /tr
parentc26420407d1f1a586b943c41977152969c5eec0c (diff)
downloaddrakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.gz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.bz2
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.tar.xz
drakx-installer-help-984a084705f358bc9799d634eb81427e81982051.zip
Update translations
Diffstat (limited to 'tr')
-rw-r--r--tr/Select-and-use-ISOs.html110
-rw-r--r--tr/index.html17
-rw-r--r--tr/selectCountry.html22
-rw-r--r--tr/setupBootloader.html198
-rw-r--r--tr/setupBootloaderAddEntry.html9
-rw-r--r--tr/uninstall-Mageia.html4
6 files changed, 0 insertions, 360 deletions
diff --git a/tr/Select-and-use-ISOs.html b/tr/Select-and-use-ISOs.html
index a516471..a02d22f 100644
--- a/tr/Select-and-use-ISOs.html
+++ b/tr/Select-and-use-ISOs.html
@@ -136,27 +136,6 @@
<p>&Ouml;nceki s&uuml;r&uuml;mden y&uuml;kseltme veya temiz bir kurulum yapabilirler.</p>
</li>
-<<<<<<< HEAD
-=======
- </ul>
- </div>
-
- </div>
-
- <div class="section" title="DVD">
- <div class="titlepage">
- <div>
- <div>
- <h5 class="title"><a name="d5e45"></a>DVD
- </h5>
- </div>
- </div>
- </div>
-
-
- <div class="itemizedlist">
- <ul class="itemizedlist">
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<li class="listitem">
<p>32 veya 64 bit mimari i&ccedil;in farkl&#305; ortamlar.</p>
@@ -192,11 +171,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e53"></a>Canl&#305; Ortam
-=======
- <h4 class="title"><a name="d5e56"></a>Canl&#305; Ortam
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -207,11 +182,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e55"></a>Ortak &ouml;zellikler
-=======
- <h5 class="title"><a name="d5e58"></a>Ortak &ouml;zellikler
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -229,11 +200,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Her bir ISO yaln&#305;z bir masa&uuml;st&uuml; ortam&#305; i&ccedil;erir (Plasma, Gnome veya Xfce).</p>
-=======
- <p>Her bir ISO yaln&#305;z bir masa&uuml;st&uuml; ortam&#305; i&ccedil;erir (KDE, Gnome veya Xfce).</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
@@ -262,11 +229,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e69"></a>Canl&#305; DVD Plasma
-=======
- <h5 class="title"><a name="d5e72"></a>Canl&#305; DVD Plasma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -287,11 +250,7 @@
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Sadece 64 bit mimari.</p>
-=======
- <p>32 veya 64 bit mimari i&ccedil;in farkl&#305; ortamlar.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -303,11 +262,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e78"></a>Canl&#305; DVD GNOME
-=======
- <h5 class="title"><a name="d5e81"></a>Canl&#305; DVD GNOME
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -340,11 +295,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e87"></a>Canl&#305; DVD Xfce
-=======
- <h5 class="title"><a name="d5e90"></a>Canl&#305; DVD Xfce
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -379,11 +330,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e96"></a>Boot-only CD ortam&#305;
-=======
- <h4 class="title"><a name="d5e99"></a>Boot-only CD ortam&#305;
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -394,11 +341,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e98"></a>Ortak &ouml;zellikler
-=======
- <h5 class="title"><a name="d5e101"></a>Ortak &ouml;zellikler
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -442,11 +385,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e109"></a>netinstall.iso
-=======
- <h5 class="title"><a name="d5e112"></a>netinstall.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -471,11 +410,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e114"></a>netinstall-nonfree.iso
-=======
- <h5 class="title"><a name="d5e117"></a>netinstall-nonfree.iso
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -504,11 +439,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e119"></a>Ortamlar&#305; indirme ve kontrol etme
-=======
- <h3 class="title"><a name="d5e122"></a>Ortamlar&#305; indirme ve kontrol etme
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -519,11 +450,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e121"></a>&#304;ndirme
-=======
- <h4 class="title"><a name="d5e124"></a>&#304;ndirme
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -551,18 +478,13 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e133"></a>&#304;ndirilen ortam&#305;n b&uuml;t&uuml;nl&uuml;&#287;&uuml;n&uuml; kontrol etme
-=======
- <h4 class="title"><a name="d5e136"></a>&#304;ndirilen ortam&#305;n b&uuml;t&uuml;nl&uuml;&#287;&uuml;n&uuml; kontrol etme
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
</div>
-<<<<<<< HEAD
<p>Her sa&#287;lama toplam&#305;, indirilecek dosyadan bir algoritma taraf&#305;ndan
hesaplanan onalt&#305;l&#305;k say&#305;lardan olu&#351;ur. Bu algoritmalara indirdi&#287;iniz
dosyadan bu say&#305;y&#305; yeniden hesaplamas&#305;n&#305; istedi&#287;inizde ya ayn&#305; rakam&#305;
@@ -570,14 +492,6 @@
dosyan&#305;n bozuk olmas&#305; nedeniyle farkl&#305; bir rakam bulacak ve hata
verecektir. Bir hata, ya dosyay&#305; yeniden indirmeniz gerekti&#287;i veya
BitTorrent kullanarak onarman&#305;z gerekti&#287;i anlam&#305;na gelmektedir.
-=======
- <p>Both checksums are hexadecimal numbers calculated by an algorithm from the
- file to be downloaded. When you ask these algorithms to recalculate this
- number from your downloaded file, either you have the same number and your
- downloaded file is correct, or the number is different and you have a
- failure. A failure infers that you should retry the download or attempt a
- repair using BitTorrent.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>Konsolu a&ccedil;&#305;n -root olman&#305;za gerek yok- ve a&#351;a&#287;&#305;daki komutlardan birini
@@ -607,11 +521,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e146"></a>ISO yakma veya atma
-=======
- <h3 class="title"><a name="d5e149"></a>ISO yakma veya atma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -627,11 +537,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e149"></a>Bir CD/DVD &uuml;zerine ISO yakma
-=======
- <h4 class="title"><a name="d5e152"></a>Bir CD/DVD &uuml;zerine ISO yakma
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -651,11 +557,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h4 class="title"><a name="d5e154"></a>Bir USB bellek &uuml;zerine ISO atmak
-=======
- <h4 class="title"><a name="d5e157"></a>Bir USB bellek &uuml;zerine ISO atmak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -693,11 +595,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e160"></a>Mageia &uuml;zerinde bir grafiksel ara&ccedil; kullanarak
-=======
- <h5 class="title"><a name="d5e163"></a>Mageia &uuml;zerinde bir grafiksel ara&ccedil; kullanarak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -714,11 +612,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e164"></a>Windows &uuml;zerinde bir grafiksel ara&ccedil; kullanarak
-=======
- <h5 class="title"><a name="d5e167"></a>Windows &uuml;zerinde bir grafiksel ara&ccedil; kullanarak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
@@ -740,11 +634,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h5 class="title"><a name="d5e171"></a>Bir GNU/Linux sistem &uuml;zerinde komut sat&#305;r&#305;n&#305; kullanarak
-=======
- <h5 class="title"><a name="d5e174"></a>Bir GNU/Linux sistem &uuml;zerinde komut sat&#305;r&#305;n&#305; kullanarak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h5>
</div>
</div>
diff --git a/tr/index.html b/tr/index.html
index 2268ca6..4d7a00a 100644
--- a/tr/index.html
+++ b/tr/index.html
@@ -28,13 +28,8 @@
<dl>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e19">Giri&#351;</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e29">Ortam</a></span></dt>
-<<<<<<< HEAD
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e119">Ortamlar&#305; indirme ve kontrol etme</a></span></dt>
<dt><span class="section"><a href="Select-and-use-ISOs.html#d5e146">ISO yakma veya atma</a></span></dt>
-=======
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e122">Ortamlar&#305; indirme ve kontrol etme</a></span></dt>
- <dt><span class="section"><a href="Select-and-use-ISOs.html#d5e149">ISO yakma veya atma</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="installer.html">DrakX, Mageia Kurulum Arac&#305;</a></span></dt>
@@ -80,19 +75,11 @@
<dt><span class="section"><a href="setupBootloader.html">&Ouml;ny&uuml;kleyici ana se&ccedil;enekleri</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="setupBootloader.html#d5e883">&Ouml;ny&uuml;kleyici aray&uuml;z&uuml;</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e907">Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e921">Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e924">Zincirleme y&uuml;kleme kullan&#305;l&#305;yor</a></span></dt>
<dt><span class="section"><a href="setupBootloader.html#d5e938">Se&ccedil;enekler</a></span></dt>
-=======
- <dt><span class="section"><a href="setupBootloader.html#d5e886">Bootloader interface</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e910">Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e924">Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e927">Using chain loading</a></span></dt>
- <dt><span class="section"><a href="setupBootloader.html#d5e941">Se&ccedil;enekler</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
<dt><span class="section"><a href="setupBootloaderAddEntry.html">&Ouml;ny&uuml;kleme Men&uuml; Girdisi Ekleme veya De&#287;i&#351;tirme</a></span></dt>
@@ -126,11 +113,7 @@
<dt><span class="section"><a href="uninstall-Mageia.html">Mageia' y&#305; Kald&#305;rma</a></span></dt>
<dd>
<dl>
-<<<<<<< HEAD
<dt><span class="section"><a href="uninstall-Mageia.html#d5e1243">Nas&#305;l</a></span></dt>
-=======
- <dt><span class="section"><a href="uninstall-Mageia.html#d5e1247">Nas&#305;l</a></span></dt>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</dl>
</dd>
</dl>
diff --git a/tr/selectCountry.html b/tr/selectCountry.html
index e2a35b0..7f54abb 100644
--- a/tr/selectCountry.html
+++ b/tr/selectCountry.html
@@ -29,15 +29,9 @@
-<<<<<<< HEAD
<p><a name="selectCountry-pa1"></a>Bulundu&#287;unuz &uuml;lke veya b&ouml;lgeyi se&ccedil;in. Bu i&#351;lem, para birimi ve kablosuz a&#287;
dola&#351;&#305;m alan&#305; gibi her t&uuml;r ayar i&ccedil;in &ouml;nemlidir. Yanl&#305;&#351; &uuml;lkeyi se&ccedil;mek
Kablosuz a&#287; kullan&#305;m&#305;n&#305;z&#305; engelleyebilir.
-=======
- <p><a name="selectCountry-pa1"></a>Select your country or region. This is important for all kinds of settings,
- like the currency and wireless regulatory domain. Setting the wrong country
- can lead to not being able to use a Wireless network.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -79,22 +73,12 @@
-<<<<<<< HEAD
<p><a name="selectCountry-pa4"></a><span class="guilabel">Di&#287;er &Uuml;lkeler</span> ekran&#305;nda ayr&#305;ca bir girdi y&ouml;ntemi
(listenin sonunda) se&ccedil;ebilirsiniz. Girdi y&ouml;ntemleri kullan&#305;c&#305;lar&#305;n birden
&ccedil;ok alfabe karakterini (&Ccedil;ince, Japonca, Korece v.b.) kullanmalar&#305;n&#305;
sa&#287;lar. IBus &ouml;n tan&#305;ml&#305; girdi y&ouml;ntemidir. Di&#287;er girdi y&ouml;ntemleri de (SCIM,
GCIN, HIME vb.) benzer i&#351;levler sunar ve paket se&ccedil;iminden &ouml;nce HTTP/FTP veri
kayna&#287;&#305; ayarlanm&#305;&#351;sa kurulabilirler.
-=======
- <p><a name="selectCountry-pa4"></a>In the <span class="guilabel">Other Countries</span> screen you can also select an
- input method (at the bottom of the list). Input methods allow users to input
- multilingual characters (Chinese, Japanese, Korean, etc). IBus is the
- default input method, so users should not need to configure it
- manually. Other input methods(SCIM, GCIN, HIME, etc) also provide similar
- functions and can be installed if you added HTTP/FTP media before package
- selection.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -107,16 +91,10 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p><a name="selectCountry-pa5"></a>Kurulum s&#305;ras&#305;nda girdi y&ouml;ntemi kurulumunu atlam&#305;&#351;san&#305;z; bu i&#351;leve,
kurdu&#287;unuz sistemi ba&#351;latt&#305;ktan sonra "Bilgisayar&#305;n&#305;z&#305; Yap&#305;land&#305;r&#305;n" -&gt;
"Sistem" yoluyla veya k&ouml;k olarak localedrake arac&#305;n&#305; &ccedil;al&#305;&#351;t&#305;rarak
eri&#351;ebilirsiniz.
-=======
- <p><a name="selectCountry-pa5"></a>If you missed the input method setup during installation, you can access it
- after you boot your installed system via "Configure your Computer" -&gt;
- "System", or by running localedrake as root.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</td>
diff --git a/tr/setupBootloader.html b/tr/setupBootloader.html
index defb765..5cc2edd 100644
--- a/tr/setupBootloader.html
+++ b/tr/setupBootloader.html
@@ -29,19 +29,11 @@
-<<<<<<< HEAD
<div class="section" title="&Ouml;ny&uuml;kleyici aray&uuml;z&uuml;">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e883"></a>&Ouml;ny&uuml;kleyici aray&uuml;z&uuml;
-=======
- <div class="section" title="Bootloader interface">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e886"></a>Bootloader interface
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -49,31 +41,19 @@
-<<<<<<< HEAD
<p>&Ouml;ntan&#305;ml&#305; olarak Mageia sadece &#351;unu kullan&#305;r:</p>
-=======
- <p>By default, Mageia uses exclusively:</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>Eski/MBR veya Eski/GPT sistem i&ccedil;in Grub2 (grafiksel men&uuml; ile/olmadan) </p>
-=======
- <p>Grub2 (with or without graphical menu) for a Legacy/MBR or Legacy/GPT system</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>Bir UEFI sistem i&ccedil;in Grub2-efi</p>
-=======
- <p>Grub2-efi for a UEFI system.</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
@@ -97,19 +77,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Eski/MBR ve Eski/GPT sistemler &uuml;zerinde Grub2">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e893"></a>Eski/MBR ve Eski/GPT sistemler &uuml;zerinde Grub2
-=======
- <div class="section" title="Grub2 on Legacy/MBR and Legacy/GPT systems">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e896"></a>Grub2 on Legacy/MBR and Legacy/GPT systems
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -126,19 +98,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="UEFI sistemler &uuml;zerinde Grub2-efi">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e899"></a>UEFI sistemler &uuml;zerinde Grub2-efi
-=======
- <div class="section" title="Grub2-efi on UEFI systems">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e902"></a>Grub2-efi on UEFI systems
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -146,19 +110,13 @@
-<<<<<<< HEAD
<p>Bir UEFI sistemde kullan&#305;c&#305; aray&uuml;z&uuml; biraz farkl&#305;d&#305;r &ccedil;&uuml;nk&uuml; grafiksel men&uuml;n&uuml;n
bulunmas&#305; veya bulunmamas&#305; aras&#305;nda tercihte bulunamazs&#305;n&#305;z
-=======
- <p>With an UEFI system, the user interface is slightly different as you cannot
- choose between with or without graphical menu
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>Mageia bilgisayar&#305;n&#305;za kurdu&#287;unuz tek sistemse, kurulum arac&#305; &ouml;ny&uuml;kleyiciyi
(Grub2-efi) ta&#351;&#305;mak &uuml;zere bir ESP (EFI Sistem Disk B&ouml;l&uuml;m&uuml;)
olu&#351;turacakt&#305;r. Bilgisayar&#305;n&#305;zda &ouml;nceden bir UEFI i&#351;letim sistemi (Mesela
@@ -166,15 +124,6 @@
olan mevcut ESP alan&#305;n&#305; alg&#305;layarak grub2-efi'yi ekleyecektir. Birden fazla
ESP' nin bir arada olmas&#305; m&uuml;mk&uuml;n ise de sadece bir tane olmas&#305; &ouml;nerilir;
&ccedil;&uuml;nk&uuml; ka&ccedil; i&#351;letim sistemi kurulu olursa olsun biri yeterlidir.
-=======
- <p>If Mageia is the only system installed on your computer, the installer
- created an ESP (EFI System Partition) to receive the bootloader
- (Grub2-efi). If there are already UEFI operating systems installed on your
- computer (Windows 8 for example), the Mageia installer detects the existing
- ESP created by Windows and adds grub2-efi. Although it is possible to have
- several ESPs, only one is advised and enough whatever the number of
- operating systems you have.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -191,11 +140,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e907"></a>Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak
-=======
- <h3 class="title"><a name="d5e910"></a>Bir Mageia &ouml;ny&uuml;kleyicisi kullanmak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -203,54 +148,34 @@
-<<<<<<< HEAD
<p>&Ouml;ntan&#305;ml&#305; olarak, sisteminize uygun bi&ccedil;imde Mageia &#351;unlardan birini yeni
olarak yazar:
</p>
-=======
- <p>By default, according to your system, Mageia writes a new:</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p>Ya ilk sabit diskinizdeki MBR (Birincil &Ouml;ny&uuml;kleme Kayd&#305;) i&ccedil;ine veya BIOS
disk b&ouml;l&uuml;m&uuml;ne GRUB2 &ouml;ny&uuml;kleyicisi
-=======
- <p>GRUB2 bootloader either into the MBR (Master Boot Record) of your first hard
- drive or in the BIOS boot partition.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p>ESP i&ccedil;ine Grub2-efi &ouml;ny&uuml;kleyicisi</p>
-=======
- <p>Grub2-efi bootloader into the ESP</p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
</div>
-<<<<<<< HEAD
<p>Zaten bir i&#351;letim sistemi kuruluysa, Mageia bunlar&#305; yeni Mageia &ouml;ny&uuml;kleme
men&uuml;n&uuml;ze eklemeyi dener. Bu davran&#305;&#351;&#305; istemiyorsan&#305;z
<span class="guibutton">&#304;leri</span> d&uuml;&#287;mesine t&#305;klay&#305;p <span class="guilabel">Yabanc&#305; &#304;&#351;letim
Sistemini Sorgula</span> kutucu&#287;undaki i&#351;areti kald&#305;r&#305;n.
</p>
-=======
- <p>If you already have other operating systems installed, Mageia attempts to
- add them to your new Mageia boot menu. If you don't want this behaviour,
- click on <span class="guibutton">Next</span> and then uncheck the box
- <span class="guilabel">Probe Foreign OS</span></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
@@ -261,11 +186,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e921"></a>Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak
-=======
- <h3 class="title"><a name="d5e924"></a>Mevcut bir &ouml;ny&uuml;kleyiciyi kullanmak
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -283,19 +204,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Zincirleme y&uuml;kleme kullan&#305;l&#305;yor">
<div class="titlepage">
<div>
<div>
<h3 class="title"><a name="d5e924"></a>Zincirleme y&uuml;kleme kullan&#305;l&#305;yor
-=======
- <div class="section" title="Using chain loading">
- <div class="titlepage">
- <div>
- <div>
- <h3 class="title"><a name="d5e927"></a>Using chain loading
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -303,29 +216,17 @@
-<<<<<<< HEAD
<p>&Ouml;ny&uuml;klenebilir bir Mageia istemiyor fakat bir ba&#351;ka i&#351;letim sisteminden
zincirleme y&uuml;klenmesini istiyorsan&#305;z, <span class="guibutton">&#304;leri</span> ve
<span class="guibutton">Geli&#351;mi&#351;</span> d&uuml;&#287;melerine t&#305;klayarak <span class="guibutton">ESP veya
MBR'ye dokunma</span> kutucu&#287;unu i&#351;aretleyin.
-=======
- <p>If you don't want a bootable Mageia, but to chain load it from another OS,
- click on <span class="guibutton">Next</span>, then on
- <span class="guibutton">Advanced</span> and Check the box <span class="guilabel">Do not touch ESP
- or MBR</span>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
-<<<<<<< HEAD
<p>&Ouml;ny&uuml;kleyicinin eksik oldu&#287;una dair bir uyar&#305; alacaks&#305;n&#305;z. Ancak bunu
<span class="guibutton">Tamam</span> d&uuml;&#287;mesine t&#305;klayarak atlay&#305;n.
-=======
- <p>You will get a warning that the bootloader is missing, ignore it by clicking
- <span class="guibutton">OK</span>.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -337,11 +238,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e938"></a>Se&ccedil;enekler
-=======
- <h3 class="title"><a name="d5e941"></a>Se&ccedil;enekler
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
@@ -349,19 +246,11 @@
-<<<<<<< HEAD
<div class="section" title="&#304;lk sayfa">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e940"></a>&#304;lk sayfa
-=======
- <div class="section" title="First page">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e943"></a>First page
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -373,71 +262,44 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">&Ouml;ntan&#305;ml&#305; g&ouml;r&uuml;nt&uuml;n&uuml;n y&uuml;klemesinden &ouml;nceki gecikme</span>: Bu
metin kutusu &ouml;ntan&#305;ml&#305; i&#351;letim sistemi ba&#351;lat&#305;lmadan &ouml;nceki gecikme
s&uuml;resini saniye cinsinden ayarlaman&#305;z&#305; sa&#287;lar.
-=======
- <p><span class="guilabel">Delay before booting the default image</span>: This text box
- lets you set a delay in seconds before the default operating system is
- started up.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guibutton">G&uuml;venlik</span>: &Ouml;ny&uuml;kleyici i&ccedil;in bir parola ayarlaman&#305;z&#305;
sa&#287;lar. B&ouml;ylece &ouml;ny&uuml;kleme s&#305;ras&#305;nda &ouml;ny&uuml;kleme girdisini se&ccedil;mek veya ayarlar&#305;
de&#287;i&#351;tirmek i&ccedil;in bir kullan&#305;c&#305; ad&#305; ile parolas&#305; sorulur. Kullan&#305;c&#305; ad&#305;
"root" ve parola da burada se&ccedil;ilendir.
-=======
- <p><span class="guilabel">Security</span>: This allows you to set a password for the
- bootloader. This means other people can not enter single user mode or change
- settings at the boot time.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Parola</span>: Bu metin kutusu parolan&#305;z&#305; olu&#351;turaca&#287;&#305;n&#305;z
k&#305;s&#305;md&#305;r
-=======
- <p><span class="guilabel">Password</span>: This text box is where you actually put the
- password
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Parola (tekrar)</span>: Parolan&#305;z&#305; yeniden yaz&#305;n. B&ouml;ylece
Drakx &uuml;stte yaz&#305;lan parola ile uyu&#351;up uyu&#351;mad&#305;&#287;&#305;n&#305; denetler.
-=======
- <p><span class="guilabel">Password (again)</span>: Retype the password and Drakx will
- check that it matches with the one set above.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Geli&#351;mi&#351;</span></p>
-=======
- <p><span class="guilabel">Advanced</span></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">ACPI &ouml;zelli&#287;ini etkinle&#351;tir:</span> ACPI (Geli&#351;mi&#351;
Yap&#305;land&#305;rma ve G&uuml;&ccedil; Arabirimi) bir g&uuml;&ccedil; y&ouml;netimi standard&#305;d&#305;r. Kullan&#305;lmayan
ayg&#305;tlar&#305; durdurarak, ki bu APM &ouml;ncesinde kullan&#305;lan y&ouml;ntemdir, enerji
@@ -445,55 +307,30 @@
&ccedil;&uuml;nk&uuml; bilgisayar&#305;n&#305;z ACPI' yi desteklemiyor olabilir veya ACPI
uygulamas&#305;n&#305;n baz&#305; sorunlara (mesela rastgele yeniden ba&#351;latmalar veya
sistem kilitlenmeleri) yol a&ccedil;t&#305;&#287;&#305;n&#305; d&uuml;&#351;&uuml;n&uuml;yor olabilirsiniz.
-=======
- <p><span class="guilabel">Enable ACPI:</span> ACPI (Advanced Configuration and Power
- Interface) is a standard for the power management. It can save energy by
- stopping unused devices, this was the method used before APM. Unchecking it
- could be useful if, for example, your computer does not support ACPI or if
- you think the ACPI implementation might cause some problems (for instance
- random reboots or system lockups).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">SMP &ouml;zelli&#287;ini etkinle&#351;tir</span>: Bu se&ccedil;enek, &ccedil;ok &ccedil;ekirdekli
i&#351;lemcilerde simetrik &ccedil;oklu i&#351;lemeyi etkinle&#351;tirir veya devre d&#305;&#351;&#305; b&#305;rak&#305;r.
-=======
- <p><span class="guilabel">Enable SMP</span>: This option enables / disables symmetric
- multiprocessing for multi core processors.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">APIC &ouml;zelli&#287;ini etkinle&#351;tir</span>: Bunu etkinle&#351;tirmek
i&#351;letim sisteminin Geli&#351;mi&#351; Programlanabilir Kesme Denetleyicisi-APIC-ne
eri&#351;imini sa&#287;lar. APIC ayg&#305;tlar&#305; daha karma&#351;&#305;k &ouml;ncelikleme modellerine ve
Geli&#351;mi&#351; IRQ (Kesme Talebi) y&ouml;netimine izin verir.
-=======
- <p><span class="guilabel">Enable APIC</span>: Enabling or disabling this gives the
- operating system access to the Advanced Programmable Interrupt
- Controller. APIC devices permit more complex priority models, and Advanced
- IRQ (Interrupt Request) management.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Yerel APIC &ouml;zelli&#287;ini etkinle&#351;tir</span>: Burada, bir SMP
sistemde belli bir i&#351;lemci i&ccedil;in t&uuml;m d&#305;&#351; kesmeleri y&ouml;neten yerel APIC
&ouml;zelli&#287;ini ayarlayabilirsiniz.
-=======
- <p><span class="guilabel">Enable Local APIC</span>: Here you can set local APIC, which
- manages all external interrupts for a specific processor in an SMP system.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
@@ -507,19 +344,11 @@
</div>
-<<<<<<< HEAD
<div class="section" title="Sonraki sayfa">
<div class="titlepage">
<div>
<div>
<h4 class="title"><a name="d5e972"></a>Sonraki sayfa
-=======
- <div class="section" title="Next page">
- <div class="titlepage">
- <div>
- <div>
- <h4 class="title"><a name="d5e975"></a>Next page
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h4>
</div>
</div>
@@ -531,70 +360,43 @@
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">&Ouml;ntan&#305;ml&#305;:</span> &Ouml;ntan&#305;ml&#305; olarak ba&#351;lat&#305;lacak i&#351;letim
sistemi
-=======
- <p><span class="guilabel">Default:</span> Operating system started up by default
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Sonuna ekle:</span> Bu se&ccedil;enek &ccedil;ekirdek bilgisini ge&ccedil;menizi
veya &ccedil;ekirde&#287;e &ouml;ny&uuml;kleme s&#305;ras&#305;nda daha fazla bilgi vermesini s&ouml;ylemenizi
sa&#287;lar.
-=======
- <p><span class="guilabel">Append:</span> This option lets you pass the kernel
- information or tell the kernel to give you more information as it boots.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Yabanc&#305; &#304;&#351;letim Sistemini Sorgula</span>: yukar&#305;ya bak&#305;n&#305;z
<a class="link" href="setupBootloader.html#setupMageiaBootloader">Bir Mageia &ouml;ny&uuml;kleyicisini
kullanma</a></p>
-=======
- <p><span class="guilabel">Probe foreign OS</span>: see above <a class="link" href="setupBootloader.html#setupMageiaBootloader">Using a Mageia bootloader</a></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Geli&#351;mi&#351;</span></p>
-=======
- <p><span class="guilabel">Advanced</span></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<div class="itemizedlist">
<ul class="itemizedlist">
<li class="listitem">
-<<<<<<< HEAD
<p><span class="guilabel">Ekran kipi:</span> Bu se&ccedil;enek, &ouml;ny&uuml;kleme men&uuml;s&uuml;n&uuml;n kullanaca&#287;&#305;
ekran boyutunu ve renk derinli&#287;ini ayarlar. A&#351;a&#287;&#305; y&ouml;nl&uuml; &uuml;&ccedil;gene
t&#305;klad&#305;&#287;&#305;n&#305;zda daha fazla boyut ve renk derinli&#287;i se&ccedil;enekleri &ouml;nerilir.
-=======
- <p><span class="guilabel">Video mode:</span> This sets the screen size and colour depth
- the boot menu will use. If you click the down triangle you will be offered
- other size and colour depth options.
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
</li>
<li class="listitem">
-<<<<<<< HEAD
<p><span class="bold"><strong>ESP veya MBR'ye dokunma </strong></span>: yukar&#305;ya bak&#305;n&#305;z
<a class="link" href="setupBootloader.html#setupChainLoading">Zincirleme y&uuml;klemeyi kullanma</a></p>
-=======
- <p><span class="bold"><strong>Do not touch ESP or MBR</strong></span>: see above <a class="link" href="setupBootloader.html#setupChainLoading">Using the chain loading</a></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</li>
</ul>
diff --git a/tr/setupBootloaderAddEntry.html b/tr/setupBootloaderAddEntry.html
index a2c27cf..e445e8d 100644
--- a/tr/setupBootloaderAddEntry.html
+++ b/tr/setupBootloaderAddEntry.html
@@ -27,14 +27,9 @@
-<<<<<<< HEAD
<p>Bunu yapmak i&ccedil;in /boot/grub2/custom.cfg dosyas&#305;n&#305; elle d&uuml;zenlemeli veya
Mageia veri kaynaklar&#305;nda bulunan grub-customizer yaz&#305;l&#305;m&#305;n&#305;
kullanmal&#305;s&#305;n&#305;z.
-=======
- <p>To do that you need to manually edit /boot/grub2/custom.cfg or use the
- software grub-customizer instead (Available in the Mageia repositories).
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -47,11 +42,7 @@
<tr>
<td align="left" valign="top">
-<<<<<<< HEAD
<p>Daha fazla bilgi i&ccedil;in wiki sayfam&#305;z&#305; okuyun: </p>
-=======
- <p>For more information, see our wiki: <a class="ulink" href="https://wiki.mageia.org/en/Grub2-efi_and_Mageia" target="_top">https://wiki.mageia.org/en/Grub2-efi_and_Mageia</a></p>
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</td>
</tr>
diff --git a/tr/uninstall-Mageia.html b/tr/uninstall-Mageia.html
index c861b84..e96fe31 100644
--- a/tr/uninstall-Mageia.html
+++ b/tr/uninstall-Mageia.html
@@ -31,11 +31,7 @@
<div class="titlepage">
<div>
<div>
-<<<<<<< HEAD
<h3 class="title"><a name="d5e1243"></a>Nas&#305;l
-=======
- <h3 class="title"><a name="d5e1247"></a>Nas&#305;l
->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</h3>
</div>
</div>
generated by cgit v1.2.1 (git 2.21.0) at 2024-06-10 06:34:56 +0000