Permalink
Browse files

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

  • Loading branch information...
2 parents fdf420c + de89833 commit bf6b1631345a4200fcafeea031042bdc374ebee1 Ken Moore committed Mar 14, 2014
Showing 469 changed files with 93,248 additions and 93,190 deletions.
@@ -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 \
@@ -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
@@ -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
@@ -26,7 +26,7 @@ case $ANS in
startx 2>/tmp/Xerrors ;;
utility) /root/PCBSDUtil.sh
clear ;;
- reboot) shutdown -r now ;;
+ reboot) reboot -q ;;
*) ;;
esac
@@ -705,38 +705,31 @@
</message>
<message>
<source>&amp;Build PBI</source>
- <translation type="unfinished">
- </translation>
+ <translation>Зібрати PBI</translation>
</message>
<message>
<source>&amp;Cancel Build</source>
- <translation type="unfinished">
- </translation>
+ <translation>Скасувати збирання</translation>
</message>
<message>
<source>&amp;Save Build Log</source>
- <translation type="unfinished">
- </translation>
+ <translation>Зберегти лог збирання</translation>
</message>
<message>
<source>&amp;Save Configuration</source>
- <translation type="unfinished">
- </translation>
+ <translation>Зберегти налаштування</translation>
</message>
<message>
<source>&amp;Change</source>
- <translation type="unfinished">
- </translation>
+ <translation>Змінити</translation>
</message>
<message>
<source>&amp;Add File</source>
- <translation type="unfinished">
- </translation>
+ <translation>Додати файл</translation>
</message>
<message>
<source>&amp;Delete File</source>
- <translation type="unfinished">
- </translation>
+ <translation>Видалити файл</translation>
</message>
<message>
<source>&amp;Wrapper Script</source>
@@ -745,73 +738,59 @@
</message>
<message>
<source>&amp;Save Script</source>
- <translation type="unfinished">
- </translation>
+ <translation>Зберегти скрипт</translation>
</message>
<message>
<source>&amp;Save</source>
- <translation type="unfinished">
- </translation>
+ <translation>Зберегти</translation>
</message>
<message>
<source>&amp;Add</source>
- <translation type="unfinished">
- </translation>
+ <translation>Додати</translation>
</message>
<message>
<source>&amp;Create</source>
- <translation type="unfinished">
- </translation>
+ <translation>Створити</translation>
</message>
<message>
<source>&amp;Remove</source>
- <translation type="unfinished">
- </translation>
+ <translation>Видалити</translation>
</message>
<message>
<source>&amp;Remove Entry</source>
- <translation type="unfinished">
- </translation>
+ <translation>Видалити елемент</translation>
</message>
<message>
<source>&amp;Add Entry</source>
- <translation type="unfinished">
- </translation>
+ <translation>Додати елемент</translation>
</message>
<message>
<source>&amp;File</source>
- <translation type="unfinished">
- </translation>
+ <translation>Файл</translation>
</message>
<message>
<source>&amp;Configure</source>
- <translation type="unfinished">
- </translation>
+ <translation>Налаштувати</translation>
</message>
<message>
<source>&amp;Help</source>
- <translation type="unfinished">
- </translation>
+ <translation>Допомога</translation>
</message>
<message>
<source>&amp;Settings</source>
- <translation type="unfinished">
- </translation>
+ <translation>Налаштування</translation>
</message>
<message>
<source>Free&amp;BSD Ports</source>
- <translation type="unfinished">
- </translation>
+ <translation>Порти Free&amp;BSD</translation>
</message>
<message>
<source>&amp;PBI Modules</source>
- <translation type="unfinished">
- </translation>
+ <translation>Модулі &amp;PBI</translation>
</message>
<message>
<source>&amp;Quit</source>
- <translation type="unfinished">
- </translation>
+ <translation>Вихід</translation>
</message>
<message>
<source>&amp;Package Module</source>
@@ -825,8 +804,7 @@
</message>
<message>
<source>&amp;Refresh Module</source>
- <translation type="unfinished">
- </translation>
+ <translation>Оновити модуль</translation>
</message>
</context>
<context>
@@ -101,8 +101,7 @@
</message>
<message>
<source>Utils:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Utils:</translation>
</message>
</context>
</TS>
@@ -101,8 +101,7 @@
</message>
<message>
<source>Utils:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Utils:</translation>
</message>
</context>
</TS>
@@ -89,23 +89,19 @@
</message>
<message>
<source>&amp;System components...</source>
- <translation type="unfinished">
- </translation>
+ <translation>Компоненти системи...</translation>
</message>
<message>
<source>&amp;Desktop environments...</source>
- <translation type="unfinished">
- </translation>
+ <translation>Оточення стільниці...</translation>
</message>
<message>
<source>&amp;Close</source>
- <translation type="unfinished">
- </translation>
+ <translation>Закрити</translation>
</message>
<message>
<source>Utils:</source>
- <translation type="unfinished">
- </translation>
+ <translation>Утиліти:</translation>
</message>
</context>
</TS>
@@ -18,7 +18,7 @@
<item>
<widget class="QTabWidget" name="tabWidget">
<property name="currentIndex">
- <number>0</number>
+ <number>2</number>
</property>
<widget class="QWidget" name="tabSettings">
<attribute name="title">
@@ -44,7 +44,7 @@
<item>
<widget class="QPushButton" name="pushChangeCompName">
<property name="text">
- <string>Change</string>
+ <string>&amp;Change</string>
</property>
</widget>
</item>
@@ -72,7 +72,7 @@
<item>
<widget class="QPushButton" name="pushDisconnectDevice">
<property name="text">
- <string>Disconnect Device</string>
+ <string>&amp;Disconnect Device</string>
</property>
</widget>
</item>
@@ -103,7 +103,7 @@
<item>
<widget class="QPushButton" name="pushStartTray">
<property name="text">
- <string>Start Tray Application</string>
+ <string>Start &amp;Tray Application</string>
</property>
</widget>
</item>
@@ -123,7 +123,7 @@
<item>
<widget class="QPushButton" name="pushRestart">
<property name="text">
- <string>Restart Service</string>
+ <string>&amp;Restart Service</string>
</property>
</widget>
</item>
@@ -157,7 +157,7 @@
<item>
<widget class="QPushButton" name="pushScanNew">
<property name="text">
- <string>Scan</string>
+ <string>&amp;Scan</string>
</property>
</widget>
</item>
@@ -177,7 +177,7 @@
<item>
<widget class="QPushButton" name="pushAddDevice">
<property name="text">
- <string>Add Device</string>
+ <string>&amp;Add Device</string>
</property>
</widget>
</item>
@@ -205,7 +205,7 @@
<item>
<widget class="QPushButton" name="pushConnectDevice">
<property name="text">
- <string>Initiate Pairing</string>
+ <string>&amp;Initiate Pairing</string>
</property>
</widget>
</item>
@@ -225,14 +225,14 @@
<item>
<widget class="QPushButton" name="pushConfigureOld">
<property name="text">
- <string>Configure</string>
+ <string>&amp;Configure</string>
</property>
</widget>
</item>
<item>
<widget class="QPushButton" name="pushRemoveOld">
<property name="text">
- <string>Remove Device</string>
+ <string>&amp;Remove Device</string>
</property>
</widget>
</item>
Oops, something went wrong.

0 comments on commit bf6b163

Please sign in to comment.