Permalink
Browse files

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

Conflicts:
	src-sh/xtrafiles/local/share/pcbsd/conf/pcbsd-mirrors
  • Loading branch information...
2 parents dac7e02 + 9bdcc26 commit c9e754c0361e7e630549c6a7a3e4ae5ffa361828 @kmoore134 kmoore134 committed Jun 3, 2013
@@ -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
@@ -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>
@@ -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)) );
@@ -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>
@@ -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
@@ -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
@@ -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]=包管理器
@@ -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>
@@ -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>
@@ -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>
Oops, something went wrong.

0 comments on commit c9e754c

Please sign in to comment.