aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:09:06 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 08:09:06 +0200
commit13be3647823b111f5be8d29da7aa4f12ad8292de (patch)
treee8cb0e64a13a5131dac6cb880e154e9e67e35175
parent3491ae60e905b38a5579409cb51cf9e8044a8bca (diff)
downloaddrakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.tar
drakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.tar.gz
drakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.tar.bz2
drakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.tar.xz
drakx-installer-help-13be3647823b111f5be8d29da7aa4f12ad8292de.zip
Add Turkish files
-rw-r--r--tr/Select-and-use-ISOs.html114
-rw-r--r--tr/index.html17
-rw-r--r--tr/selectCountry.html22
-rw-r--r--tr/setupBootloader.html211
-rw-r--r--tr/setupBootloaderAddEntry.html10
-rw-r--r--tr/uninstall-Mageia.html4
6 files changed, 366 insertions, 12 deletions
diff --git a/tr/Select-and-use-ISOs.html b/tr/Select-and-use-ISOs.html
index 2a8092b..a516471 100644
--- a/tr/Select-and-use-ISOs.html
+++ b/tr/Select-and-use-ISOs.html
@@ -136,6 +136,8 @@
<p>&Ouml;nceki s&uuml;r&uuml;mden y&uuml;kseltme veya temiz bir kurulum yapabilirler.</p>
</li>
+<<<<<<< HEAD
+=======
</ul>
</div>
@@ -154,6 +156,7 @@
<div class="itemizedlist">
<ul class="itemizedlist">
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<li class="listitem">
<p>32 veya 64 bit mimari i&ccedil;in farkl&#305; ortamlar.</p>
@@ -189,7 +192,11 @@
<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>
@@ -200,7 +207,11 @@
<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>
@@ -218,7 +229,11 @@
</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">
@@ -247,7 +262,11 @@
<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>
@@ -268,7 +287,11 @@
</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>
@@ -280,7 +303,11 @@
<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>
@@ -301,7 +328,7 @@
</li>
<li class="listitem">
- <p>32 veya 64 bit mimari i&ccedil;in farkl&#305; ortamlar.</p>
+ <p>Sadece 64 bit mimari</p>
</li>
</ul>
@@ -313,7 +340,11 @@
<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>
@@ -334,7 +365,7 @@
</li>
<li class="listitem">
- <p>32 veya 64 bit mimari i&ccedil;in farkl&#305; ortamlar.</p>
+ <p>32 veya 64 bit mimari.</p>
</li>
</ul>
@@ -348,7 +379,11 @@
<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>
@@ -359,7 +394,11 @@
<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>
@@ -403,7 +442,11 @@
<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>
@@ -414,8 +457,8 @@
<ul class="itemizedlist">
<li class="listitem">
- <p>&Ouml;zg&uuml;r olmayan yaz&#305;l&#305;m kullanmay&#305; reddeden ki&#351;iler i&ccedil;in yaln&#305;z &ouml;zg&uuml;r yaz&#305;l&#305;m
- i&ccedil;erir.
+ <p>&Ouml;zg&uuml;r olmayan yaz&#305;l&#305;m kullanmamay&#305; tercih edenler i&ccedil;in yaln&#305;zca &ouml;zg&uuml;r
+ yaz&#305;l&#305;m i&ccedil;erir.
</p>
</li>
@@ -428,7 +471,11 @@
<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>
@@ -457,7 +504,11 @@
<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>
@@ -468,7 +519,11 @@
<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>
@@ -476,16 +531,15 @@
<p>ISO dosyan&#305;z&#305; se&ccedil;er se&ccedil;mez dosyay&#305; http veya BitTorrent kullanarak
- indirebilirsiniz. Her iki durumda da baz&#305; bilgiler i&ccedil;eren bi pencere
- a&ccedil;&#305;l&#305;r. &Ouml;rne&#287;in e&#287;er bant aral&#305;&#287;&#305;n&#305;z &ccedil;ok d&uuml;&#351;&uuml;kse kullan&#305;lan yans&#305;y&#305;
- de&#287;i&#351;tirme imkan&#305; sa&#287;lamak gibi. E&#287;er http se&ccedil;ildiyse &#351;&ouml;yle bir &#351;ey
- g&ouml;rebilirsiniz
+ indirebilirsiniz. Her iki durumda da kullan&#305;lan yans&#305; ve bant geni&#351;li&#287;i azsa
+ bunu de&#287;i&#351;tirme imkan&#305; gibi baz&#305; bilgiler i&ccedil;eren bir pencere a&ccedil;&#305;l&#305;r. E&#287;er
+ http se&ccedil;ildiyse &#351;&ouml;yle bir &#351;ey g&ouml;rebilirsiniz
</p>
<p>md5sum ve sha1sum ara&ccedil;lar&#305; ISO kal&#305;b&#305;n&#305;n b&uuml;t&uuml;nl&uuml;&#287;&uuml;n&uuml; denetlemeye yarayan
- ara&ccedil;lard&#305;r. Sadece bunlardan birin&#304; kullan&#305;n. Yine birini <a class="link" href="Select-and-use-ISOs.html#integrity">ba&#351;ka zaman kullanmak &uuml;zere</a> kay&#305;tl&#305;
- tutun. Sonras&#305;nda &#351;u pencere g&ouml;r&uuml;nt&uuml;lenir:
+ ara&ccedil;lard&#305;r. Sadece bunlardan birini kullan&#305;n. Yine bunlardan birini <a class="link" href="Select-and-use-ISOs.html#integrity">ba&#351;ka zaman kullanmak &uuml;zere</a> kay&#305;tl&#305;
+ tutun. Sonras&#305;nda &#351;una benzer bir pencere g&ouml;r&uuml;nt&uuml;lenir:
</p>
@@ -497,19 +551,33 @@
<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;
+ bularak indirdi&#287;iniz dosyan&#305;n do&#287;ru oldu&#287;unu anlars&#305;n&#305;z ya da indirilen
+ 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
@@ -539,7 +607,11 @@
<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>
@@ -555,7 +627,11 @@
<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>
@@ -575,7 +651,11 @@
<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>
@@ -613,7 +693,11 @@
<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>
@@ -630,7 +714,11 @@
<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>
@@ -652,7 +740,11 @@
<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>
@@ -747,7 +839,7 @@
<p>X= ayg&#305;t&#305;n&#305;z&#305;n ad&#305;d&#305;r. &ouml;rn: /dev/sdc</p>
<p>&Ouml;rne&#287;in: # <strong class="userinput"><code>dd
- if=/home/kullan&#305;c&#305;Ad&#305;/Downloads/Mageia-4-x86_64-DVD.iso of=/dev/sdb
+ if=/home/kullan&#305;c&#305;Ad&#305;/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdb
bs=1M</code></strong></p>
</li>
diff --git a/tr/index.html b/tr/index.html
index 7f58cc3..2268ca6 100644
--- a/tr/index.html
+++ b/tr/index.html
@@ -28,8 +28,13 @@
<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>
@@ -75,11 +80,19 @@
<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>
@@ -113,7 +126,11 @@
<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 42a7a17..e2a35b0 100644
--- a/tr/selectCountry.html
+++ b/tr/selectCountry.html
@@ -29,9 +29,15 @@
+<<<<<<< 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>
@@ -73,6 +79,14 @@
+<<<<<<< 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
@@ -80,6 +94,7 @@
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>
@@ -92,9 +107,16 @@
<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 f613a80..defb765 100644
--- a/tr/setupBootloader.html
+++ b/tr/setupBootloader.html
@@ -29,11 +29,19 @@
+<<<<<<< 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>
@@ -41,19 +49,31 @@
+<<<<<<< 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>
@@ -69,7 +89,7 @@
<tr>
<td align="left" valign="top">
- <p>Mageia grafik men&uuml;leri g&uuml;zeldir :</p>
+ <p>Mageia grafik men&uuml;leri g&uuml;zeldir :)</p>
</td>
</tr>
@@ -77,11 +97,19 @@
</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>
@@ -98,11 +126,19 @@
</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>
@@ -110,13 +146,27 @@
+<<<<<<< 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
+ Windows 8) kuruluysa Mageia kurulum arac&#305; Windows taraf&#305;ndan olu&#351;turulmu&#351;
+ 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
@@ -124,6 +174,7 @@
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>
@@ -140,7 +191,11 @@
<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>
@@ -148,31 +203,54 @@
+<<<<<<< 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
@@ -183,7 +261,11 @@
<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>
@@ -201,11 +283,19 @@
</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>
@@ -213,17 +303,29 @@
+<<<<<<< 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>
@@ -235,7 +337,11 @@
<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>
@@ -243,11 +349,19 @@
+<<<<<<< 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>
@@ -259,72 +373,127 @@
<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
+ tasarrufu sa&#287;layabilir. Bu se&ccedil;ene&#287;in i&#351;aretini kald&#305;rmak faydal&#305; olabilir;
+ &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>
@@ -338,11 +507,19 @@
</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>
@@ -354,38 +531,70 @@
<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 5f3b1d3..a2c27cf 100644
--- a/tr/setupBootloaderAddEntry.html
+++ b/tr/setupBootloaderAddEntry.html
@@ -27,8 +27,14 @@
+<<<<<<< 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>
@@ -41,7 +47,11 @@
<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 c32d212..c861b84 100644
--- a/tr/uninstall-Mageia.html
+++ b/tr/uninstall-Mageia.html
@@ -31,7 +31,11 @@
<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>