aboutsummaryrefslogtreecommitdiffstats
path: root/hu/soundConfig.html
diff options
context:
space:
mode:
Diffstat (limited to 'hu/soundConfig.html')
-rw-r--r--hu/soundConfig.html23
1 files changed, 23 insertions, 0 deletions
diff --git a/hu/soundConfig.html b/hu/soundConfig.html
index 19300e4..c2ae706 100644
--- a/hu/soundConfig.html
+++ b/hu/soundConfig.html
@@ -22,7 +22,10 @@
</div>
</div>
</div>
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
@@ -33,22 +36,35 @@
<p>In this screen the name of the driver that the installer chose for your
sound card is given, which will be the default driver if we have a default
one.
+<<<<<<< HEAD
+ </p>
+
+=======
</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>The default driver should work without problems. However, if after install
you do encounter problems, then run <span class="command"><strong>draksound</strong></span> or start
this tool via MCC (Mageia Control Center), by choosing the
<span class="guilabel">Hardware</span> tab and clicking on <span class="guilabel">Sound
Configuration</span> at the top right of the screen.
+<<<<<<< HEAD
+ </p>
+
+=======
</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
<p>Then, in the draksound or "Sound Configuration" tool screen, click on
<span class="guibutton">Advanced</span> and then on
<span class="guibutton">Troubleshooting</span> to find very useful advice about how
to solve the problem.
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
@@ -67,15 +83,22 @@
<p>Clicking <span class="guibutton">Advanced</span> in this screen, during install, is
useful if there is no default driver and there are several drivers
available, but you think the installer selected the wrong one.
+<<<<<<< HEAD
+=======
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</p>
<p>In that case you can select a different driver after clicking on
<span class="guibutton">Let me pick any driver</span>.
+<<<<<<< HEAD
+ </p>
+=======
</p>
+>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
</div>