diff options
| author | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 07:51:07 +0200 |
|---|---|---|
| committer | Papoteur <papoteur@mageialinux-online.org> | 2017-06-06 07:51:07 +0200 |
| commit | 320d202f1fae239f8bb8cf041866011ab3456d7f (patch) | |
| tree | 86226245d61efc1751ffdba25302ae71a1f4a822 /de/misc-params.html | |
| parent | a979860a232ea8759dc5e6b72074051c9f64b6f8 (diff) | |
| download | drakx-installer-help-320d202f1fae239f8bb8cf041866011ab3456d7f.tar drakx-installer-help-320d202f1fae239f8bb8cf041866011ab3456d7f.tar.gz drakx-installer-help-320d202f1fae239f8bb8cf041866011ab3456d7f.tar.bz2 drakx-installer-help-320d202f1fae239f8bb8cf041866011ab3456d7f.tar.xz drakx-installer-help-320d202f1fae239f8bb8cf041866011ab3456d7f.zip | |
Update German files
Diffstat (limited to 'de/misc-params.html')
| -rw-r--r-- | de/misc-params.html | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/de/misc-params.html b/de/misc-params.html index 66db358..5b95a67 100644 --- a/de/misc-params.html +++ b/de/misc-params.html @@ -199,8 +199,14 @@ <tr> <td align="left" valign="top"> +<<<<<<< HEAD + <p>Wenn Sie feststellen, dass ein falsches Tastaturlayout verwendet wird und + Sie dieses ändern möchten, beachten Sie, das sich Ihr Passwort hierdurch + auch ändert. +======= <p>If you notice a wrong keyboard layout and want to change it, keep in mind that your passwords are going to change too. +>>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 </p> </td> @@ -303,7 +309,7 @@ </li> <li class="listitem"> - <p><a name="misc-params-network-pa4"></a><span class="guilabel">Proxies</span>: + <p><a name="misc-params-network-pa4"></a><span class="guilabel">Proxys</span>: </p> |