Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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

Conflicts:
	src-sh/xtrafiles/local/share/pcbsd/conf/pcbsd-mirrors
  • Loading branch information...
commit c9e754c0361e7e630549c6a7a3e4ae5ffa361828 2 parents dac7e02 + 9bdcc26
@kmoore134 kmoore134 authored
View
3  build-files/conf/port-make.conf
@@ -12,6 +12,9 @@ WITH_PLASMA_PYTHON=yes
WITH_PLASMA_RUBY=yes
WITH_VDPAU=yes
+# Revert back to Ruby 1.8 for the time being, 1.9 isn't working with KDE yet
+RUBY_DEFAULT_VER=1.8
+
# Setup pkgng
WITH_PKGNG=yes
DEFAULT_MIRROR_TYPE=2
View
69 src-qt4/EasyPBI/i18n/EasyPBI_et.ts
@@ -765,23 +765,19 @@
</message>
<message>
<source>Application needs administrator privileges to run</source>
- <translation type="unfinished">
- </translation>
+ <translation>Rakendus vajab käivitamiseks administraatori õigusi</translation>
</message>
<message>
<source>Requires Root</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vajalik juurkasutaja</translation>
</message>
<message>
<source>Refresh Module</source>
- <translation type="unfinished">
- </translation>
+ <translation>Värskenda moodulit</translation>
</message>
<message>
<source>Please open up the EasyPBI settings to correct this deficiency.</source>
- <translation type="unfinished">
- </translation>
+ <translation>Ava EasyPBI sätted, et see viga parandada.</translation>
</message>
</context>
<context>
@@ -1095,17 +1091,15 @@
</message>
<message>
<source>FreeBSD Ports</source>
- <translation type="unfinished">FreeBSD pordid</translation>
+ <translation>FreeBSD pordid</translation>
</message>
<message>
<source>Ports Tree</source>
- <translation type="unfinished">
- </translation>
+ <translation>Portide puu</translation>
</message>
<message>
<source>Last Update</source>
- <translation type="unfinished">
- </translation>
+ <translation>Viimane värskendus</translation>
</message>
<message>
<source>TextLabel</source>
@@ -1114,90 +1108,79 @@
</message>
<message>
<source>Create Dir</source>
- <translation type="unfinished">
- </translation>
+ <translation>Loo kaust</translation>
</message>
<message>
<source>Update</source>
- <translation type="unfinished">
- </translation>
+ <translation>Värskenda</translation>
</message>
<message>
<source>Status</source>
- <translation type="unfinished">Olek</translation>
+ <translation>Olek</translation>
</message>
<message>
<source>PBI Builds</source>
- <translation type="unfinished">
- </translation>
+ <translation>Ehitatud PBI-d</translation>
</message>
<message>
<source>External Utilities</source>
- <translation type="unfinished">
- </translation>
+ <translation>Välised tööriistad</translation>
</message>
<message>
<source>Default Search Paths</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vaikimisi otsingurajad</translation>
</message>
<message>
<source>Modules</source>
- <translation type="unfinished">
- </translation>
+ <translation>Moodulid</translation>
</message>
<message>
<source>Resources</source>
- <translation type="unfinished">Ressursid</translation>
+ <translation>Ressursid</translation>
</message>
<message>
<source>Default Icon</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vaikimisi ikoon</translation>
</message>
<message>
<source>Current User (~/EasyPBI/ports)</source>
- <translation type="unfinished">
- </translation>
+ <translation>Praegune kasutaja (~/EasyPBI/ports)</translation>
</message>
<message>
<source>All Users (/usr/ports)</source>
- <translation type="unfinished">
- </translation>
+ <translation>Kõik kasutajad (/usr/ports)</translation>
</message>
<message>
<source>Other</source>
- <translation type="unfinished">
- </translation>
+ <translation>Muu</translation>
</message>
<message>
<source>Nonexistent</source>
- <translation type="unfinished">
- </translation>
+ <translation>Puudub</translation>
</message>
<message>
<source>Success</source>
- <translation type="unfinished">Õnnestus</translation>
+ <translation>Õnnestus</translation>
</message>
<message>
<source>The FreeBSD ports tree has been successfully updated</source>
- <translation type="unfinished">FreeBSD portide puu uuendati edukalt</translation>
+ <translation>FreeBSD portide puu uuendati edukalt</translation>
</message>
<message>
<source>Failure</source>
- <translation type="unfinished">Tõrge</translation>
+ <translation>Tõrge</translation>
</message>
<message>
<source>The FreeBSD ports tree has failed to update.</source>
- <translation type="unfinished">FreeBSD portide puud ei õnnestunud uuendada.</translation>
+ <translation>FreeBSD portide puud ei õnnestunud uuendada.</translation>
</message>
<message>
<source>Last Message: %1</source>
- <translation type="unfinished">Viimane sõnum: %1</translation>
+ <translation>Viimane sõnum: %1</translation>
</message>
<message>
<source>Requesting Root Access</source>
- <translation type="unfinished">Küsitakse juurkasutaja ligipääsu</translation>
+ <translation>Nõutud on juurkasutaja ligipääs</translation>
</message>
</context>
<context>
View
5 src-qt4/EasyPBI/mainGUI.cpp
@@ -1414,7 +1414,10 @@ void MainGUI::on_push_build_start_clicked(){
//Setup Process connections
p = new QProcess(this);
p->setProcessChannelMode(QProcess::MergedChannels);
- p->setProcessEnvironment( QProcessEnvironment::systemEnvironment() );
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ env.remove("LD_LIBRARY_PATH");
+ p->setProcessEnvironment( env );
+ p->setWorkingDirectory(QDir::homePath());
connect(p,SIGNAL(readyReadStandardOutput()),this,SLOT(slotUpdatePBIBuild()) );
connect(p,SIGNAL(finished(int,QProcess::ExitStatus)),this,SLOT(slotPBIbuildFinished(int,QProcess::ExitStatus)) );
connect(p,SIGNAL(error(QProcess::ProcessError)),this,SLOT(slotBuildError(QProcess::ProcessError)) );
View
10 src-qt4/libpcbsd/ui/i18n/libpcbsd_et.ts
@@ -16,7 +16,7 @@
<name>dialogMetaProgress</name>
<message>
<source>System-Packages</source>
- <translation>Süsteemi paketid</translation>
+ <translation>Süsteemi pakid</translation>
</message>
<message>
<source>Total Progress</source>
@@ -28,13 +28,13 @@
</message>
<message>
<source>Meta-Package Changes</source>
- <translation>Metapakettide muutmine</translation>
+ <translation>Metapakkide muutmine</translation>
</message>
<message>
<source>Warning: Packages are still being modifed!
If you cancel now the packages may be corrupted. Cancel anyway?</source>
- <translation>Hoiatus: pakettide muudetakse!
-Kui nüüd katkestada, siis võivad paketid katki minna. Katkestada ikkagi?</translation>
+ <translation>Hoiatus: pakke muudetakse!
+Kui nüüd katkestada, siis võivad pakid katki minna. Katkestada ikkagi?</translation>
</message>
</context>
<context>
@@ -116,7 +116,7 @@ Kui nüüd katkestada, siis võivad paketid katki minna. Katkestada ikkagi?</tra
</message>
<message>
<source>Performing system-package changes.</source>
- <translation>Teostatakse süsteemi pakettide muudatusi.</translation>
+ <translation>Teostatakse süsteemi pakkide muudatusi.</translation>
</message>
<message>
<source>System Packages</source>
View
1  src-qt4/pc-controlpanel/items/de/lxde-desktop-prefs.desktop
@@ -9,6 +9,7 @@ Categories=Settings;DesktopSettings;X-LXDE-Settings;GTK;
OnlyShowIn=LXDE;
Name=Desktop Preferences
Name[ar]=خصائص سطح المكتب
+Name[bg]=Настройки на работния плот
Name[bs]=Podešavanja radne površine
Name[de]=Arbeitsflächeneinstellungen
Name[en_GB]=Desktop Preferences
View
1  src-qt4/pc-controlpanel/items/software/easypbi.desktop
@@ -72,6 +72,7 @@ GenericName[zh_HK]=EasyPBI
GenericName[zh_TW]=EasyPBI
Comment=Simple PBI creation system
Comment[ar]=نظام إنشاء PBI المبسط
+Comment[bg]=Опростена система за правене на PBI
Comment[bs]=Jednostavan sistem za pravljenje PBI
Comment[de]=Einfaches PBI-Entwicklungssystem
Comment[en_GB]=Simple PBI creation system
View
2  src-qt4/pc-controlpanel/items/software/pc-pkgmanager.desktop
@@ -9,10 +9,12 @@ Name=Package Manager
Name[bs]=Upravljač paketa
Name[de]=Paketverwalter
Name[es]=Administrador de Paquetes
+Name[et]=Pakihaldur
Name[fr]=Gestionnaire de Paquets
Name[fr_CA]=Gestionnaire de Paquet
Name[hr]=Upravljač paketa
Name[nl]=Pakketbeheerder
+Name[pl]=Menadżer Pakietów
Name[sr]=Upravljač paketa
Name[uk]=Менеджер пакунків
Name[zh_CN]=包管理器
View
2  src-qt4/pc-installgui/i18n/SysInstaller_et.ts
@@ -239,7 +239,7 @@ Vajuta &quot;Lõpeta&quot;, et taaskäivitada. Pärast taaskäivitamist võib pa
</message>
<message>
<source>The selected disk / partition is less than recommended %1GB. The installation may fail...</source>
- <translation type="unfinished">Valitud ketas/partitsioon on väiksem kui soovitatud %1 MB. Paigaldamine võib ebaõnnestuda... {1G?}</translation>
+ <translation>Valitud ketas/partitsioon on väiksem kui soovitatud %1 GB. Paigaldamine võib ebaõnnestuda...</translation>
</message>
</context>
<context>
View
48 src-qt4/pc-mounttray/i18n/MountTray_et.ts
@@ -5,41 +5,34 @@
<name>FSDialog</name>
<message>
<source>System Disk Capacity</source>
- <translation type="unfinished">
- </translation>
+ <translation>Süsteemi ketta maht</translation>
</message>
<message>
<source>Mount Point</source>
- <translation type="unfinished">
- </translation>
+ <translation>Haakepunkt</translation>
</message>
<message>
<source>Filesystem</source>
- <translation type="unfinished">
- </translation>
+ <translation>Failisüsteem</translation>
</message>
<message>
<source>Used/Total</source>
- <translation type="unfinished">
- </translation>
+ <translation>Kasutatud/kokku</translation>
</message>
<message>
<source>Percent %</source>
- <translation type="unfinished">
- </translation>
+ <translation>Protsenti %</translation>
</message>
<message>
<source>Close</source>
- <translation type="unfinished">
- </translation>
+ <translation>Sulge</translation>
</message>
</context>
<context>
<name>FSWatcher</name>
<message>
<source>Disk(s) Almost Full</source>
- <translation type="unfinished">
- </translation>
+ <translation>Ketas (kettad) peaaegu täis</translation>
</message>
</context>
<context>
@@ -139,51 +132,42 @@ Failihaldurit ei saa juurkasutaja õigustega avada</translation>
</message>
<message>
<source>More Options</source>
- <translation type="unfinished">
- </translation>
+ <translation>Veel valikuid</translation>
</message>
<message>
<source>View Disk Usage</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vaata ketta kasutust</translation>
</message>
<message>
<source>Change Settings</source>
- <translation type="unfinished">
- </translation>
+ <translation>Muuda sätteid</translation>
</message>
</context>
<context>
<name>SettingsDialog</name>
<message>
<source>Mount Tray Settings</source>
- <translation type="unfinished">
- </translation>
+ <translation type="unfinished">Süsteemisalve sätted</translation>
</message>
<message>
<source>Monitor disk storage space</source>
- <translation type="unfinished">
- </translation>
+ <translation>Jälgi kettaruumi kasutust</translation>
</message>
<message>
<source>Perform check on device notifications</source>
- <translation type="unfinished">
- </translation>
+ <translation>Kontrolli seadme teavituste ajal</translation>
</message>
<message>
<source>Maximum time between checks (minutes)</source>
- <translation type="unfinished">
- </translation>
+ <translation>Suurim lubatud aeg kontrollide vahel (minutites)</translation>
</message>
<message>
<source>Cancel</source>
- <translation type="unfinished">
- </translation>
+ <translation>Katkesta</translation>
</message>
<message>
<source>Apply</source>
- <translation type="unfinished">
- </translation>
+ <translation>Rakenda</translation>
</message>
</context>
</TS>
View
3  src-qt4/pc-mounttray/i18n/MountTray_pl.ts
@@ -5,8 +5,7 @@
<name>FSDialog</name>
<message>
<source>System Disk Capacity</source>
- <translation type="unfinished">
- </translation>
+ <translation>Pojemność dysku systemowego</translation>
</message>
<message>
<source>Mount Point</source>
View
99 src-qt4/pc-pkgmanager/mainWin.ui
@@ -7,7 +7,7 @@
<x>0</x>
<y>0</y>
<width>802</width>
- <height>586</height>
+ <height>643</height>
</rect>
</property>
<property name="windowTitle">
@@ -91,7 +91,7 @@
<string>Package Information</string>
</property>
<layout class="QGridLayout" name="gridLayout_6">
- <item row="0" column="1" rowspan="3">
+ <item row="0" column="0" rowspan="3">
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
<number>0</number>
@@ -101,9 +101,48 @@
<string>Description</string>
</attribute>
<layout class="QGridLayout" name="gridLayout_3">
- <item row="0" column="0">
+ <item row="3" column="0">
<widget class="QTextBrowser" name="textDesc"/>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="labelSize">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>10 MB</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="0">
+ <widget class="QLabel" name="labelPkgNameVer">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string>My Package 1.0</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="labelWeb">
+ <property name="text">
+ <string>http://www.pcbsd.org</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
+ </property>
+ <property name="wordWrap">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
<widget class="QWidget" name="tabOpts">
@@ -128,58 +167,6 @@
</widget>
</widget>
</item>
- <item row="0" column="0">
- <widget class="QLabel" name="labelPkgNameVer">
- <property name="sizePolicy">
- <sizepolicy hsizetype="MinimumExpanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>My Package 1.0</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="labelSize">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string>10 MB</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>118</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="3" column="0" colspan="2">
- <widget class="QLabel" name="labelWeb">
- <property name="text">
- <string>http://www.pcbsd.org</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignVCenter</set>
- </property>
- <property name="wordWrap">
- <bool>true</bool>
- </property>
- </widget>
- </item>
</layout>
</widget>
</item>
@@ -406,7 +393,7 @@ p, li { white-space: pre-wrap; }
<x>0</x>
<y>0</y>
<width>802</width>
- <height>22</height>
+ <height>25</height>
</rect>
</property>
<widget class="QMenu" name="menu_File">
View
2  src-qt4/pc-pkgmanager/pc-pkgmanager.desktop
@@ -8,10 +8,12 @@ Name=Package Manager
Name[bs]=Upravljač paketa
Name[de]=Paketverwalter
Name[es]=Administrador de Paquetes
+Name[et]=Pakihaldur
Name[fr]=Gestionnaire de Paquets
Name[fr_CA]=Gestionnaire de Paquet
Name[hr]=Upravljač paketa
Name[nl]=Pakketbeheerder
+Name[pl]=Menadżer Pakietów
Name[sr]=Upravljač paketa
Name[uk]=Менеджер пакунків
Name[zh_CN]=包管理器
View
9 src-qt4/pc-softwaremanager/largeItemWidget.h
@@ -48,7 +48,7 @@ class LargeItemWidget : public QWidget{
public:
LargeItemWidget(QString appID, QString name, QString description, QString icon) : QWidget(){
- QGridLayout *layout = new QGridLayout;
+
//Create the toolbutton
QToolButton *button = new QToolButton();
button->setIconSize(QSize(34,34));
@@ -61,15 +61,20 @@ class LargeItemWidget : public QWidget{
QLabel *appDesc = new QLabel(description);
appDesc->setWordWrap(TRUE);
//Add the items to the widget
+ QGridLayout *layout = new QGridLayout;
layout->addWidget(button,0,0,2,1);
layout->addWidget(appName,0,1);
layout->addWidget(appDesc,1,1);
this->setLayout(layout);
+
//Save the app identifier
uniqueAppID=appID;
- connect(button,SIGNAL(triggered(QAction*)), this, SLOT(sendSignal()) );
+ connect(button,SIGNAL(clicked()), this, SLOT(sendSignal()) );
}
virtual ~LargeItemWidget(){}
+
+ protected:
+ void mousePressEvent(QMouseEvent *ev){ sendSignal(); }
};
View
6 src-qt4/pc-systemupdatertray/i18n/SystemUpdaterTray_et.ts
@@ -97,13 +97,11 @@
</message>
<message>
<source>Package updates available</source>
- <translation type="unfinished">
- </translation>
+ <translation>Pakkide uuendused on saadaval</translation>
</message>
<message>
<source>Important package updates are available. Click here to install them!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Olulised pakkide uuendused on saadaval. Vajuta siia, et need paigaldada!</translation>
</message>
</context>
</TS>
View
45 src-qt4/warden-gui/i18n/Warden_et.ts
@@ -95,78 +95,63 @@
</message>
<message>
<source>Jail Configuration</source>
- <translation type="unfinished">
- </translation>
+ <translation>Vanglate seadistus</translation>
</message>
<message>
<source>IPv4</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv4</translation>
</message>
<message>
<source>IPv4 Address</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv4-aadress</translation>
</message>
<message>
<source>IPv4 Bridge Address</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv4 silla aadress</translation>
</message>
<message>
<source>IPv4 Default Router</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv4 vaikimisi ruuter</translation>
</message>
<message>
<source>IPv6</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv6</translation>
</message>
<message>
<source>IPv6 Address</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv6-aadress</translation>
</message>
<message>
<source>IPv6 Bridge Address</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv6 silla aadress</translation>
</message>
<message>
<source>IPv6 Default Router</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv6 vaikimisi ruuter</translation>
</message>
<message>
<source>Aliases</source>
- <translation type="unfinished">
- </translation>
+ <translation>Aliased</translation>
</message>
<message>
<source>IPv4 Aliases</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv4 aliased</translation>
</message>
<message>
<source>IPv4 Bridge Aliases</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv4 silla aliased</translation>
</message>
<message>
<source>IPv6 Aliases</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv6 aliased</translation>
</message>
<message>
<source>IPv6 Bridge Aliases</source>
- <translation type="unfinished">
- </translation>
+ <translation>IPv6 silla aliased</translation>
</message>
<message>
<source>Permissions</source>
- <translation type="unfinished">
- </translation>
+ <translation>Load</translation>
</message>
<message>
<source>The following permissions can be enabled or diabled for this jail. For more details hover over each item or refer to the jail manpage.</source>
View
2  src-qt4/xtrafiles/local/share/wallpapers/pcbsd9-default/metadata.desktop
@@ -7,10 +7,12 @@ X-KDE-PluginInfo-License=BSD
Name=Default: PC-BSD
Name[bs]=Default: PC-BSD
Name[de]=Voreinstellung: PC-BSD
+Name[et]=Vaikimisi: PC-BSD
Name[fr]=Par défaut: PC-BSD
Name[fr_CA]=Par défaut: PC-BSD
Name[hr]=Default: PC-BSD
Name[nl]=Standaard: PC-BSD
+Name[pl]=Domyślnie: PC-BSD
Name[sr]=Default: PC-BSD
Name[uk]=Типово: PC-BSD
Name[zh_CN]=默认:PC-BSD
View
5 src-sh/pc-thinclient/pc-thinclient
@@ -184,7 +184,10 @@ check_installconfig() {
chroot ${PXEWORLD} tar cvf conf/base/etc.cpio.gz --format cpio --gzip etc 2>/dev/null
chroot ${PXEWORLD} tar cvf conf/base/var.cpio.gz --exclude var/db/pkg --format cpio --gzip var 2>/dev/null
chroot ${PXEWORLD} tar cvf conf/base/root.cpio.gz --format cpio --gzip root 2>/dev/null
-
+
+ # Fix the ZFS zpool.cache
+ rmdir ${PXEWORLD}/boot/zfs 2>/dev/null
+ ln -fs /tmp ${PXEWORLD}/boot/zfs
}
# Check if we need to build the world environment
View
3  src-sh/pc-thinclient/resources/scripts/pc-sysinstall.example
@@ -7,7 +7,8 @@ hostname=examplesystem
# Set the disk parameters
disk0=ada0
partition=all
-bootManager=none
+bootManager=bsd
+partscheme=MBR
commitDiskPart
# Setup the disk label
View
1  src-sh/pc-thinclient/resources/scripts/tcsinstall.sh
@@ -3,6 +3,7 @@
do_installwiz() {
+ installChoices=""
for i in `ls /installscripts`
do
installChoices="$installChoices $i $i"
View
1  src-sh/xtrafiles/local/share/pcbsd/conf/pcbsd-mirrors
@@ -30,3 +30,4 @@ http://ftp.free.org/pub/PC-BSD
http://stingray.cyber.net.pk/pub/pcbsd
ftp://pcbsd.iqm.unicamp.br/pub/pcbsd
http://mirror.klaus.priv.at/pub/PCBSD
+ftp://ftp.isc-germany.biz/mirror/PcBSD.org
Please sign in to comment.
Something went wrong with that request. Please try again.