* [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ab7e955f1210e1f23fbcae4b64e499c8dde588e1
@ 2025-03-28 12:11 Michael Tremer
0 siblings, 0 replies; only message in thread
From: Michael Tremer @ 2025-03-28 12:11 UTC (permalink / raw)
To: ipfire-scm
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 79975 bytes --]
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "IPFire 2.x development tree".
The branch, next has been updated
via ab7e955f1210e1f23fbcae4b64e499c8dde588e1 (commit)
via 80208fe4e628d7148e4439053e25f9de0bcd6ecb (commit)
via 22e7fefc22d23a033c32ffed035995892a895ad7 (commit)
via e0dc059b360d0609961d588694dfc7e386e63306 (commit)
via b79accc2a46d289667c05e43893ffa200fb5ddf9 (commit)
via 3e79d2a2544377a83c6ccde5feed7eb2e48883d8 (commit)
via 0378ba767ae0698b3f909671177ea2f1369b291f (commit)
via 88838a2a2580a55bbbb3f5b4e8a9492aa5a15cb6 (commit)
via 9f82bd84751feaf9c4596a8cab0695110f0675c1 (commit)
via 5a16ed0b0224de172f03516f15fb2108e87f1b8c (commit)
from 6c75a5eee22ddd0e3fbff58677f7a6a3c19d2c64 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ab7e955f1210e1f23fbcae4b64e499c8dde588e1
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Mar 28 12:11:22 2025 +0000
credits.cgi. Update contributors
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 80208fe4e628d7148e4439053e25f9de0bcd6ecb
Author: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri Mar 28 12:11:08 2025 +0000
core194: Ship pakfire.cgi
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 22e7fefc22d23a033c32ffed035995892a895ad7
Author: Stephen Cuka <stephen@firemypi.org>
Date: Wed Mar 26 23:34:40 2025 -0600
pakfire.cgi: Convert icons to buttons.
- Convert icons to buttons on main and confirmation pages.
- Disable Upgrade button if no core or add-on updates available.
- Disable Install and Remove buttons until an add-on is selected
to install or remove.
- Change 'abort' to 'cancel'.
- Change 'uninstall' to 'remove'.
- Set fixed height on select boxes to keep the size the same if
there are no options for the select.
- Change translation for install/remove description text, the previous
text referred to the icons.
'pakfire install description' -> 'Please select one or more add-ons to install.'
'pakfire uninstall description' -> 'Please select one or more add-ons to remove.'
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit e0dc059b360d0609961d588694dfc7e386e63306
Author: Stephen Cuka <stephen@firemypi.org>
Date: Tue Mar 25 13:25:42 2025 -0600
pakfire.cgi: Change to new translations.
upgrade -> pakfire upgrade
install -> pakfire install
available updates -> pakfire updates
calamaris refresh list -> pakfire refresh list
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit b79accc2a46d289667c05e43893ffa200fb5ddf9
Author: Stephen Cuka <stephen@firemypi.org>
Date: Mon Mar 24 16:12:55 2025 -0600
langs: Add trs for upgrade confirmation page.
'pakfire confirm updates' => 'Do you want to install all updates?'
'pakfire updating' => 'Updating pakfire database, please wait...'
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 3e79d2a2544377a83c6ccde5feed7eb2e48883d8
Author: Stephen Cuka <stephen@firemypi.org>
Date: Mon Mar 24 13:13:47 2025 -0600
langs: Add trs for install/remove confirmation pages.
'pakfire dependencies found' => 'Dependencies found:'
'pakfire no dependencies found' => 'No dependencies found.'
'pakfire resolvedeps wait' => 'Checking for dependencies, please
wait...'
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 0378ba767ae0698b3f909671177ea2f1369b291f
Author: Stephen Cuka <stephen@firemypi.org>
Date: Sun Mar 23 19:10:10 2025 -0600
langs: Add 'pakfire refresh list' translation.
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 88838a2a2580a55bbbb3f5b4e8a9492aa5a15cb6
Author: Stephen Cuka <stephen@firemypi.org>
Date: Sun Mar 23 18:35:43 2025 -0600
langs: Add 'pakfire updates' translation.
Add missing 'pakfire updates' tr to en.pl and it.pl. For other
languages, in cases where the existing 'pakfire updates' tr does not
match the 'available updates' tr currently used by pakfire.cgi, give
precedence to the 'available updates' tr and update 'pakfire updates'
accordingly.
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 9f82bd84751feaf9c4596a8cab0695110f0675c1
Author: Stephen Cuka <stephen@firemypi.org>
Date: Sun Mar 23 15:25:13 2025 -0600
langs: Add 'pakfire install' translation.
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
commit 5a16ed0b0224de172f03516f15fb2108e87f1b8c
Author: Stephen Cuka <stephen@firemypi.org>
Date: Sun Mar 23 14:42:13 2025 -0600
langs: Add 'pakfire upgrade' translation.
Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
-----------------------------------------------------------------------
Summary of changes:
config/rootfiles/core/194/filelists/files | 1 +
doc/language_issues.de | 11 +-
doc/language_issues.en | 13 +-
doc/language_issues.es | 11 +-
doc/language_issues.fr | 11 +-
doc/language_issues.it | 10 ++
doc/language_issues.nl | 11 +-
doc/language_issues.pl | 11 +-
doc/language_issues.ru | 11 +-
doc/language_issues.tr | 11 +-
doc/language_missings | 3 +
html/cgi-bin/credits.cgi | 2 +-
html/cgi-bin/pakfire.cgi | 212 +++++++++++++++++-------------
langs/de/cgi-bin/de.pl | 14 +-
langs/en/cgi-bin/en.pl | 13 +-
langs/es/cgi-bin/es.pl | 14 +-
langs/fr/cgi-bin/fr.pl | 14 +-
langs/it/cgi-bin/it.pl | 13 +-
langs/nl/cgi-bin/nl.pl | 14 +-
langs/pl/cgi-bin/pl.pl | 14 +-
langs/ru/cgi-bin/ru.pl | 14 +-
langs/tr/cgi-bin/tr.pl | 14 +-
22 files changed, 314 insertions(+), 128 deletions(-)
Difference in files:
diff --git a/config/rootfiles/core/194/filelists/files b/config/rootfiles/core/194/filelists/files
index e69de29bb2..93b48a87c0 100644
--- a/config/rootfiles/core/194/filelists/files
+++ b/config/rootfiles/core/194/filelists/files
@@ -0,0 +1 @@
+srv/web/ipfire/cgi-bin/pakfire.cgi
diff --git a/doc/language_issues.de b/doc/language_issues.de
index 8626edafd4..c5db3dc64a 100644
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -42,6 +42,7 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Utilization on
WARNING: translation string unused: Verbose
WARNING: translation string unused: Weekly
+WARNING: translation string unused: abort
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting
@@ -130,6 +131,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: artist
WARNING: translation string unused: attemps
+WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup config floppy
WARNING: translation string unused: backup configuration
@@ -424,6 +426,7 @@ WARNING: translation string unused: incoming
WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
+WARNING: translation string unused: install
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
@@ -628,11 +631,15 @@ WARNING: translation string unused: ovpn_processprioVH
WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire confirm updates
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire dependecies found
WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire no dependecies found
WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire resolvdeps wait
WARNING: translation string unused: pakfire update daily
-WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: pakfire updating
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
@@ -825,6 +832,7 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: uninstall
WARNING: translation string unused: unix charset
WARNING: translation string unused: unix group
WARNING: translation string unused: unix password sync
@@ -843,6 +851,7 @@ WARNING: translation string unused: updxlrtr standard view
WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
+WARNING: translation string unused: upgrade
WARNING: translation string unused: upload file
WARNING: translation string unused: upload new ruleset
WARNING: translation string unused: upload static key
diff --git a/doc/language_issues.en b/doc/language_issues.en
index 037fb45df1..5e4221153e 100644
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -82,7 +82,6 @@ WARNING: untranslated string: WakeOnLan = Wake On Lan
WARNING: untranslated string: a ca certificate with this name already exists = A CA certificate with this name already exists.
WARNING: untranslated string: a connection with this common name already exists = A connection with this common name already exists.
WARNING: untranslated string: a connection with this name already exists = A connection with this name already exists.
-WARNING: untranslated string: abort = abort
WARNING: untranslated string: access point name = Access Point Name
WARNING: untranslated string: access point name is invalid = Access Point Name is invalid
WARNING: untranslated string: access point name is required = Access Point Name is required
@@ -326,7 +325,6 @@ WARNING: untranslated string: authentication = Authentication:
WARNING: untranslated string: automatic = Automatic
WARNING: untranslated string: autonomous system = Autonomous System
WARNING: untranslated string: available = available
-WARNING: untranslated string: available updates = Available updates
WARNING: untranslated string: average = Average
WARNING: untranslated string: back = Back
WARNING: untranslated string: backup = Backup
@@ -1082,7 +1080,6 @@ WARNING: untranslated string: incoming traffic in bytes per second = Incoming Tr
WARNING: untranslated string: info messages = unknown string
WARNING: untranslated string: init string = Init:
WARNING: untranslated string: inodes = Index-Nodes
-WARNING: untranslated string: install = Install
WARNING: untranslated string: instant update = Instant Update
WARNING: untranslated string: integrity = Integrity:
WARNING: untranslated string: interface = Interface
@@ -1458,7 +1455,8 @@ WARNING: untranslated string: pakfire configuration = Pakfire Configuration
WARNING: untranslated string: pakfire core update level = Core-Update-Level
WARNING: untranslated string: pakfire finished = Pakfire has finished! Returning...
WARNING: untranslated string: pakfire finished error = Pakfire has finished! Errors occurred, please check the log output before proceeding.
-WARNING: untranslated string: pakfire install description = Please choose one or more items from the list below and click the plus to install.
+WARNING: untranslated string: pakfire install = Install
+WARNING: untranslated string: pakfire install description = Please select one or more add-ons to install.
WARNING: untranslated string: pakfire install package = You want to install the following packages:
WARNING: untranslated string: pakfire installed addons = Installed Add-ons:
WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
@@ -1467,6 +1465,7 @@ WARNING: untranslated string: pakfire last package update = Last packages list u
WARNING: untranslated string: pakfire last serverlist update = Last server list update made
WARNING: untranslated string: pakfire last update = Last update made
WARNING: untranslated string: pakfire possible dependency = There may be depending packages, here is a list of packages that need to be installed.
+WARNING: untranslated string: pakfire refresh list = Refresh List
WARNING: untranslated string: pakfire return = Return to Pakfire
WARNING: untranslated string: pakfire system state = System Status
WARNING: untranslated string: pakfire tree = Repository
@@ -1474,8 +1473,10 @@ WARNING: untranslated string: pakfire tree stable = Stable
WARNING: untranslated string: pakfire tree testing = Testing
WARNING: untranslated string: pakfire tree unstable = Unstable
WARNING: untranslated string: pakfire uninstall all = Do you want to uninstall the following packages?
-WARNING: untranslated string: pakfire uninstall description = Please choose one or more items from the list below and click the minus to uninstall.
+WARNING: untranslated string: pakfire uninstall description = Please select one or more add-ons to remove.
WARNING: untranslated string: pakfire uninstall package = You want to uninstall the following packages:
+WARNING: untranslated string: pakfire updates = Available Updates
+WARNING: untranslated string: pakfire upgrade = Upgrade
WARNING: untranslated string: pakfire working = Pakfire is working ... Please wait until all operations have completed successfully.
WARNING: untranslated string: pap or chap = PAP or CHAP
WARNING: untranslated string: parentclass = Parentclass
@@ -1802,7 +1803,6 @@ WARNING: untranslated string: unable to contact = Unable to contact
WARNING: untranslated string: unblock = Unblock
WARNING: untranslated string: unblock all = Unblock all
WARNING: untranslated string: uncheck all = Uncheck all
-WARNING: untranslated string: uninstall = Uninstall
WARNING: untranslated string: unknown = UNKNOWN
WARNING: untranslated string: unlimited = Unlimited
WARNING: untranslated string: unnamed = Unnamed
@@ -1873,7 +1873,6 @@ WARNING: untranslated string: updxlrtr web proxy service required = Web proxy se
WARNING: untranslated string: updxlrtr week = one week
WARNING: untranslated string: updxlrtr weekly = weekly
WARNING: untranslated string: updxlrtr year = one year
-WARNING: untranslated string: upgrade = upgrade
WARNING: untranslated string: uplink = Uplink
WARNING: untranslated string: uplink bit rate = Uplink Bit Rate
WARNING: untranslated string: uplink speed = Uplink speed (kbit/sec)
diff --git a/doc/language_issues.es b/doc/language_issues.es
index 5f5624426c..de7a79bc4d 100644
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -43,6 +43,7 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Utilization on
WARNING: translation string unused: Verbose
WARNING: translation string unused: Weekly
+WARNING: translation string unused: abort
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting
@@ -132,6 +133,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: artist
WARNING: translation string unused: attemps
+WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -467,6 +469,7 @@ WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
@@ -683,11 +686,15 @@ WARNING: translation string unused: ovpn_processprioVH
WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire confirm updates
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire dependencies found
WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire no dependencies found
WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire resolvedeps wait
WARNING: translation string unused: pakfire update daily
-WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: pakfire updating
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
@@ -890,6 +897,7 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: uninstall
WARNING: translation string unused: unix charset
WARNING: translation string unused: unix group
WARNING: translation string unused: unix password sync
@@ -909,6 +917,7 @@ WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
WARNING: translation string unused: updxlrtr used by
+WARNING: translation string unused: upgrade
WARNING: translation string unused: upload dh key
WARNING: translation string unused: upload fcdsl.o
WARNING: translation string unused: upload file
diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 0965d97509..41cda19883 100644
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -46,6 +46,7 @@ WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Utilization on
WARNING: translation string unused: Verbose
WARNING: translation string unused: Weekly
+WARNING: translation string unused: abort
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting
@@ -135,6 +136,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: artist
WARNING: translation string unused: attemps
+WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -452,6 +454,7 @@ WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
@@ -658,11 +661,15 @@ WARNING: translation string unused: ovpn_processprioVH
WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire confirm updates
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire dependencies found
WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire no dependencies found
WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire resolvedeps wait
WARNING: translation string unused: pakfire update daily
-WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: pakfire updating
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
@@ -863,6 +870,7 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: uninstall
WARNING: translation string unused: unix charset
WARNING: translation string unused: unix group
WARNING: translation string unused: unix password sync
@@ -882,6 +890,7 @@ WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
WARNING: translation string unused: updxlrtr used by
+WARNING: translation string unused: upgrade
WARNING: translation string unused: upload file
WARNING: translation string unused: upload new ruleset
WARNING: translation string unused: upload static key
diff --git a/doc/language_issues.it b/doc/language_issues.it
index 607e013ff2..80ef720272 100644
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -18,6 +18,7 @@ WARNING: translation string unused: Subclass
WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Utilization on
WARNING: translation string unused: Verbose
+WARNING: translation string unused: abort
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting
@@ -105,6 +106,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: artist
WARNING: translation string unused: attemps
+WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -418,6 +420,7 @@ WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
@@ -612,10 +615,15 @@ WARNING: translation string unused: ovpn_processprioVH
WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire confirm updates
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire dependencies found
WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire no dependencies found
WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire resolvedeps wait
WARNING: translation string unused: pakfire update daily
+WARNING: translation string unused: pakfire updating
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
@@ -815,6 +823,7 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: uninstall
WARNING: translation string unused: unix charset
WARNING: translation string unused: unix group
WARNING: translation string unused: unix password sync
@@ -833,6 +842,7 @@ WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
WARNING: translation string unused: updxlrtr used by
+WARNING: translation string unused: upgrade
WARNING: translation string unused: upload fcdsl.o
WARNING: translation string unused: upload file
WARNING: translation string unused: upload new ruleset
diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index d13efb0670..43b16a94f5 100644
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -18,6 +18,7 @@ WARNING: translation string unused: Subclass
WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Utilization on
WARNING: translation string unused: Verbose
+WARNING: translation string unused: abort
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting
@@ -105,6 +106,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: artist
WARNING: translation string unused: attemps
+WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -420,6 +422,7 @@ WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
@@ -611,11 +614,15 @@ WARNING: translation string unused: ovpn_processprioVH
WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire confirm updates
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire dependencies found
WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire no dependencies found
WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire resolvedeps wait
WARNING: translation string unused: pakfire update daily
-WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: pakfire updating
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
@@ -816,6 +823,7 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: uninstall
WARNING: translation string unused: unix charset
WARNING: translation string unused: unix group
WARNING: translation string unused: unix password sync
@@ -834,6 +842,7 @@ WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
WARNING: translation string unused: updxlrtr used by
+WARNING: translation string unused: upgrade
WARNING: translation string unused: upload fcdsl.o
WARNING: translation string unused: upload file
WARNING: translation string unused: upload new ruleset
diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index 8f3249a69a..e59af39967 100644
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -18,6 +18,7 @@ WARNING: translation string unused: Subclass
WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Utilization on
WARNING: translation string unused: Verbose
+WARNING: translation string unused: abort
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting
@@ -100,6 +101,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: artist
WARNING: translation string unused: attemps
+WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -359,6 +361,7 @@ WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
@@ -536,11 +539,15 @@ WARNING: translation string unused: ovpn_processprioVH
WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire confirm updates
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire dependencies found
WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire no dependencies found
WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire resolvedeps wait
WARNING: translation string unused: pakfire update daily
-WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: pakfire updating
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
@@ -732,6 +739,7 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: uninstall
WARNING: translation string unused: unix charset
WARNING: translation string unused: unix group
WARNING: translation string unused: unix password sync
@@ -747,6 +755,7 @@ WARNING: translation string unused: updxlrtr invalid num of children
WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
+WARNING: translation string unused: upgrade
WARNING: translation string unused: upload fcdsl.o
WARNING: translation string unused: upload file
WARNING: translation string unused: upload new ruleset
diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 20877431df..371f38fa7c 100644
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -18,6 +18,7 @@ WARNING: translation string unused: Subclass
WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Utilization on
WARNING: translation string unused: Verbose
+WARNING: translation string unused: abort
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting
@@ -100,6 +101,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: artist
WARNING: translation string unused: attemps
+WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -355,6 +357,7 @@ WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
@@ -531,11 +534,15 @@ WARNING: translation string unused: ovpn_processprioVH
WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire confirm updates
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire dependencies found
WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire no dependencies found
WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire resolvedeps wait
WARNING: translation string unused: pakfire update daily
-WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: pakfire updating
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
@@ -727,6 +734,7 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: uninstall
WARNING: translation string unused: unix charset
WARNING: translation string unused: unix group
WARNING: translation string unused: unix password sync
@@ -742,6 +750,7 @@ WARNING: translation string unused: updxlrtr invalid num of children
WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
+WARNING: translation string unused: upgrade
WARNING: translation string unused: upload fcdsl.o
WARNING: translation string unused: upload file
WARNING: translation string unused: upload new ruleset
diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index 973e87c62c..fd624e9d6f 100644
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -39,6 +39,7 @@ WARNING: translation string unused: Subclass
WARNING: translation string unused: TOS Bits
WARNING: translation string unused: Utilization on
WARNING: translation string unused: Verbose
+WARNING: translation string unused: abort
WARNING: translation string unused: access allowed
WARNING: translation string unused: access refused with this oinkcode
WARNING: translation string unused: accounting
@@ -127,6 +128,7 @@ WARNING: translation string unused: apply
WARNING: translation string unused: archive not exist
WARNING: translation string unused: artist
WARNING: translation string unused: attemps
+WARNING: translation string unused: available updates
WARNING: translation string unused: avoid dod
WARNING: translation string unused: backup archive
WARNING: translation string unused: backup clear archive
@@ -444,6 +446,7 @@ WARNING: translation string unused: incorrect password
WARNING: translation string unused: info
WARNING: translation string unused: insert floppy
WARNING: translation string unused: insert removable device
+WARNING: translation string unused: install
WARNING: translation string unused: install new update
WARNING: translation string unused: installed
WARNING: translation string unused: installed updates
@@ -641,11 +644,15 @@ WARNING: translation string unused: ovpn_processprioVH
WARNING: translation string unused: ovpnstatus log
WARNING: translation string unused: ovpnsys log
WARNING: translation string unused: package failed to install
+WARNING: translation string unused: pakfire confirm updates
WARNING: translation string unused: pakfire core update auto
+WARNING: translation string unused: pakfire dependencies found
WARNING: translation string unused: pakfire health check
+WARNING: translation string unused: pakfire no dependencies found
WARNING: translation string unused: pakfire register
+WARNING: translation string unused: pakfire resolvedeps wait
WARNING: translation string unused: pakfire update daily
-WARNING: translation string unused: pakfire updates
+WARNING: translation string unused: pakfire updating
WARNING: translation string unused: password contains illegal characters
WARNING: translation string unused: password crypting key
WARNING: translation string unused: passwords must be at least 6 characters in length
@@ -845,6 +852,7 @@ WARNING: translation string unused: tripwirewarningpolicy
WARNING: translation string unused: umount
WARNING: translation string unused: umount removable media before to unplug
WARNING: translation string unused: unencrypted
+WARNING: translation string unused: uninstall
WARNING: translation string unused: unix charset
WARNING: translation string unused: unix group
WARNING: translation string unused: unix password sync
@@ -863,6 +871,7 @@ WARNING: translation string unused: updxlrtr unknown
WARNING: translation string unused: updxlrtr update information
WARNING: translation string unused: updxlrtr update notification
WARNING: translation string unused: updxlrtr used by
+WARNING: translation string unused: upgrade
WARNING: translation string unused: upload fcdsl.o
WARNING: translation string unused: upload file
WARNING: translation string unused: upload new ruleset
diff --git a/doc/language_missings b/doc/language_missings
index 53e6f224dd..58191cfe35 100644
--- a/doc/language_missings
+++ b/doc/language_missings
@@ -82,6 +82,9 @@
< oops something went wrong
< optional
< ovpn roadwarrior server
+< pakfire dependencies found
+< pakfire no dependencies found
+< pakfire resolvedeps wait
< quick control
< random number generator daemon
< regenerate host certificate
diff --git a/html/cgi-bin/credits.cgi b/html/cgi-bin/credits.cgi
index b13771fe45..4edeace767 100644
--- a/html/cgi-bin/credits.cgi
+++ b/html/cgi-bin/credits.cgi
@@ -93,6 +93,7 @@ Jörn-Ingo Weigert,
Alexander Koch,
Wolfgang Apolinarski,
Alfred Haas,
+Stephen Cuka,
Lars Schuhmacher,
Rene Zingel,
Sascha Kilian,
@@ -150,7 +151,6 @@ Robert Möker,
Stefan Ernst,
Stefan Ferstl,
Steffen Klammer,
-Stephen Cuka,
Thomas Cekal,
Thomas Ebert,
Timmothy Wilson,
diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 42c603c613..1cd39e4118 100644
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -120,18 +120,18 @@ if(($cgiparams{'ACTION'} ne '') && ($pagemode eq $PM_DEFAULT)) {
if(&_is_pakfire_busy()) {
$errormessage = $Lang::tr{'pakfire already busy'};
$pagemode = $PM_LOGREAD; # Running Pakfire instance found, switch to log viewer mode
- } elsif(($cgiparams{'ACTION'} eq 'install') && ($cgiparams{'FORCE'} eq 'on')) {
+ } elsif(($cgiparams{'ACTION'} eq $Lang::tr{'pakfire install'}) && ($cgiparams{'FORCE'} eq 'on')) {
my @pkgs = split(/\|/, $cgiparams{'INSPAKS'});
&General::system_background("/usr/local/bin/pakfire", "install", "--non-interactive", "--no-colors", @pkgs);
&_http_pagemode_redirect($PM_LOGREAD, 1);
- } elsif(($cgiparams{'ACTION'} eq 'remove') && ($cgiparams{'FORCE'} eq 'on')) {
+ } elsif(($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) && ($cgiparams{'FORCE'} eq 'on')) {
my @pkgs = split(/\|/, $cgiparams{'DELPAKS'});
&General::system_background("/usr/local/bin/pakfire", "remove", "--non-interactive", "--no-colors", @pkgs);
&_http_pagemode_redirect($PM_LOGREAD, 1);
- } elsif($cgiparams{'ACTION'} eq 'update') {
+ } elsif($cgiparams{'ACTION'} eq $Lang::tr{'pakfire refresh list'}) {
&General::system_background("/usr/local/bin/pakfire", "update", "--force", "--no-colors");
&_http_pagemode_redirect($PM_LOGREAD, 1);
- } elsif($cgiparams{'ACTION'} eq 'upgrade') {
+ } elsif($cgiparams{'ACTION'} eq $Lang::tr{'pakfire upgrade'}) {
&General::system_background("/usr/local/bin/pakfire", "upgrade", "-y", "--no-colors");
&_http_pagemode_redirect($PM_LOGREAD, 1);
} elsif($cgiparams{'ACTION'} eq $Lang::tr{'save'}) {
@@ -161,16 +161,11 @@ my $extraHead = <<END
/* Main screen */
table#pfmain {
width: 100%;
- border-style: hidden;
table-layout: fixed;
- }
-
- #pfmain td {
- padding: 5px 20px 0;
text-align: center;
}
- #pfmain tr:not(:last-child) > td {
- padding-bottom: 1.5em;
+ #pfmain td {
+ padding: 0px 20px;
}
#pfmain tr > td.heading {
padding: 0;
@@ -207,7 +202,6 @@ my $extraHead = <<END
margin-top: 0.7em;
padding-top: 0.7em;
border-top: 0.5px solid $Header::bordercolour;
-
text-align: left;
min-height: 15em;
overflow-x: auto;
@@ -280,36 +274,40 @@ END
# Show Pakfire install/remove dependencies and confirm form
# (_is_pakfire_busy status was checked before and can be omitted)
-if (($cgiparams{'ACTION'} eq 'install') && ($pagemode eq $PM_DEFAULT)) {
+if (($cgiparams{'ACTION'} eq $Lang::tr{'pakfire install'}) && ($pagemode eq $PM_DEFAULT)) {
&Header::openbox("100%", "center", $Lang::tr{'request'});
my @pkgs = split(/\|/, $cgiparams{'INSPAKS'});
my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
print <<END;
- <table style="width: 100%"><tr><td colspan='2'><p>$Lang::tr{'pakfire install package'} <strong>@{pkgs}</strong><br>
- $Lang::tr{'pakfire possible dependency'}</p>
- <pre>
+ <table style="width: 100%">
+ <tr>
+ <td>
+ <p>$Lang::tr{'pakfire install package'} <strong>@{pkgs}</strong><br>$Lang::tr{'pakfire possible dependency'}</p>
+ <pre>
END
foreach (@output) {
$_ =~ s/\^[\[[0-1]\;[0-9]+m//g;
print "$_\n";
}
print <<END;
- </pre></td></tr>
- <tr><td colspan='2'>$Lang::tr{'pakfire accept all'}</td></tr>
- <tr><td colspan='2'> </td></tr>
- <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' />
- <input type='hidden' name='FORCE' value='on' />
- <input type='hidden' name='ACTION' value='install' />
- <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/go-next.png' />
- </form>
+ </pre>
</td>
- <td align='left'>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value='' />
- <input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
- </form>
+ </tr>
+ <tr>
+ <td>$Lang::tr{'pakfire accept all'}</td>
+ </tr>
+ <tr>
+ <td> </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' />
+ <input type='hidden' name='FORCE' value='on' />
+ <input type='submit' name='ACTION' value='$Lang::tr{'pakfire install'}'/>
+ <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}'/>
+ </form>
</td>
</tr>
</table>
@@ -319,36 +317,40 @@ END
&Header::closepage();
exit;
-} elsif (($cgiparams{'ACTION'} eq 'remove') && ($pagemode eq $PM_DEFAULT)) {
+} elsif (($cgiparams{'ACTION'} eq $Lang::tr{'remove'}) && ($pagemode eq $PM_DEFAULT)) {
&Header::openbox("100%", "center", $Lang::tr{'request'});
my @pkgs = split(/\|/, $cgiparams{'DELPAKS'});
my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
print <<END;
- <table style="width: 100%"><tr><td colspan='2'><p>$Lang::tr{'pakfire uninstall package'} <strong>@{pkgs}</strong><br>
- $Lang::tr{'pakfire possible dependency'}</p>
- <pre>
+ <table style="width: 100%">
+ <tr>
+ <td colspan='2'>
+ <p>$Lang::tr{'pakfire uninstall package'} <strong>@{pkgs}</strong><br>$Lang::tr{'pakfire possible dependency'}</p>
+ <pre>
END
foreach (@output) {
$_ =~ s/\^[\[[0-1]\;[0-9]+m//g;
print "$_\n";
}
print <<END;
- </pre></td></tr>
- <tr><td colspan='2'>$Lang::tr{'pakfire uninstall all'}</td></tr>
- <tr><td colspan='2'> </td></tr>
- <tr><td align='right'><form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
- <input type='hidden' name='FORCE' value='on' />
- <input type='hidden' name='ACTION' value='remove' />
- <input type='image' alt='$Lang::tr{'uninstall'}' title='$Lang::tr{'uninstall'}' src='/images/go-next.png' />
- </form>
+ </pre>
</td>
- <td align='left'>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value='' />
- <input type='image' alt='$Lang::tr{'abort'}' title='$Lang::tr{'abort'}' src='/images/dialog-error.png' />
- </form>
+ </tr>
+ <tr>
+ <td colspan='2'>$Lang::tr{'pakfire uninstall all'}</td>
+ </tr>
+ <tr>
+ <td colspan='2'> </td>
+ </tr>
+ <tr>
+ <td align='center'>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <input type='hidden' name='DELPAKS' value='$cgiparams{'DELPAKS'}' />
+ <input type='hidden' name='FORCE' value='on' />
+ <input type='submit' name='ACTION' value='$Lang::tr{'remove'}'/>
+ <input type='submit' name='ACTION' value='$Lang::tr{'cancel'}'/>
+ </form>
</td>
</tr>
</table>
@@ -374,30 +376,36 @@ $selected{"TREE"}{$pakfiresettings{"TREE"}} = "selected";
print <<END;
<table id="pfmain">
END
-if ("$pakfire_status{'RebootRequired'}" eq "yes") {
- print "\t\t<tr><td colspan='2'><a href='/cgi-bin/shutdown.cgi'>$Lang::tr{'needreboot'}!</a></td></tr>\n";
+if ($pakfire_status{'RebootRequired'} eq "yes")
+{
+ print <<END;
+ <tr>
+ <td colspan='2' style='padding-bottom:20px'>
+ <a href='/cgi-bin/shutdown.cgi'>$Lang::tr{'needreboot'}!</a>
+ </td>
+ </tr>
+END
}
print <<END;
- <tr><td class="heading">$Lang::tr{'pakfire system state'}:</td>
- <td class="heading">$Lang::tr{'available updates'}:</td></tr>
-
- <tr><td><strong>$Lang::tr{'pakfire core update level'}: $pakfire_status{'Release'}</strong>
- <hr>
- <div class="pflist">
- $Lang::tr{'pakfire last update'} $pakfire_status{'LastUpdate'} $Lang::tr{'pakfire ago'}<br>
- $Lang::tr{'pakfire last serverlist update'} $pakfire_status{'LastServerListUpdate'} $Lang::tr{'pakfire ago'}<br>
- $Lang::tr{'pakfire last core list update'} $pakfire_status{'LastCoreListUpdate'} $Lang::tr{'pakfire ago'}<br>
- $Lang::tr{'pakfire last package update'} $pakfire_status{'LastPakListUpdate'} $Lang::tr{'pakfire ago'}
- </div>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <input type='hidden' name='ACTION' value='update' />
- <input type='submit' value='$Lang::tr{'calamaris refresh list'}' />
- </form>
+ <tr>
+ <td class="heading">$Lang::tr{'pakfire system state'}:</td>
+ <td class="heading">$Lang::tr{'pakfire updates'}:</td>
+ </tr>
+
+ <tr>
+ <td style='padding-top: 15px'>
+ <strong>$Lang::tr{'pakfire core update level'}: $pakfire_status{'Release'}</strong>
+ <hr>
+ <div class="pflist">
+ $Lang::tr{'pakfire last update'} $pakfire_status{'LastUpdate'} $Lang::tr{'pakfire ago'}<br>
+ $Lang::tr{'pakfire last serverlist update'} $pakfire_status{'LastServerListUpdate'} $Lang::tr{'pakfire ago'}<br>
+ $Lang::tr{'pakfire last core list update'} $pakfire_status{'LastCoreListUpdate'} $Lang::tr{'pakfire ago'}<br>
+ $Lang::tr{'pakfire last package update'} $pakfire_status{'LastPakListUpdate'} $Lang::tr{'pakfire ago'}
+ </div>
</td>
- <td>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <select name="UPDPAKS" class="pflist" size="5" disabled>
+ <td style='padding-top: 15px'>
+ <select class="pflist" style="height: 103px" size="5" disabled>
END
if ("$pakfire_status{'CoreUpdateAvailable'}" eq "yes") {
@@ -412,18 +420,44 @@ END
}
print <<END;
- </select>
- <input type='hidden' name='ACTION' value='upgrade' />
- <input type='image' alt='$Lang::tr{'upgrade'}' title='$Lang::tr{'upgrade'}' src='/images/document-save.png' />
- </form>
+ </select>
</td>
</tr>
- <tr><td class="heading">$Lang::tr{'pakfire available addons'}</td>
- <td class="heading">$Lang::tr{'pakfire installed addons'}</td></tr>
+ <tr>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <td style='padding-bottom: 15px'>
+ <input type='submit' name='ACTION' value='$Lang::tr{'pakfire refresh list'}' />
+ </td>
+ <td style='padding-bottom: 15px'>
+END
- <tr><td style="padding:5px 10px 20px 20px" align="center"><p>$Lang::tr{'pakfire install description'}</p>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <select name="INSPAKS" class="pflist" size="10" multiple>
+ if (($pakfire_status{'CoreUpdateAvailable'} eq "yes") || ($pakfire_status{'PakUpdatesAvailable'} > 0))
+ {
+ print "<input type='submit' name='ACTION' value='$Lang::tr{'pakfire upgrade'}'/>\n";
+ } else {
+ print "<input disabled type='submit' name='ACTION' value='$Lang::tr{'pakfire upgrade'}'/>\n";
+ }
+
+ print <<END;
+ </td>
+ </form>
+ </tr>
+ <tr>
+ <td class="heading">$Lang::tr{'pakfire available addons'}</td>
+ <td class="heading">$Lang::tr{'pakfire installed addons'}</td>
+ </tr>
+ <form method='post' action='$ENV{'SCRIPT_NAME'}'>
+ <tr>
+ <td style='padding-top: 15px; padding-bottom: 5px'>
+ $Lang::tr{'pakfire install description'}
+ </td>
+ <td style='padding-top: 15px; padding-bottom: 5px'>
+ $Lang::tr{'pakfire uninstall description'}
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <select name="INSPAKS" class="pflist" style="height:206px" size="10" multiple onchange="document.getElementById('installbutton').disabled=false">
END
my %notinstalledlist = &Pakfire::dblist("notinstalled");
@@ -432,14 +466,10 @@ END
}
print <<END;
- </select>
- <input type='hidden' name='ACTION' value='install' />
- <input type='image' alt='$Lang::tr{'install'}' title='$Lang::tr{'install'}' src='/images/list-add.png' />
- </form>
+ </select>
</td>
- <td style="padding:5px 10px 20px 20px" align="center"><p>$Lang::tr{'pakfire uninstall description'}</p>
- <form method='post' action='$ENV{'SCRIPT_NAME'}'>
- <select name="DELPAKS" class="pflist" size="10" multiple>
+ <td>
+ <select name="DELPAKS" class="pflist" style="height:206px" size="10" multiple onchange="document.getElementById('removebutton').disabled=false">
END
my %installedlist = &Pakfire::dblist("installed");
@@ -448,12 +478,18 @@ END
}
print <<END;
- </select>
- <input type='hidden' name='ACTION' value='remove' />
- <input type='image' alt='$Lang::tr{'remove'}' title='$Lang::tr{'remove'}' src='/images/list-remove.png' />
- </form>
+ </select>
+ </td>
+ </tr>
+ <tr>
+ <td style='padding-bottom: 5px'>
+ <input disabled type='submit' id='installbutton' name='ACTION' value='$Lang::tr{'pakfire install'}'/>
+ </td>
+ <td style='padding-bottom: 5px'>
+ <input disabled type='submit' id='removebutton' name='ACTION' value='$Lang::tr{'remove'}'/>
</td>
</tr>
+ </form>
</table>
END
diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 5cac132b9d..bb0c51f035 100644
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2011,12 +2011,15 @@
'pakfire already busy' => 'Pakfire führt bereits eine Aufgabe aus. Bitte versuchen Sie es später erneut.',
'pakfire available addons' => 'Verfügbare Add-ons:',
'pakfire configuration' => 'Pakfire Konfiguration',
+'pakfire confirm updates' => 'Möchten Sie alle Updates installieren?',
'pakfire core update auto' => 'Core- und Add-on-Updates automatisch installieren:',
'pakfire core update level' => 'Core-Update-Level',
+'pakfire dependecies found' => 'Abhängigkeiten gefunden:',
'pakfire finished' => 'Pakfire ist fertig! Kehre zurück...',
'pakfire finished error' => 'Pakfire ist fertig! Fehler sind aufgetreten, bitte überprüfen Sie die Log-Ausgabe, bevor Sie fortfahren.',
'pakfire health check' => 'Mirrors auf Erreichbarkeit prüfen (Ping):',
-'pakfire install description' => 'Wählen Sie ein oder mehrere Pakete zur Installation aus und drücken Sie auf das plus-Symbol.',
+'pakfire install' => 'Installieren',
+'pakfire install description' => 'Bitte wählen Sie ein oder mehrere Add-Ons zur Installation aus.',
'pakfire install package' => 'Sie möchten folgende Pakete installieren: ',
'pakfire installed addons' => 'Installierte Add-ons:',
'pakfire invalid tree' => '',
@@ -2024,8 +2027,11 @@
'pakfire last package update' => 'Letztes Paketlisten Update ist',
'pakfire last serverlist update' => 'Letztes Serverlisten Update ist',
'pakfire last update' => 'Letztes Update ist',
+'pakfire no dependecies found' => 'Keine Abhängigkeiten gefunden.',
'pakfire possible dependency' => ' Möglicherweise haben diese Pakete Abhängigkeiten, d.h. andere Pakete müssen zusätzlich installiert werden. Dazu sehen Sie unten eine Liste.',
+'pakfire refresh list' => 'Liste aktualisieren',
'pakfire register' => 'Registrierung am Pakfire-Server:',
+'pakfire resolvdeps wait' => 'Prüfen auf Abhängigkeiten, bitte warten...',
'pakfire return' => 'Zurück zu Pakfire',
'pakfire system state' => 'System Status',
'pakfire tree' => 'Zu verwendendes Pakfire-Repository:',
@@ -2033,10 +2039,12 @@
'pakfire tree testing' => 'Vorabversionen (testing)',
'pakfire tree unstable' => 'Experimentelle Versionen (unstable)',
'pakfire uninstall all' => 'Möchten Sie die folgenden Pakete deinstallieren?',
-'pakfire uninstall description' => 'Wählen Sie ein oder mehrere Pakete zur Deinstallation aus und drücken Sie auf das minus-Symbol.',
+'pakfire uninstall description' => 'Bitte wählen Sie ein oder mehrere Add-Ons zum Entfernen aus.',
'pakfire uninstall package' => 'Sie möchten folgende Pakete deinstallieren: ',
'pakfire update daily' => 'Täglich nach Updates suchen:',
-'pakfire updates' => 'Zur Verfügung stehende Updates:',
+'pakfire updates' => 'Verfügbare Updates',
+'pakfire updating' => 'Aktualisierung der pakfire Datenbank, bitte warten...',
+'pakfire upgrade' => 'Upgrade',
'pakfire working' => 'Pakfire führt gerade eine Aufgabe aus... Bitte warten Sie, bis diese erfolgreich beendet wurde.',
'pap or chap' => 'PAP oder CHAP',
'parentclass' => 'Elternklasse',
diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 7e3cedc5cc..9dccabf097 100644
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2077,12 +2077,15 @@
'pakfire already busy' => 'Pakfire is already performing a task. Please try again later.',
'pakfire available addons' => 'Available Add-ons:',
'pakfire configuration' => 'Pakfire Configuration',
+'pakfire confirm updates' => 'Do you want to install all updates?',
'pakfire core update auto' => 'Install core and add-on updates automatically:',
'pakfire core update level' => 'Core-Update-Level',
+'pakfire dependencies found' => 'Dependencies found:',
'pakfire finished' => 'Pakfire has finished! Returning...',
'pakfire finished error' => 'Pakfire has finished! Errors occurred, please check the log output before proceeding.',
'pakfire health check' => 'Check if mirror is reachable (ping):',
-'pakfire install description' => 'Please choose one or more items from the list below and click the plus to install.',
+'pakfire install' => 'Install',
+'pakfire install description' => 'Please select one or more add-ons to install.',
'pakfire install package' => 'You want to install the following packages: ',
'pakfire installed addons' => 'Installed Add-ons:',
'pakfire invalid tree' => 'Invalid repository selected',
@@ -2090,8 +2093,11 @@
'pakfire last package update' => 'Last packages list update made',
'pakfire last serverlist update' => 'Last server list update made',
'pakfire last update' => 'Last update made',
+'pakfire no dependencies found' => 'No dependencies found.',
'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
+'pakfire refresh list' => 'Refresh List',
'pakfire register' => 'Register at pakfire-server:',
+'pakfire resolvedeps wait' => 'Checking for dependencies, please wait...',
'pakfire return' => 'Return to Pakfire',
'pakfire system state' => 'System Status',
'pakfire tree' => 'Repository',
@@ -2099,9 +2105,12 @@
'pakfire tree testing' => 'Testing',
'pakfire tree unstable' => 'Unstable',
'pakfire uninstall all' => 'Do you want to uninstall the following packages?',
-'pakfire uninstall description' => 'Please choose one or more items from the list below and click the minus to uninstall.',
+'pakfire uninstall description' => 'Please select one or more add-ons to remove.',
'pakfire uninstall package' => 'You want to uninstall the following packages: ',
'pakfire update daily' => 'Search for updates daily:',
+'pakfire updates' => 'Available Updates',
+'pakfire updating' => 'Updating pakfire database, please wait...',
+'pakfire upgrade' => 'Upgrade',
'pakfire working' => 'Pakfire is working ... Please wait until all operations have completed successfully.',
'pap or chap' => 'PAP or CHAP',
'parentclass' => 'Parentclass',
diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 8a6322abe6..4da08b4807 100644
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -2074,12 +2074,15 @@
'pakfire already busy' => 'Pakfire ya está realizando una tarea. Por favor, inténtelo de nuevo más tarde.',
'pakfire available addons' => 'Complementos disponibles:',
'pakfire configuration' => 'Configuración de Pakfire',
+'pakfire confirm updates' => '¿Desea instalar todas las actualizaciones?',
'pakfire core update auto' => 'Instar actualizaciones principales y complementarias automáticamente:',
'pakfire core update level' => 'Nivel de actualización del núcleo',
+'pakfire dependencies found' => 'Dependencias encontradas:',
'pakfire finished' => '¡Pakfire ha terminado! Volviendo...',
'pakfire finished error' => '¡Pakfire ha terminado! Ocurrieron errores, verifique la salida del registro antes de continuar.',
'pakfire health check' => 'Verificar disponibilidad del espejo (ping):',
-'pakfire install description' => 'Por favor elija uno o más elementos de la siguiente lista y haga click en el signo + para instalar',
+'pakfire install' => 'Instalar',
+'pakfire install description' => 'Seleccione uno o más complementos para instalar.',
'pakfire install package' => 'Ud. desea instalar los siguientes paquetes:',
'pakfire installed addons' => 'Complementos instalados:',
'pakfire invalid tree' => 'Repositorio no válido seleccionado',
@@ -2087,8 +2090,11 @@
'pakfire last package update' => 'Última lista de actualización de paquetes hecha',
'pakfire last serverlist update' => 'Última lista de actualización de servidor hecha',
'pakfire last update' => 'Última actualización realizada',
+'pakfire no dependencies found' => 'No se encontraron dependencias.',
'pakfire possible dependency' => 'Puede haber paquetes con dependencias, aquí está una lista de paquetes que necesitan ser instalados.',
+'pakfire refresh list' => 'Refrescar Lista',
'pakfire register' => 'Registrar en el servidor pakfire:',
+'pakfire resolvedeps wait' => 'Buscando dependencias, por favor espere...',
'pakfire return' => 'Regresar a Pakfire',
'pakfire system state' => 'Estado del sistema',
'pakfire tree' => 'Repositorio',
@@ -2096,10 +2102,12 @@
'pakfire tree testing' => 'Pruebas',
'pakfire tree unstable' => 'Inestable',
'pakfire uninstall all' => '¿Desea desinstalar los siguientes paquetes?',
-'pakfire uninstall description' => 'Por favor elija uno o más elementos de la siguiente lista y haga click en el signo - para desinstalar',
+'pakfire uninstall description' => 'Seleccione uno o más complementos para eliminar.',
'pakfire uninstall package' => 'Desea desinstalar los siguientes paquetes:',
'pakfire update daily' => 'Buscar actualizaciones diariamente:',
-'pakfire updates' => 'Actualización disponible:',
+'pakfire updates' => 'Actualizaciones Disponibles',
+'pakfire updating' => 'Actualizando base de datos pakfire, por favor espere...',
+'pakfire upgrade' => 'Actualizar',
'pakfire working' => 'Pakfire está trabajando… Por favor espere hasta que todas las operaciones se hallan completado exitosamente.',
'pap or chap' => 'PAP o CHAP',
'parentclass' => 'Clase principal',
diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 055def46e5..9e457acd01 100644
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -2072,12 +2072,15 @@
'pakfire already busy' => 'Pakfire est déjà en train d\'effectuer une tâche. Veuillez réessayer plus tard.',
'pakfire available addons' => 'Modules disponibles :',
'pakfire configuration' => 'Configuration Pakfire',
+'pakfire confirm updates' => 'Voulez-vous installer toutes les mises à jour ?',
'pakfire core update auto' => 'Installer automatiquement les mises à jour du noyau et des modules :',
'pakfire core update level' => 'Version de mise à jour du noyau ',
+'pakfire dependencies found' => 'Dépendances trouvées :',
'pakfire finished' => 'Pakfire a fini ! Retour...',
'pakfire finished error' => 'Pakfire a fini ! Des erreurs se sont produites, veuillez vérifier les rapports système des journaux avant de continuer.',
'pakfire health check' => 'Vérifier si le miroir est accessible (ping) :',
-'pakfire install description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe PLUS pour le(s) installer.',
+'pakfire install' => 'Installer',
+'pakfire install description' => 'Veuillez sélectionner un ou plusieurs modules complémentaires à installer.',
'pakfire install package' => 'Vous souhaitez installer le(s) module(s) suivant(s) : ',
'pakfire installed addons' => 'Modules installés :',
'pakfire invalid tree' => 'Dépôt choisi invalide',
@@ -2085,8 +2088,11 @@
'pakfire last package update' => 'Dernière mise à jour de la liste des paquets : ',
'pakfire last serverlist update' => 'Dernière mise à jour de la liste des serveurs : ',
'pakfire last update' => 'Dernière mise à jour : ',
+'pakfire no dependencies found' => 'Aucune dépendance trouvée.',
'pakfire possible dependency' => 'Il y a peut-être des dépendances, voici la liste des paquets qu\'il faut (dés)installer.',
+'pakfire refresh list' => 'Actualiser la Liste',
'pakfire register' => 'S\'inscrire au serveur pakfire :',
+'pakfire resolvedeps wait' => 'Vérification des dépendances, veuillez patienter...',
'pakfire return' => 'Retour à Pakfire',
'pakfire system state' => 'Statut système PakFire ',
'pakfire tree' => 'Dépôt officiel',
@@ -2094,10 +2100,12 @@
'pakfire tree testing' => 'En test',
'pakfire tree unstable' => 'Instable',
'pakfire uninstall all' => 'Voulez-vous désinstaller ce(s) paquet(s) ?',
-'pakfire uninstall description' => 'Veuillez choisir un ou plusieurs modules dans la liste ci-dessous<br>et cliquer sur le signe MOINS pour le(s) désinstaller.',
+'pakfire uninstall description' => 'Veuillez sélectionner un ou plusieurs modules complémentaires à supprimer.',
'pakfire uninstall package' => 'Vous souhaitez désinstaller le(s) module(s) suivant(s) : ',
'pakfire update daily' => 'Rechercher des mises à jour quotidiennes :',
-'pakfire updates' => 'Mise à jour disponible :',
+'pakfire updates' => 'Mises à jour Disponibles',
+'pakfire updating' => 'Mise à jour de la base de données pakfire, veuillez patienter...',
+'pakfire upgrade' => 'Améliorer',
'pakfire working' => 'Pakfire est en cours de traitement... Veuillez attendre que tout soit terminé.',
'pap or chap' => 'PAP ou CHAP',
'parentclass' => 'Classe parent',
diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 4654813cc0..b13c3b85c6 100644
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1712,23 +1712,32 @@
'pakfire ago' => 'ago.',
'pakfire available addons' => 'Addons disponibili:',
'pakfire configuration' => 'Configurazione Pakfire',
+'pakfire confirm updates' => 'Vuoi installare tutti gli aggiornamenti?',
'pakfire core update auto' => 'Install core and addon updates automatically:',
'pakfire core update level' => 'Core-Update-Level',
+'pakfire dependencies found' => 'Dipendenze trovate:',
'pakfire health check' => 'Controllare se il mirror è raggiungibile (ping):',
-'pakfire install description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e fai clic sul segno più per installare.',
+'pakfire install' => 'Installare',
+'pakfire install description' => 'Selezionare uno o più componenti aggiuntivi da installare.',
'pakfire install package' => 'You want to install the following packages: ',
'pakfire installed addons' => 'Addons installati:',
'pakfire last core list update' => 'Ultimo aggiornamento della lista di sistema',
'pakfire last package update' => 'Ultimo aggiornamento della lista pacchetti',
'pakfire last serverlist update' => 'Ultimo aggiornamento della lista server',
'pakfire last update' => 'Ultimo aggiornamento di sistema effettuato',
+'pakfire no dependencies found' => 'Nessuna dipendenza trovata.',
'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
+'pakfire refresh list' => 'Aggiorna le Liste',
'pakfire register' => 'Registrati sul pakfire-server:',
+'pakfire resolvedeps wait' => 'Controllo delle dipendenze, attendere prego...',
'pakfire system state' => 'Stato del Sistema',
'pakfire uninstall all' => 'Vuoi disinstallare i seguenti pacchetti?',
-'pakfire uninstall description' => 'Si prega di scegliere uno o più elementi dalla lista qui sotto e fare clic sul meno per disinstallare..',
+'pakfire uninstall description' => 'Seleziona uno o più componenti aggiuntivi da rimuovere.',
'pakfire uninstall package' => 'You want to uninstall the following packages: ',
'pakfire update daily' => 'Ricerca gli aggiornamenti una volta al giorno:',
+'pakfire updates' => 'Aggiornamenti Disponibili',
+'pakfire updating' => 'Aggiornamento del database Pakfire, attendere prego...',
+'pakfire upgrade' => 'Aggiornamento',
'pakfire working' => 'Pakfire sta lavorando... Per favore attendi il termine delle operazioni',
'pap or chap' => 'PAP or CHAP',
'parentclass' => 'Parentclass',
diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 8b8979972f..439f24249b 100644
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1687,24 +1687,32 @@
'pakfire ago' => 'geleden.',
'pakfire available addons' => 'Beschikbare add-ons:',
'pakfire configuration' => 'Pakfire configuratie',
+'pakfire confirm updates' => 'Wilt u alle updates installeren?',
'pakfire core update auto' => 'Installeer core- en extensie-updates automatisch:',
'pakfire core update level' => 'Core-updateniveau',
+'pakfire dependencies found' => 'Afhankelijkheden gevonden:',
'pakfire health check' => 'Controleer of de mirror bereikbaar is (ping):',
-'pakfire install description' => 'Kies een of meer items uit de lijst hieronder en klik op de plus om te installeren.',
+'pakfire install' => 'Installeren',
+'pakfire install description' => 'Selecteer een of meer add-ons om te installeren.',
'pakfire install package' => 'U wilt de volgende pakketten installeren: ',
'pakfire installed addons' => 'Geïnstalleerde add-ons:',
'pakfire last core list update' => 'Laatste core-lijst update gemaakt',
'pakfire last package update' => 'Laatste pakketlijst update gemaakt',
'pakfire last serverlist update' => 'Laatste serverlijst update gemaakt',
'pakfire last update' => 'Laatste update gemaakt',
+'pakfire no dependencies found' => 'Geen afhankelijkheden gevonden.',
'pakfire possible dependency' => ' Er kunnen pakketafhankelijkheden zijn, hier is een lijst met pakketten die moeten worden geïnstalleerd.',
+'pakfire refresh list' => 'Ververs Lijst',
'pakfire register' => 'Registreer bij de pakfire-server:',
+'pakfire resolvedeps wait' => 'Controleren op afhankelijkheden, even geduld...',
'pakfire system state' => 'Systeemstatus',
'pakfire uninstall all' => 'Wilt u de volgende pakketten verwijderen?',
-'pakfire uninstall description' => 'Kies een of meer items uit de lijst hieronder en klik op de min om te deinstalleren.',
+'pakfire uninstall description' => 'Selecteer een of meer add-ons om te verwijderen.',
'pakfire uninstall package' => 'U wilt de volgende pakketten deinstalleren: ',
'pakfire update daily' => 'Zoek dagelijks naar updates:',
-'pakfire updates' => 'Beschikbare update:',
+'pakfire updates' => 'Beschikbare Updates',
+'pakfire updating' => 'Pakfire-database wordt bijgewerkt, even geduld...',
+'pakfire upgrade' => 'Upgrade',
'pakfire working' => 'Pakfire is bezig ... Wacht a.u.b. totdat alle handelingen succesvol zijn afgerond.',
'pap or chap' => 'PAP of CHAP',
'parentclass' => 'Parent-klasse',
diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 4be749041d..c5198b6f14 100644
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1352,24 +1352,32 @@
'pakfire ago' => 'temu.',
'pakfire available addons' => 'Dostępne dodatki:',
'pakfire configuration' => 'Konfiguracja Pakfire',
+'pakfire confirm updates' => 'Czy chcesz zainstalować wszystkie aktualizacje?',
'pakfire core update auto' => 'Instaluj aktualizacje jądra automatycznie:',
'pakfire core update level' => 'Aktualizacja jądra',
+'pakfire dependencies found' => 'Znaleziono zależności:',
'pakfire health check' => 'Sprawdź czy mirror jest dostępny (ping):',
-'pakfire install description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, a następnie kliknąć plus aby zainstalować.',
+'pakfire install' => 'Instaluj',
+'pakfire install description' => 'Wybierz jeden lub więcej dodatków do zainstalowania.',
'pakfire install package' => 'Zamierzasz zainstalować następujące pakiety: ',
'pakfire installed addons' => 'Zainstalowane dodatki:',
'pakfire last core list update' => 'Sprawdzenie aktualizacja jądra:',
'pakfire last package update' => 'Ostatnia aktualizacja listy pakietów:',
'pakfire last serverlist update' => 'Ostatnia aktualizacja listy serwerów:',
'pakfire last update' => 'Ostatnia aktualizacja:',
+'pakfire no dependencies found' => 'Nie znaleziono zależności.',
'pakfire possible dependency' => ' Pewne pakiety mogą wymagać zależności. Oto lista pakietów które muszę zostać zainstalowane.',
+'pakfire refresh list' => 'Odśwież Listę',
'pakfire register' => 'Register at pakfire-server:',
+'pakfire resolvedeps wait' => 'Sprawdzanie zależności, proszę czekać...',
'pakfire system state' => 'Status systemu',
'pakfire uninstall all' => 'Czy chcesz odinstalować następujące pakiety?',
-'pakfire uninstall description' => 'Proszę wybrać jedną lub kilka pozycji z poniższej listy, a następnie kliknąć minus aby odinstalować.',
+'pakfire uninstall description' => 'Wybierz jeden lub więcej dodatków do usunięcia.',
'pakfire uninstall package' => 'Zamierzasz odinstalować następujące pakiety: ',
'pakfire update daily' => 'Szukaj aktualizacje codziennie:',
-'pakfire updates' => 'Dostępne aktualizacje:',
+'pakfire updates' => 'Dostępne Aktualizacje',
+'pakfire updating' => 'Aktualizacja bazy danych pakfire, proszę czekać...',
+'pakfire upgrade' => 'Aktualizacja',
'pakfire working' => 'Pakfire pracuje ... Proszę poczekać na zakończenie wszystkich operacji.',
'pap or chap' => 'PAP lub CHAP',
'parentclass' => 'Klasa nadrzędna',
diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index 32f6f993d3..1a3ac2230b 100644
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -1347,24 +1347,32 @@
'pakfire ago' => 'назад.',
'pakfire available addons' => 'Доступные Аддоны:',
'pakfire configuration' => 'Pakfire Configuration',
+'pakfire confirm updates' => 'Вы хотите установить все обновления?',
'pakfire core update auto' => 'Устанавливать обновления ядра и аддонов автоматически:',
'pakfire core update level' => 'Уровень обновления системы',
+'pakfire dependencies found' => 'Зависимости найдены:',
'pakfire health check' => 'Пинговать зеркало на доступность:',
-'pakfire install description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и нажмите плюсик для установки.',
+'pakfire install' => 'Установить',
+'pakfire install description' => 'Пожалуйста, выберите одно или несколько дополнений для установки.',
'pakfire install package' => 'Вы собираетесь установить следующие пакеты: ',
'pakfire installed addons' => 'Установленные Аддоны:',
'pakfire last core list update' => 'Обновление core-списков',
'pakfire last package update' => 'Обновление списка пакетов',
'pakfire last serverlist update' => 'Обновление серверных списков',
'pakfire last update' => 'Последнее обновление',
+'pakfire no dependencies found' => 'Зависимости не найдены.',
'pakfire possible dependency' => ' There may be depending packages, here is a list of packages that need to be installed.',
+'pakfire refresh list' => 'Обновить Список',
'pakfire register' => 'Регистрировать на pakfire-сервере:',
+'pakfire resolvedeps wait' => 'Проверка зависимостей, пожалуйста, подождите...',
'pakfire system state' => 'Статус системы',
'pakfire uninstall all' => 'Вы хотите удалить следующие пакеты?',
-'pakfire uninstall description' => 'Пожалуйста, укажите один или несколько элементов в списке ниже и нажмите минус для удаления.',
+'pakfire uninstall description' => 'Пожалуйста, выберите одно или несколько дополнений для удаления.',
'pakfire uninstall package' => 'Вы собираетесь удалить следующие пакеты: ',
'pakfire update daily' => 'Ежедневный поиск обновлений:',
-'pakfire updates' => 'Доступное обновление:',
+'pakfire updates' => 'Доступное Обновление',
+'pakfire updating' => 'Обновление базы данных pakfire, пожалуйста, подождите...',
+'pakfire upgrade' => 'Апгрейд',
'pakfire working' => 'Pakfire работает ... Пожалуйста дождитесь успешного завершения процедуры.',
'pap or chap' => 'PAP или CHAP',
'parentclass' => 'Родительский класс',
diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 624f6eec55..7dd46f5845 100644
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1856,24 +1856,32 @@
'pakfire ago' => 'önce yapıldı.',
'pakfire available addons' => 'Mevcut eklentiler:',
'pakfire configuration' => 'Pakfire yapılandırması',
+'pakfire confirm updates' => 'Tüm güncellemeleri yüklemek istiyor musunuz?',
'pakfire core update auto' => 'Otomatik olarak çekirdek ve eklenti güncelleştirmelerini yükle:',
'pakfire core update level' => 'Çekirdek-Güncelleme-Seviyesi',
+'pakfire dependencies found' => 'Bağımlılıklar bulundu:',
'pakfire health check' => 'Yansımanın ulaşılabilir olup olmadığını kontrol et (ping):',
-'pakfire install description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra eklemek için artı simgesine tıklayınız.',
+'pakfire install' => 'Yükle',
+'pakfire install description' => 'Lütfen yüklemek için bir veya daha fazla eklenti seçin.',
'pakfire install package' => 'Aşağıdaki paketleri yüklemek istediniz: ',
'pakfire installed addons' => 'Kurulu eklentiler:',
'pakfire last core list update' => 'Son çekirdek listesi güncellemesi',
'pakfire last package update' => 'Son paket listesi güncellemesi',
'pakfire last serverlist update' => 'Son sunucu listesi güncellemesi',
'pakfire last update' => 'Son güncelleme',
+'pakfire no dependencies found' => 'Hiçbir bağımlılık bulunamadı.',
'pakfire possible dependency' => ' Yüklenemesi gereken paketlerin yüklenebilmesi için buradaki paketlere ihtiyaç duyulabilir.',
+'pakfire refresh list' => 'Listeyi Yenile',
'pakfire register' => 'Pakfire sunucusuna kayıt:',
+'pakfire resolvedeps wait' => 'Bağımlılıklar kontrol ediliyor, lütfen bekleyin...',
'pakfire system state' => 'Sistem durumu',
'pakfire uninstall all' => 'Aşağıdaki paketleri kaldırmak istiyor musunuz?',
-'pakfire uninstall description' => 'Aşağıdaki listeden bir veya daha fazla öğeyi seçtikten sonra kaldırmak için eksi simgesine tıklayınız.',
+'pakfire uninstall description' => 'Lütfen kaldırmak için bir veya daha fazla eklenti seçin.',
'pakfire uninstall package' => 'Aşağıdaki paketleri kaldırmak istiyorum: ',
'pakfire update daily' => 'Günlük güncellemeleri ara:',
-'pakfire updates' => 'Mevcut Güncelleme:',
+'pakfire updates' => 'Mevcut Güncellemeler',
+'pakfire updating' => 'Pakfire veritabanı güncelleniyor, lütfen bekleyin...',
+'pakfire upgrade' => 'Yükselt',
'pakfire working' => 'Pakfire çalışıyor ... Tüm işlemler başarıyla tamamlanana kadar bekleyin.',
'pap or chap' => 'PAP veya CHAP',
'parentclass' => 'Ana Sınıf',
hooks/post-receive
--
IPFire 2.x development tree
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2025-03-28 12:11 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2025-03-28 12:11 [git.ipfire.org] IPFire 2.x development tree branch, next, updated. ab7e955f1210e1f23fbcae4b64e499c8dde588e1 Michael Tremer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox