Revert "Merge branch 'master' of github.com:pcbsd/pcbsd into 9.2-rele…

…ase"

This reverts commit d208e87, reversing
changes made to 8cdae0b.

Conflicts:
	src-qt4/pc-installgui/installer.cpp

.gitignore

@@ -1124,85 +1124,3 @@ src-qt4/pc-zmanager/i18n/ZManager_zh_CN.qm
 src-qt4/pc-zmanager/i18n/ZManager_zh_HK.qm
 src-qt4/pc-zmanager/i18n/ZManager_zh_TW.qm
 src-qt4/pc-zmanager/i18n/ZManager_zu.qm
-src-qt4/PCDM/themes/default/.directory
-src-qt4/life-preserver/lp-gui/Makefile
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_af.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ar.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_az.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_bg.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_bn.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_bs.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ca.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_cs.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_cy.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_da.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_de.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_el.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_en_GB.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_en_US.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_en_ZA.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_es.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_et.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_eu.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_fa.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_fi.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_fr.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_fr_CA.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_fur.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_gl.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_he.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_hi.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_hr.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_hu.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_id.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_is.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_it.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ja.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ka.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ko.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_lt.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_lv.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_mk.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_mn.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ms.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_mt.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_nb.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ne.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_nl.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_pa.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_pl.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_pt.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_pt_BR.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ro.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ru.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_sa.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_sk.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_sl.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_sr.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_sv.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_sw.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_ta.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_tg.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_th.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_tr.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_uk.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_uz.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_vi.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_zh_CN.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_zh_HK.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_zh_TW.qm
-src-qt4/life-preserver/lp-gui/i18n/LifePreserver_zu.qm
-src-qt4/life-preserver/lp-gui/life-preserver
-src-qt4/life-preserver/lp-gui/ui_LPConfig.h
-src-qt4/life-preserver/lp-gui/ui_LPMain.h
-src-qt4/life-preserver/lp-gui/ui_LPWizard.h
-src-qt4/pc-zmanager/Makefile
-src-qt4/pc-zmanager/pc-zmanager
-src-qt4/pc-zmanager/ui_dialogfscreate.h
-src-qt4/pc-zmanager/ui_dialogfsprop.h
-src-qt4/pc-zmanager/ui_dialogmount.h
-src-qt4/pc-zmanager/ui_dialogname.h
-src-qt4/pc-zmanager/ui_dialognewpool.h
-src-qt4/pc-zmanager/ui_dialogpartition.h
-src-qt4/pc-zmanager/ui_dialogprop.h
-src-qt4/pc-zmanager/ui_zmanagerwindow.h

build-files/conf/port-make.conf

@@ -49,7 +49,6 @@ claws-mail_SET=BOGOFILTER GPGME SPAMASSASSIN
 conky_SET=XFT LUA LUA_CAIRO LUA_IMLIB2 IMLIB2
 cups-base_SET=XPDF
 cups-base_UNSET=GHOSTSCRIPT
-curl_SET=COOKIES
 denemo_SET=LILYPOND
 dovecot_SET=MYSQL PGSQL SQLITE LDAP
 easytag_SET=WAVEPACK

build-files/ports-overlay/misc/pcbsd-base/Makefile

@@ -14,7 +14,6 @@ MAINTAINER=	kmoore@FreeBSD.org
 COMMENT=	PC-BSD QT4 Utilities
 
 RUN_DEPENDS=	pc-updategui:${PORTSDIR}/sysutils/pcbsd-utils-qt4 \
-		git:${PORTSDIR}/devel/git \
 		beadm:${PORTSDIR}/sysutils/beadm-devel \
 		samba36>=0:${PORTSDIR}/net/samba36 \
 		foomatic-db>=0:${PORTSDIR}/print/foomatic-db \
@@ -125,7 +124,7 @@ RUN_DEPENDS=	pc-updategui:${PORTSDIR}/sysutils/pcbsd-utils-qt4 \
 		tk84>=0:${PORTSDIR}/x11-toolkits/tk84 \
 		tk85>=0:${PORTSDIR}/x11-toolkits/tk85 \
 		tk86>=0:${PORTSDIR}/x11-toolkits/tk86 \
-		panicmail>=0:${PORTSDIR}/sysutils/panicmail \
+		gdm>=0:${PORTSDIR}/x11/gdm \
 		grub-mkconfig:${PORTSDIR}/sysutils/grub2 \
 		grub2-efi>=0:${PORTSDIR}/sysutils/grub2-efi
 

build-files/ports-overlay/misc/trueos-base/Makefile

@@ -37,7 +37,6 @@ RUN_DEPENDS=    pkg-static:${PORTSDIR}/ports-mgmt/pkg \
 		mosh:${PORTSDIR}/net/mosh \
 		zfs-stats:${PORTSDIR}/sysutils/zfs-stats \
 		ataidle>=0:${PORTSDIR}/sysutils/ataidle \
-		panicmail>=0:${PORTSDIR}/sysutils/panicmail \
 		grub-mkconfig:${PORTSDIR}/sysutils/grub2 \
 		grub2-efi>=0:${PORTSDIR}/sysutils/grub2-efi
 

overlays/install-overlay/root/Desktop/installpcbsd.desktop

@@ -27,7 +27,7 @@ Name[en_US]=Install PC-BSD
 Name[en_ZA]=Install PC-BSD
 Name[es]=Instalar PC-BSD
 Name[et]=Paigalda PC-BSD
-Name[fa]=نصب PC-BSD
+Name[fa]= نصب PC-BSD
 Name[fi]=Asenna PC-BSD
 Name[fr]=Installer PC-BSD
 Name[fr_CA]=Installer PC-BSD
@@ -38,7 +38,6 @@ Name[id]=Instal PC-BSD
 Name[it]=Installa PC-BSD
 Name[ja]=PC-BSD のインストール
 Name[ko]=PC-BSD 설치
-Name[lv]=Installēt PC-BSD
 Name[mn]=PC-BSD суулгах
 Name[nl]=Installeer PC-BSD
 Name[pl]=Instaluj PC-BSD
@@ -81,7 +80,6 @@ Comment[id]=Instal PC-BSD ke Disk
 Comment[it]=Installa PC-BSD sul Disco
 Comment[ja]=PC-BSD をディスクにインストール
 Comment[ko]=PC-BSD를 디스크에 설치
-Comment[lv]=Installēt PC-BSD uz diska
 Comment[mn]=PC-BSD Диск рүү суулгах
 Comment[nl]=Installeer PC-BSD op schijf
 Comment[pl]=Instaluj PC-BSD na dysku

src-qt4/EasyPBI/i18n/EasyPBI_fa.ts

@@ -357,7 +357,7 @@
     </message>
     <message>
         <source>Current Entries</source>
-        <translation>مطالب فعلی</translation>
+        <translation> مطالب فعلی</translation>
     </message>
     <message>
         <source>File</source>
@@ -397,11 +397,11 @@
     </message>
     <message>
         <source>Flags to determine the file type</source>
-        <translation>پرچم برای تعیین نوع فایل</translation>
+        <translation> پرچم برای تعیین نوع فایل</translation>
     </message>
     <message>
         <source>Available flags for the new link</source>
-        <translation>پرچم های موجود برای لینک جدید</translation>
+        <translation> پرچم های موجود برای لینک جدید</translation>
     </message>
     <message>
         <source>Save this link to the PBI module</source>