diff --git a/build-files/conf/port-make.conf b/build-files/conf/port-make.conf
index b8679f5eb..8dcc9bc96 100644
--- a/build-files/conf/port-make.conf
+++ b/build-files/conf/port-make.conf
@@ -81,6 +81,7 @@ gnupg_SET=GPGSM
gpgme_SET=GPGSM
graveman_SET=MP3 OGG DVD
grip_SET=FAAC FLAC GOGO
+grub2-pcbsd_SET=MKFONT FUSE
gthumb_SET=EXIV2
hal_SET=FIXED_MOUNTPOINTS
hplip_SET=SNMP SCAN XSANE FAX
diff --git a/build-files/ports-overlay/misc/pcbsd-base/Makefile b/build-files/ports-overlay/misc/pcbsd-base/Makefile
index 0226029fa..3c5b06ce2 100644
--- a/build-files/ports-overlay/misc/pcbsd-base/Makefile
+++ b/build-files/ports-overlay/misc/pcbsd-base/Makefile
@@ -113,7 +113,7 @@ RUN_DEPENDS= pc-updategui:${PORTSDIR}/sysutils/pcbsd-utils-qt4 \
paprefs>=0:${PORTSDIR}/audio/paprefs \
pavucontrol>=0:${PORTSDIR}/audio/pavucontrol \
disktype>=0:${PORTSDIR}/sysutils/disktype \
- grub-mkconfig:${PORTSDIR}/sysutils/grub2 \
+ grub-mkconfig:${PORTSDIR}/sysutils/grub2-pcbsd \
grub2-efi>=0:${PORTSDIR}/sysutils/grub2-efi \
unrar:${PORTSDIR}/archivers/unrar \
p7zip:${PORTSDIR}/archivers/p7zip \
diff --git a/build-files/ports-overlay/misc/trueos-base/Makefile b/build-files/ports-overlay/misc/trueos-base/Makefile
index a47a426a8..fad2ea426 100644
--- a/build-files/ports-overlay/misc/trueos-base/Makefile
+++ b/build-files/ports-overlay/misc/trueos-base/Makefile
@@ -36,7 +36,7 @@ RUN_DEPENDS= pkg-static:${PORTSDIR}/ports-mgmt/pkg \
zfs-stats:${PORTSDIR}/sysutils/zfs-stats \
ataidle>=0:${PORTSDIR}/sysutils/ataidle \
panicmail>=0:${PORTSDIR}/sysutils/panicmail \
- grub-mkconfig:${PORTSDIR}/sysutils/grub2 \
+ grub-mkconfig:${PORTSDIR}/sysutils/grub2-pcbsd \
grub2-efi>=0:${PORTSDIR}/sysutils/grub2-efi
NO_BUILD= yes
diff --git a/lumina/lumina-config/i18n/lumina-config_fr.ts b/lumina/lumina-config/i18n/lumina-config_fr.ts
index a8e8c7e26..9d46030d7 100644
--- a/lumina/lumina-config/i18n/lumina-config_fr.ts
+++ b/lumina/lumina-config/i18n/lumina-config_fr.ts
@@ -93,191 +93,154 @@
-
-
+ Hauteur:
-
-
+ pixels
-
-
+ Lieu:
-
-
+ Menu
-
-
+ Défaut Terminal:
-
-
+ Menu Items:
-
-
+ Régler par défaut Terminal Application
-
-
+ Application Binaries (*)
-
-
+ Invalide Binary
-
-
+ Le fichier sélectionné n'est pas exécutable!
-
-
+ Échantillon d'Apparence du panneau
-
-
+ ...
-
-
+ Choisissez la couleur du panneau
QObject
-
-
+ Bouton Utilisateur
-
-
+ Ceci est le bouton principal d'accès au système de l'utilisateur (applications, répertoires, paramètres, se déconnecter).
-
-
+ Desktop Barre
-
-
+ Cette offre des raccourcis pour tout dans le dossier de bureau - permettant un accès facile à tous vos fichiers/applications préférées.
-
-
+ Espaceur
-
-
+ Espacement invisible pour greffons séparés.
-
-
+ Desktop Switcher
-
-
+ Les commandes de commutation entre les différents postes de travail virtuels.
-
-
+ Moniteur de batterie
-
-
+ Gardez une trace de votre état de la batterie.
-
-
+ Heure/Date
-
-
+ Afficher l'heure et la date courante.
-
-
+ Terminal
-
-
+ Lancer le terminal par défaut du système.
-
-
+ Applications
-
-
+ Afficher le menu des applications du système.
-
-
+ Séparateur
-
-
+ Ligne horizontale statique.
-
-
+ Paramètres
-
-
+ Afficher le menu de configuration de bureau.
-
-
+ Gestionnaire des tâches
-
-
+ Voir et contrôler les fenêtres de l'application en cours d'exécution
-
-
+ Plateau de système
-
-
+ Zone d'affichage pour les applications du système fixables
diff --git a/lumina/lumina-open/i18n/lumina-open_fr.ts b/lumina/lumina-open/i18n/lumina-open_fr.ts
index 7254bd0c4..a4c4dc0eb 100644
--- a/lumina/lumina-open/i18n/lumina-open_fr.ts
+++ b/lumina/lumina-open/i18n/lumina-open_fr.ts
@@ -85,23 +85,19 @@
-
-
+ Ouvrir avec...
-
-
+ Préférence
-
-
+ Disponible
-
-
+ Personnaliser
diff --git a/pbi-modules/accessibility/jovie/xdg-desktop/jovie.desktop b/pbi-modules/accessibility/jovie/xdg-desktop/jovie.desktop
index 0ee3a3b32..c19f9e9e5 100644
--- a/pbi-modules/accessibility/jovie/xdg-desktop/jovie.desktop
+++ b/pbi-modules/accessibility/jovie/xdg-desktop/jovie.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=jovie
-GenericName=jovie
Exec=jovie
Path=
Icon=
Categories=
StartupNotify=true
+Name=jovie
+Name[ja]=jovie
+GenericName=jovie
+GenericName[ja]=jovie
diff --git a/pbi-modules/accessibility/jovie/xdg-menu/jovie.desktop b/pbi-modules/accessibility/jovie/xdg-menu/jovie.desktop
index 48be8ef07..8accde5eb 100644
--- a/pbi-modules/accessibility/jovie/xdg-menu/jovie.desktop
+++ b/pbi-modules/accessibility/jovie/xdg-menu/jovie.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=jovie
-GenericName=jovie
Exec=jovie
Path=
Icon=
Categories=Settings
StartupNotify=true
+Name=jovie
+Name[ja]=jovie
+GenericName=jovie
+GenericName[ja]=jovie
diff --git a/pbi-modules/accessibility/kmag/xdg-desktop/kmag.desktop b/pbi-modules/accessibility/kmag/xdg-desktop/kmag.desktop
index 560a91cb7..73fe29df7 100644
--- a/pbi-modules/accessibility/kmag/xdg-desktop/kmag.desktop
+++ b/pbi-modules/accessibility/kmag/xdg-desktop/kmag.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=kmag
-GenericName=kmag
Exec=kmag
Path=
Icon=
Categories=
StartupNotify=true
+Name=kmag
+Name[ja]=kmag
+GenericName=kmag
+GenericName[ja]=kmag
diff --git a/pbi-modules/accessibility/kmag/xdg-menu/kmag.desktop b/pbi-modules/accessibility/kmag/xdg-menu/kmag.desktop
index 99cb84759..22405b513 100644
--- a/pbi-modules/accessibility/kmag/xdg-menu/kmag.desktop
+++ b/pbi-modules/accessibility/kmag/xdg-menu/kmag.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=kmag
-GenericName=kmag
Exec=kmag
Path=
Icon=
Categories=Settings
StartupNotify=true
+Name=kmag
+Name[ja]=kmag
+GenericName=kmag
+GenericName[ja]=kmag
diff --git a/pbi-modules/accessibility/kmousetool/xdg-desktop/kmousetool.desktop b/pbi-modules/accessibility/kmousetool/xdg-desktop/kmousetool.desktop
index b0cfe368b..2fa204aa8 100644
--- a/pbi-modules/accessibility/kmousetool/xdg-desktop/kmousetool.desktop
+++ b/pbi-modules/accessibility/kmousetool/xdg-desktop/kmousetool.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=kmousetool
-GenericName=kmousetool
Exec=kmousetool
Path=
Icon=
Categories=
StartupNotify=true
+Name=kmousetool
+Name[ja]=kmousetool
+GenericName=kmousetool
+GenericName[ja]=kmousetool
diff --git a/pbi-modules/accessibility/kmousetool/xdg-menu/kmousetool.desktop b/pbi-modules/accessibility/kmousetool/xdg-menu/kmousetool.desktop
index e4a4ba843..c03bc1cf3 100644
--- a/pbi-modules/accessibility/kmousetool/xdg-menu/kmousetool.desktop
+++ b/pbi-modules/accessibility/kmousetool/xdg-menu/kmousetool.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=kmousetool
-GenericName=kmousetool
Exec=kmousetool
Path=
Icon=
Categories=Settings
StartupNotify=true
+Name=kmousetool
+Name[ja]=kmousetool
+GenericName=kmousetool
+GenericName[ja]=kmousetool
diff --git a/pbi-modules/accessibility/kmouth/xdg-desktop/kmouth.desktop b/pbi-modules/accessibility/kmouth/xdg-desktop/kmouth.desktop
index 70d796ae0..5818a37ae 100644
--- a/pbi-modules/accessibility/kmouth/xdg-desktop/kmouth.desktop
+++ b/pbi-modules/accessibility/kmouth/xdg-desktop/kmouth.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=kmouth
-GenericName=kmouth
Exec=kmouth
Path=
Icon=
Categories=
StartupNotify=true
+Name=kmouth
+Name[ja]=kmouth
+GenericName=kmouth
+GenericName[ja]=kmouth
diff --git a/pbi-modules/accessibility/kmouth/xdg-menu/kmouth.desktop b/pbi-modules/accessibility/kmouth/xdg-menu/kmouth.desktop
index 857e84001..610436326 100644
--- a/pbi-modules/accessibility/kmouth/xdg-menu/kmouth.desktop
+++ b/pbi-modules/accessibility/kmouth/xdg-menu/kmouth.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=kmouth
-GenericName=kmouth
Exec=kmouth
Path=
Icon=
Categories=Settings
StartupNotify=true
+Name=kmouth
+Name[ja]=kmouth
+GenericName=kmouth
+GenericName[ja]=kmouth
diff --git a/pbi-modules/archivers/ark/xdg-desktop/ark.desktop b/pbi-modules/archivers/ark/xdg-desktop/ark.desktop
index 958ec5620..fe571bea2 100644
--- a/pbi-modules/archivers/ark/xdg-desktop/ark.desktop
+++ b/pbi-modules/archivers/ark/xdg-desktop/ark.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=ark
-GenericName=ark
Exec=ark
Path=
Icon=
Categories=
StartupNotify=true
+Name=ark
+Name[ja]=ark
+GenericName=ark
+GenericName[ja]=ark
diff --git a/pbi-modules/archivers/ark/xdg-menu/ark.desktop b/pbi-modules/archivers/ark/xdg-menu/ark.desktop
index 6d72fd4cb..5b5095212 100644
--- a/pbi-modules/archivers/ark/xdg-menu/ark.desktop
+++ b/pbi-modules/archivers/ark/xdg-menu/ark.desktop
@@ -2,10 +2,12 @@
[Desktop Entry]
Value=1.0
Type=Application
-Name=ark
-GenericName=ark
Exec=ark
Path=
Icon=
Categories=Utility
StartupNotify=true
+Name=ark
+Name[ja]=ark
+GenericName=ark
+GenericName[ja]=ark
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_af.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_af.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_af.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_af.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ar.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ar.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ar.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ar.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_az.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_az.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_az.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_az.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bg.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bg.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bg.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bg.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bn.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bn.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bn.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bn.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bs.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bs.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bs.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_bs.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ca.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ca.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ca.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ca.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_cs.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_cs.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_cs.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_cs.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_cy.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_cy.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_cy.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_cy.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_da.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_da.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_da.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_da.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_de.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_de.ts
index 3e569886b..19c26a7e7 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_de.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_de.ts
@@ -263,5 +263,9 @@
Die Boot-Umgebung kann nicht entfernt werden, wenn sie als Standard eingestellt ist.
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_el.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_el.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_el.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_el.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_en_GB.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_en_GB.ts
index 39052626b..4219af0bc 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_en_GB.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_en_GB.ts
@@ -267,5 +267,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_en_ZA.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_en_ZA.ts
index 39052626b..4219af0bc 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_en_ZA.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_en_ZA.ts
@@ -267,5 +267,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_es.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_es.ts
index 3d4833a63..2726df484 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_es.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_es.ts
@@ -315,5 +315,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_et.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_et.ts
index 577c36317..4b0ead3c4 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_et.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_et.ts
@@ -267,5 +267,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_eu.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_eu.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_eu.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_eu.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fa.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fa.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fa.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fa.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fi.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fi.ts
index 38cc0c17c..9a75a6314 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fi.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fi.ts
@@ -327,5 +327,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr.ts
index 633547066..e97f1ca0b 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr.ts
@@ -249,23 +249,23 @@
-
-
+ Défaut Boot Environment
-
-
+ Vous ne pouvez pas renommer l'environnement d'initialisation qui est actuellement défini par défaut!
-
-
+ Vous ne pouvez pas supprimer l'environnement d'initialisation que vous utilisez actuellement!
-
-
+ Vous ne pouvez pas supprimer l'environnement d'initialisation qui est actuellement défini par défaut!
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr_CA.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr_CA.ts
index 257612bb2..3a9c917d0 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr_CA.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr_CA.ts
@@ -267,5 +267,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_gl.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_gl.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_gl.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_gl.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_he.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_he.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_he.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_he.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hi.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hi.ts
index 06ce661cf..65b792c5b 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hi.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hi.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hr.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hr.ts
index f23fabe6d..104b5fae8 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hr.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hr.ts
@@ -299,5 +299,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hu.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hu.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hu.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_hu.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_id.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_id.ts
index ab5a56d97..144d8b1be 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_id.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_id.ts
@@ -272,5 +272,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_is.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_is.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_is.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_is.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_it.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_it.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_it.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_it.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ja.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ja.ts
index 6f7c99ad9..b6d657fc9 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ja.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ja.ts
@@ -263,5 +263,9 @@
現在デフォルトとして設定されているブート環境を削除することはできません!
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ka.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ka.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ka.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ka.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ko.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ko.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ko.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ko.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_lt.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_lt.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_lt.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_lt.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_lv.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_lv.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_lv.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_lv.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mk.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mk.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mk.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mk.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mn.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mn.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mn.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mn.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ms.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ms.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ms.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ms.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mt.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mt.ts
index 0d67c3a51..810963c1e 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mt.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_mt.ts
@@ -267,5 +267,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_nb.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_nb.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_nb.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_nb.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_nl.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_nl.ts
index 62ff0e0b5..ff95f26ec 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_nl.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_nl.ts
@@ -267,5 +267,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pa.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pa.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pa.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pa.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pl.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pl.ts
index 3721aece4..0f7ebb425 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pl.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pl.ts
@@ -267,5 +267,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pt.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pt.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pt.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pt.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pt_BR.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pt_BR.ts
index f9491fd4e..c9d9657d8 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pt_BR.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_pt_BR.ts
@@ -268,5 +268,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ro.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ro.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ro.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ro.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ru.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ru.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ru.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ru.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sa.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sa.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sa.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sa.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sk.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sk.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sk.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sk.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sl.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sl.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sl.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sl.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sr.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sr.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sr.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sr.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sv.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sv.ts
index 80fe0a543..09c9de52d 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sv.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sv.ts
@@ -272,5 +272,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sw.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sw.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sw.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_sw.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ta.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ta.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ta.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_ta.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_tg.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_tg.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_tg.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_tg.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_th.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_th.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_th.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_th.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_tr.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_tr.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_tr.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_tr.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uk.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uk.ts
index 09400607d..2a6540cc4 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uk.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uk.ts
@@ -263,5 +263,9 @@
Ви не можете видалити оточення завантаження за замовчуванням!
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uz.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uz.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uz.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_uz.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_vi.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_vi.ts
index 533c0ec07..25b3b3710 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_vi.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_vi.ts
@@ -267,5 +267,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_CN.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_CN.ts
index 919a8fe4a..2dab1de1c 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_CN.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_CN.ts
@@ -273,5 +273,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_HK.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_HK.ts
index 9abce821b..9ed956ba5 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_HK.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_HK.ts
@@ -274,5 +274,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_TW.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_TW.ts
index de25a9b41..d94d5a403 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_TW.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zh_TW.ts
@@ -272,5 +272,9 @@
+
+
+
+
diff --git a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zu.ts b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zu.ts
index 4564e9f24..36f606cda 100644
--- a/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zu.ts
+++ b/src-qt4/pc-bootconfig/i18n/pc-bootconfig_zu.ts
@@ -328,5 +328,9 @@
+
+
+
+
diff --git a/src-qt4/pc-controlpanel/backend/cp-itemgroup.cpp b/src-qt4/pc-controlpanel/backend/cp-itemgroup.cpp
index 369bb0349..4adbe3791 100644
--- a/src-qt4/pc-controlpanel/backend/cp-itemgroup.cpp
+++ b/src-qt4/pc-controlpanel/backend/cp-itemgroup.cpp
@@ -89,36 +89,36 @@ bool CItemGroup::checkItemDE(CControlPanelItem &item, const QStringList &enabled
QStringList item_disallowed_de=item.notShowIn();
QString current_de= pcbsd::Utils::currentDesktop().Name.toLower().trimmed();
- // Check allowed desktop environments
- if (item_allowed_de.size())
+ //Check disallowed desktop environments
+ if (item_disallowed_de.size())
{
- for (int i=0 ;iMainWindow
-
-
+ PC-BSD Panneau Contrôle
@@ -38,48 +37,39 @@
-
-
+ Icônes normales
-
-
+ Icônes Larges
-
-
+ Mode Grille
-
-
+ Vue Liste
-
-
+ Système seulement
-
-
+ Tous les bureaux
-
-
+ (Courrant)
-
-
+ Chargement articles...
-
-
+ Disposition articles fixes
diff --git a/src-qt4/pc-controlpanel/i18n/pc-controlpanel_uk.ts b/src-qt4/pc-controlpanel/i18n/pc-controlpanel_uk.ts
index efa31bc9e..00c21e3fb 100644
--- a/src-qt4/pc-controlpanel/i18n/pc-controlpanel_uk.ts
+++ b/src-qt4/pc-controlpanel/i18n/pc-controlpanel_uk.ts
@@ -69,8 +69,7 @@
-
-
+ Фіксоване розташування
diff --git a/src-qt4/pc-controlpanel/items/de/xfce-wmtweaks-settings.desktop b/src-qt4/pc-controlpanel/items/de/xfce-wmtweaks-settings.desktop
index 72e1757a3..044d1183b 100644
--- a/src-qt4/pc-controlpanel/items/de/xfce-wmtweaks-settings.desktop
+++ b/src-qt4/pc-controlpanel/items/de/xfce-wmtweaks-settings.desktop
@@ -7,7 +7,7 @@ Terminal=false
Type=Application
Categories=X-XFCE;Settings;DesktopSettings;X-XfceSettingsDialog;
StartupNotify=true
-OnlyShowIn=XFCE;
+NotShowIn=KDE;
X-XfcePluggable=true
X-XfceHelpFile=xfwm4.html
Name=Window Manager Tweaks
diff --git a/src-qt4/pc-controlpanel/pc-controlpanel.pro b/src-qt4/pc-controlpanel/pc-controlpanel.pro
index b321fceef..9088cc153 100644
--- a/src-qt4/pc-controlpanel/pc-controlpanel.pro
+++ b/src-qt4/pc-controlpanel/pc-controlpanel.pro
@@ -109,7 +109,7 @@ mkdiritems.path=/usr/local/share/pcbsd/pc-controlpanel/items
mkdiritems.extra=mkdir -p $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items
cpitems.path=/usr/local/share/pcbsd/pc-controlpanel/items
-cpitems.extra=tar cvf - --exclude '.svn/' -C items . 2>/dev/null | tar xvf - -C $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items 2>/dev/null
+cpitems.extra=tar cvf - --exclude '.svn/' -C items . 2>/dev/null | tar xvf - -C $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items && chmod -R 0555 $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/items 2>/dev/null
mkdiricons.path=/usr/local/share/pcbsd/pc-controlpanel/icons
mkdiricons.extra=mkdir -p $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/icons
@@ -117,6 +117,7 @@ mkdiricons.extra=mkdir -p $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/
cpicons.path=/usr/local/share/pcbsd/pc-controlpanel/items
cpicons.extra=tar cvf - --exclude '.svn/' -C icons . 2>/dev/null | tar xvf - -C $(INSTALL_ROOT)/usr/local/share/pcbsd/pc-controlpanel/icons 2>/dev/null
+
INSTALLS += target desktop cleanitems mkdiritems cpitems mkdiricons cpicons dotrans
RESOURCES += \
diff --git a/src-qt4/pc-firstbootgui/i18n/FirstBoot_fr.ts b/src-qt4/pc-firstbootgui/i18n/FirstBoot_fr.ts
index 460b1f1b4..cd24b1b71 100644
--- a/src-qt4/pc-firstbootgui/i18n/FirstBoot_fr.ts
+++ b/src-qt4/pc-firstbootgui/i18n/FirstBoot_fr.ts
@@ -114,18 +114,15 @@
-
-
+ S'il vous plaît sélectionner le fuseau horaire de votre région.
-
-
+ Peut être utilisé lors de dual-boot
-
-
+ Paramétrage du BIOS à l'heure UTC
diff --git a/src-qt4/pc-installgui/i18n/SysInstaller_fr.ts b/src-qt4/pc-installgui/i18n/SysInstaller_fr.ts
index 77af93305..5bb47c365 100644
--- a/src-qt4/pc-installgui/i18n/SysInstaller_fr.ts
+++ b/src-qt4/pc-installgui/i18n/SysInstaller_fr.ts
@@ -696,28 +696,23 @@ Click Finish to reboot. After rebooting you may eject the install media.
-
-
+ ZFS permet l'utilisation de cache de lecture (L2Arc) d'écrire et d'identifier les appareils (ZIL). Si vous souhaitez activer un des deux, s'il vous plaît sélectionnez les disques à utiliser ci-dessous.
-
-
+ Activer dispositif de cache
-
-
+ Activer périphérique de journal
-
-
+ PC-BSD peut crypter vos disques à l'aide du cadre de GELI. C'est chiffrement complet des disques nécessitera un mot de passe au démarrage. Si vous souhaitez crypter uniquement les données des utilisateurs, cryptage home-directory est disponible après l'installation.
-
-
+ Disque Chiffrer avec GELI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_af.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_af.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_af.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_af.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ar.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ar.ts
index 81905b0ed..41d9e4d35 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ar.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ar.ts
@@ -533,11 +533,6 @@
-
-
-
-
-
@@ -723,6 +718,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_az.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_az.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_az.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_az.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bg.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bg.ts
index d7abd1f19..8cadaff65 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bg.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bg.ts
@@ -533,11 +533,6 @@
-
-
-
-
-
@@ -723,6 +718,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bn.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bn.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bn.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bn.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bs.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bs.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bs.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_bs.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ca.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ca.ts
index b22609025..61d22d810 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ca.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ca.ts
@@ -533,11 +533,6 @@
-
-
-
-
-
@@ -723,6 +718,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_cs.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_cs.ts
index 90c9625aa..bafe3c9dc 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_cs.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_cs.ts
@@ -533,11 +533,6 @@
-
-
-
-
-
@@ -723,6 +718,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_cy.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_cy.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_cy.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_cy.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_da.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_da.ts
index 00862b73e..65cc650ee 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_da.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_da.ts
@@ -533,11 +533,6 @@
-
-
-
-
-
@@ -723,6 +718,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_de.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_de.ts
index 4acfe705f..7db994398 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_de.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_de.ts
@@ -439,10 +439,6 @@ Damit dies funktioniert müssen Sie in Ihrer Desktopumgebung diese richtig einge
Bitte warten. Bildschirmfotos werden heruntergeladen.
-
-
- Kann Bildschirmfotos nicht herunterladen (Netzwerkfehler)
-
Anwendungen verfügbar: %1
@@ -600,6 +596,30 @@ Damit dies funktioniert müssen Sie in Ihrer Desktopumgebung diese richtig einge
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_el.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_el.ts
index 6805f3b66..a18170aca 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_el.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_el.ts
@@ -523,11 +523,6 @@
-
-
-
-
-
@@ -713,6 +708,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_GB.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_GB.ts
index 8d0539dc3..f61ba419b 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_GB.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_GB.ts
@@ -439,10 +439,6 @@
Please wait. Downloading Screenshot.
-
-
- Could not load screenshot (network error)
-
Applications Available: %1
@@ -601,6 +597,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_ZA.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_ZA.ts
index 5f5135501..6a44f5776 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_ZA.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_en_ZA.ts
@@ -439,10 +439,6 @@
Please wait. Downloading Screenshot.
-
-
- Could not load screenshot (network error)
-
Applications Available: %1
@@ -601,6 +597,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_es.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_es.ts
index a6e523ece..11b41af02 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_es.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_es.ts
@@ -505,11 +505,6 @@
-
-
-
-
-
@@ -695,6 +690,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_et.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_et.ts
index 584a7e8a4..08b8d9182 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_et.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_et.ts
@@ -481,11 +481,6 @@ Selleks peab meiliklient olema seadistatud. Kui ei ole, siis saab allolevale aad
-
-
-
-
-
@@ -671,6 +666,30 @@ Selleks peab meiliklient olema seadistatud. Kui ei ole, siis saab allolevale aad
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_eu.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_eu.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_eu.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_eu.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fa.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fa.ts
index e4cc3db7c..fec131691 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fa.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fa.ts
@@ -529,11 +529,6 @@
-
-
-
-
-
@@ -719,6 +714,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fi.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fi.ts
index 726128bf1..28d034012 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fi.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fi.ts
@@ -514,11 +514,6 @@
-
-
-
-
-
@@ -704,6 +699,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts
index 2b39b69f9..7d063cf92 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts
@@ -439,10 +439,6 @@ Vous devez avoir cette configuration dans votre environnement de bureau actuel p
S'il vous plaît attendre. Téléchargement Capture d'écran.
-
-
- Impossible de charger l'écran (erreur réseau)
-
Applications disponibles: %1
@@ -533,78 +529,87 @@ Vous devez avoir cette configuration dans votre environnement de bureau actuel p
-
-
+ Nouveau
-
-
+ Montrer les paquets orphelins
-
-
+ Opération
-
-
+ Visualiser la pleine dimension
-
-
+ Auteur inconnu
-
-
+ Vulnérabilité Infos
-
-
+ toolBar
-
-
+ Attention
-
-
+ Jail Installation Avertissement
-
-
+ Jail Vérification
-
-
+ Actualiser la liste des prisons disponibles.
-
-
+ Système
-
-
+ Jail:
-
-
+ Installation ou mise à jour des applications dans un Jail synchronisera automatiquement la configuration paquet de référentiel dans le Jail de la configuration actuelle du système.
-
-
+ En prison: %1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -643,8 +648,7 @@ Vous devez avoir cette configuration dans votre environnement de bureau actuel p
-
-
+ Téléchargement: %1 (%2% of %3)
@@ -743,8 +747,7 @@ Vous devez avoir cette configuration dans votre environnement de bureau actuel p
-
-
+ Téléchargement %1 (%2% of %3)
@@ -758,13 +761,11 @@ Vous devez avoir cette configuration dans votre environnement de bureau actuel p
SSDialog
-
-
+ Capture d'écran de l'application
-
-
+ Fermer Captures d'écran
@@ -807,13 +808,11 @@ Vous devez avoir cette configuration dans votre environnement de bureau actuel p
-
-
+ Vue d'ensemble
-
-
+ Mettre à jour les détails
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts
index d70412b8d..898fdea36 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts
@@ -481,11 +481,6 @@ Vous devez avoir cette configuration dans votre environnement de bureau actuel p
-
-
-
-
-
@@ -671,6 +666,30 @@ Vous devez avoir cette configuration dans votre environnement de bureau actuel p
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fur.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fur.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fur.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_fur.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_gl.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_gl.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_gl.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_gl.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_he.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_he.ts
index 63af6b130..86cbcf5d5 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_he.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_he.ts
@@ -538,11 +538,6 @@
-
-
-
-
-
@@ -728,6 +723,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hi.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hi.ts
index 7572aeac4..a00ea3ea0 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hi.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hi.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hr.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hr.ts
index 1e889e20d..bc0438400 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hr.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hr.ts
@@ -512,11 +512,6 @@
-
-
-
-
-
@@ -702,6 +697,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hu.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hu.ts
index 028500bf1..0083a4702 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hu.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_hu.ts
@@ -529,11 +529,6 @@
-
-
-
-
-
@@ -719,6 +714,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_id.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_id.ts
index 05a35790a..7c314dcdc 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_id.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_id.ts
@@ -494,11 +494,6 @@
-
-
-
-
-
@@ -684,6 +679,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_is.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_is.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_is.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_is.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_it.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_it.ts
index b64aec30a..ee53db598 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_it.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_it.ts
@@ -529,11 +529,6 @@
-
-
-
-
-
@@ -719,6 +714,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ja.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ja.ts
index fd1bfb8f9..db232d7b0 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ja.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ja.ts
@@ -439,10 +439,6 @@
スクリーンショットダウンロードしています。しばらくお待ちください。
-
-
- スクリーンショットを読み込むことができませんでした (ネットワークエラー)
-
利用できるアプリケーション: %1
@@ -591,6 +587,30 @@
jailの中へ: %1
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ka.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ka.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ka.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ka.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ko.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ko.ts
index 4c563adb7..691ea56ee 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ko.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ko.ts
@@ -506,11 +506,6 @@
-
-
-
-
-
@@ -696,6 +691,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_lt.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_lt.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_lt.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_lt.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_lv.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_lv.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_lv.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_lv.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mk.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mk.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mk.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mk.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mn.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mn.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mn.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mn.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ms.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ms.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ms.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ms.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mt.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mt.ts
index 74f2f5884..9012264fa 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mt.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_mt.ts
@@ -481,11 +481,6 @@ Irid ikollok dan setup fl-ambjent tiegħek desktop kurrenti biex dan jaħdem sew
-
-
-
-
-
@@ -671,6 +666,30 @@ Irid ikollok dan setup fl-ambjent tiegħek desktop kurrenti biex dan jaħdem sew
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_nb.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_nb.ts
index e7e169820..212bbb84a 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_nb.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_nb.ts
@@ -511,11 +511,6 @@
-
-
-
-
-
@@ -701,6 +696,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ne.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ne.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ne.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ne.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts
index 8636732ca..ec27f3947 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_nl.ts
@@ -494,11 +494,6 @@
-
-
-
-
-
@@ -684,6 +679,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pa.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pa.ts
index 1cc516d1f..0bfe341f1 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pa.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pa.ts
@@ -540,11 +540,6 @@
-
-
-
-
-
@@ -730,6 +725,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pl.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pl.ts
index 4d347043b..e11530b3b 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pl.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pl.ts
@@ -481,11 +481,6 @@
-
-
-
-
-
@@ -671,6 +666,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt_BR.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt_BR.ts
index e2a4a0855..31e53e554 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt_BR.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_pt_BR.ts
@@ -455,10 +455,6 @@
Por favor aguarde. Baixando imagem.
-
-
- Não foi possível carregar imagem (erro de rede)
-
Aplicativos disponíveis: %1
@@ -623,6 +619,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ro.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ro.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ro.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ro.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ru.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ru.ts
index 14d56a9cc..fcdaa39f2 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ru.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ru.ts
@@ -529,11 +529,6 @@
-
-
-
-
-
@@ -719,6 +714,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sa.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sa.ts
index f3f40116e..3a52f385d 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sa.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sa.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sk.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sk.ts
index 21d7b3eae..6e64b254d 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sk.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sk.ts
@@ -540,11 +540,6 @@
-
-
-
-
-
@@ -730,6 +725,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sl.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sl.ts
index 2c6b10c73..748c77f50 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sl.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sl.ts
@@ -540,11 +540,6 @@
-
-
-
-
-
@@ -730,6 +725,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sr.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sr.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sr.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sr.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sv.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sv.ts
index 17831510c..eecb8bf01 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sv.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sv.ts
@@ -494,11 +494,6 @@
-
-
-
-
-
@@ -684,6 +679,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sw.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sw.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sw.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_sw.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ta.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ta.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ta.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_ta.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_tg.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_tg.ts
index 75c937c6e..1a0eee6b2 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_tg.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_tg.ts
@@ -530,11 +530,6 @@
-
-
-
-
-
@@ -720,6 +715,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_th.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_th.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_th.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_th.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_tr.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_tr.ts
index 15199a7fa..8c78bc0f4 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_tr.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_tr.ts
@@ -529,11 +529,6 @@
-
-
-
-
-
@@ -719,6 +714,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_uk.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_uk.ts
index da19f79fa..13f2dbddc 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_uk.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_uk.ts
@@ -439,10 +439,6 @@
Завантаження знімку екрану. Будь ласка зачекайте.
-
-
- Не вдалося завантажити знімок екрану через помилку мережі
-
Наявно додатків: %1
@@ -600,6 +596,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_uz.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_uz.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_uz.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_uz.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_vi.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_vi.ts
index 619a990d4..7157b9ac9 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_vi.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_vi.ts
@@ -481,11 +481,6 @@ Bạn phải có thiết lập này trong môi trường máy tính để bàn h
-
-
-
-
-
@@ -671,6 +666,30 @@ Bạn phải có thiết lập này trong môi trường máy tính để bàn h
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_CN.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_CN.ts
index d69d3809f..0752be865 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_CN.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_CN.ts
@@ -494,11 +494,6 @@
-
-
-
-
-
@@ -684,6 +679,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_HK.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_HK.ts
index 5506c1fc9..b6caa8538 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_HK.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_HK.ts
@@ -496,11 +496,6 @@
-
-
-
-
-
@@ -686,6 +681,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_TW.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_TW.ts
index 9cdf65409..b9332ceb7 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_TW.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zh_TW.ts
@@ -494,11 +494,6 @@
-
-
-
-
-
@@ -684,6 +679,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zu.ts b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zu.ts
index ae73f5ec6..010bdacea 100644
--- a/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zu.ts
+++ b/src-qt4/pc-softwaremanager/i18n/SoftwareManager_zu.ts
@@ -545,11 +545,6 @@
-
-
-
-
-
@@ -735,6 +730,30 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
MigrateUI
diff --git a/src-qt4/pc-updategui/i18n/UpdateGui_fr.ts b/src-qt4/pc-updategui/i18n/UpdateGui_fr.ts
index dc1c3bd50..4494e1981 100644
--- a/src-qt4/pc-updategui/i18n/UpdateGui_fr.ts
+++ b/src-qt4/pc-updategui/i18n/UpdateGui_fr.ts
@@ -153,7 +153,7 @@
- Redémarrage requis pour terminer la mise à jour!
+ Redémarrage requis pour terminer la mise à jour!
@@ -161,18 +161,15 @@
-
-
+ Création d'un nouveau démarrage d'environnement... S'il vous plaît patienter...
-
-
+ Vérification échouée!
-
-
+ freebsd-update n'a pas réussi à vérifier les mises à jour. S'il vous plaît vérifier votre connexion Internet.
diff --git a/src-qt4/pc-updategui/i18n/UpdateGui_uk.ts b/src-qt4/pc-updategui/i18n/UpdateGui_uk.ts
index 7e95cfc57..caa83401b 100644
--- a/src-qt4/pc-updategui/i18n/UpdateGui_uk.ts
+++ b/src-qt4/pc-updategui/i18n/UpdateGui_uk.ts
@@ -161,18 +161,15 @@
-
-
+ Створення нового оточення завантаження.... Будь ласка зачекайте...
-
-
+ Не вдала перевірка!
-
-
+ freebsd-update не вдалося перевірити наявність оновлень. Будь ласка перевірте з'єднання з мережею.
diff --git a/src-qt4/warden-gui/i18n/Warden_fr.ts b/src-qt4/warden-gui/i18n/Warden_fr.ts
index 02eaa8ea7..872bb849e 100644
--- a/src-qt4/warden-gui/i18n/Warden_fr.ts
+++ b/src-qt4/warden-gui/i18n/Warden_fr.ts
@@ -672,23 +672,19 @@
-
-
+ Aucune étiquette
-
-
+ Capture de commentaire
-
-
+ Exécutez AppCafe pour ce Jail. (Jail doit être en cours d'exécution)
-
-
+ AppCafe
diff --git a/src-qt4/xtrafiles/local/share/pcbsd/doc/handbook_en.pdf b/src-qt4/xtrafiles/local/share/pcbsd/doc/handbook_en.pdf
index fadc57c97..d809814d1 100644
Binary files a/src-qt4/xtrafiles/local/share/pcbsd/doc/handbook_en.pdf and b/src-qt4/xtrafiles/local/share/pcbsd/doc/handbook_en.pdf differ
diff --git a/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/00_header b/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/00_header
deleted file mode 100755
index 10d8b96f9..000000000
--- a/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/00_header
+++ /dev/null
@@ -1,335 +0,0 @@
-#! /bin/sh
-set -e
-
-# grub-mkconfig helper script.
-# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
-#
-# GRUB is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GRUB is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GRUB. If not, see .
-
-transform="s,x,x,"
-
-prefix="/usr/local"
-exec_prefix="${prefix}"
-datarootdir="${prefix}/share"
-grub_lang=`echo $LANG | cut -d . -f 1`
-
-export TEXTDOMAIN=grub
-export TEXTDOMAINDIR="/usr/local/share/locale"
-
-. "${datarootdir}/grub/grub-mkconfig_lib"
-
-# Set indicator that we haven't written device access yet
-haveDevAccess=0
-
-# Do this as early as possible, since other commands might depend on it.
-# (e.g. the `loadfont' command might need lvm or raid modules)
-for i in ${GRUB_PRELOAD_MODULES} ; do
- echo "insmod $i"
-done
-
-if [ "x${GRUB_DEFAULT}" = "x" ] ; then GRUB_DEFAULT=0 ; fi
-if [ "x${GRUB_DEFAULT}" = "xsaved" ] ; then GRUB_DEFAULT='${saved_entry}' ; fi
-if [ "x${GRUB_TIMEOUT}" = "x" ] ; then GRUB_TIMEOUT=5 ; fi
-if [ "x${GRUB_GFXMODE}" = "x" ] ; then GRUB_GFXMODE=auto ; fi
-
-# Check if we have more than one BE, and need to show the menu by default
-beNum=`beadm list 2>/dev/null | grep -v 'Mountpoint' | wc -l | awk '{print $1}'`
-if [ $beNum -gt 1 ] ; then GRUB_HIDDEN_TIMEOUT=""; fi
-
-if [ "x${GRUB_DEFAULT_BUTTON}" = "x" ] ; then GRUB_DEFAULT_BUTTON="$GRUB_DEFAULT" ; fi
-if [ "x${GRUB_DEFAULT_BUTTON}" = "xsaved" ] ; then GRUB_DEFAULT_BUTTON='${saved_entry}' ; fi
-if [ "x${GRUB_TIMEOUT_BUTTON}" = "x" ] ; then GRUB_TIMEOUT_BUTTON="$GRUB_TIMEOUT" ; fi
-
-cat << EOF
-if [ -s \$prefix/grubenv ]; then
- load_env
-fi
-EOF
-if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
- cat < /dev/null ; then
- font_path="${path}"
- else
- continue
- fi
- break 2
- done
- done
- if [ -n "${font_path}" ] ; then
- cat << EOF
-if [ x\$feature_default_font_path = xy ] ; then
- font=unicode
-else
-EOF
- # Make the font accessible
- if [ $haveDevAccess -ne 1 ] ; then
- haveDevAccess=1
- prepare_grub_to_access_device `${grub_probe} --target=device "${font_path}"`
- fi
- cat << EOF
- font="`make_system_path_relative_to_its_root "${font_path}"`"
-fi
-
-if loadfont \$font ; then
-EOF
- else
- cat << EOF
-if loadfont unicode ; then
-EOF
- fi
- fi
-
- cat << EOF
- set gfxmode=${GRUB_GFXMODE}
- load_video
- insmod gfxterm
-EOF
-
-# Gettext variables and module
-if [ "x${LANG}" != "xC" -a "x${grub_lang}" != "xen_US" ] ; then
- cat << EOF
- set locale_dir=\$prefix/locale
- set lang=${grub_lang}
- insmod gettext
-EOF
-fi
-
-cat <&2
-
- if [ $haveDevAccess -ne 1 ] ; then
- haveDevAccess=1
- prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_THEME"`
- fi
- cat << EOF
-insmod gfxmenu
-EOF
- themedir="`dirname "$GRUB_THEME"`"
- for x in "$themedir"/*.pf2 "$themedir"/f/*.pf2; do
- if [ -f "$x" ]; then
- cat << EOF
-loadfont (\$root)`make_system_path_relative_to_its_root $x`
-EOF
- fi
- done
- if [ x"`echo "$themedir"/*.jpg`" != x"$themedir/*.jpg" ] || [ x"`echo "$themedir"/*.jpeg`" != x"$themedir/*.jpeg" ]; then
- cat << EOF
-insmod jpeg
-EOF
- fi
- if [ x"`echo "$themedir"/*.png`" != x"$themedir/*.png" ]; then
- cat << EOF
-insmod png
-EOF
- fi
- if [ x"`echo "$themedir"/*.tga`" != x"$themedir/*.tga" ]; then
- cat << EOF
-insmod tga
-EOF
- fi
-
- cat << EOF
-set theme=(\$root)`make_system_path_relative_to_its_root $GRUB_THEME`
-export theme
-EOF
- elif [ "x$GRUB_BACKGROUND" != x ] && [ -f "$GRUB_BACKGROUND" ] \
- && is_path_readable_by_grub "$GRUB_BACKGROUND"; then
- gettext_printf "Found background: %s\n" "$GRUB_BACKGROUND" >&2
- case "$GRUB_BACKGROUND" in
- *.png) reader=png ;;
- *.tga) reader=tga ;;
- *.jpg|*.jpeg) reader=jpeg ;;
- *) gettext "Unsupported image format" >&2; echo >&2; exit 1 ;;
- esac
- if [ $haveDevAccess -ne 1 ] ; then
- haveDevAccess=1
- prepare_grub_to_access_device `${grub_probe} --target=device "$GRUB_BACKGROUND"`
- fi
- cat << EOF
-insmod $reader
-background_image -m stretch `make_system_path_relative_to_its_root "$GRUB_BACKGROUND"`
-EOF
- fi
-fi
-
-make_timeout ()
-{
- if [ "x${1}" != "x" ] ; then
- if [ "x${GRUB_HIDDEN_TIMEOUT_QUIET}" = "xtrue" ] ; then
- verbose=
- else
- verbose=" --verbose"
- fi
- cat << EOF
-echo "Hold Left-Shift for menu.."
-if sleep$verbose --interruptible ${1} ; then
- if keystatus --shift; then
- set timeout=-1
- else
- set timeout=0
- fi
-fi
-EOF
- else
- cat << EOF
-set timeout=${2}
-EOF
- fi
-}
-
-if [ "x$GRUB_BUTTON_CMOS_ADDRESS" != "x" ]; then
- cat </dev/null
- if [ $? -ne 0 ] ; then
- echo "Failed to mount ${1}" >&2
- return
- fi
- else
- fMnt=""
- fi
-
- # Create our placeholder to save _load entries to parse
- touch /tmp/.lRObjs.$$
- touch /tmp/.lSysCtls.$$
-
- # Loader files, in order of which to read them
- lFiles="${fMnt}/boot/loader.conf.local ${fMnt}/boot/loader.conf ${fMnt}/boot/loader.conf.trueos ${fMnt}/boot/loader.conf.pcbsd"
- for f in $lFiles
- do
- if [ ! -e "$f" ] ; then continue ; fi
-
- # Lets parse any of the _load= lines
- grep "_load=" ${f} | grep -v "^#" >/tmp/.lObjs.$$
- while read line
- do
- loadVal="`echo $line | cut -d '=' -f 1`"
- # Is this value already set in a higher priority file?
- grep -q "^${loadVal}" /tmp/.lRObjs.$$
- if [ $? -eq 0 ];then continue; fi
-
- # Save this value for later
- echo "$line" >> /tmp/.lRObjs.$$
- haveObjs=1
-
- done < /tmp/.lObjs.$$
- rm /tmp/.lObjs.$$
-
- # Lets look for any sysctls to set
- grep "." ${f} | grep "=" | grep -v "^#" | grep -v "_load" >/tmp/.sObjs.$$
- while read line
- do
- loadVal="`echo $line | cut -d '=' -f 1`"
- # Is this value already set in a higher priority file?
- grep -q "^${loadVal}" /tmp/.lSysCtls.$$
- if [ $? -eq 0 ];then continue; fi
-
- # Save this value for later
- echo "$line" >> /tmp/.lSysCtls.$$
- haveSysCtls=1
-
- done < /tmp/.sObjs.$$
- rm /tmp/.sObjs.$$
- done
-
- # Now lets echo out the modules to load
- if [ "$haveObjs" = "1" ] ; then
- while read line
- do
- echo "$line" | grep -q '"YES"'
- if [ $? -ne 0 ] ; then continue ; fi
- module="`echo $line | cut -d '=' -f 1 | sed 's|_load||g'`"
- # Try to locate module now
- if [ -e "${fMnt}/boot/kernel/${module}.ko" ] ; then
- mPath="kernel"
- elif [ -e "${fMnt}/boot/modules/${module}.ko" ] ; then
- mPath="modules"
- else
- # This isn't a module that we can see, lets set it as a variable
- #echo "No such module $line, setting as a variable" >&2
- echo "$line" >> /tmp/.lSysCtls.$$
- continue
- fi
- echo " kfreebsd_module_elf ${loadPrefix}/@/boot/${mPath}/${module}.ko"
- done < /tmp/.lRObjs.$$
- fi
-
- # Any sysctls to set?
- if [ "$haveSysCtls" = "1" ] ; then
- while read line
- do
- # Strip out the vfs.root.mountfrom, we set that elsewhere
- echo "$line" | grep -q "vfs.root.mountfrom"
- if [ $? -eq 0 ] ; then continue ; fi
-
- val="`echo $line | sed 's|"||g'`"
- echo " set kFreeBSD.${val}"
- done < /tmp/.lSysCtls.$$
- fi
-
- rm /tmp/.lRObjs.$$
- rm /tmp/.lSysCtls.$$
- if [ -n "$1" ] ; then
- umount /mnt.$$ >/dev/null
- rmdir /mnt.$$ >/dev/null
- fi
-}
-
-detect_beadm()
-{
- which -s beadm
- if [ $? -ne 0 ] ; then return 0; fi
-
- # Check if we are running from the installer and use its beadm
- if [ -e "/root/beadm.install" ] ; then
- BEADM="/root/beadm.install"
- else
- BEADM="`which beadm`"
- fi
-
- ${BEADM} list >/dev/null 2>/dev/null
- if [ $? -ne 0 ] ; then return 0; fi
-
-
- if [ -e "/etc/defaults/pcbsd" ] ; then
- NICK="PC-BSD"
- else
- NICK="TrueOS"
- fi
-
- # Get list of beadm datasets
- for b in `${BEADM} list 2>/dev/null| grep -v "Created" | cut -d ' ' -f 1`
- do
- # Got a beadm snapshot, lets get the complete dataset name
- beLine=`${BEADM} list -a | grep "/$BEDS/${b}"`
- cdataset=`echo $beLine | awk '{print $1}'`
- cdatadate=`echo $beLine | awk '{print $5}'`
- cdatatime=`echo $beLine | awk '{print $6}'`
- ztank=`echo $cdataset | cut -d '/' -f 1`
- shortdataset="/`echo $cdataset | cut -d '/' -f 2-5`"
-
- # First part of this dataset
- cat > /tmp/.grubdataset.$$.1 << EOF
- insmod zfs
- search --no-floppy -s -l $ztank
-EOF
-
- # Second part of loader to save
- cat > /tmp/.grubdataset.$$.2 << EOF
- kfreebsd_module ${shortdataset}/@/boot/zfs/zpool.cache type=/boot/zfs/zpool.cache
- set kFreeBSD.vfs.root.mountfrom=zfs:$cdataset
-EOF
-
- # Now lets look for options in loader.conf to load
- loadPrefix="${shortdataset}"
- # If this is the current mounted dataset, we can skip mounting it
- mount | grep -q -e "$cdataset on / (" -e "$cdataset on /mnt ("
- if [ $? -eq 0 ] ; then
- display_loaderopts >>/tmp/.grubdataset.$$.2
- else
- display_loaderopts $cdataset >> /tmp/.grubdataset.$$.2
- fi
-
- # Lets start a submenu for each BE
-cat << EOF
-# Start TrueOS BE Submenu
-submenu "${NICK} ($b) - ${cdatadate} ${cdatatime}" {
-EOF
-
- # Lets do the default entry first
- #################################
- cat << EOF
- menuentry "Normal Bootup" {
-EOF
- # Get the dataset guts
- cat /tmp/.grubdataset.$$.1
- echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel"
- echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
- cat /tmp/.grubdataset.$$.2
-
- # Set any options
- cat << EOF
- }
-EOF
-
- # Next lets do single user mode
- #################################
- cat << EOF
- menuentry "Single User Mode" {
-EOF
- # Get the dataset guts
- cat /tmp/.grubdataset.$$.1
- echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel -s"
- echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
- cat /tmp/.grubdataset.$$.2
-
- # Set any options
- cat << EOF
- }
-EOF
-
- # Next lets do verbose mode
- #################################
- cat << EOF
- menuentry "Verbose Mode" {
-EOF
- # Get the dataset guts
- cat /tmp/.grubdataset.$$.1
- echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel -v"
- echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
- cat /tmp/.grubdataset.$$.2
-
- # Set any options
- cat << EOF
- }
-EOF
-
- if [ -e "/etc/defaults/pcbsd" ] ; then
- # Next lets do display wizard
- #################################
- cat << EOF
- menuentry "Run the Display Wizard" {
-EOF
- # Get the dataset guts
- cat /tmp/.grubdataset.$$.1
- echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel"
- echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
- cat /tmp/.grubdataset.$$.2
-
- # Set any options
- cat << EOF
- set kFreeBSD.runwiz=YES
- }
-EOF
- # Now for vesa mode
- #################################
- cat << EOF
- menuentry "Run X in vesa mode" {
-EOF
- # Get the dataset guts
- cat /tmp/.grubdataset.$$.1
- echo " kfreebsd ${shortdataset}/@/boot/kernel/kernel"
- echo " kfreebsd_loadenv ${shortdataset}@/boot/device.hints"
- cat /tmp/.grubdataset.$$.2
-
- # Set any options
- cat << EOF
- set kFreeBSD.xvesa=YES
- }
-EOF
- fi
-
-
- # Lastly lets close the submenu section
- cat << EOF
-}
-# End TrueOS BE
-
-EOF
- done
-
- # Cleanup after ourselves
- if [ -e "/tmp/.grubdataset.$$.1" ] ; then
- rm /tmp/.grubdataset.$$.1
- rm /tmp/.grubdataset.$$.2
- fi
-}
-
-# Detect our types of disk layouts
-detect_beadm
-
diff --git a/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/30_os-prober b/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/30_os-prober
deleted file mode 100755
index 52efd9043..000000000
--- a/src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/grub.d/30_os-prober
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/bin/sh
-#
-# Copyright 2013 iXsystems (Kris Moore)
-# All rights reserved
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted providing that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
-#
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
-# IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-
-# Script to detect other NON BSD OS's and add to grub.cfg
-
-check_ntfs_part()
-{
- local disk="$1"
- fs_label=`grub-probe --device /dev/${disk} --target=fs_label`
-
- # Check for common windows NTFS labels for bootable partitions
- if [ "$fs_label" != "System Reserved" -a "$fs_label" != "OS" -a "$fs_label" != "SYSTEM" ] ; then return; fi
-
- fs_uuid=`grub-probe --device /dev/${disk} --target=fs_uuid`
- if [ -z "$fs_uuid" ] ; then
- echo "Warning: Could not get fs_uuid for $disk"
- return
- fi
-
- cat << EOF
-menuentry "Microsoft Windows ($disk)" {
- search --no-floppy --fs-uuid --set=root $fs_uuid
- chainloader +1
-}
-EOF
-}
-
-# Start by looking for disks
-for disk in `cd /dev/ && ls ada[0-9]s[0-9] da[0-9]s[0-9] ada[0-9]p[0-9] da[0-9]p[0-9] 2>/dev/null`
-do
-
- # Start checking for NTFS
- fs_type=`grub-probe --device /dev/${disk} --target=fs 2>/dev/null`
- case $fs_type in
- ntfs) check_ntfs_part "$disk" ;;
- *) ;; # Unknown for now, add more!
- esac
-done
diff --git a/src-sh/pc-extractoverlay/ports-overlay/usr/local/sbin/grub-mkconfig b/src-sh/pc-extractoverlay/ports-overlay/usr/local/sbin/grub-mkconfig
deleted file mode 100755
index cd45bd51f..000000000
--- a/src-sh/pc-extractoverlay/ports-overlay/usr/local/sbin/grub-mkconfig
+++ /dev/null
@@ -1,331 +0,0 @@
-#! /bin/sh
-set -e
-
-# Generate grub.cfg by inspecting /boot contents.
-# Copyright (C) 2006,2007,2008,2009,2010 Free Software Foundation, Inc.
-#
-# GRUB is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GRUB is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GRUB. If not, see .
-
-prefix="/usr/local"
-exec_prefix="/usr/local"
-datarootdir="/usr/local/share"
-
-prefix="/usr/local"
-exec_prefix="/usr/local"
-sbindir="${exec_prefix}/sbin"
-bindir="${exec_prefix}/bin"
-sysconfdir="${prefix}/etc"
-PACKAGE_NAME=GRUB
-PACKAGE_VERSION=2.02~beta2
-host_os=freebsd10.0
-datadir="${datarootdir}"
-if [ "x$pkgdatadir" = x ]; then
- pkgdatadir="${datadir}/grub"
-fi
-grub_cfg=""
-grub_mkconfig_dir="${sysconfdir}"/grub.d
-
-self=`basename $0`
-
-grub_probe="${sbindir}/grub-probe"
-grub_file="${bindir}/grub-file"
-grub_editenv="${bindir}/grub-editenv"
-grub_script_check="${bindir}/grub-script-check"
-
-export TEXTDOMAIN=grub
-export TEXTDOMAINDIR="/usr/local/share/locale"
-
-. "${pkgdatadir}/grub-mkconfig_lib"
-
-# Usage: usage
-# Print the usage.
-usage () {
- gettext_printf "Usage: %s [OPTION]\n" "$self"
- gettext "Generate a grub config file"; echo
- echo
- print_option_help "-o, --output=$(gettext FILE)" "$(gettext "output generated config to FILE [default=stdout]")"
- print_option_help "-h, --help" "$(gettext "print this message and exit")"
- print_option_help "-v, --version" "$(gettext "print the version information and exit")"
- echo
- gettext "Report bugs to ."; echo
-}
-
-argument () {
- opt=$1
- shift
-
- if test $# -eq 0; then
- gettext_printf "%s: option requires an argument -- \`%s'\n" "$self" "$opt" 1>&2
- exit 1
- fi
- echo $1
-}
-
-# Check the arguments.
-while test $# -gt 0
-do
- option=$1
- shift
-
- case "$option" in
- -h | --help)
- usage
- exit 0 ;;
- -v | --version)
- echo "$self (${PACKAGE_NAME}) ${PACKAGE_VERSION}"
- exit 0 ;;
- -o | --output)
- grub_cfg=`argument $option "$@"`; shift;;
- --output=*)
- grub_cfg=`echo "$option" | sed 's/--output=//'`
- ;;
- -*)
- gettext_printf "Unrecognized option \`%s'\n" "$option" 1>&2
- usage
- exit 1
- ;;
- # Explicitly ignore non-option arguments, for compatibility.
- esac
-done
-
-if [ "x$EUID" = "x" ] ; then
- EUID=`id -u`
-fi
-
-if [ "$EUID" != 0 ] ; then
- root=f
- case "`uname 2>/dev/null`" in
- CYGWIN*)
- # Cygwin: Assume root if member of admin group
- for g in `id -G 2>/dev/null` ; do
- case $g in
- 0|544) root=t ;;
- esac
- done ;;
- esac
- if [ $root != t ] ; then
- gettext_printf "%s: You must run this as root\n" "$self" >&2
- exit 1
- fi
-fi
-
-set $grub_probe dummy
-if test -f "$1"; then
- :
-else
- gettext_print "%s: Not found.\n" "$1" 1>&2
- exit 1
-fi
-
-# Device containing our userland. Typically used for root= parameter.
-GRUB_DEVICE="`${grub_probe} --target=device /`"
-GRUB_DEVICE_UUID="`${grub_probe} --device ${GRUB_DEVICE} --target=fs_uuid 2> /dev/null`" || true
-
-# Device containing our /boot partition. Usually the same as GRUB_DEVICE.
-GRUB_DEVICE_BOOT="`${grub_probe} --target=device /boot`"
-GRUB_DEVICE_BOOT_UUID="`${grub_probe} --device ${GRUB_DEVICE_BOOT} --target=fs_uuid 2> /dev/null`" || true
-
-# Filesystem for the device containing our userland. Used for stuff like
-# choosing Hurd filesystem module.
-GRUB_FS="`${grub_probe} --device ${GRUB_DEVICE} --target=fs 2> /dev/null || echo unknown`"
-
-if [ x"$GRUB_FS" = xunknown ]; then
- GRUB_FS="$(stat -f --printf=%T / || echo unknown)"
-fi
-
-if test -f ${sysconfdir}/default/grub ; then
- . ${sysconfdir}/default/grub
-fi
-
-# XXX: should this be deprecated at some point?
-if [ "x${GRUB_TERMINAL}" != "x" ] ; then
- GRUB_TERMINAL_INPUT="${GRUB_TERMINAL}"
- GRUB_TERMINAL_OUTPUT="${GRUB_TERMINAL}"
-fi
-
-termoutdefault=0
-if [ "x${GRUB_TERMINAL_OUTPUT}" = "x" ]; then
- GRUB_TERMINAL_OUTPUT=gfxterm;
- termoutdefault=1;
-fi
-
-for x in ${GRUB_TERMINAL_OUTPUT}; do
- case "x${x}" in
- xgfxterm) ;;
- xconsole | xserial | xofconsole | xvga_text)
- # make sure all our children behave in conformance with ascii..
- export LANG=C;;
- *) echo "Invalid output terminal \"${GRUB_TERMINAL_OUTPUT}\"" >&2 ; exit 1 ;;
- esac
-done
-
-GRUB_ACTUAL_DEFAULT="$GRUB_DEFAULT"
-
-if [ "x${GRUB_ACTUAL_DEFAULT}" = "xsaved" ] ; then GRUB_ACTUAL_DEFAULT="`"${grub_editenv}" - list | sed -n '/^saved_entry=/ s,^saved_entry=,,p'`" ; fi
-
-
-# These are defined in this script, export them here so that user can
-# override them.
-export GRUB_DEVICE \
- GRUB_DEVICE_UUID \
- GRUB_DEVICE_BOOT \
- GRUB_DEVICE_BOOT_UUID \
- GRUB_FS \
- GRUB_FONT \
- GRUB_PRELOAD_MODULES \
- GRUB_ACTUAL_DEFAULT
-
-# These are optional, user-defined variables.
-export GRUB_DEFAULT \
- GRUB_HIDDEN_TIMEOUT \
- GRUB_HIDDEN_TIMEOUT_QUIET \
- GRUB_TIMEOUT \
- GRUB_TIMEOUT_STYLE \
- GRUB_DEFAULT_BUTTON \
- GRUB_HIDDEN_TIMEOUT_BUTTON \
- GRUB_TIMEOUT_BUTTON \
- GRUB_TIMEOUT_STYLE_BUTTON \
- GRUB_BUTTON_CMOS_ADDRESS \
- GRUB_BUTTON_CMOS_CLEAN \
- GRUB_DISTRIBUTOR \
- GRUB_CMDLINE_LINUX \
- GRUB_CMDLINE_LINUX_DEFAULT \
- GRUB_CMDLINE_XEN \
- GRUB_CMDLINE_XEN_DEFAULT \
- GRUB_CMDLINE_LINUX_XEN_REPLACE \
- GRUB_CMDLINE_LINUX_XEN_REPLACE_DEFAULT \
- GRUB_CMDLINE_NETBSD \
- GRUB_CMDLINE_NETBSD_DEFAULT \
- GRUB_CMDLINE_GNUMACH \
- GRUB_TERMINAL_INPUT \
- GRUB_TERMINAL_OUTPUT \
- GRUB_SERIAL_COMMAND \
- GRUB_DISABLE_LINUX_UUID \
- GRUB_DISABLE_RECOVERY \
- GRUB_VIDEO_BACKEND \
- GRUB_GFXMODE \
- GRUB_BACKGROUND \
- GRUB_THEME \
- GRUB_GFXPAYLOAD_LINUX \
- GRUB_DISABLE_OS_PROBER \
- GRUB_INIT_TUNE \
- GRUB_SAVEDEFAULT \
- GRUB_ENABLE_CRYPTODISK \
- GRUB_BADRAM \
- GRUB_OS_PROBER_SKIP_LIST \
- GRUB_DISABLE_SUBMENU
-
-if test "x${grub_cfg}" != "x"; then
- rm -f "${grub_cfg}.new"
- oldumask=$(umask); umask 077
- exec > "${grub_cfg}.new"
- umask $oldumask
-fi
-gettext "Generating grub configuration file ..." >&2
-echo >&2
-
-cat << EOF
-#
-# DO NOT EDIT THIS FILE
-#
-# It is automatically generated by $self using templates
-# from ${grub_mkconfig_dir} and settings from ${sysconfdir}/default/grub
-#
-EOF
-
-
-for i in "${grub_mkconfig_dir}"/* ; do
- case "$i" in
- # emacsen backup files. FIXME: support other editors
- *~) ;;
- # emacsen autosave files. FIXME: support other editors
- */\#*\#) ;;
- *)
- if grub_file_is_not_garbage "$i" && test -x "$i" ; then
- echo
- echo "### BEGIN $i ###"
- "$i"
- echo "### END $i ###"
- fi
- ;;
- esac
-done
-
-if test "x${grub_cfg}" != "x" ; then
- if ! ${grub_script_check} ${grub_cfg}.new; then
- # TRANSLATORS: %s is replaced by filename
- gettext_printf "Syntax errors are detected in generated GRUB config file.
-Ensure that there are no errors in /etc/default/grub
-and /etc/grub.d/* files or please file a bug report with
-%s file attached." "${grub_cfg}.new" >&2
- echo >&2
- else
- # none of the children aborted with error, install the new grub.cfg
- mv -f ${grub_cfg}.new ${grub_cfg}
- fi
-fi
-
-# KPM 6-24-2013
-# If doing a real grub.cfg update, make sure that our config gets
-# copied to the /default/ ZFS BE
-check_grub_zfs_be()
-{
-
- ROOTFS=`mount | awk '/ \/ / {print $1}'`
- BEDS="$( echo ${ROOTFS} | awk -F '/' '{print $2}' )"
- if [ "$BEDS" = "dev" ] ; then BEDS="ROOT"; fi
-
- if [ "$grub_cfg" = "/boot/grub/grub.cfg" ] ; then
- for i in `beadm list -a 2>/dev/null | grep "/${BEDS}/" | awk '{print $1}'`
- do
- if ! mount | grep -q "$dTank on / ("; then
- echo -e "Copying grub.cfg to $dTank...\c" >&2
- fMnt="/mnt.$$"
- mkdir $fMnt
- if ! mount -t zfs ${dTank} $fMnt ; then
- echo "Failed to mount ${dTank}" >&2
- return
- else
- cp ${grub_cfg} ${fMnt}/boot/grub/grub.cfg
- echo -e "done" >&2
- umount ${fMnt} >/dev/null
- rmdir ${fMnt} >/dev/null
- fi
- fi
- done
-
- # Check if we can re-stamp the boot-loader
- TANK=`echo $ROOTFS | cut -d '/' -f 1`
- for i in `zpool status $TANK | grep ONLINE | awk '{print $1}'`
- do
- if [ ! -e "/dev/${i}" ] ; then continue; fi
- disk=`echo $i | sed 's|.eli||g'`
-
- # Now get the root of the disk
- disk=`echo $disk | sed 's|p[1-9]$||g' | sed "s|s[1-9][a-z]||g"`
- if [ ! -e "/dev/${disk}" ] ; then continue; fi
-
- # Re-install GRUB on this disk
- echo "Installing GRUB to $disk" >&2
- grub-install /dev/${disk}
- done
- fi
-
-}
-gettext "done" >&2
-echo >&2
-
-# Check if we need to copy this cfg to the original BE
-check_grub_zfs_be
-
diff --git a/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/grub/grub-mkconfig_lib b/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/grub/grub-mkconfig_lib
deleted file mode 100644
index ff78d4649..000000000
--- a/src-sh/pc-extractoverlay/ports-overlay/usr/local/share/grub/grub-mkconfig_lib
+++ /dev/null
@@ -1,380 +0,0 @@
-# Helper library for grub-mkconfig
-# Copyright (C) 2007,2008,2009,2010 Free Software Foundation, Inc.
-#
-# GRUB is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-#
-# GRUB is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with GRUB. If not, see .
-
-prefix="/usr/local"
-exec_prefix="/usr/local"
-datarootdir="/usr/local/share"
-datadir="${datarootdir}"
-bindir="${exec_prefix}/bin"
-sbindir="${exec_prefix}/sbin"
-if [ "x$pkgdatadir" = x ]; then
- pkgdatadir="${datadir}/grub"
-fi
-
-if test "x$grub_probe" = x; then
- grub_probe="${sbindir}/grub-probe"
-fi
-if test "x$grub_file" = x; then
- grub_file="${bindir}/grub-file"
-fi
-if test "x$grub_mkrelpath" = x; then
- grub_mkrelpath="${bindir}/grub-mkrelpath"
-fi
-
-if which gettext >/dev/null 2>/dev/null; then
- :
-else
- gettext () {
- printf "%s" "$@"
- }
-fi
-
-grub_warn ()
-{
- echo "$(gettext "Warning:")" "$@" >&2
-}
-
-make_system_path_relative_to_its_root ()
-{
- "${grub_mkrelpath}" "$1"
-}
-
-is_path_readable_by_grub ()
-{
- path="$1"
-
- # abort if path doesn't exist
- if test -e "$path" ; then : ;else
- return 1
- fi
-
- # abort if file is in a filesystem we can't read
- if "${grub_probe}" -t fs "$path" > /dev/null 2>&1 ; then : ; else
- return 1
- fi
-
- # ... or if we can't figure out the abstraction module, for example if
- # memberlist fails on an LVM volume group.
- if abstractions="`"${grub_probe}" -t abstraction "$path"`" 2> /dev/null ; then
- :
- else
- return 1
- fi
-
- if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
- return 0
- fi
-
- for abstraction in $abstractions; do
- if [ "x$abstraction" = xcryptodisk ]; then
- return 1
- fi
- done
-
- return 0
-}
-
-convert_system_path_to_grub_path ()
-{
- path="$1"
-
- grub_warn "convert_system_path_to_grub_path() is deprecated. Use prepare_grub_to_access_device() instead."
-
- # abort if GRUB can't access the path
- if is_path_readable_by_grub "${path}" ; then : ; else
- return 1
- fi
-
- if drive="`"${grub_probe}" -t drive "$path"`" ; then : ; else
- return 1
- fi
-
- if relative_path="`make_system_path_relative_to_its_root "$path"`" ; then : ; else
- return 1
- fi
-
- echo "${drive}${relative_path}"
-}
-
-save_default_entry ()
-{
- if [ "x${GRUB_SAVEDEFAULT}" = "xtrue" ] ; then
- cat << EOF
-savedefault
-EOF
- fi
-}
-
-prepare_grub_to_access_device ()
-{
- old_ifs="$IFS"
- IFS='
-'
- partmap="`"${grub_probe}" --device $@ --target=partmap`"
- for module in ${partmap} ; do
- case "${module}" in
- netbsd | openbsd)
- echo "insmod part_bsd";;
- *)
- echo "insmod part_${module}";;
- esac
- done
-
- # Abstraction modules aren't auto-loaded.
- abstraction="`"${grub_probe}" --device $@ --target=abstraction`"
- for module in ${abstraction} ; do
- echo "insmod ${module}"
- done
-
- # KPM - 6-24-2013
- # Add this work-around since GRUB doesn't like to identify ZFS
- # partitions which are in a raidz configuration, gives Unknown FS error
- # We can instead look at zpool to see if this device is used though
- zpool status 2>/dev/null | grep -q "`echo ${device} | sed 's|/dev/||g'`"
- if [ $? -eq 0 ] ; then
- fs="zfs"
- else
- fs="`"${grub_probe}" --device $@ --target=fs`"
- fi
-
- for module in ${fs} ; do
- echo "insmod ${module}"
- done
-
- if [ x$GRUB_ENABLE_CRYPTODISK = xy ]; then
- for uuid in "`"${grub_probe}" --device $@ --target=cryptodisk_uuid`"; do
- echo "cryptomount -u $uuid"
- done
- fi
-
- # If there's a filesystem UUID that GRUB is capable of identifying, use it;
- # otherwise set root as per value in device.map.
- fs_hint="`"${grub_probe}" --device $@ --target=compatibility_hint`"
- if [ "x$fs_hint" != x ]; then
- echo "set root='$fs_hint'"
- fi
- if fs_uuid="`"${grub_probe}" --device $@ --target=fs_uuid 2> /dev/null`" ; then
- hints="`"${grub_probe}" --device $@ --target=hints_string 2> /dev/null`" || hints=
- echo "if [ x\$feature_platform_search_hint = xy ]; then"
- echo " search --no-floppy --fs-uuid --set=root ${hints} ${fs_uuid}"
- echo "else"
- echo " search --no-floppy --fs-uuid --set=root ${fs_uuid}"
- echo "fi"
- fi
- IFS="$old_ifs"
-}
-
-grub_get_device_id ()
-{
- old_ifs="$IFS"
- IFS='
-'
- device="$1"
- if fs_uuid="`"${grub_probe}" --device ${device} --target=fs_uuid 2> /dev/null`" ; then
- echo "$fs_uuid";
- else
- echo $device |sed 's, ,_,g'
- fi
- IFS="$old_ifs"
-}
-
-grub_file_is_not_garbage ()
-{
- if test -f "$1" ; then
- case "$1" in
- *.dpkg-*) return 1 ;; # debian dpkg
- *.rpmsave|*.rpmnew) return 1 ;;
- README*|*/README*) return 1 ;; # documentation
- esac
- else
- return 1
- fi
- return 0
-}
-
-version_sort ()
-{
- case $version_sort_sort_has_v in
- yes)
- LC_ALL=C sort -V;;
- no)
- LC_ALL=C sort -n;;
- *)
- if sort -V /dev/null 2>&1; then
- version_sort_sort_has_v=yes
- LC_ALL=C sort -V
- else
- version_sort_sort_has_v=no
- LC_ALL=C sort -n
- fi;;
- esac
-}
-
-version_test_numeric ()
-{
- version_test_numeric_a="$1"
- version_test_numeric_cmp="$2"
- version_test_numeric_b="$3"
- if [ "$version_test_numeric_a" = "$version_test_numeric_b" ] ; then
- case "$version_test_numeric_cmp" in
- ge|eq|le) return 0 ;;
- gt|lt) return 1 ;;
- esac
- fi
- if [ "$version_test_numeric_cmp" = "lt" ] ; then
- version_test_numeric_c="$version_test_numeric_a"
- version_test_numeric_a="$version_test_numeric_b"
- version_test_numeric_b="$version_test_numeric_c"
- fi
- if (echo "$version_test_numeric_a" ; echo "$version_test_numeric_b") | version_sort | head -n 1 | grep -qx "$version_test_numeric_b" ; then
- return 0
- else
- return 1
- fi
-}
-
-version_test_gt ()
-{
- version_test_gt_a="`echo "$1" | sed -e "s/[^-]*-//"`"
- version_test_gt_b="`echo "$2" | sed -e "s/[^-]*-//"`"
- version_test_gt_cmp=gt
- if [ "x$version_test_gt_b" = "x" ] ; then
- return 0
- fi
- case "$version_test_gt_a:$version_test_gt_b" in
- *.old:*.old) ;;
- *.old:*) version_test_gt_a="`echo -n "$version_test_gt_a" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=gt ;;
- *:*.old) version_test_gt_b="`echo -n "$version_test_gt_b" | sed -e 's/\.old$//'`" ; version_test_gt_cmp=ge ;;
- esac
- version_test_numeric "$version_test_gt_a" "$version_test_gt_cmp" "$version_test_gt_b"
- return "$?"
-}
-
-version_find_latest ()
-{
- version_find_latest_a=""
- for i in "$@" ; do
- if version_test_gt "$i" "$version_find_latest_a" ; then
- version_find_latest_a="$i"
- fi
- done
- echo "$version_find_latest_a"
-}
-
-# One layer of quotation is eaten by "" and the second by sed; so this turns
-# ' into \'.
-grub_quote () {
- sed "s/'/'\\\\''/g"
-}
-
-gettext_quoted () {
- gettext "$@" | grub_quote
-}
-
-# Run the first argument through gettext, and then pass that and all
-# remaining arguments to printf. This is a useful abbreviation and tends to
-# be easier to type.
-gettext_printf () {
- gettext_printf_format="$1"
- shift
- printf "$(gettext "$gettext_printf_format")" "$@"
-}
-
-uses_abstraction () {
- device="$1"
- old_ifs="$IFS"
- IFS='
-'
-
- abstraction="`"${grub_probe}" --device ${device} --target=abstraction`"
- for module in ${abstraction}; do
- if test "x${module}" = "x$2"; then
- IFS="$old_ifs"
- return 0
- fi
- done
- IFS="$old_ifs"
- return 1
-}
-
-print_option_help () {
- if test x$print_option_help_wc = x; then
- if wc -L /dev/null 2>&1; then
- print_option_help_wc=-L
- elif wc -m /dev/null 2>&1; then
- print_option_help_wc=-m
- else
- print_option_help_wc=-b
- fi
- fi
- if test x$grub_have_fmt = x; then
- if fmt -w 40 /dev/null 2>&1; then
- grub_have_fmt=y;
- else
- grub_have_fmt=n;
- fi
- fi
- print_option_help_lead=" $1"
- print_option_help_lspace="$(echo "$print_option_help_lead" | wc $print_option_help_wc)"
- print_option_help_fill="$((26 - print_option_help_lspace))"
- printf "%s" "$print_option_help_lead"
- if test $print_option_help_fill -le 0; then
- print_option_help_nl=y
- echo
- else
- print_option_help_i=0;
- while test $print_option_help_i -lt $print_option_help_fill; do
- printf " "
- print_option_help_i=$((print_option_help_i+1))
- done
- print_option_help_nl=n
- fi
- if test x$grub_have_fmt = xy; then
- print_option_help_split="$(echo "$2" | fmt -w 50)"
- else
- print_option_help_split="$2"
- fi
- if test x$print_option_help_nl = xy; then
- echo "$print_option_help_split" | awk \
- '{ print " " $0; }'
- else
- echo "$print_option_help_split" | awk 'BEGIN { n = 0 }
- { if (n == 1) print " " $0; else print $0; n = 1 ; }'
- fi
-}
-
-grub_fmt () {
- if test x$grub_have_fmt = x; then
- if fmt -w 40 < /dev/null > /dev/null; then
- grub_have_fmt=y;
- else
- grub_have_fmt=n;
- fi
- fi
-
- if test x$grub_have_fmt = xy; then
- fmt
- else
- cat
- fi
-}
-
-grub_tab=" "
-
-grub_add_tab () {
- sed -e "s/^/$grub_tab/"
-}
-