Permalink
Browse files

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

  • Loading branch information...
2 parents b7bd617 + 23b067d commit ba86ec730c1b546a537549acf853ad0a9113a21b Ken Moore committed Nov 4, 2013
Showing with 980 additions and 1,338 deletions.
  1. +0 −1 build-files/ports-overlay/misc/pcbsd-meta-gnome/Makefile
  2. +42 −42 overlays/install-overlay/root/Desktop/installpcbsd.desktop
  3. +3 −3 src-qt4/EasyPBI/i18n/EasyPBI_fa.ts
  4. +1 −1 src-qt4/PCDM/PCDMd
  5. +5 −6 src-qt4/about-gui/i18n/AboutGui_fa.ts
  6. +1 −2 src-qt4/pc-bootconfig/i18n/pc-bootconfig_vi.ts
  7. +1 −1 src-qt4/pc-controlpanel/items/de/kde-sweeper.desktop
  8. +39 −39 src-qt4/pc-controlpanel/items/hardware/cups.desktop
  9. +2 −0 src-qt4/pc-controlpanel/items/hardware/pc-zmanager.desktop
  10. +1 −1 src-qt4/pc-controlpanel/items/software/appcafe.desktop
  11. +1 −1 src-qt4/pc-installgui/i18n/SysInstaller_fa.ts
  12. +61 −112 src-qt4/pc-installgui/i18n/SysInstaller_sl.ts
  13. +3 −6 src-qt4/pc-mounttray/i18n/MountTray_vi.ts
  14. +2 −3 src-qt4/pc-netmanager/src/ethernetconfig/i18n/ethernetconfig_fa.ts
  15. +1 −2 src-qt4/pc-pbigui/i18n/PBI_fa.ts
  16. +56 −112 src-qt4/pc-pkgmanager/i18n/PackageManager_en_ZA.ts
  17. +63 −126 src-qt4/pc-pkgmanager/i18n/PackageManager_vi.ts
  18. +3 −6 src-qt4/pc-softwaremanager/i18n/SoftwareManager_vi.ts
  19. +1 −1 src-qt4/pc-softwaremanager/softmanager.desktop
  20. +1 −2 src-qt4/pc-updategui/i18n/UpdateGui_vi.ts
  21. +1 −1 src-qt4/pc-xgui/i18n/XGUISource_fa.ts
  22. +8 −8 src-qt4/pc-zmanager/i18n/ZManager_fa.ts
  23. +182 −274 src-qt4/pc-zmanager/i18n/ZManager_fr.ts
  24. +182 −274 src-qt4/pc-zmanager/i18n/ZManager_fr_CA.ts
  25. +1 −2 src-qt4/warden-gui/i18n/Warden_vi.ts
  26. +10 −3 src-sh/pbi-manager10/pbi-manager
  27. +1 −1 src-sh/pc-extractoverlay/desktop-overlay/usr/share/skel/Desktop/appcafe.desktop
  28. +1 −1 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/hplip.desktop
  29. +53 −53 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/ibus.desktop
  30. +70 −70 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/applications/kde4/amor.desktop
  31. +41 −41 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/01kde4.desktop
  32. +84 −84 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/02gnome.desktop
  33. +56 −56 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/04xfce.desktop
  34. +1 −1 src-sh/pc-extractoverlay/ports-overlay/usr/local/share/xsessions/17Etoile.desktop
  35. +2 −2 src-sh/warden/scripts/backend/checkstatus.sh
@@ -27,7 +27,6 @@ RUN_DEPENDS= gnome2-lite>=0:${PORTSDIR}/x11/gnome2-lite \
gnome-power-manager>=0:${PORTSDIR}/sysutils/gnome-power-manager \
seahorse>=0:${PORTSDIR}/security/seahorse \
seahorse-plugins>=0:${PORTSDIR}/security/seahorse-plugins \
- py27-gtk>=0:${PORTSDIR}/x11-toolkits/py-gtk2 \
gtk2-qtcurve-theme>=0:${PORTSDIR}/x11-themes/qtcurve-gtk2 \
nimbus>=0:${PORTSDIR}/x11-themes/nimbus \
nautilus>=0:${PORTSDIR}/x11-fm/nautilus \
@@ -13,48 +13,6 @@ X-DBUS-ServiceName=
X-DBUS-StartupType=
X-KDE-SubstituteUID=false
X-KDE-Username=
-Name=Install PC-BSD
-Name[af]=Installeer PC-BSD
-Name[ar]=ثبت PC-BSD
-Name[bg]=Инсталиране на PC-BSD
-Name[bs]=Instaliraj PC-BSD
-Name[ca]=Instal·lar PC-BSD
-Name[da]=Installer PC-BSD
-Name[de]=PC-BSD installieren
-Name[el]=Εγκαταστήστε το PC-BSD
-Name[en_GB]=Install PC-BSD
-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[fi]=Asenna PC-BSD
-Name[fr]=Installer PC-BSD
-Name[fr_CA]=Installer PC-BSD
-Name[he]=התקן את PC-BSD
-Name[hr]=Instaliraj PC-BSD
-Name[hu]=PC–BSD telepítése
-Name[id]=Instal PC-BSD
-Name[it]=Installa PC-BSD
-Name[ja]=PC-BSD のインストール
-Name[ko]=PC-BSD 설치
-Name[mn]=PC-BSD суулгах
-Name[nl]=Installeer PC-BSD
-Name[pl]=Instaluj PC-BSD
-Name[pt_BR]=Instalar PC-BSD
-Name[ro]=Instalare PC-BSD
-Name[ru]=Установить PC-BSD
-Name[sk]=Inštalovať PC-BSD
-Name[sl]=Namesti PC-BSD
-Name[sr]=Instaliraj PC-BSD
-Name[sv]=Installera PC-BSD
-Name[tg]=Сабткунии PC-BSD
-Name[tr]=PC-BSD'yi kur
-Name[uk]=Встановити PC-BSD
-Name[vi]=Cài đặt PC-BSD
-Name[zh_CN]=安装 PC-BSD
-Name[zh_HK]=安裝 PC-BSD
-Name[zh_TW]=安裝PC-BSD
Comment=Install PC-BSD to Disk
Comment[af]=Installeer PC-BSD te Skyf
Comment[ar]=ثبت PC-BSD على القرص الصلب
@@ -97,3 +55,45 @@ Comment[vi]=Cài đặt PC-BSD vào đĩa
Comment[zh_CN]=安装 PC-BSD 的磁盘
Comment[zh_HK]=將 PC-BSD 安裝至磁碟
Comment[zh_TW]=安裝PC-BSD至磁碟
+Name=Install PC-BSD
+Name[af]=Installeer PC-BSD
+Name[ar]=ثبت PC-BSD
+Name[bg]=Инсталиране на PC-BSD
+Name[bs]=Instaliraj PC-BSD
+Name[ca]=Instal·lar PC-BSD
+Name[da]=Installer PC-BSD
+Name[de]=PC-BSD installieren
+Name[el]=Εγκαταστήστε το PC-BSD
+Name[en_GB]=Install PC-BSD
+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[fi]=Asenna PC-BSD
+Name[fr]=Installer PC-BSD
+Name[fr_CA]=Installer PC-BSD
+Name[he]=התקן את PC-BSD
+Name[hr]=Instaliraj PC-BSD
+Name[hu]=PC–BSD telepítése
+Name[id]=Instal PC-BSD
+Name[it]=Installa PC-BSD
+Name[ja]=PC-BSD のインストール
+Name[ko]=PC-BSD 설치
+Name[mn]=PC-BSD суулгах
+Name[nl]=Installeer PC-BSD
+Name[pl]=Instaluj PC-BSD
+Name[pt_BR]=Instalar PC-BSD
+Name[ro]=Instalare PC-BSD
+Name[ru]=Установить PC-BSD
+Name[sk]=Inštalovať PC-BSD
+Name[sl]=Namesti PC-BSD
+Name[sr]=Instaliraj PC-BSD
+Name[sv]=Installera PC-BSD
+Name[tg]=Сабткунии PC-BSD
+Name[tr]=PC-BSD'yi kur
+Name[uk]=Встановити PC-BSD
+Name[vi]=Cài đặt PC-BSD
+Name[zh_CN]=安装 PC-BSD
+Name[zh_HK]=安裝 PC-BSD
+Name[zh_TW]=安裝PC-BSD
@@ -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>
View
@@ -24,7 +24,7 @@ if [ $? -eq 0 ]; then
vncopts="-nevershared "
fi
if [ -e "/usr/local/etc/vncpass" ] ; then
- vnccmd="x11vnc -display :0 $vncopts -passwdfile /usr/local/etc/vncpass"
+ vnccmd="x11vnc -display :0 $vncopts -passwdfile /usr/local/etc/vncpass -loop"
else
echo "WARNING: VNC enabled but no password in /usr/local/etc/vncpass!"
sleep 5
@@ -22,12 +22,12 @@
<message>
<source>????</source>
<translation>
- ؟؟؟؟؟</translation>
+؟؟؟؟</translation>
</message>
<message>
<source>FreeBSD base</source>
<translation>
- اساس FreeBSD </translation>
+اساس FreeBSD</translation>
</message>
<message>
<source>Arch:</source>
@@ -43,7 +43,7 @@
</message>
<message>
<source>CPU:</source>
- <translation>پردازنده</translation>
+ <translation>پردازنده:</translation>
</message>
<message>
<source>Mem.</source>
@@ -84,7 +84,7 @@
<message>
<source>System components...</source>
<translation>
- اجزای سیستم</translation>
+اجزای سیستم</translation>
</message>
<message>
<source>Desktop environments...</source>
@@ -96,8 +96,7 @@
</message>
<message>
<source>PC-BSD UI utilities:</source>
- <translation>
- ابزارهای رابط کاربری PC-BSD:</translation>
+ <translation>ابزارهای رابط کاربری PC-BSD:</translation>
</message>
</context>
</TS>
@@ -245,8 +245,7 @@
</message>
<message>
<source>You cannot make a copy of the currently running boot environment!</source>
- <translation type="unfinished">
- </translation>
+ <translation>Bạn không thể tạo một bản sao của môi trường khởi động hiện đang chạy!</translation>
</message>
</context>
</TS>
@@ -90,7 +90,7 @@ GenericName[eo]=Sistema purigilo
GenericName[es]=Limpieza del sistema
GenericName[et]=Süsteemi puhastamine
GenericName[eu]=Sistemaren garbitzailea
-GenericName[fa]= پاکساز سیستم
+GenericName[fa]=پاکساز سیستم
GenericName[fi]=Järjestelmän puhdistus
GenericName[fr]=Nettoyage du système
GenericName[fr_CA]=Nettoyage du système
@@ -6,6 +6,44 @@ Icon=cups-icon
#PC-TryCommand= whereis -b firefox opera konqueror | cut -d ':' -f 2 | grep -e firefox -e opera -e konqueror
Keywords="printer,printer settings,setup printer"
Categories=Settings;System;
+Comment=Common UNIX printing system web GUI
+Comment[af]=Algemene UNIX druk stelsel web GUI
+Comment[ar]=واجهه الوب للطباعة لنظام يونكس
+Comment[bg]=Общата UNIX система за печат - уеб GUI
+Comment[bs]=Ne prevodite, ime programa
+Comment[ca]=Interfície d'usuari basada en web pel Sistema d'Impressió Common UNIX
+Comment[da]=Netværksgrænsflade til CUPS
+Comment[de]=Common UNIX Printing System - Weboberfläche
+Comment[el]=Κοινό σύστημα web εκτύπωσης UNIX GUI
+Comment[en_GB]=Common UNIX printing system web GUI
+Comment[en_ZA]=Common UNIX printing system web GUI
+Comment[es]=Sistema web de impresión común para Unix
+Comment[et]=Common Unix Printing Systemi veebiliides
+Comment[fa]=GUI متداول سیستم چاپ وب UNIX
+Comment[fr]=Interface web CUPS
+Comment[fr_CA]=Interface web CUPS
+Comment[he]=ממשק ה-Web של מערכת ההדפסה CUPS
+Comment[hr]=Web sučelje za zajednički sustav printanja na UNIX-u
+Comment[hu]=Internetes beállítófelület a Common UNIX Printing System-hez
+Comment[id]=Antarmuka web Common UNIX Printing System
+Comment[it]=Web GUI per Common UNIX printing system
+Comment[ja]=共通 UNIX 印刷システム (CUPS) の web GUI 画面
+Comment[ko]=일반적인 UNIX 인쇄 시스템 웹 GUI
+Comment[mn]=CUPS - веб интерфэйс
+Comment[nl]=Webgebaseerde gebruikersschil voor Gemeenschappelijk UNIX-afdruksysteem
+Comment[pl]=Common UNIX Printing System - interfejs WWW
+Comment[pt_BR]=Interface gráfica (GUI) web do sitema de impressão UNIX comum (CUPS)
+Comment[ro]=Interfață grafică web comună a sistemului de imprimare UNIX
+Comment[ru]=Веб-интерфейс общей системы печати (CUPS)
+Comment[sr]=Common UNIX printing system web GUI
+Comment[sv]=Webb GUI för Common UNIX Printing System
+Comment[tg]=Интерфейси веби умумии системаи чопи UNIX
+Comment[tr]=Common UNIX Printing System web arayüzü
+Comment[uk]=Веб інтерфейс до системи друку Common UNIX printing system
+Comment[vi]=Chung hệ thống in ấn UNIX giao diện web
+Comment[zh_CN]=通用UNIX打印系统的Web图形界面
+Comment[zh_HK]=通用 Unix 打印系統的 Web 圖像化用戶介面
+Comment[zh_TW]=Unix通用列印系統的Web圖形使用者介面
Name=CUPS
Name[af]=CUPS
Name[ar]=CUPS
@@ -19,7 +57,7 @@ Name[en_GB]=CUPS
Name[en_ZA]=CUPS
Name[es]=CUPS
Name[et]=CUPS
-Name[fa]= CUPS
+Name[fa]=CUPS
Name[fr]=CUPS
Name[fr_CA]=CUPS
Name[he]=CUPS
@@ -46,41 +84,3 @@ Name[vi]=CUPS
Name[zh_CN]=Common UNIX Printing System
Name[zh_HK]=CUPS
Name[zh_TW]=CUPS
-Comment=Common UNIX printing system web GUI
-Comment[af]=Algemene UNIX druk stelsel web GUI
-Comment[ar]=واجهه الوب للطباعة لنظام يونكس
-Comment[bg]=Общата UNIX система за печат - уеб GUI
-Comment[bs]=Ne prevodite, ime programa
-Comment[ca]=Interfície d'usuari basada en web pel Sistema d'Impressió Common UNIX
-Comment[da]=Netværksgrænsflade til CUPS
-Comment[de]=Common UNIX Printing System - Weboberfläche
-Comment[el]=Κοινό σύστημα web εκτύπωσης UNIX GUI
-Comment[en_GB]=Common UNIX printing system web GUI
-Comment[en_ZA]=Common UNIX printing system web GUI
-Comment[es]=Sistema web de impresión común para Unix
-Comment[et]=Common Unix Printing Systemi veebiliides
-Comment[fa]=GUI متداول سیستم چاپ وب UNIX
-Comment[fr]=Interface web CUPS
-Comment[fr_CA]=Interface web CUPS
-Comment[he]=ממשק ה-Web של מערכת ההדפסה CUPS
-Comment[hr]=Web sučelje za zajednički sustav printanja na UNIX-u
-Comment[hu]=Internetes beállítófelület a Common UNIX Printing System-hez
-Comment[id]=Antarmuka web Common UNIX Printing System
-Comment[it]=Web GUI per Common UNIX printing system
-Comment[ja]=共通 UNIX 印刷システム (CUPS) の web GUI 画面
-Comment[ko]=일반적인 UNIX 인쇄 시스템 웹 GUI
-Comment[mn]=CUPS - веб интерфэйс
-Comment[nl]=Webgebaseerde gebruikersschil voor Gemeenschappelijk UNIX-afdruksysteem
-Comment[pl]=Common UNIX Printing System - interfejs WWW
-Comment[pt_BR]=Interface gráfica (GUI) web do sitema de impressão UNIX comum (CUPS)
-Comment[ro]=Interfață grafică web comună a sistemului de imprimare UNIX
-Comment[ru]=Веб-интерфейс общей системы печати (CUPS)
-Comment[sr]=Common UNIX printing system web GUI
-Comment[sv]=Webb GUI för Common UNIX Printing System
-Comment[tg]=Интерфейси веби умумии системаи чопи UNIX
-Comment[tr]=Common UNIX Printing System web arayüzü
-Comment[uk]=Веб інтерфейс до системи друку Common UNIX printing system
-Comment[vi]=Chung hệ thống in ấn UNIX giao diện web
-Comment[zh_CN]=通用UNIX打印系统的Web图形界面
-Comment[zh_HK]=通用 Unix 打印系統的 Web 圖像化用戶介面
-Comment[zh_TW]=Unix通用列印系統的Web圖形使用者介面
@@ -16,6 +16,7 @@ Name[fr_CA]=Gestionnaire de disque
Name[nl]=Schijfbeheerder
Name[pl]=Menadżer dysku
Name[uk]=Файлові системи
+Name[vi]=quản lý đĩa
Name[zh_CN]=磁盘管理器
Comment=ZFS / Disk Management
Comment[de]=ZFS-/Festplattenverwaltung
@@ -26,4 +27,5 @@ Comment[fr_CA]=ZFS / Gestion des disques
Comment[nl]=ZFS / Schijfbeheer
Comment[pl]=ZFS / zarządzanie dyskiem
Comment[uk]=Керування файловими системами ZFS
+Comment[vi]=ZFS / quản lý đĩa
Comment[zh_CN]=ZFS/磁盘管理
@@ -33,7 +33,7 @@ Name[en_US]=AppCafe
Name[en_ZA]=AppCafe
Name[es]=AppCafe
Name[et]=AppCafe
-Name[fa]= برنامه AppCafe
+Name[fa]=AppCafe
Name[fr]=AppCafé
Name[fr_CA]=AppCafé
Name[he]=קפה
@@ -781,7 +781,7 @@ Click Finish to reboot. After rebooting you may eject the install media.</source
</message>
<message>
<source>Please select a network device to configure for this system.</source>
- <translation>لطفا يك كارت شبكه براي براي پيكربندي بروري اين سيستم انتخاب كنيد</translation>
+ <translation>لطفا يك كارت شبكه براي پيكربندي بروري اين سيستم انتخاب كنيد.</translation>
</message>
<message>
<source>Network Interface</source>
Oops, something went wrong.

0 comments on commit ba86ec7

Please sign in to comment.