aboutsummaryrefslogtreecommitdiffstats
path: root/hu/chooseDesktop.html
diff options
context:
space:
mode:
authorPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:53:28 +0200
committerPapoteur <papoteur@mageialinux-online.org>2017-06-06 07:53:28 +0200
commitfbd9dfd8acd9dedd07332fa4a48c152f6b9490a8 (patch)
tree58a4e95dec3ffaf6f522568095d47085b0367d25 /hu/chooseDesktop.html
parent8f7de370a7103f809917a71bc24ca1b16543f06e (diff)
downloaddrakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.tar
drakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.tar.gz
drakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.tar.bz2
drakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.tar.xz
drakx-installer-help-fbd9dfd8acd9dedd07332fa4a48c152f6b9490a8.zip
Update Hungarian files
Diffstat (limited to 'hu/chooseDesktop.html')
-rw-r--r--hu/chooseDesktop.html23
1 files changed, 23 insertions, 0 deletions
diff --git a/hu/chooseDesktop.html b/hu/chooseDesktop.html
index 10b1d70..289b098 100644
--- a/hu/chooseDesktop.html
+++ b/hu/chooseDesktop.html
@@ -22,6 +22,14 @@
</div>
</div>
</div>
+<<<<<<< HEAD
+
+
+
+
+
+
+=======
@@ -31,21 +39,32 @@
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Depending on your selection here, you may be offered further screens to fine
tune your choice.
</p>
+<<<<<<< HEAD
+
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>After the selection step(s), you will see a slide show during package
installation. The slide show can be disabled by pressing the
<span class="guilabel">Details</span> button
</p>
+<<<<<<< HEAD
+
+
+
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Choose whether you prefer to use the <span class="application">KDE</span> or
<span class="application">Gnome</span> desktop environment. Both come with a full
set of useful applications and tools. Tick <span class="guilabel">Custom</span> if
@@ -54,7 +73,11 @@
<span class="application">LXDE</span> desktop is lighter than the previous two,
sporting less eye candy and fewer packages installed by default.
</p>
+<<<<<<< HEAD
+
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>
</body>
</html>