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

trueos · Mar 19, 2014 · f4533dc · f4533dc
2 parents f758657 + 802876a
commit f4533dc
Show file tree

Hide file tree

Showing 1,061 changed files with 29,268 additions and 19,976 deletions.
diff --git a/build-files/conf/port-make.conf b/build-files/conf/port-make.conf
@@ -79,6 +79,7 @@ jasperserver_SET=XLS
 k3b_SET=SOX NORMALIZE TRANSCODE
 kmymoney-kde4_SET=KBANKING OFX
 kopete_SET=WEBCAM
+krdc_SET=FREERDP
 libreoffice_SET=SYSTRAY
 libxine_SET=LIBBLURAY VAAPI WAVPACK SMB XVMC
 libxul_UNSET=ALSA

diff --git a/build-files/ports-overlay/misc/pcbsd-base/Makefile b/build-files/ports-overlay/misc/pcbsd-base/Makefile
@@ -43,7 +43,6 @@ RUN_DEPENDS=	pc-updategui:${PORTSDIR}/sysutils/pcbsd-utils-qt4 \
 		growisofs:${PORTSDIR}/sysutils/dvd+rw-tools \
 		ssh-askpass:${PORTSDIR}/security/openssh-askpass \
 		vim:${PORTSDIR}/editors/vim \
-		cups-smb-backend>=0:${PORTSDIR}/print/cups-smb-backend \
 		cups-pdf>=0:${PORTSDIR}/print/cups-pdf \
 		cups-bjnp>=0:${PORTSDIR}/print/cups-bjnp \
 		splix>=0:${PORTSDIR}/print/splix \

diff --git a/build-files/ports-overlay/misc/pcbsd-meta-handheld/Makefile b/build-files/ports-overlay/misc/pcbsd-meta-handheld/Makefile
@@ -13,8 +13,7 @@ MAINTAINER=	kris@pcbsd.org
 COMMENT=	The meta-port pcbsd-meta-handheld
 
 RUN_DEPENDS=	synce-librapi2>=0:${PORTSDIR}/palm/synce-librapi2 \
-		synce-librra>=0:${PORTSDIR}/palm/synce-librra \
-		synce-sync-engine>=0:${PORTSDIR}/palm/synce-sync-engine
+		synce-librra>=0:${PORTSDIR}/palm/synce-librra
 
 NO_BUILD=	yes
 

diff --git a/overlays/install-overlay/root/PCBSDStart.sh b/overlays/install-overlay/root/PCBSDStart.sh
@@ -63,7 +63,7 @@ if [ -e "/usr/pcbsd-live" ]; then
   if [ "$FOUND" = "0" ]
   then
     /root/PCBSDtext.sh
-    shutdown -r now
+    reboot -q
     exit
   fi
 
@@ -94,7 +94,7 @@ mkdir /tmp/xkb
 kenv xconsole 2>/dev/null | grep -q "YES"
 if [ $? -eq 0 ]; then
   /root/PCBSDtext.sh
-  shutdown -r now
+  reboot -q
   exit
 fi
 
@@ -105,12 +105,12 @@ start_xorg
 if [ -e "/root/.exitStatus" ] ; then
   STATUS="`cat /root/.exitStatus`"
   if [ "$STATUS" = "0" ] ; then
-    shutdown -r now
+    reboot -q
   else
     echo "Installation failed! Press any key to drop to shell or type 'reboot' to restart the system"
     read tmp
     if [ "$tmp" = "reboot" ] ; then
-      shutdown -r now
+      reboot -q
     else
       /bin/sh
     fi

diff --git a/overlays/install-overlay/root/PCBSDtext.sh b/overlays/install-overlay/root/PCBSDtext.sh
@@ -26,7 +26,7 @@ case $ANS in
              startx 2>/tmp/Xerrors ;;
     utility) /root/PCBSDUtil.sh
               clear ;;
-     reboot)  shutdown -r now ;;
+     reboot)  reboot -q ;;
           *) ;;
 esac
 

diff --git a/src-qt4/EasyPBI/i18n/EasyPBI_af.ts b/src-qt4/EasyPBI/i18n/EasyPBI_af.ts
@@ -744,103 +744,128 @@
     </message>
     <message>
         <source>&amp;Build PBI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Cancel Build</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Save Build Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Save Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Change</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Add File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Delete File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Wrapper Script</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Save Script</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Create</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Remove Entry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Add Entry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Configure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>Free&amp;BSD Ports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;PBI Modules</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Package Module</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Refresh Module</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>

diff --git a/src-qt4/EasyPBI/i18n/EasyPBI_ar.ts b/src-qt4/EasyPBI/i18n/EasyPBI_ar.ts
@@ -880,103 +880,128 @@
     </message>
     <message>
         <source>&amp;Build PBI</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Cancel Build</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Save Build Log</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Save Configuration</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Change</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Add File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Delete File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Wrapper Script</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Save Script</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Save</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Add</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Create</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Remove</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Remove Entry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Add Entry</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;File</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Configure</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Help</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Settings</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>Free&amp;BSD Ports</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;PBI Modules</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Quit</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Package Module</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;About</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
     <message>
         <source>&amp;Refresh Module</source>
-        <translation type="unfinished"></translation>
+        <translation type="unfinished">
+            </translation>
     </message>
 </context>
 <context>