1 files changed, 22 insertions, 0 deletions
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>