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

trueos · Jun 6, 2014 · ccc0b58 · ccc0b58
2 parents b139144 + 5a541db
commit ccc0b58
Show file tree

Hide file tree

Showing 160 changed files with 1,969 additions and 1,957 deletions.
diff --git 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
@@ -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
@@ -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
@@ -93,191 +93,154 @@
     </message>
     <message>
         <source>Height:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Hauteur:</translation>
     </message>
     <message>
         <source> pixels</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>pixels</translation>
     </message>
     <message>
         <source>Location:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Lieu:</translation>
     </message>
     <message>
         <source>Menu</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Menu</translation>
     </message>
     <message>
         <source>Default Terminal:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Défaut Terminal:</translation>
     </message>
     <message>
         <source>Menu Items:</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Menu Items:</translation>
     </message>
     <message>
         <source>Set Default Terminal Application</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Régler par défaut Terminal Application</translation>
     </message>
     <message>
         <source>Application Binaries (*)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Application Binaries (*)</translation>
     </message>
     <message>
         <source>Invalid Binary</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Invalide Binary</translation>
     </message>
     <message>
         <source>The selected file is not executable!</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Le fichier sélectionné n&apos;est pas exécutable!</translation>
     </message>
     <message>
         <source>Sample Panel Appearance</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Échantillon d&apos;Apparence du panneau</translation>
     </message>
     <message>
         <source>...</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>...</translation>
     </message>
     <message>
         <source>Select Panel Color</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Choisissez la couleur du panneau</translation>
     </message>
 </context>
 <context>
     <name>QObject</name>
     <message>
         <source>User Button</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Bouton Utilisateur</translation>
     </message>
     <message>
         <source>This is the main system access button for the user (applications, directories, settings, log out).</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Ceci est le bouton principal d&apos;accès au système de l&apos;utilisateur (applications, répertoires, paramètres, se déconnecter).</translation>
     </message>
     <message>
         <source>Desktop Bar</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Desktop Barre</translation>
     </message>
     <message>
         <source>This provides shortcuts to everything in the desktop folder - allowing easy access to all your favorite files/applications.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Cette offre des raccourcis pour tout dans le dossier de bureau - permettant un accès facile à tous vos fichiers/applications préférées.</translation>
     </message>
     <message>
         <source>Spacer</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Espaceur</translation>
     </message>
     <message>
         <source>Invisible spacer to separate plugins.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Espacement invisible pour greffons séparés.</translation>
     </message>
     <message>
         <source>Desktop Switcher</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Desktop Switcher</translation>
     </message>
     <message>
         <source>Controls for switching between the various virtual desktops.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Les commandes de commutation entre les différents postes de travail virtuels.</translation>
     </message>
     <message>
         <source>Battery Monitor</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Moniteur de batterie</translation>
     </message>
     <message>
         <source>Keep track of your battery status.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Gardez une trace de votre état de la batterie.</translation>
     </message>
     <message>
         <source>Time/Date</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Heure/Date</translation>
     </message>
     <message>
         <source>View the current time and date.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Afficher l&apos;heure et la date courante.</translation>
     </message>
     <message>
         <source>Terminal</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Terminal</translation>
     </message>
     <message>
         <source>Start the default system terminal.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Lancer le terminal par défaut du système.</translation>
     </message>
     <message>
         <source>Applications</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Applications</translation>
     </message>
     <message>
         <source>Show the system applications menu.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Afficher le menu des applications du système.</translation>
     </message>
     <message>
         <source>Separator</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Séparateur</translation>
     </message>
     <message>
         <source>Static horizontal line.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Ligne horizontale statique.</translation>
     </message>
     <message>
         <source>Settings</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Paramètres</translation>
     </message>
     <message>
         <source>Show the desktop settings menu.</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Afficher le menu de configuration de bureau.</translation>
     </message>
     <message>
         <source>Task Manager</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Gestionnaire des tâches</translation>
     </message>
     <message>
         <source>View and control any running application windows</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Voir et contrôler les fenêtres de l&apos;application en cours d&apos;exécution</translation>
     </message>
     <message>
         <source>System Tray</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Plateau de système</translation>
     </message>
     <message>
         <source>Display area for dockable system applications</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Zone d&apos;affichage pour les applications du système fixables</translation>
     </message>
 </context>
 </TS>
diff --git a/lumina/lumina-open/i18n/lumina-open_fr.ts b/lumina/lumina-open/i18n/lumina-open_fr.ts
@@ -85,23 +85,19 @@
     </message>
     <message>
         <source>Open With...</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Ouvrir avec...</translation>
     </message>
     <message>
         <source>Preferred</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Préférence</translation>
     </message>
     <message>
         <source>Available</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Disponible</translation>
     </message>
     <message>
         <source>Custom</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Personnaliser</translation>
     </message>
 </context>
 </TS>
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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