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

build-files/conf/port-make.conf

@@ -66,7 +66,6 @@ gnupg_SET=GPGSM
 gpgme_SET=GPGSM
 graveman_SET=MP3 OGG DVD
 grip_SET=FAAC FLAC GOGO
-grub2_SET=MKFONT ZFS
 gthumb_SET=EXIV2
 hal_SET=FIXED_MOUNTPOINTS
 hplip_SET=SNMP SCAN XSANE FAX
@@ -89,7 +88,7 @@ nginx_SET=HTTP_FLV HTTP_SSL PASSENGER
 nvidia-driver_SET=ACPI_PM
 perl-5.14_SET=THREADS
 php5_SET=APACHE FPM
-postfix_SET=MYSQL TLS
+postfix_SET=MYSQL TLS DOVECOT
 pspp_SET=GUI
 qemu_SET=KQEMU
 quodlibet_SET=EXTENSIONS

overlays/install-overlay/root/PCBSDUtil.sh

@@ -12,7 +12,7 @@ i="1"
 do
 
 # Display Utility Menu
-dialog --title "PC-BSD Utility Menu" --menu "Please select from the following options:" 20 55 15 shell "Drop to emergency shell" chroot "Chroot into root partition" exit "Exit Utilities" 2>/tmp/UtilAnswer
+dialog --title "PC-BSD Utility Menu" --menu "Please select from the following options:" 20 55 15 shell "Drop to emergency shell" exit "Exit Utilities" 2>/tmp/UtilAnswer
 
 ANS="`cat /tmp/UtilAnswer`"
 
@@ -23,31 +23,6 @@ case $ANS in
 #############################################################"
 
               /bin/csh ;;
-     chroot) clear 
-             $ECHO "Enter the root partition of the drive you wish
-to chroot to. (Example: /dev/ad0s1a for an IDE drive.)
-Select Partition:\c"
-             read partition
-             if [ -e "$partition" ]
-             then
-                 mount $partition /mnt
-                 if [ "$?" = "0" ]
-                 then
-                     $ECHO "# PC-BSD chroot session
-#
-# Please type 'exit' to return to the menu
-#############################################################"
-                     chroot /mnt /bin/sh
-                     umount /mnt
-                     $ECHO "(Press Enter to continue)\c" ; read tmp
-                 else 
-                    $ECHO "Error mounting partition ($partition) (Press Enter to continue)\c" ; read tmp
-                 fi
-             else
-                $ECHO "Device doesn't exist! (Press Enter to continue)\c"; read tmp
-             fi
-
-             ;;
         exit) break ; exit 0 ;;
           *) ;;
 esac

overlays/install-overlay/root/cardDetect/XF86Config.default

@@ -62,25 +62,4 @@ Section "Screen"
 	Identifier "Screen0"
 	Device     "Card0"
 	Monitor    "Monitor0"
-	DefaultDepth 24
-	SubSection "Display"
-		Depth     4
-		Modes	"1024x768"
-	EndSubSection
-	SubSection "Display"
-		Depth     8
-		Modes	"1024x768"
-	EndSubSection
-	SubSection "Display"
-		Depth     15
-		Modes	"1024x768"
-	EndSubSection
-	SubSection "Display"
-		Depth     16
-		Modes	"1024x768"
-	EndSubSection
-	SubSection "Display"
-		Depth     24
-		Modes	"1024x768"
-	EndSubSection
 EndSection

overlays/install-overlay/root/cardDetect/XF86Config.intel

@@ -61,27 +61,6 @@ Section "Screen"
 	Identifier "Screen0"
 	Device     "Card0"
 	Monitor    "Monitor0"
-	DefaultDepth 24
-	SubSection "Display"
-		Depth     4
-		Modes	"1024x768"
-	EndSubSection
-	SubSection "Display"
-		Depth     8
-		Modes	"1024x768"
-	EndSubSection
-	SubSection "Display"
-		Depth     15
-		Modes	"1024x768"
-	EndSubSection
-	SubSection "Display"
-		Depth     16
-		Modes	"1024x768"
-	EndSubSection
-	SubSection "Display"
-		Depth     24
-		Modes	"1024x768"
-	EndSubSection
 EndSection
 
 Section "Device"

overlays/install-overlay/root/functions.sh

@@ -16,16 +16,60 @@ detect_x()
     return
   fi
 
-  # Ignore X -configure for now, let startx handle it
-  # Now run the X auto-detection
-  #echo "Detecting X Setup..."
-  #sleep 5
-  #HOME="/root" ; export HOME
-  #X -configure >/dev/null 2>&1
-  # Copy over the new xorg.conf
-  #cp /root/xorg.conf.new /etc/X11/xorg.conf
-  # Use nvidia driver
-  #sed -i '' 's|"nv"|"nvidia"|g' /etc/X11/xorg.conf
+}
+
+cfg_second_card()
+{
+  # This is a script to try an xorg.conf file configured to use the second vgapci1 device
+  # For most systems this wont do anything, but on a number of newer hybrid
+  # intel/amd or intel/nvidia laptops this may fix a problem where the intel card (which works)
+  # is the secondary pcivga1 device, and the non-functional AMD/NVIDIA optimus  shows up first.
+
+  inCard=0
+  pciconf -lv > /tmp/.pciconf.$$
+  while read line
+  do
+    echo $line | grep -q "^vgapci"
+    if [ $? -eq 0 ] ; then
+       curCard=`echo $line | cut -d "@" -f 1 | sed 's|vgapci||g'`
+       busID="`echo $line | cut -d ':' -f 2-4`"
+       inCard=1
+       continue
+    fi
+
+    echo $line | grep -q "subclass"
+    if [ $? -eq 0 ] ; then inCard=0; continue; fi
+
+    if [ $inCard -eq 1 ] ; then
+       echo $line | grep -q "vendor"
+       if [ $? -eq 0 ]; then
+          case $curCard in
+             0) card1=`echo $line | cut -d "'" -f 2`
+                card1bus="$busID"
+                ;;
+             1) card2=`echo $line | cut -d "'" -f 2`
+                card2bus="$busID"
+	        ;;
+             *) ;;
+          esac
+       fi
+    fi
+  done < /tmp/.pciconf.$$
+  rm /tmp/.pciconf.$$
+
+  # No secondary card, return 1
+  if [ -z "$card2" ] ; then return 1; fi
+
+  # Found a second card, lets try an xorg config for it
+  cp /root/cardDetect/XF86Config.default /etc/X11/xorg.conf
+  echo "
+Section \"Device\"
+        Identifier      \"Card0\"
+        BusID           \"${card2bus}\"
+EndSection
+  " >> /etc/X11/xorg.conf
+
+  return 0
 
 }
 
@@ -35,12 +79,16 @@ start_xorg()
   startx
   if [ ! -e "/tmp/.xstarted" ]
   then
-    # Failed to start X with detected driver. Now try our detection mode.
-    echo "ERROR: Failed to start X with detected driver... Trying SAFE mode..."
-    rm /etc/X11/xorg.conf
-    X -configure >/dev/null 2>&1
-    # Copy over the new xorg.conf
-    cp /root/xorg.conf.new /etc/X11/xorg.conf
+    # Failed to auto-start X with its own internal video detection
+    # Now lets try some magic
+    rm /etc/X11/xorg.conf 2>/dev/null
+
+    echo "ERROR: Failed to start X with default video card... Trying secondary mode..."
+    cfg_second_card
+    if [ $? -ne 0 ] ; then
+      # Try the Intel driver, since nvidia/vesa will fail on optimus cards
+      cp /root/cardDetect/XF86Config.intel /etc/X11/xorg.conf
+    fi
 
     startx
     if [ ! -e "/tmp/.xstarted" ]

retired/pc-gdmconf/pcgdmconf.desktop

@@ -27,6 +27,7 @@ Name[fr_CA]=Configuration GDM
 Name[he]=הגדרות GDM
 Name[hr]=GDM postavke
 Name[hu]=GDM-beállítás
+Name[id]=Susunan GDM
 Name[it]=Configurazione GDM
 Name[ja]=GDM の設定
 Name[ko]=GDM 설정

src-qt4/EasyPBI/EasyPBI.desktop

@@ -22,6 +22,7 @@ Name[fr]=EasyPBI
 Name[fr_CA]=EasyPBI
 Name[hr]=EasyPBI
 Name[hu]=EasyPBI
+Name[id]=EasyPBI
 Name[it]=EasyPBI
 Name[ja]=EasyPBI
 Name[ko]=EasyPBI

src-qt4/EasyPBI/i18n/EasyPBI_et.ts

@@ -665,32 +665,27 @@
     </message>
     <message>
         <source>View Package Overrides (optional)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Täpsusta pakkide parameetreid (valikuline)</translation>
     </message>
     <message>
         <source>Add Pkgs</source>
         <translation>Lisa pakke</translation>
     </message>
     <message>
         <source>Never use pre-built packages</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Ära kasuta eelnevalt ehitatud pakke</translation>
     </message>
     <message>
         <source>View Repository Information (optional)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Täpsusta varamu infot (valikuline)</translation>
     </message>
     <message>
         <source>Tags</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Sildid</translation>
     </message>
     <message>
         <source>Comma-separated list of search tags for the application</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Komaga eraldatud sildid, mille järgi rakendust otsida saab</translation>
     </message>
     <message>
         <source>App Type</source>
@@ -715,8 +710,7 @@
     </message>
     <message>
         <source>View Repository Management (optional)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Täpsusta varamu haldamise sätteid (valikuline)</translation>
     </message>
     <message>
         <source>Build Key</source>
@@ -772,13 +766,11 @@
     </message>
     <message>
         <source>Build PBI (Running)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Ehita PBI (tegemisel)</translation>
     </message>
     <message>
         <source>Build PBI (Done)</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Ehita PBI (valmis)</translation>
     </message>
 </context>
 <context>
@@ -1038,13 +1030,11 @@
     <name>pkgSelect</name>
     <message>
         <source>Select a package</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Vali pakk</translation>
     </message>
     <message>
         <source>Search</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Otsi</translation>
     </message>
     <message>
         <source>...</source>
@@ -1053,33 +1043,27 @@
     </message>
     <message>
         <source>Available Packages</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Saadaolevad pakid</translation>
     </message>
     <message>
         <source>Cancel</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Katkesta</translation>
     </message>
     <message>
         <source>Accept</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Nõustu</translation>
     </message>
     <message>
         <source>No Packages Available</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Pakke pole saadaval</translation>
     </message>
     <message>
         <source>Search Finished</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Otsimine lõpetatud</translation>
     </message>
     <message>
         <source>No package found with that term</source>
-        <translation type="unfinished">
-            </translation>
+        <translation>Ühtegi pakki sellise nimega ei leitud</translation>
     </message>
 </context>
 </TS>