diff options
Diffstat (limited to 'hu/chooseDesktop.html')
| -rw-r--r-- | hu/chooseDesktop.html | 23 |
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> |