Permalink
Browse files

Merge branch 'master' of github.com:pcbsd/pcbsd

  • Loading branch information...
2 parents b22b3a5 + 9855292 commit dfb8c89a41d0b5a1f58353f89d87d8154866acf0 Ken Moore committed Oct 23, 2013
Showing with 489 additions and 418 deletions.
  1. +32 −0 build-files/ports-overlay/sysutils/policykit-gnome/Makefile
  2. +2 −0 build-files/ports-overlay/sysutils/policykit-gnome/distinfo
  3. +11 −0 build-files/ports-overlay/sysutils/policykit-gnome/files/patch-Makefile.in
  4. +13 −0 build-files/ports-overlay/sysutils/policykit-gnome/files/patch-polkit-gnome_polkit-gnome-action.c
  5. +5 −0 build-files/ports-overlay/sysutils/policykit-gnome/pkg-descr
  6. +39 −0 build-files/ports-overlay/sysutils/policykit-gnome/pkg-plist
  7. +1 −0 src-qt4/life-preserver/lp-gui/LPMain.cpp
  8. +1 −2 src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr.ts
  9. +1 −2 src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr_CA.ts
  10. +4 −0 src-qt4/pc-controlpanel/items/hardware/pc-zmanager.desktop
  11. +41 −82 src-qt4/pc-installgui/i18n/SysInstaller_fr.ts
  12. +41 −82 src-qt4/pc-installgui/i18n/SysInstaller_fr_CA.ts
  13. +7 −16 src-qt4/pc-installgui/installer.cpp
  14. +2 −2 src-qt4/pc-installgui/installer.h
  15. +13 −13 src-qt4/pc-installgui/wizardDisk.cpp
  16. +1 −1 src-qt4/pc-installgui/wizardDisk.h
  17. +143 −123 src-qt4/pc-installgui/wizardDisk.ui
  18. +3 −6 src-qt4/pc-mounttray/i18n/MountTray_fr.ts
  19. +6 −9 src-qt4/pc-mounttray/i18n/MountTray_fr_CA.ts
  20. +8 −16 src-qt4/pc-pkgmanager/i18n/PackageManager_fr.ts
  21. +8 −16 src-qt4/pc-pkgmanager/i18n/PackageManager_fr_CA.ts
  22. +3 −6 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts
  23. +3 −6 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts
  24. +1 −2 src-qt4/pc-updategui/i18n/UpdateGui_fr.ts
  25. +1 −2 src-qt4/pc-updategui/i18n/UpdateGui_fr_CA.ts
  26. +1 −2 src-qt4/warden-gui/i18n/Warden_fr.ts
  27. +1 −2 src-qt4/warden-gui/i18n/Warden_fr_CA.ts
  28. +2 −0 src-sh/pbi-manager10/install.sh
  29. +47 −0 src-sh/pbi-manager10/pbi-manager
  30. +1 −5 src-sh/pc-extractoverlay/install.sh
  31. +0 −4 src-sh/pc-extractoverlay/port-excludes
  32. +4 −0 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/sudoers
  33. +33 −14 src-sh/pc-installdialog/pc-installdialog.sh
  34. +7 −3 src-sh/pc-sysinstall/backend/functions-disk.sh
  35. +3 −1 src-sh/port-files/Makefile
  36. +0 −1 src-sh/port-files/pkg-plist
View
32 build-files/ports-overlay/sysutils/policykit-gnome/Makefile
@@ -0,0 +1,32 @@
+# Created by: Joe Marcus Clarke <marcus@FreeBSD.org>
+# $FreeBSD: sysutils/policykit-gnome/Makefile 327772 2013-09-20 23:05:58Z bapt $
+# $MCom: ports/sysutils/policykit-gnome/Makefile,v 1.6 2008/10/03 17:19:43 marcus Exp $
+
+PORTNAME= policykit-gnome
+PORTVERSION= 0.9.2
+PORTREVISION= 6
+CATEGORIES= sysutils gnome
+MASTER_SITES= http://hal.freedesktop.org/releases/
+DISTNAME= PolicyKit-gnome-${PORTVERSION}
+
+MAINTAINER= gnome@FreeBSD.org
+COMMENT= GNOME frontend to the PolicyKit framework
+
+LIB_DEPENDS= polkit.2:${PORTSDIR}/sysutils/policykit
+
+USE_BZIP2= yes
+USE_GMAKE= yes
+USE_GCC= 4.8+
+USES= gettext pkgconfig
+USE_GNOME= gnomehack intlhack gnomedocutils gconf2
+GNU_CONFIGURE= yes
+USE_LDCONFIG= yes
+CONFIGURE_ARGS= --disable-gtk-doc \
+ --localstatedir=/var
+CPPFLAGS+= -I${LOCALBASE}/include
+LDFLAGS+= -L${LOCALBASE}/lib
+
+GCONF_SCHEMAS= polkit-gnome.schemas
+
+NO_STAGE= yes
+.include <bsd.port.mk>
View
2 build-files/ports-overlay/sysutils/policykit-gnome/distinfo
@@ -0,0 +1,2 @@
+SHA256 (PolicyKit-gnome-0.9.2.tar.bz2) = ecf4ce303a90a4580c54ee7b932ffaf01b7f115f40b17d75634c5bbfba085c8a
+SIZE (PolicyKit-gnome-0.9.2.tar.bz2) = 1223691
View
11 build-files/ports-overlay/sysutils/policykit-gnome/files/patch-Makefile.in
@@ -0,0 +1,11 @@
+--- Makefile.in.orig 2008-07-23 21:40:50.000000000 -0400
++++ Makefile.in 2008-07-23 21:41:41.000000000 -0400
+@@ -259,7 +259,7 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+
+ # Need to build docs after examples because the docs include generated files
+-SUBDIRS = data src polkit-gnome tools $(am__append_1) doc po
++SUBDIRS = data src polkit-gnome tools $(am__append_1) po
+ EXTRA_DIST = \
+ autogen.sh \
+ TODO \
View
13 ...les/ports-overlay/sysutils/policykit-gnome/files/patch-polkit-gnome_polkit-gnome-action.c
@@ -0,0 +1,13 @@
+--- polkit-gnome/polkit-gnome-action.c.old 2009-06-28 12:54:35.000000000 +0200
++++ polkit-gnome/polkit-gnome-action.c 2009-06-28 12:55:07.000000000 +0200
+@@ -2062,6 +2062,8 @@
+ case POLKIT_RESULT_ONLY_VIA_SELF_AUTH_KEEP_ALWAYS:
+ /* g_debug ("blocking clicked"); */
+ g_signal_stop_emission_by_name (button, "clicked");
++ if (action->priv->polkit_action != NULL)
++ g_signal_emit (action, signals [AUTH_START_SIGNAL], 0);
+ break;
+
+ default:
+
+
View
5 build-files/ports-overlay/sysutils/policykit-gnome/pkg-descr
@@ -0,0 +1,5 @@
+PolicyKit is a framework for defining policy for system-wide components and
+for desktop pieces to configure it. PolicyKit-gnome is a GTK+/GNOME frontend
+for that framework.
+
+WWW: http://www.freedesktop.org/wiki/Software/PolicyKit
View
39 build-files/ports-overlay/sysutils/policykit-gnome/pkg-plist
@@ -0,0 +1,39 @@
+bin/polkit-gnome-authorization
+bin/polkit-gnome-example
+include/PolicyKit/polkit-gnome/polkit-gnome-action.h
+include/PolicyKit/polkit-gnome/polkit-gnome-auth.h
+include/PolicyKit/polkit-gnome/polkit-gnome-context.h
+include/PolicyKit/polkit-gnome/polkit-gnome-toggle-action.h
+include/PolicyKit/polkit-gnome/polkit-gnome.h
+lib/libpolkit-gnome.a
+lib/libpolkit-gnome.la
+lib/libpolkit-gnome.so
+lib/libpolkit-gnome.so.0
+libdata/pkgconfig/polkit-gnome.pc
+libexec/polkit-gnome-manager
+share/PolicyKit/policy/org.gnome.policykit.examples.policy
+share/applications/polkit-gnome-authorization.desktop
+share/dbus-1/services/gnome-org.freedesktop.PolicyKit.AuthenticationAgent.service
+share/dbus-1/services/org.gnome.PolicyKit.AuthorizationManager.service
+share/dbus-1/services/org.gnome.PolicyKit.service
+share/locale/ar/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/ca/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/cs/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/da/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/de/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/el/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/en_GB/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/es/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/fi/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/fr/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/he/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/hu/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/ja/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/pl/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/pt/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/pt_BR/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/ru/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/sk/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/sv/LC_MESSAGES/PolicyKit-gnome.mo
+share/locale/zh_CN/LC_MESSAGES/PolicyKit-gnome.mo
+@dirrm include/PolicyKit/polkit-gnome
View
1 src-qt4/life-preserver/lp-gui/LPMain.cpp
@@ -1,5 +1,6 @@
#include "LPMain.h"
#include "ui_LPMain.h"
+#include <unistd.h>
LPMain::LPMain(QWidget *parent) : QMainWindow(parent), ui(new Ui::LPMain){
ui->setupUi(this); //load the Qt-designer UI file
View
3 src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr.ts
@@ -245,8 +245,7 @@
</message>
<message>
<source>You cannot make a copy of the currently running boot environment!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vous ne pouvez pas faire une copie de l&apos;environnement d&apos;initialisation en cours d&apos;exécution!</translation>
</message>
</context>
</TS>
View
3 src-qt4/pc-bootconfig/i18n/pc-bootconfig_fr_CA.ts
@@ -245,8 +245,7 @@
</message>
<message>
<source>You cannot make a copy of the currently running boot environment!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vous ne pouvez pas faire une copie de l&apos;environnement d&apos;initialisation en cours d&apos;exécution! </translation>
</message>
</context>
</TS>
View
4 src-qt4/pc-controlpanel/items/hardware/pc-zmanager.desktop
@@ -9,7 +9,11 @@ Keywords="disk, ZFS, raid"
Categories=Settings;System;
Name=Disk Manager
Name[de]=Festplattenverwaltung
+Name[fr]=Gestionnaire de disque
+Name[fr_CA]=Gestionnaire de disque
Name[uk]=Файлові системи
Comment=ZFS / Disk Management
Comment[de]=ZFS-/Festplattenverwaltung
+Comment[fr]=ZFS / Gestion des disques
+Comment[fr_CA]=ZFS / Gestion des disques
Comment[uk]=Керування файловими системами ZFS
View
123 src-qt4/pc-installgui/i18n/SysInstaller_fr.ts
@@ -259,59 +259,48 @@
</message>
<message>
<source>Restore from Life-Preserver backup</source>
- <translation type="unfinished">
- </translation>
+ <translation>Restaurer depuis bouée de sauvetage</translation>
</message>
<message>
<source>Manage network connectivity</source>
- <translation type="unfinished">
- </translation>
+ <translation>Gérer la connectivité réseau</translation>
</message>
<message>
<source>ZFS Datasets:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Jeux de données ZFS: </translation>
</message>
<message>
<source>The original ZFS layout will be restored</source>
- <translation type="unfinished">
- </translation>
+ <translation>La disposition ZFS d&apos;origine sera rétablie </translation>
</message>
<message>
<source>Performing a restore from a Life-Preserver backup. Click next to start the restore wizard.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Effectuer une restauration à partir d&apos;une sauvegarde de bouée de sauvetage. Cliquez sur Suivant pour lancer l&apos;assistant de restauration.</translation>
</message>
<message>
<source>Start the restore now?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Démarrer la restauration maintenant?</translation>
</message>
<message>
<source>Your system is now restored!
Click Finish to reboot. After rebooting you may eject the install media.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Votre système est maintenant restauré!\NCliquez sur Terminer pour redémarrer. Après le redémarrage vous pouvez éjecter le média d&apos;installation.</translation>
</message>
<message>
<source>System Restore</source>
- <translation type="unfinished">
- </translation>
+ <translation>Restauration du système </translation>
</message>
<message>
<source>Your system is now being restored, this may take a while depending upon the size of your backup and network conditions.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Votre système est maintenant en cours de restauration, cela peut prendre un certain temps selon la taille de votre sauvegarde et conditions du réseau. </translation>
</message>
<message>
<source>Installing meta-package: %1</source>
- <translation type="unfinished">
- </translation>
+ <translation>Installation méta-paquet: 1%</translation>
</message>
<message>
<source>Restoring system: %1</source>
- <translation type="unfinished">
- </translation>
+ <translation>La restauration du système: %1</translation>
</message>
</context>
<context>
@@ -373,8 +362,7 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
</message>
<message>
<source>Please select the software to install. Post-install you may also add / remove software via the Package Manager (desktop) or &quot;pkg&quot; command (server).</source>
- <translation type="unfinished">
- </translation>
+ <translation>S&apos;il vous plaît sélectionner le logiciel à installer. Post-installation vous pouvez ajouter / supprimer des logiciels via la commande &quot;paquet&quot; Package Manager (desktop) ou (serveur).</translation>
</message>
</context>
<context>
@@ -684,38 +672,31 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
</message>
<message>
<source>Install GRUB (Required for Boot-Environment support)</source>
- <translation type="unfinished">
- </translation>
+ <translation>GRUB (Requis pour le support Boot-Environnement) </translation>
</message>
<message>
<source>Please select the disk or partition you wish to install onto. Please note that you must select either an entire disk or a primary partition that is at least 20GB for a server install or 50GB for a desktop install. </source>
- <translation type="unfinished">
- </translation>
+ <translation>S&apos;il vous plaît sélectionner le disque ou la partition que vous souhaitez faire l&apos;installation. Veuillez noter que vous devez sélectionner un disque entier ou une partition principale qui est d&apos;au moins 20 Go pour une installation serveur ou 50 Go pour une installation de bureau. </translation>
</message>
<message>
<source>Installing to SSD (Disables SWAP / atime)</source>
- <translation type="unfinished">
- </translation>
+ <translation>Installation de SSD (désactive SWAP / atime) </translation>
</message>
<message>
<source>No boot-loader!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aucun chargeur de démarrage!</translation>
</message>
<message>
<source>You have chosen not to install GRUB on your MBR. You will need to manually setup your own MBR loader.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vous avez choisi de ne pas installer GRUB dans le MBR. Vous aurez besoin de configurer manuellement votre propre chargeur de MBR.</translation>
</message>
<message>
<source>Stamp GRUB on MBR</source>
- <translation type="unfinished">
- </translation>
+ <translation>Installer GRUB sur le MBR </translation>
</message>
<message>
<source>The original system datasets / mount-points will be automatically restored.</source>
- <translation type="unfinished">
- </translation>
+ <translation>L&apos;ensembles de données / points de montage système original sera automatiquement rétabli. </translation>
</message>
</context>
<context>
@@ -821,116 +802,94 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
<name>wizardRestore</name>
<message>
<source>This wizard will walk you though the process of restoring your system from a Life-Preserver backup. Click next to begin. </source>
- <translation type="unfinished">
- </translation>
+ <translation>Cet assistant vous guidera si le processus de restauration de votre système à partir d&apos;une sauvegarde de bouée de sauvetage. Cliquez sur Suivant pour commencer.</translation>
</message>
<message>
<source>To get started please enter the hostname, username and port of your backup server.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Pour commencer, veuillez entrer le nom d&apos;hôte, nom d&apos;utilisateur et le port de votre serveur de sauvegarde. </translation>
</message>
<message>
<source>Backup Server</source>
- <translation type="unfinished">
- </translation>
+ <translation>Serveur de sauvegarde </translation>
</message>
<message>
<source>Host Name</source>
- <translation type="unfinished">
- </translation>
+ <translation>Nom d&apos;hôte</translation>
</message>
<message>
<source>User Name</source>
- <translation type="unfinished">
- </translation>
+ <translation>Nom d&apos;usager</translation>
</message>
<message>
<source>SSH Port</source>
- <translation type="unfinished">
- </translation>
+ <translation>SSH Port </translation>
</message>
<message>
<source>If you saved your Life-Preserver key onto a USB stick, select it below, otherwise you may wish to use password authentication.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Si vous avez enregistré votre clé de bouée de sauvetage sur une clé USB, sélectionnez-la ci-dessous, sinon vous pouvez utiliser l&apos;authentification par mot de passe.</translation>
</message>
<message>
<source>Server Authentication</source>
- <translation type="unfinished">
- </translation>
+ <translation>Authentification Serveur </translation>
</message>
<message>
<source>Use USB key</source>
- <translation type="unfinished">
- </translation>
+ <translation>Utilisez la clé USB </translation>
</message>
<message>
<source>Use password authentication</source>
- <translation type="unfinished">
- </translation>
+ <translation>Utiliser l&apos;authentification par mot de passe</translation>
</message>
<message>
<source>The following systems are backed up on this server, select the one you wish to restore. </source>
- <translation type="unfinished">
- </translation>
+ <translation>Les systèmes suivants sont sauvegardés sur le serveur, sélectionnez celui que vous souhaitez restaurer. </translation>
</message>
<message>
<source>Restore System Selection</source>
- <translation type="unfinished">
- </translation>
+ <translation>Restaurer la sélection du système</translation>
</message>
<message>
<source>Restore Summary</source>
- <translation type="unfinished">
- </translation>
+ <translation>Restaurer Résumé </translation>
</message>
<message>
<source>The system is ready to be restored, click Finish to continue.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Le système est prêt à être restauré, cliquez sur Terminer pour continuer.</translation>
</message>
<message>
<source>No keys found!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aucune clé trouvé! </translation>
</message>
<message>
<source>No Auth keys could be found on that memory stick!
Please try another USB stick or use password authentication.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Pas de touches Auth n&apos;a pu être trouvé sur ce memory stick!\NS&apos;il vous plaît essayer une autre clé USB ou utiliser l&apos;authentification par mot de passe.</translation>
</message>
<message>
<source>Connection failed!</source>
- <translation type="unfinished">
- </translation>
+ <translation>La connexion a échoué! </translation>
</message>
<message>
<source>Could not connect to the backup server!
Please check that the server is reachable and verify your user/password.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Impossible de se connecter au serveur de sauvegarde!\NVeuillez vérifier que le serveur est accessible et vérifiez votre nom d&apos;utilisateur/mot de passe.</translation>
</message>
<message>
<source>Could not connect to the backup server!
Please check your hostname and that the backup server is reachable.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Impossible de se connecter au serveur de sauvegarde!\NS&apos;il vous plaît vérifier votre nom d&apos;hôte et que le serveur de sauvegarde est accessible. </translation>
</message>
<message>
<source>Will restore from:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Permettra de restaurer à partir de:</translation>
</message>
<message>
<source>Select the SSH key to use</source>
- <translation type="unfinished">
- </translation>
+ <translation>Sélectionnez la clé SSH à utiliser </translation>
</message>
<message>
<source>Key File:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Fichier de clé: </translation>
</message>
</context>
</TS>
View
123 src-qt4/pc-installgui/i18n/SysInstaller_fr_CA.ts
@@ -259,59 +259,48 @@ Cliquez sur Terminer pour redémarrer l&apos;ordinateur. Après le redémarrage,
</message>
<message>
<source>Restore from Life-Preserver backup</source>
- <translation type="unfinished">
- </translation>
+ <translation>Restaurer depuis bouée de sauvetage</translation>
</message>
<message>
<source>Manage network connectivity</source>
- <translation type="unfinished">
- </translation>
+ <translation>Gérer la connectivité réseau</translation>
</message>
<message>
<source>ZFS Datasets:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Jeux de données ZFS: </translation>
</message>
<message>
<source>The original ZFS layout will be restored</source>
- <translation type="unfinished">
- </translation>
+ <translation>La disposition ZFS d&apos;origine sera rétablie </translation>
</message>
<message>
<source>Performing a restore from a Life-Preserver backup. Click next to start the restore wizard.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Effectuer une restauration à partir d&apos;une sauvegarde de bouée de sauvetage. Cliquez sur Suivant pour lancer l&apos;assistant de restauration. </translation>
</message>
<message>
<source>Start the restore now?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Démarrer la restauration maintenant? </translation>
</message>
<message>
<source>Your system is now restored!
Click Finish to reboot. After rebooting you may eject the install media.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Votre système est maintenant restauré!\NCliquez sur Terminer pour redémarrer. Après le redémarrage vous pouvez éjecter le média d&apos;installation. </translation>
</message>
<message>
<source>System Restore</source>
- <translation type="unfinished">
- </translation>
+ <translation>Restauration du système</translation>
</message>
<message>
<source>Your system is now being restored, this may take a while depending upon the size of your backup and network conditions.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Votre système est maintenant en cours de restauration, cela peut prendre un certain temps selon la taille de votre sauvegarde et conditions du réseau. </translation>
</message>
<message>
<source>Installing meta-package: %1</source>
- <translation type="unfinished">
- </translation>
+ <translation>Installation méta-paquet: 1%</translation>
</message>
<message>
<source>Restoring system: %1</source>
- <translation type="unfinished">
- </translation>
+ <translation>La restauration du système: %1</translation>
</message>
</context>
<context>
@@ -373,8 +362,7 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
</message>
<message>
<source>Please select the software to install. Post-install you may also add / remove software via the Package Manager (desktop) or &quot;pkg&quot; command (server).</source>
- <translation type="unfinished">
- </translation>
+ <translation>S&apos;il vous plaît sélectionner le logiciel à installer. Post-installation vous pouvez ajouter / supprimer des logiciels via la commande &quot;paquet&quot; Package Manager (desktop) ou (serveur).</translation>
</message>
</context>
<context>
@@ -684,38 +672,31 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
</message>
<message>
<source>Install GRUB (Required for Boot-Environment support)</source>
- <translation type="unfinished">
- </translation>
+ <translation>GRUB (Requis pour le support Boot-Environnement)</translation>
</message>
<message>
<source>Please select the disk or partition you wish to install onto. Please note that you must select either an entire disk or a primary partition that is at least 20GB for a server install or 50GB for a desktop install. </source>
- <translation type="unfinished">
- </translation>
+ <translation>S&apos;il vous plaît sélectionner le disque ou la partition que vous souhaitez faire l&apos;installation. Veuillez noter que vous devez sélectionner un disque entier ou une partition principale qui est d&apos;au moins 20 Go pour une installation serveur ou 50 Go pour une installation de bureau.</translation>
</message>
<message>
<source>Installing to SSD (Disables SWAP / atime)</source>
- <translation type="unfinished">
- </translation>
+ <translation>Installation de SSD (désactive SWAP / atime)</translation>
</message>
<message>
<source>No boot-loader!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aucun chargeur de démarrage!</translation>
</message>
<message>
<source>You have chosen not to install GRUB on your MBR. You will need to manually setup your own MBR loader.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vous avez choisi de ne pas installer GRUB dans le MBR. Vous aurez besoin de configurer manuellement votre propre chargeur de MBR. </translation>
</message>
<message>
<source>Stamp GRUB on MBR</source>
- <translation type="unfinished">
- </translation>
+ <translation>Installer GRUB sur le MBR</translation>
</message>
<message>
<source>The original system datasets / mount-points will be automatically restored.</source>
- <translation type="unfinished">
- </translation>
+ <translation>L&apos;ensembles de données / points de montage système original sera automatiquement rétabli.</translation>
</message>
</context>
<context>
@@ -821,116 +802,94 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
<name>wizardRestore</name>
<message>
<source>This wizard will walk you though the process of restoring your system from a Life-Preserver backup. Click next to begin. </source>
- <translation type="unfinished">
- </translation>
+ <translation>Cet assistant vous guidera si le processus de restauration de votre système à partir d&apos;une sauvegarde de bouée de sauvetage. Cliquez sur Suivant pour commencer.</translation>
</message>
<message>
<source>To get started please enter the hostname, username and port of your backup server.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Pour commencer, veuillez entrer le nom d&apos;hôte, nom d&apos;utilisateur et le port de votre serveur de sauvegarde. </translation>
</message>
<message>
<source>Backup Server</source>
- <translation type="unfinished">
- </translation>
+ <translation>Serveur de sauvegarde </translation>
</message>
<message>
<source>Host Name</source>
- <translation type="unfinished">
- </translation>
+ <translation>Nom d&apos;hôte</translation>
</message>
<message>
<source>User Name</source>
- <translation type="unfinished">
- </translation>
+ <translation>Nom d&apos;usager </translation>
</message>
<message>
<source>SSH Port</source>
- <translation type="unfinished">
- </translation>
+ <translation>SSH Port </translation>
</message>
<message>
<source>If you saved your Life-Preserver key onto a USB stick, select it below, otherwise you may wish to use password authentication.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Si vous avez enregistré votre clé de bouée de sauvetage sur une clé USB, sélectionnez-la ci-dessous, sinon vous pouvez utiliser l&apos;authentification par mot de passe.</translation>
</message>
<message>
<source>Server Authentication</source>
- <translation type="unfinished">
- </translation>
+ <translation>Authentification Serveur </translation>
</message>
<message>
<source>Use USB key</source>
- <translation type="unfinished">
- </translation>
+ <translation>Utilisez la clé USB</translation>
</message>
<message>
<source>Use password authentication</source>
- <translation type="unfinished">
- </translation>
+ <translation>Utiliser l&apos;authentification par mot de passe </translation>
</message>
<message>
<source>The following systems are backed up on this server, select the one you wish to restore. </source>
- <translation type="unfinished">
- </translation>
+ <translation>Les systèmes suivants sont sauvegardés sur le serveur, sélectionnez celui que vous souhaitez restaurer. </translation>
</message>
<message>
<source>Restore System Selection</source>
- <translation type="unfinished">
- </translation>
+ <translation>Restaurer la sélection du système </translation>
</message>
<message>
<source>Restore Summary</source>
- <translation type="unfinished">
- </translation>
+ <translation>Restaurer Résumé</translation>
</message>
<message>
<source>The system is ready to be restored, click Finish to continue.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Le système est prêt à être restauré, cliquez sur Terminer pour continuer.</translation>
</message>
<message>
<source>No keys found!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aucune clé trouvé!</translation>
</message>
<message>
<source>No Auth keys could be found on that memory stick!
Please try another USB stick or use password authentication.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Pas de touches Auth n&apos;a pu être trouvé sur ce memory stick!\NS&apos;il vous plaît essayer une autre clé USB ou utiliser l&apos;authentification par mot de passe.</translation>
</message>
<message>
<source>Connection failed!</source>
- <translation type="unfinished">
- </translation>
+ <translation>La connexion a échoué! </translation>
</message>
<message>
<source>Could not connect to the backup server!
Please check that the server is reachable and verify your user/password.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Impossible de se connecter au serveur de sauvegarde!\NVeuillez vérifier que le serveur est accessible et vérifiez votre nom d&apos;utilisateur/mot de passe.</translation>
</message>
<message>
<source>Could not connect to the backup server!
Please check your hostname and that the backup server is reachable.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Impossible de se connecter au serveur de sauvegarde!\NS&apos;il vous plaît vérifier votre nom d&apos;hôte et que le serveur de sauvegarde est accessible. </translation>
</message>
<message>
<source>Will restore from:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Permettra de restaurer à partir de:</translation>
</message>
<message>
<source>Select the SSH key to use</source>
- <translation type="unfinished">
- </translation>
+ <translation>Sélectionnez la clé SSH à utiliser</translation>
</message>
<message>
<source>Key File:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Fichier de clé: </translation>
</message>
</context>
</TS>
View
23 src-qt4/pc-installgui/installer.cpp
@@ -34,8 +34,8 @@ Installer::Installer(QWidget *parent) : QMainWindow(parent)
backButton->setText(tr("&Back"));
nextButton->setText(tr("&Next"));
- // Init the MBR to yes
- loadMBR = true;
+ // Init the boot-loader
+ bootLoader = QString("GRUB");
// Init the GPT to no
loadGPT = false;
@@ -505,7 +505,7 @@ void Installer::slotDiskCustomizeClicked()
wDisk->setWindowModality(Qt::ApplicationModal);
if ( radioRestore->isChecked() )
wDisk->setRestoreMode();
- connect(wDisk, SIGNAL(saved(QList<QStringList>, bool, bool, QString, bool)), this, SLOT(slotSaveDiskChanges(QList<QStringList>, bool, bool, QString, bool)));
+ connect(wDisk, SIGNAL(saved(QList<QStringList>, QString, bool, QString, bool)), this, SLOT(slotSaveDiskChanges(QList<QStringList>, QString, bool, QString, bool)));
wDisk->show();
wDisk->raise();
}
@@ -536,14 +536,14 @@ void Installer::slotSaveMetaChanges(QStringList sPkgs)
textDeskSummary->setText(tr("The following meta-pkgs will be installed:") + "<br>" + selectedPkgs.join("<br>"));
}
-void Installer::slotSaveDiskChanges(QList<QStringList> newSysDisks, bool MBR, bool GPT, QString zName, bool zForce )
+void Installer::slotSaveDiskChanges(QList<QStringList> newSysDisks, QString BL, bool GPT, QString zName, bool zForce )
{
+ bootLoader=BL;
zpoolName = zName;
force4K = zForce;
// Save the new disk layout
- loadMBR = MBR;
loadGPT = GPT;
sysFinalDiskLayout = newSysDisks;
textEditDiskSummary->clear();
@@ -1090,17 +1090,8 @@ QStringList Installer::getDiskCfgSettings()
tmpList << "disk" + tmp.setNum(disk) + "=" + workingDisk;
tmpList << "partition=" + tmpSlice;
- // Are we loading a boot-loader?
- if ( loadMBR )
- tmpList << "bootManager=GRUB";
- else {
- // If the user declined the GRUB MBR, but we are still using a slice, install it to the slice
- // for chain-loading later
- if ( tmpSlice != "ALL" && ! loadGPT )
- tmpList << "bootManager=GRUB-slice";
- else
- tmpList << "bootManager=none";
- }
+ // Which boot-loader are we stamping?
+ tmpList << "bootManager=" + bootLoader;
// Set the GPT/MBR options
if ( loadGPT )
View
4 src-qt4/pc-installgui/installer.h
@@ -47,7 +47,7 @@ private slots:
// Disk slots
void slotDiskCustomizeClicked();
- void slotSaveDiskChanges(QList<QStringList>, bool, bool, QString, bool);
+ void slotSaveDiskChanges(QList<QStringList>, QString, bool, QString, bool);
// Slots for the installation
void slotInstallProcFinished( int exitCode, QProcess::ExitStatus status);
@@ -125,7 +125,7 @@ private slots:
QList<QStringList> sysDisks; // Our lists which contains disk info
QList<QStringList> sysPartitions; // Our lists which contains partition info
QList<QStringList> sysFinalDiskLayout; // Our lists which contains the final disk layout
- bool loadMBR;
+ QString bootLoader;
bool loadGPT;
int systemMemory; // Ammount of system RAM we have in MB
QList<QStringList> listComponents; // QStringList for our available components
View
26 src-qt4/pc-installgui/wizardDisk.cpp
@@ -97,19 +97,21 @@ void wizardDisk::slotClose()
void wizardDisk::accept()
{
- bool useGRUB = true;
+ QString bootLoader;
bool useGPT = false;
bool force4K = false;
QString zpoolName;
if (comboPartition->currentIndex() == 0 )
useGPT = checkGPT->isChecked();
- // Are we installing GRUB?
- useGRUB = checkGRUB->isChecked();
+ // Get the boot-loader
+ bootLoader = comboBootLoader->currentText();
+ if ( radioBasic->isChecked() )
+ bootLoader="GRUB";
- if ( comboPartition->currentIndex() != 0 && ! useGRUB ) {
+ if ( comboPartition->currentIndex() != 0 && bootLoader == "NONE" ) {
QMessageBox::warning(this, tr("No boot-loader!"),
- tr("You have chosen not to install GRUB on your MBR. You will need to manually setup your own MBR loader."),
+ tr("You have chosen not to install a boot-loader. You will need to manually setup your own loader."),
QMessageBox::Ok,
QMessageBox::Ok);
}
@@ -126,9 +128,9 @@ void wizardDisk::accept()
zpoolName = lineZpoolName->text();
if ( radioExpert->isChecked() )
- emit saved(sysFinalDiskLayout, false, false, zpoolName, force4K);
+ emit saved(sysFinalDiskLayout, QString("NONE"), false, zpoolName, force4K);
else
- emit saved(sysFinalDiskLayout, useGRUB, useGPT, zpoolName, force4K);
+ emit saved(sysFinalDiskLayout, bootLoader, useGPT, zpoolName, force4K);
close();
}
@@ -140,13 +142,15 @@ int wizardDisk::nextId() const
return Page_Expert;
if (radioBasic->isChecked()) {
checkGPT->setVisible(false);
- checkGRUB->setVisible(false);
+ comboBootLoader->setVisible(false);
+ textBootLoader->setVisible(false);
checkForce4K->setVisible(false);
groupZFSPool->setVisible(false);
}
if (radioAdvanced->isChecked()) {
checkGPT->setVisible(true);
- checkGRUB->setVisible(true);
+ comboBootLoader->setVisible(true);
+ textBootLoader->setVisible(true);
checkForce4K->setVisible(true);
groupZFSPool->setVisible(true);
}
@@ -237,10 +241,6 @@ bool wizardDisk::validatePage()
} else {
checkGPT->setVisible(true);
checkForce4K->setVisible(true);
- if ( comboPartition->currentIndex() == 0)
- checkGRUB->setText(tr("Install GRUB (Required for Boot-Environment support)"));
- else
- checkGRUB->setText(tr("Stamp GRUB on MBR"));
}
// Doing a Advanced install
View
2 src-qt4/pc-installgui/wizardDisk.h
@@ -92,7 +92,7 @@ private slots:
enum { Page_Intro, Page_BasicDisk, Page_ZFS, Page_Mounts, Page_Expert, Page_Confirmation };
signals:
- void saved(QList<QStringList>, bool, bool, QString, bool);
+ void saved(QList<QStringList>, QString, bool, QString, bool);
} ;
#endif // WIZDISK_H
View
266 src-qt4/pc-installgui/wizardDisk.ui
@@ -189,113 +189,8 @@
</layout>
</widget>
<widget class="QWizardPage" name="Page_BasicDisk">
- <layout class="QGridLayout" name="gridLayout_11">
- <item row="9" column="1">
- <widget class="QGroupBox" name="groupZFSPool">
- <property name="font">
- <font>
- <weight>50</weight>
- <bold>false</bold>
- </font>
- </property>
- <property name="title">
- <string>ZFS pool name</string>
- </property>
- <property name="checkable">
- <bool>true</bool>
- </property>
- <property name="checked">
- <bool>false</bool>
- </property>
- <layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="QLineEdit" name="lineZpoolName">
- <property name="inputMask">
- <string/>
- </property>
- <property name="maxLength">
- <number>32767</number>
- </property>
- <property name="placeholderText">
- <string notr="true">tank</string>
- </property>
- </widget>
- </item>
- </layout>
- </widget>
- </item>
- <item row="2" column="1">
- <spacer name="verticalSpacer_4">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>387</width>
- <height>18</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="2" rowspan="11">
- <spacer name="horizontalSpacer_3">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>17</width>
- <height>256</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="7" column="1">
- <widget class="QCheckBox" name="checkGRUB">
- <property name="text">
- <string>Install GRUB (Required for Boot-Environment support)</string>
- </property>
- <property name="checked">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <spacer name="verticalSpacer_5">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeType">
- <enum>QSizePolicy::Fixed</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>387</width>
- <height>18</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="4" column="1">
- <spacer name="verticalSpacer_17">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="0" column="0" rowspan="12">
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0" rowspan="9">
<layout class="QVBoxLayout" name="verticalLayout_4">
<item>
<widget class="QLabel" name="label_3">
@@ -340,12 +235,21 @@
</item>
</layout>
</item>
- <item row="5" column="1">
- <widget class="QCheckBox" name="checkGPT">
- <property name="text">
- <string>Partition disk with GPT</string>
+ <item row="0" column="1">
+ <spacer name="verticalSpacer_5">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- </widget>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>387</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
</item>
<item row="1" column="1">
<widget class="QLabel" name="label_4">
@@ -363,25 +267,37 @@
</property>
</widget>
</item>
- <item row="11" column="1">
- <spacer name="verticalSpacer_6">
+ <item row="1" column="2" rowspan="8">
+ <spacer name="horizontalSpacer_3">
<property name="orientation">
- <enum>Qt::Vertical</enum>
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
- <width>387</width>
- <height>43</height>
+ <width>17</width>
+ <height>256</height>
</size>
</property>
</spacer>
</item>
- <item row="6" column="1">
- <widget class="QCheckBox" name="checkForce4K">
- <property name="text">
- <string>Force ZFS 4K block size</string>
+ <item row="2" column="1">
+ <spacer name="verticalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- </widget>
+ <property name="sizeType">
+ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>387</width>
+ <height>18</height>
+ </size>
+ </property>
+ </spacer>
</item>
<item row="3" column="1">
<layout class="QGridLayout" name="gridLayout_3">
@@ -433,13 +349,117 @@
</item>
</layout>
</item>
- <item row="8" column="1">
+ <item row="4" column="1">
+ <widget class="QCheckBox" name="checkGPT">
+ <property name="text">
+ <string>Partition disk with GPT</string>
+ </property>
+ </widget>
+ </item>
+ <item row="5" column="1">
+ <widget class="QCheckBox" name="checkForce4K">
+ <property name="text">
+ <string>Force ZFS 4K block size</string>
+ </property>
+ </widget>
+ </item>
+ <item row="6" column="1">
<widget class="QCheckBox" name="checkSSD">
<property name="text">
<string>Installing to SSD (Disables SWAP / atime)</string>
</property>
</widget>
</item>
+ <item row="7" column="1">
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QComboBox" name="comboBootLoader">
+ <item>
+ <property name="text">
+ <string notr="true">GRUB</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true">BSD</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string notr="true">NONE</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLabel" name="textBootLoader">
+ <property name="text">
+ <string>Boot-Loader (GRUB recommended)</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer_4">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ <item row="8" column="1">
+ <widget class="QGroupBox" name="groupZFSPool">
+ <property name="font">
+ <font>
+ <weight>50</weight>
+ <bold>false</bold>
+ </font>
+ </property>
+ <property name="title">
+ <string>ZFS pool name</string>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="checked">
+ <bool>false</bool>
+ </property>
+ <layout class="QGridLayout" name="gridLayout_4">
+ <item row="0" column="0">
+ <widget class="QLineEdit" name="lineZpoolName">
+ <property name="inputMask">
+ <string/>
+ </property>
+ <property name="maxLength">
+ <number>32767</number>
+ </property>
+ <property name="placeholderText">
+ <string notr="true">tank</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item row="9" column="1">
+ <spacer name="verticalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>387</width>
+ <height>43</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
</layout>
</widget>
<widget class="QWizardPage" name="Page_ZFS">
View
9 src-qt4/pc-mounttray/i18n/MountTray_fr.ts
@@ -95,18 +95,15 @@
</message>
<message>
<source>Device Busy</source>
- <translation type="unfinished">
- </translation>
+ <translation>Périphérique occupé </translation>
</message>
<message>
<source>The device appears to be busy. Would you like to unmount it anyway?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Le périphérique semble être occupé. Voulez-vous le démonter toute façon? </translation>
</message>
<message>
<source>NOTE: This is generally not recommended unless you are sure that you don&apos;t have any applications using the device.</source>
- <translation type="unfinished">
- </translation>
+ <translation>NOTE: Ce n&apos;est généralement pas recommandée, sauf si vous êtes sûr que vous n&apos;avez pas toutes les applications qui est utilisé par le dispositif. </translation>
</message>
</context>
<context>
View
15 src-qt4/pc-mounttray/i18n/MountTray_fr_CA.ts
@@ -95,18 +95,15 @@
</message>
<message>
<source>Device Busy</source>
- <translation type="unfinished">
- </translation>
+ <translation>Périphérique occupé </translation>
</message>
<message>
<source>The device appears to be busy. Would you like to unmount it anyway?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Le périphérique semble être occupé. Voulez-vous le démonter toute façon?</translation>
</message>
<message>
<source>NOTE: This is generally not recommended unless you are sure that you don&apos;t have any applications using the device.</source>
- <translation type="unfinished">
- </translation>
+ <translation>NOTE: Ce n&apos;est généralement pas recommandée, sauf si vous êtes sûr que vous n&apos;avez pas toutes les applications qui est utilisé par le dispositif. </translation>
</message>
</context>
<context>
@@ -127,7 +124,7 @@
<source>Unable to determine the non-root user who started the application
Can not open the file manager with root permissions</source>
<translation>Impossible de déterminer l&apos;utilisateur non-administrateur, qui a démarré l&apos;application
- Impossible d&apos;ouvrir le gestionnaire de fichiers avec les permissions administrateur </translation>
+Impossible d&apos;ouvrir le gestionnaire de fichiers avec les permissions administrateur </translation>
</message>
<message>
<source>New Device</source>
@@ -139,15 +136,15 @@ Can not open the file manager with root permissions</source>
</message>
<message>
<source>Rescan Devices</source>
- <translation>Réanalyser les Dispositifs </translation>
+ <translation>Réanalyser les Dispositifs</translation>
</message>
<message>
<source>Please Wait</source>
<translation>Attendez s&apos;il vous plaît</translation>
</message>
<message>
<source>Rescanning devices attached to the system</source>
- <translation>Réanalyser les Dispositifs connectés au système </translation>
+ <translation>Réanalyser les Dispositifs connectés au système</translation>
</message>
<message>
<source>More Options</source>
View
24 src-qt4/pc-pkgmanager/i18n/PackageManager_fr.ts
@@ -228,43 +228,35 @@
</message>
<message>
<source>Dependencies</source>
- <translation type="unfinished">
- </translation>
+ <translation>Dépendances </translation>
</message>
<message>
<source>Find Packages</source>
- <translation type="unfinished">
- </translation>
+ <translation>Trouver des paquets</translation>
</message>
<message>
<source>Search</source>
- <translation type="unfinished">
- </translation>
+ <translation>Recherche</translation>
</message>
<message>
<source>No Search Results</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aucun résultat de recherche</translation>
</message>
<message>
<source>Do you want to continue the search from the top?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Voulez-vous continuer la recherche par le haut? </translation>
</message>
<message>
<source>No packages could be found with that search term. Please adjust it and try again.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aucun paquet n&apos;a pu être trouvée avec ce terme de recherche. S&apos;il vous plaît ajuster et essayer à nouveau. </translation>
</message>
<message>
<source>Processes Running</source>
- <translation type="unfinished">
- </translation>
+ <translation>Processus en cours </translation>
</message>
<message>
<source>Packages are currently being changed. Are you sure you want to quit?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Les paquets sont actuellement en cours de modification. Etes-vous sûr de vouloir quitter?</translation>
</message>
</context>
</TS>
View
24 src-qt4/pc-pkgmanager/i18n/PackageManager_fr_CA.ts
@@ -228,43 +228,35 @@
</message>
<message>
<source>Dependencies</source>
- <translation type="unfinished">
- </translation>
+ <translation>Dépendances </translation>
</message>
<message>
<source>Find Packages</source>
- <translation type="unfinished">
- </translation>
+ <translation>Trouver des paquets </translation>
</message>
<message>
<source>Search</source>
- <translation type="unfinished">
- </translation>
+ <translation>Recherche </translation>
</message>
<message>
<source>No Search Results</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aucun résultat de recherche</translation>
</message>
<message>
<source>Do you want to continue the search from the top?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Voulez-vous continuer la recherche par le haut?</translation>
</message>
<message>
<source>No packages could be found with that search term. Please adjust it and try again.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aucun paquet n&apos;a pu être trouvée avec ce terme de recherche. S&apos;il vous plaît ajuster et essayer à nouveau.</translation>
</message>
<message>
<source>Processes Running</source>
- <translation type="unfinished">
- </translation>
+ <translation>Processus en cours </translation>
</message>
<message>
<source>Packages are currently being changed. Are you sure you want to quit?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Les paquets sont actuellement en cours de modification. Etes-vous sûr de vouloir quitter?</translation>
</message>
</context>
</TS>
View
9 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr.ts
@@ -484,18 +484,15 @@
</message>
<message>
<source>Product Page</source>
- <translation type="unfinished">
- </translation>
+ <translation>Page Produit</translation>
</message>
<message>
<source>Verify Installation</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vérification de l&apos;installation </translation>
</message>
<message>
<source>Are you sure you want to install this application?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Êtes-vous sûr que vous voulez installer cette application? </translation>
</message>
</context>
<context>
View
9 src-qt4/pc-softwaremanager/i18n/SoftwareManager_fr_CA.ts
@@ -484,18 +484,15 @@
</message>
<message>
<source>Product Page</source>
- <translation type="unfinished">
- </translation>
+ <translation>Page Produit </translation>
</message>
<message>
<source>Verify Installation</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vérification de l&apos;installation</translation>
</message>
<message>
<source>Are you sure you want to install this application?</source>
- <translation type="unfinished">
- </translation>
+ <translation>Êtes-vous sûr que vous voulez installer cette application? </translation>
</message>
</context>
<context>
View
3 src-qt4/pc-updategui/i18n/UpdateGui_fr.ts
@@ -157,8 +157,7 @@
</message>
<message>
<source>Reboot required for update to finish!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Redémarrage requis pour terminer la mise à jour! </translation>
</message>
</context>
</TS>
View
3 src-qt4/pc-updategui/i18n/UpdateGui_fr_CA.ts
@@ -157,8 +157,7 @@
</message>
<message>
<source>Reboot required for update to finish!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Redémarrage requis pour terminer la mise à jour!</translation>
</message>
</context>
</TS>
View
3 src-qt4/warden-gui/i18n/Warden_fr.ts
@@ -227,8 +227,7 @@
</message>
<message>
<source>The following permissions can be enabled or disabled for this jail. For more details hover over each item or refer to the jail manpage.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Les autorisations suivantes peuvent être activées ou désactivées pour ce jail. Pour plus de détails planer sur chaque article ou reportez-vous à la page de manuel jail. </translation>
</message>
</context>
<context>
View
3 src-qt4/warden-gui/i18n/Warden_fr_CA.ts
@@ -227,8 +227,7 @@
</message>
<message>
<source>The following permissions can be enabled or disabled for this jail. For more details hover over each item or refer to the jail manpage.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Les autorisations suivantes peuvent être activées ou désactivées pour ce jail. Pour plus de détails planer sur chaque article ou reportez-vous à la page de manuel jail.</translation>
</message>
</context>
<context>
View
2 src-sh/pbi-manager10/install.sh
@@ -42,6 +42,8 @@ ln -f ${LB}/sbin/pbi_create ${LB}/sbin/pbi_update
ln -f ${LB}/sbin/pbi_create ${LB}/sbin/pbi_update_hashdir
ln -f ${LB}/sbin/pbi_create ${LB}/sbin/pbid
ln -f ${LB}/sbin/pbi_create ${LB}/sbin/pbi-crashhandler
+ln -f ${LB}/sbin/pbi_create ${LB}/sbin/app
+ln -f ${LB}/sbin/pbi_create ${LB}/sbin/pbi
# Set the new PREFIX / LOCALBASE
if [ "$LB" != /usr/local ] ; then
View
47 src-sh/pbi-manager10/pbi-manager
@@ -7641,6 +7641,51 @@ getZFSTank() {
return 1
}
+app_init()
+{
+ cmd=$1
+
+ # Alias install -> add
+ if [ "$cmd" = "install" ] ; then cmd="add" ; fi
+
+ which -s "pbi_${cmd}"
+ if [ $? -ne 0 ] ; then usage_app; fi
+
+ shift
+ pbi_${cmd} $*
+ exit $?
+}
+
+usage_app()
+{
+ cat <<EOF
+usage: `basename $0` <subcommand>
+
+Available sub-commands:
+
+ add
+ addrepo
+ autobuild
+ browser
+ create
+ deleterepo
+ delete
+ icon
+ indextool
+ info
+ install
+ listrepo
+ makeport
+ makepatch
+ makerepo
+ metatool
+ patch
+ update
+
+EOF
+ exit 1
+}
+
# Source our shared PCBSD functions
. /usr/local/share/pcbsd/scripts/functions.sh
@@ -7676,6 +7721,8 @@ case `basename ${0}` in
pbi_update) pbi_update_init "$@" ;;
pbi_update_hashdir) pbi_update_hashdir_init "$@" ;;
pbi-crashhandler) pbi_crash_init "$@" ;;
+ app) app_init "$@" ;;
+ pbi) app_init "$@" ;;
pbid) pbid_init "$@" ;;
*) echo "Error: Called with invalid basename!" ; exit_trap ;;
esac
View
6 src-sh/pc-extractoverlay/install.sh
@@ -30,11 +30,7 @@ if [ $? -ne 0 ] ; then
exit 1
fi
-# Copy exclude list
-cp port-excludes ${LB}/share/pcbsd/conf
-if [ $? -ne 0 ] ; then
- exit 1
-fi
+# Copy exclude lists
cp desktop-excludes ${LB}/share/pcbsd/conf
if [ $? -ne 0 ] ; then
exit 1
View
4 src-sh/pc-extractoverlay/port-excludes
@@ -1,4 +0,0 @@
-# List of files to exclude when re-extracting overlay distfile
-# Make sure to update both copies of this file in
-./usr/local/etc/gdm
-./usr/local/etc/default/grub
View
4 src-sh/pc-extractoverlay/ports-overlay/usr/local/etc/sudoers
@@ -5,6 +5,10 @@
## that prevent sudo from running.
##
## See the sudoers man page for the details on how to write a sudoers file.
+##
+## WARNING!!!
+## Changes to this file will be lost during system updates. Please set
+## custom option files in the /usr/local/etc/sudoers.d/ directory instead.
##
##
View
47 src-sh/pc-installdialog/pc-installdialog.sh
@@ -18,15 +18,23 @@ get_dlg_ans()
{
if [ -e "$TANS" ] ; then rm ${TANS}; fi
if [ -e "$TANS.dlg" ] ; then rm ${TANS}.dlg; fi
- echo "dialog --title \"$TITLE\" ${@}" >${TANS}.dlg
- sh ${TANS}.dlg 2>${TANS}
- exit=$?
- if [ ! -e "$TANS" ] ; then
- ANS=""
- return $exit
- fi
- ANS=`cat ${TANS}`
- return $exit
+ while :
+ do
+ echo "dialog --title \"$TITLE\" ${@}" >${TANS}.dlg
+ sh ${TANS}.dlg 2>${TANS}
+ if [ $? -ne 0 ] ; then
+ dialog --title "$TITLE" --yesno 'Exit the installer?' 8 30
+ if [ $? -eq 0 ] ; then exit_err "User canceled install" ; fi
+ continue
+ fi
+
+ if [ ! -e "$TANS" ] ; then
+ ANS=""
+ return
+ fi
+ ANS=`cat ${TANS}`
+ return
+ done
}
@@ -45,6 +53,15 @@ get_sys_type()
fi
}
+get_sys_bootmanager()
+{
+ # Ask the boot-manager
+ get_dlg_ans "--radiolist \"Boot Manager\" 12 50 5 GRUB \"GRUB - Recommended\" on BSD \"FreeBSD Boot-Loader\" off none \"No boot-loader\" off"
+ if [ -z "$ANS" ] ; then
+ exit_err "Invalid bootmanager type"
+ fi
+ SYSBOOTMANAGER="$ANS"
+}
get_target_disk()
{
@@ -114,7 +131,7 @@ get_root_pw()
fi
ROOTPWCONFIRM="$ANS"
if [ "$ROOTPWCONFIRM" = "$ROOTPW" ] ; then break; fi
- get_dlg_ans "--yesno 'Password Mismatch, try again?' 8 30"
+ dialog --title "$TITLE" --yesno 'Password Mismatch, try again?' 8 30
if [ $? -eq 0 ] ; then continue ; fi
exit_err "Failed setting root password!"
done
@@ -135,7 +152,7 @@ get_user_pw()
fi
USERPWCONFIRM="$ANS"
if [ "$USERPWCONFIRM" = "$USERPW" ] ; then break; fi
- get_dlg_ans "--yesno 'Password Mismatch, try again?' 8 30"
+ dialog --title "$TITLE" --yesno 'Password Mismatch, try again?' 8 30
if [ $? -eq 0 ] ; then continue ; fi
exit_err "Failed setting password!"
done
@@ -180,7 +197,7 @@ get_hostname()
get_sshd()
{
SYSSSHD=""
- get_dlg_ans "--yesno 'Enable SSH?' 8 30"
+ dialog --title "$TITLE" --yesno 'Enable SSH?' 8 30
if [ $? -ne 0 ] ; then return ; fi
SYSSSHD="YES"
}
@@ -193,7 +210,7 @@ get_netconfig()
SYSNICMASK=""
SYSNICROUTE=""
- get_dlg_ans "--yesno 'Enable networking?' 6 30"
+ dialog --title "$TITLE" --yesno 'Enable networking?' 6 30
if [ $? -ne 0 ] ; then return ; fi
dOpts="auto \"Automatic DHCP\" on"
@@ -282,7 +299,7 @@ gen_pc-sysinstall_cfg()
echo "# Disk Setup for $SYSDISK" >> ${CFGFILE}
echo "disk0=$SYSDISK" >> ${CFGFILE}
echo "partition=$DISKPART" >> ${CFGFILE}
- echo "bootManager=GRUB" >> ${CFGFILE}
+ echo "bootManager=${SYSBOOTMANAGER}" >> ${CFGFILE}
echo "partscheme=$DISKFORMAT" >> ${CFGFILE}
echo "commitDiskPart" >> ${CFGFILE}
@@ -338,6 +355,7 @@ gen_pc-sysinstall_cfg()
change_disk_selection() {
get_target_disk
get_target_part
+ get_sys_bootmanager
gen_pc-sysinstall_cfg
}
@@ -347,6 +365,7 @@ start_full_wizard()
get_sys_type
get_target_disk
get_target_part
+ get_sys_bootmanager
# If doing a server setup, need to prompt for some more details
if [ "$SYSTYPE" = "server" ] ; then
View
10 src-sh/pc-sysinstall/backend/functions-disk.sh
@@ -470,6 +470,10 @@ setup_disk_slice()
get_value_from_string "${line}"
strip_white_space "$VAL"
BMANAGER="$VAL"
+ # Convert to upper
+ if [ "$BMANAGER" = "bsd" ] ; then BMANAGER="BSD" ; fi
+ if [ "$BMANAGER" = "grub" ] ; then BMANAGER="GRUB" ; fi
+ if [ "$BMANAGER" = "grub-slice" ] ; then BMANAGER="GRUB-slice" ; fi
fi
echo $line | grep -q "^commitDiskPart" 2>/dev/null
@@ -711,7 +715,7 @@ init_mbr_full_disk()
# Make the partition active
rc_halt "gpart set -a active -i 1 ${_intDISK}"
- if [ "$_intBOOT" = "bsd" ] ; then
+ if [ "$_intBOOT" = "BSD" ] ; then
echo_log "Stamping boot0 on ${_intDISK}"
rc_halt "gpart bootcode -b /boot/boot0 ${_intDISK}"
elif [ "$_intBOOT" = "GRUB" ] ; then
@@ -848,7 +852,7 @@ run_gpart_slice()
sleep 1
- if [ "${BMANAGER}" = "bsd" ]; then
+ if [ "${BMANAGER}" = "BSD" ]; then
echo_log "Stamping boot sector on ${DISK}"
rc_halt "gpart bootcode -b /boot/boot0 ${DISK}"
elif [ "${BMANAGER}" = "GRUB" ] ; then
@@ -906,7 +910,7 @@ run_gpart_free()
sleep 1
- if [ "${BMANAGER}" = "bsd" ]; then
+ if [ "${BMANAGER}" = "BSD" ]; then
echo_log "Stamping boot sector on ${DISK}"
rc_halt "gpart bootcode -b /boot/boot0 ${DISK}"
elif [ "${BMANAGER}" = "GRUB" ] ; then
View
4 src-sh/port-files/Makefile
@@ -37,7 +37,9 @@ PLIST_FILES+= share/pbi-manager/.pbime \
share/pbi-manager/.pbimount \
share/pbi-manager/.ldconfig \
share/pbi-manager/.mount_nullfs \
- etc/man.d/pbi.conf
+ etc/man.d/pbi.conf \
+ sbin/app \
+ sbin/pbi
.endif
do-install:
View
1 src-sh/port-files/pkg-plist
@@ -145,7 +145,6 @@ share/pcbsd/conf/pbi-mirror
share/pcbsd/conf/pkg-mirror
share/pcbsd/conf/iso-mirror
share/pcbsd/conf/update-mirror
-share/pcbsd/conf/port-excludes
share/pcbsd/conf/prune-port-files
share/pcbsd/conf/desktop-excludes
share/pcbsd/conf/server-excludes

0 comments on commit dfb8c89

Please sign in to comment.