From 984a084705f358bc9799d634eb81427e81982051 Mon Sep 17 00:00:00 2001 From: Papoteur Date: Sun, 25 Jun 2017 18:38:09 +0200 Subject: Update translations --- ca/Select-and-use-ISOs.html | 78 +++---- ca/addUser.html | 16 -- ca/ask_mntpoint_s.html | 2 +- ca/diskdrake.html | 6 +- ca/doPartitionDisks.html | 38 ++-- ca/formatPartitions.html | 2 +- ca/index.html | 32 +-- ca/selectKeyboard.html | 2 +- ca/setupBootloader.html | 116 ++-------- ca/takeOverHdConfirm.html | 2 +- ca/uninstall-Mageia.html | 6 +- cs/Select-and-use-ISOs.html | 80 ------- cs/addUser.html | 12 -- cs/doPartitionDisks.html | 9 - cs/index.html | 17 -- cs/setupBootloader.html | 87 -------- cs/uninstall-Mageia.html | 4 - de/Select-and-use-ISOs.html | 80 ------- de/addUser.html | 16 -- de/choosePackageGroups.html | 9 - de/doPartitionDisks.html | 17 -- de/index.html | 17 -- de/misc-params.html | 5 - de/selectCountry.html | 14 -- de/setupBootloader.html | 139 ------------ de/uninstall-Mageia.html | 4 - es/Select-and-use-ISOs.html | 132 ------------ es/addUser.html | 6 - es/choosePackageGroups.html | 5 - es/diskdrake.html | 10 - es/doPartitionDisks.html | 8 - es/index.html | 17 -- es/misc-params.html | 32 --- es/selectCountry.html | 22 -- es/setupBootloader.html | 198 ----------------- es/setupBootloaderAddEntry.html | 9 - es/uninstall-Mageia.html | 4 - et/Select-and-use-ISOs.html | 20 -- et/addUser.html | 21 -- et/index.html | 14 -- et/setupBootloader.html | 81 ------- et/setupBootloaderAddEntry.html | 105 --------- eu/Select-and-use-ISOs.html | 19 -- eu/addUser.html | 21 -- eu/index.html | 20 +- eu/setupBootloader.html | 106 ++------- eu/setupBootloaderAddEntry.html | 105 --------- eu/uninstall-Mageia.html | 4 - fr/index.html | 18 -- fr/setupBootloader.html | 8 - fr/setupBootloaderAddEntry.html | 111 ---------- fr/uninstall-Mageia.html | 4 - hu/Select-and-use-ISOs.html | 467 ---------------------------------------- hu/acceptLicense.html | 12 -- hu/addUser.html | 96 --------- hu/chooseDesktop.html | 28 --- hu/choosePackageGroups.html | 46 ---- hu/diskdrake.html | 22 -- hu/doPartitionDisks.html | 3 - hu/exitInstall.html | 29 --- hu/index.html | 27 --- hu/misc-params.html | 43 ---- hu/selectCountry.html | 68 ------ hu/selectLanguage.html | 4 - hu/setupBootloader.html | 172 --------------- hu/setupBootloaderAddEntry.html | 107 --------- hu/setupSCSI.html | 4 - hu/soundConfig.html | 28 --- hu/uninstall-Mageia.html | 4 - nl/Select-and-use-ISOs.html | 115 ---------- nl/index.html | 17 -- nl/setupBootloader.html | 66 ------ nl/uninstall-Mageia.html | 4 - ro/Select-and-use-ISOs.html | 260 ++++------------------ ro/addUser.html | 54 +---- ro/chooseDesktop.html | 19 +- ro/choosePackageGroups.html | 36 ++-- ro/diskdrake.html | 37 ++-- ro/doPartitionDisks.html | 26 +++ ro/exitInstall.html | 19 +- ro/index.html | 19 +- ro/misc-params.html | 88 +++++--- ro/selectCountry.html | 67 +++--- ro/setupBootloader.html | 386 +++++++++++++++++++++++---------- ro/setupBootloaderAddEntry.html | 122 ++--------- ro/soundConfig.html | 9 +- ro/uninstall-Mageia.html | 2 +- sl/Select-and-use-ISOs.html | 79 +------ sl/acceptLicense.html | 6 +- sl/addUser.html | 78 +++---- sl/add_supplemental_media.html | 32 ++- sl/doPartitionDisks.html | 6 - sl/index.html | 12 +- sl/setupBootloader.html | 60 +++--- sl/uninstall-Mageia.html | 2 +- sq/Select-and-use-ISOs.html | 255 ++++------------------ sq/addUser.html | 53 +---- sq/chooseDesktop.html | 19 +- sq/choosePackageGroups.html | 36 ++-- sq/diskdrake.html | 35 +-- sq/doPartitionDisks.html | 26 +++ sq/exitInstall.html | 17 +- sq/index.html | 19 +- sq/misc-params.html | 87 +++++--- sq/selectCountry.html | 54 ++--- sq/setupBootloader.html | 381 ++++++++++++++++++++++---------- sq/setupBootloaderAddEntry.html | 119 ++-------- sq/soundConfig.html | 9 +- sq/uninstall-Mageia.html | 2 +- tr/Select-and-use-ISOs.html | 110 ---------- tr/index.html | 17 -- tr/selectCountry.html | 22 -- tr/setupBootloader.html | 198 ----------------- tr/setupBootloaderAddEntry.html | 9 - tr/uninstall-Mageia.html | 4 - uk/Select-and-use-ISOs.html | 101 --------- uk/index.html | 17 -- uk/setupBootloader.html | 41 ---- uk/uninstall-Mageia.html | 4 - update-help_files.sh | 2 +- zh_cn/Select-and-use-ISOs.html | 172 --------------- zh_cn/addUser.html | 8 - zh_cn/doPartitionDisks.html | 9 - zh_cn/index.html | 17 -- zh_cn/setupBootloader.html | 88 -------- zh_cn/uninstall-Mageia.html | 4 - 126 files changed, 1206 insertions(+), 5420 deletions(-) diff --git a/ca/Select-and-use-ISOs.html b/ca/Select-and-use-ISOs.html index 88a3008..aaa5273 100644 --- a/ca/Select-and-use-ISOs.html +++ b/ca/Select-and-use-ISOs.html @@ -136,24 +136,6 @@

- - - - - -
-
-
-
-
DVD -
-
-
-
- - -
-

  • Suports diferents per a arquitectura de 32 ó 64 bits.

    @@ -189,7 +171,7 @@
    -

    Mitjà autònom +

    Mitjà autònom

    @@ -200,7 +182,7 @@
    -
    Característiques comunes +
    Característiques comunes
    @@ -219,7 +201,7 @@
  • -

    Each ISO contains only one desktop environment (KDE, GNOME or Xfce).

    +

    Each ISO contains only one desktop environment (Plasma, GNOME or Xfce).

  • @@ -248,7 +230,7 @@
    -
    Live DVD Plasma +
    Live DVD Plasma
    @@ -269,7 +251,7 @@
  • -

    Suports diferents per a arquitectura de 32 ó 64 bits.

    +

    64 bit architecture only.

@@ -281,7 +263,7 @@
-
DVD autònom de GNOME +
DVD autònom de GNOME
@@ -302,7 +284,7 @@
  • -

    Suports diferents per a arquitectura de 32 ó 64 bits.

    +

    64 bit architecture only

    • @@ -314,7 +296,7 @@
    -
    Live DVD Xfce +
    Live DVD Xfce
    @@ -335,7 +317,7 @@
  • -

    Suports diferents per a arquitectura de 32 ó 64 bits.

    +

    32 or 64 bit architectures.

    • @@ -349,7 +331,7 @@
    -

    Suport CD només d'arrencada +

    Suport CD només d'arrencada

    @@ -360,7 +342,7 @@
    -
    Característiques comunes +
    Característiques comunes
    @@ -406,7 +388,7 @@
    -
    netinstall.iso +
    netinstall.iso
    @@ -417,8 +399,8 @@
    • -

      Només conté programari lliure, per a qui rebutja la utilització de - programari de propietat. +

      Contains only free software, for those people who prefer not to use non-free + software.

      • @@ -431,7 +413,7 @@
      -
      netinstall-nonfree.iso +
      netinstall-nonfree.iso
      @@ -460,7 +442,7 @@
      -

      Baixada i comprovació del mitjà +

      Baixada i comprovació del mitjà

      @@ -471,7 +453,7 @@
      -

      Baixada +

      Baixada

      @@ -480,14 +462,14 @@

      Once you have chosen your ISO file, you can download it using either http or BitTorrent. In both cases, a window gives you some information, such as the - mirror in use and the possibility to change if the bandwidth is to low. If + mirror in use and an opportunity to change if the bandwidth is to low. If http is chosen, you may also see something like

      md5sum and sha1sum are tools to check the ISO integrity. Use only one of them. Keep one of them for further - usage. Then this window appears: + usage. Then a window similar to this one appears:

      @@ -495,11 +477,11 @@
      -
      +
      -

      Comprovació de la integritat del suport baixat +

      Checking the integrity of the downloaded media

      @@ -539,7 +521,7 @@
      -

      Enregistrament o bolcat de l'ISO +

      Enregistrament o bolcat de l'ISO

      @@ -555,7 +537,7 @@
      -

      Enregistrament de l'ISO a un CD/DVD +

      Enregistrament de l'ISO a un CD/DVD

      @@ -574,7 +556,7 @@
      -

      Bolcat de l'ISO a un llapis de memòria USB +

      Bolcat de l'ISO a un llapis de memòria USB

      @@ -605,15 +587,15 @@
      -

      To recover the original capacity, you must redo partitioning and re-format - the USB stick. +

      Per recuperar la capacitat original, heu de refer les particions i tornar a + formatar la memòria USB.

      -
      Using a graphical tool within Mageia +
      Using a graphical tool within Mageia
      @@ -628,7 +610,7 @@
      -
      Using a graphical tool within Windows +
      Using a graphical tool within Windows
      @@ -650,7 +632,7 @@
      -
      Using Command line within a GNU/Linux system +
      Using Command line within a GNU/Linux system
      @@ -741,7 +723,7 @@

      On X=nom del dispositiu, per exemple: /dev/sdc

      -

      Exemple: # dd if=/home/usuari/Baixades/Mageia-4-x86_64-DVD.iso +

      Example: # dd if=/home/user/Downloads/Mageia-6-x86_64-DVD.iso of=/dev/sdb bs=1M

      diff --git a/ca/addUser.html b/ca/addUser.html index b53ddef..b9f9e95 100644 --- a/ca/addUser.html +++ b/ca/addUser.html @@ -23,16 +23,8 @@
      -<<<<<<< HEAD -======= - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -146,19 +138,11 @@

      Any user you add while installing Mageia, will have a both read and write protected home directory (umask=0027).

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      You can add all extra needed users in the Configuration - Summary step during the install. Choose User management.

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      Els permisos d'accés també es poden modificar després de la instal·lació.

      diff --git a/ca/ask_mntpoint_s.html b/ca/ask_mntpoint_s.html index 521c935..090ec33 100644 --- a/ca/ask_mntpoint_s.html +++ b/ca/ask_mntpoint_s.html @@ -6,7 +6,7 @@ - + -
      +
      -

      Particionament personalitzat del disc amb DiskDrake +

      Particions personalitzades del disc amb DiskDrake

      diff --git a/ca/doPartitionDisks.html b/ca/doPartitionDisks.html index 04249d6..efe59cd 100644 --- a/ca/doPartitionDisks.html +++ b/ca/doPartitionDisks.html @@ -2,7 +2,7 @@ - Particionament + Particions @@ -13,11 +13,11 @@ table { font-family: sans-serif; font-size: 13px } --> -
      +
      -

      Particionament +

      Particions

      @@ -30,7 +30,7 @@

      En aquesta pantalla podeu veure en contingut del(s) disc(s) dur(s) i les - propostes de l'auxiliar de particionament de DrakX sobre on instal·lar + propostes de l'auxiliar de particions de DrakX sobre on instal·lar Mageia.

      @@ -42,8 +42,6 @@ - -

        @@ -103,8 +101,6 @@

        - -
      @@ -235,21 +231,17 @@ -

      If you are using a Legacy (as known as CSM or BIOS) system with a GPT disk, - you need to create a Bios boot partition if not already existing. It is an - about 1 MiB partition with no mount point. Choose the "Custom disk - partitioning" option to be able to create it with the Installer like any - other partition, just select BIOS boot partition as filesystem type. +

      Si feu servir un sistema de llegat (Legacy, coneguts com a CSB o BIOS) amb + un disc GPT, heu de crear una partició d'arrencada, boot, si no existeix. És + una partició d'1 MB sense punt de muntatge. Trieu l'opció de "Particions + personalitzades de disc" per poder crear-la amb l'instal·lador com qualsevol + altra partició, només cal seleccionar "partició d'arrencada BIOS" com a + tipus de sistema de fitxers.

      -<<<<<<< HEAD -======= - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 @@ -268,12 +260,12 @@

      Alguns discs nous fan servir ara sectors lògics de 4096 bytes, en lloc dels sectors lògics de 512 bytes, estàndards fins ara. A causa de la manca de - maquinari disponible, l'eina de particionament utilitzada per l'instal·lador - no s'ha pogut provar amb un dispositiu d'aquestes característiques. A més, + maquinari disponible, l'eina de particions utilitzada per l'instal·lador no + s'ha pogut provar amb un dispositiu d'aquestes característiques. A més, alguns discs SSD fan servir actualment un bloc d'esborrament de més d'1 - MB. Si teniu algun d'aquests dispositius, us recomanem de fer un - preparticionament del disc, utilitzant alguna eina de partionament - alternativa, com ara gparted, i feu servir la configuració següent: + MB. Si teniu algun d'aquests dispositius, us recomanem de fer les particions + del disc prèviament, utilitzant alguna eina de particions alternativa, com + ara gparted, i feu servir la configuració següent:

      diff --git a/ca/formatPartitions.html b/ca/formatPartitions.html index efbf7a8..574df34 100644 --- a/ca/formatPartitions.html +++ b/ca/formatPartitions.html @@ -6,7 +6,7 @@ - + -<<<<<<< HEAD

      Licenc és Kiadási megjegyzések -======= -
      -
      -
      -
      -

      Licensz és Kiadási megjegyzések ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      diff --git a/hu/addUser.html b/hu/addUser.html index a889dc2..c6890cc 100644 --- a/hu/addUser.html +++ b/hu/addUser.html @@ -23,30 +23,8 @@
      -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -58,10 +36,6 @@
      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      It is advisable for all Mageia installations to set a superuser or administrator's password, usually called the @@ -72,10 +46,6 @@ just below the first password box, this checks that you have not mistyped the first password by comparing them.

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -96,10 +66,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -111,21 +77,11 @@
      -<<<<<<< HEAD

      Add a user here. A user has fewer rights than the superuser (root), but enough to use the internet, office applications or play games and anything else the average user does with his computer

      -======= - - -

      Add a user here. A user has fewer rights than the superuser (root), but - enough to surf the internet, use office applications or play games and - anything else the average user does with his computer -

      - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
        @@ -145,13 +101,8 @@

      • Login Name: Here you enter the user login name or let -<<<<<<< HEAD drakx use a version of the user's real name. The login name is case sensitive.

        -======= - drakx use a version of the users real name. The login name is case - sensitive.

        ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      • @@ -172,10 +123,6 @@
      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -186,7 +133,6 @@
      -<<<<<<< HEAD

      Any user you add while installing Mageia, will have a both read and write protected home directory (umask=0027).

      @@ -195,29 +141,6 @@ Summary step during the install. Choose User management.

      -======= -

      Any user you add while installing Mageia, will have a world readable (but - write protected) home directory. -

      - - -

      However, while using your new install, any user you add in MCC - - System - Manage users on system will have a home directory that - is both read and write protected. -

      - - -

      If you don't want a world readable home directory for anyone, it is advised - to only add a temporary user now and to add the real one(s) after reboot. -

      - - -

      If you prefer world readable home directories, you might want to add all - extra needed users in the Configuration - Summary step - during the install. Choose User management. -

      - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      The access permissions can also be changed after the install.

      @@ -227,10 +150,6 @@ -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -242,23 +161,12 @@
      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      If the advanced button is clicked you are offered a screen that allows you to edit the settings for the user you are adding.

      -<<<<<<< HEAD - -

      Additionally, you can disable or enable a guest account.

      -======= -

      Additionally, you can disable or enable a guest account.

      - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -278,10 +186,6 @@
      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
        diff --git a/hu/chooseDesktop.html b/hu/chooseDesktop.html index 289b098..f5e9430 100644 --- a/hu/chooseDesktop.html +++ b/hu/chooseDesktop.html @@ -22,49 +22,25 @@
      -<<<<<<< HEAD -======= - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      Depending on your selection here, you may be offered further screens to fine tune your choice.

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      After the selection step(s), you will see a slide show during package installation. The slide show can be disabled by pressing the Details button

      -<<<<<<< HEAD -======= - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      Choose whether you prefer to use the KDE or Gnome desktop environment. Both come with a full set of useful applications and tools. Tick Custom if @@ -73,11 +49,7 @@ LXDE desktop is lighter than the previous two, sporting less eye candy and fewer packages installed by default.

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 diff --git a/hu/choosePackageGroups.html b/hu/choosePackageGroups.html index a046ba9..fa7131c 100644 --- a/hu/choosePackageGroups.html +++ b/hu/choosePackageGroups.html @@ -22,7 +22,6 @@ -<<<<<<< HEAD @@ -30,23 +29,12 @@ -======= - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      Packages have been sorted into groups, to make choosing what you need on your system a lot easier. The groups are fairly self explanatory, however more information about the content of each is available in tool-tips which become visible as the mouse is hovered over them.

      -<<<<<<< HEAD
        @@ -80,40 +68,6 @@ minimal install (without or with X & IceWM).

        -======= - -
        -
          -
        • - -

          Munkaállomás.

          - -
          • -
        • - -

          Kiszolgáló.

          - -
          • -
        • - -

          Grafikus környezet

          - -
          • -
        • - -

          Individual Package Selection: You can use this option to manually add or - remove packages. -

          - -
          • -
        -
        - -

        Read „Minimal Install” for instructions on how to do a - minimal install (without or with X & IceWM). -

        - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      diff --git a/hu/diskdrake.html b/hu/diskdrake.html index 159d44c..7094539 100644 --- a/hu/diskdrake.html +++ b/hu/diskdrake.html @@ -29,21 +29,6 @@ -<<<<<<< HEAD -======= - - - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -104,11 +89,7 @@

      If you are installing Mageia on an UEFI system, check that an ESP (EFI -<<<<<<< HEAD System Partition) is present and correctly mounted on /boot/EFI (see below) -======= - System Partition) is present and correctly mounted on /boot/EFI (see above) ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      @@ -119,7 +100,6 @@
      -<<<<<<< HEAD
      @@ -141,8 +121,6 @@
      -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 diff --git a/hu/doPartitionDisks.html b/hu/doPartitionDisks.html index 811400f..10950ca 100644 --- a/hu/doPartitionDisks.html +++ b/hu/doPartitionDisks.html @@ -221,7 +221,6 @@ -<<<<<<< HEAD
      @@ -248,8 +247,6 @@ -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      diff --git a/hu/exitInstall.html b/hu/exitInstall.html index 390af31..bca3d7d 100644 --- a/hu/exitInstall.html +++ b/hu/exitInstall.html @@ -22,24 +22,11 @@ -<<<<<<< HEAD -======= - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      You have finished installing and configuring @@ -54,7 +41,6 @@

      If you didn't adjust the settings for the bootloader, your Mageia install -<<<<<<< HEAD will be automatically selected and started.

      @@ -66,21 +52,6 @@

      Visit www.mageia.org if you have any questions or want to contribute to Mageia

      -======= - will be automatically selected and started. -

      - - -

      Enjoy! -

      - - -

      Visit www.mageia.org if you have any questions or want to contribute to - Mageia -

      - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 diff --git a/hu/index.html b/hu/index.html index e1ca433..d1b4f0c 100644 --- a/hu/index.html +++ b/hu/index.html @@ -28,13 +28,8 @@
      Bevezetés
      Media
      -<<<<<<< HEAD
      Downloading and Checking Media
      Burn or dump the ISO
      -======= -
      Downloading and Checking Media
      -
      Burn or dump the ISO
      ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      DrakX, the Mageia Installer
      @@ -45,11 +40,7 @@
      Válasszon nyelvet
      -<<<<<<< HEAD
      Licenc és Kiadási megjegyzések
      -======= -
      Licensz és Kiadási megjegyzések
      ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      Licencegyezmény
      @@ -84,7 +75,6 @@
      Rendszerindítási beállítások
      -<<<<<<< HEAD
      Bootloader interface
      Using a Mageia bootloader
      Using an existing bootloader
      @@ -93,19 +83,6 @@
      Add or Modify a Boot Menu Entry
      -======= -
      With a Bios system
      -
      With an UEFI system
      -
      -
      -
      Add or Modify a Boot Menu Entry
      -
      -
      -
      With a Bios system
      -
      With an UEFI system
      -
      -
      ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      Summary of miscellaneous parameters
      @@ -136,11 +113,7 @@
      Uninstalling Mageia
      -<<<<<<< HEAD
      Howto
      -======= -
      Howto
      ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      diff --git a/hu/misc-params.html b/hu/misc-params.html index 1aa2164..cba9c59 100644 --- a/hu/misc-params.html +++ b/hu/misc-params.html @@ -29,31 +29,6 @@ -<<<<<<< HEAD -======= - - - - - - - - - - - - - - - - - - - - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      DrakX made smart choices for the configuration of your system depending on the choices you made and on the hardware DrakX detected. You can check the settings here and change them if you want after pressing @@ -61,7 +36,6 @@

      -<<<<<<< HEAD
      @@ -100,8 +74,6 @@ -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -143,11 +115,7 @@

      -<<<<<<< HEAD

      Do not change anything, unless you know how to configure Grub2 -======= -

      Do not change anything, unless you know how to configure Grub and/or Lilo ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      @@ -212,7 +180,6 @@

      This is where you setup or change your keyboard layout which will depend on your location, language or type of keyboard.

      -<<<<<<< HEAD
      @@ -232,8 +199,6 @@
      -======= ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
    • @@ -252,11 +217,7 @@

      Sound card:

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      The installer uses the default driver, if there is a default one. The option to select a different driver is only given when there is more than one driver for your card, but none of them is the default one. @@ -395,12 +356,8 @@

      Select the services that you wish to have access to your system. Your -<<<<<<< HEAD selections will depend on what you use your computer for. For more information, see ???. -======= - selections will depend on what you use your computer for. ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      diff --git a/hu/selectCountry.html b/hu/selectCountry.html index 0ad230f..f8dc0b5 100644 --- a/hu/selectCountry.html +++ b/hu/selectCountry.html @@ -22,7 +22,6 @@ -<<<<<<< HEAD @@ -31,39 +30,16 @@

      Select your country or region. This is important for all kinds of settings, -======= - - - - - - - - - - - - -

      Select your country or region. This is important for all kinds of settings, ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 like the currency and wireless regulatory domain. Setting the wrong country can lead to not being able to use a Wireless network.

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      If your country isn't in the list, click the Other Countries button and choose your country / region there.

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -72,31 +48,19 @@
      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      If your country is only in the Other Countries list, after clicking OK it may seem a country from the first list was chosen. Please ignore this, DrakX will follow your real choice.

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      @@ -106,7 +70,6 @@
      -<<<<<<< HEAD @@ -120,23 +83,6 @@

      -======= - - - - -

      In the Other Countries 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 - default input method in Mageia DVDs, Africa/India and Asia/no-India - Live-CDs. For Asian and African locales, IBus will be set as default input - method so users should not need to configure it 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
      @@ -145,33 +91,19 @@
      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63

      If you missed the input method setup during installation, you can access it after you boot your installed system via "Configure your Computer" -> "System", or by running localedrake as root.

      -<<<<<<< HEAD -======= - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63
      -<<<<<<< HEAD -======= - - - ->>>>>>> 7d93c82d3a5f5446f0d7370f43a99cb09ddabc63 diff --git a/hu/selectLanguage.html b/hu/selectLanguage.html index b0b4332..841a3d1 100644 --- a/hu/selectLanguage.html +++ b/hu/selectLanguage.html @@ -7,11 +7,7 @@ -<<<<<<< HEAD