pakfire.cgi: Changes to 'Install' confirmation page

- Comma separate package names if multiple packages selected to install.

 - Display dependencies for package(s) to install in 'parent -> child' format.

 - Formatting and verbiage changes.

 - No functional changes to the install process.

Signed-off-by: Stephen Cuka <stephen@firemypi.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/doc/language_issues.de b/doc/language_issues.de
index 5c4a00fd63d19042ac9070192ad0aad76b185f31..090850fbe737b7a46d800c3b7969b3da413e2d8f 100644 (file)
--- a/doc/language_issues.de
+++ b/doc/language_issues.de
@@ -630,6 +630,7 @@ 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 accept all
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire dependecies found
 WARNING: translation string unused: pakfire health check

diff --git a/doc/language_issues.en b/doc/language_issues.en
index 5e6134aa1c23719501dcee68720dbaae16a3eb99..1c1c546f7e6892db7f217da73c99ac63e7e46557 100644 (file)
--- a/doc/language_issues.en
+++ b/doc/language_issues.en
@@ -1465,10 +1465,10 @@ WARNING: untranslated string: ovpn tls auth = TLS Channel Protection:
 WARNING: untranslated string: ovpn warning rfc3280 = Your host certificate is not RFC3280 compliant. <br>Please update to the latest IPFire version and generate as soon as possible a new root and host certificate.</br><br>All OpenVPN clients needs then to be renewed!</br>
 WARNING: untranslated string: pagerefresh = Page is beeing refreshed, please wait.
 WARNING: untranslated string: pak update = Update
-WARNING: untranslated string: pakfire accept all = Do you want to install all packages?
 WARNING: untranslated string: pakfire ago = ago.
 WARNING: untranslated string: pakfire already busy = Pakfire is already performing a task. Please try again later.
 WARNING: untranslated string: pakfire available addons = Available Add-ons:
+WARNING: untranslated string: pakfire check deps = Checking dependencies...
 WARNING: untranslated string: pakfire configuration = Pakfire Configuration
 WARNING: untranslated string: pakfire confirm upgrades = Do you want to install all upgrades?
 WARNING: untranslated string: pakfire core update level = Core-Update-Level
@@ -1476,7 +1476,7 @@ 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 = 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 install package = Packages to install:
 WARNING: untranslated string: pakfire installed addons = Installed Add-ons:
 WARNING: untranslated string: pakfire invalid tree = Invalid repository selected
 WARNING: untranslated string: pakfire last core list update = Last core list update made

diff --git a/doc/language_issues.es b/doc/language_issues.es
index 7cde49ea6859d17cc74117d62b9a5708ae284de7..cf7237435776cf4a13396f2e68b9a56344eec190 100644 (file)
--- a/doc/language_issues.es
+++ b/doc/language_issues.es
@@ -684,6 +684,7 @@ 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 accept all
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire dependencies found
 WARNING: translation string unused: pakfire health check

diff --git a/doc/language_issues.fr b/doc/language_issues.fr
index 21b7fbe26d4a1fad5078afcf81bd77e955b2435a..702911061d20b6184b20690f4a798b3f42973641 100644 (file)
--- a/doc/language_issues.fr
+++ b/doc/language_issues.fr
@@ -659,6 +659,7 @@ 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 accept all
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire dependencies found
 WARNING: translation string unused: pakfire health check

diff --git a/doc/language_issues.it b/doc/language_issues.it
index 242c5c5881824867318356bd3a8c912eb777d746..3d93239afd1eb2fe58e35e24d00ec5332a046bf4 100644 (file)
--- a/doc/language_issues.it
+++ b/doc/language_issues.it
@@ -613,6 +613,7 @@ 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 accept all
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire dependencies found
 WARNING: translation string unused: pakfire health check

diff --git a/doc/language_issues.nl b/doc/language_issues.nl
index 248fc3d9a30f6ead3e5b38250858f5d7147fe44e..f1090fc337f64bd6b10ec55537a4e166841a1cf4 100644 (file)
--- a/doc/language_issues.nl
+++ b/doc/language_issues.nl
@@ -612,6 +612,7 @@ 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 accept all
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire dependencies found
 WARNING: translation string unused: pakfire health check

diff --git a/doc/language_issues.pl b/doc/language_issues.pl
index acaeaf5495553a13ea1f099abfa675e6ced89662..1db36fb67f0d67fdbaee3bacc4bfee837c66d021 100644 (file)
--- a/doc/language_issues.pl
+++ b/doc/language_issues.pl
@@ -537,6 +537,7 @@ 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 accept all
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire dependencies found
 WARNING: translation string unused: pakfire health check

diff --git a/doc/language_issues.ru b/doc/language_issues.ru
index 6c216eab3eb4122e3a06269519d3bc3c30892d20..4d29c4f951d0ed22654ff87b0313dabaffb477d4 100644 (file)
--- a/doc/language_issues.ru
+++ b/doc/language_issues.ru
@@ -532,6 +532,7 @@ 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 accept all
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire dependencies found
 WARNING: translation string unused: pakfire health check

diff --git a/doc/language_issues.tr b/doc/language_issues.tr
index c406a6e3f3cea222b86ecd4c17dc67cdbb4af75c..2da19f276101dd87823fa684b4c7462c72691cfa 100644 (file)
--- a/doc/language_issues.tr
+++ b/doc/language_issues.tr
@@ -642,6 +642,7 @@ 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 accept all
 WARNING: translation string unused: pakfire core update auto
 WARNING: translation string unused: pakfire dependencies found
 WARNING: translation string unused: pakfire health check

diff --git a/html/cgi-bin/pakfire.cgi b/html/cgi-bin/pakfire.cgi
index 1246760df99b863a4b48ec140e174e0fc57c423d..3cd5b156342dee4fe8c3a5cbae6c25853a591b25 100644 (file)
--- a/html/cgi-bin/pakfire.cgi
+++ b/html/cgi-bin/pakfire.cgi
@@ -278,30 +278,127 @@ if (($cgiparams{'ACTION'} eq $Lang::tr{'pakfire install'}) && ($pagemode eq $PM_
        &Header::openbox("100%", "center", $Lang::tr{'pakfire install'});
 
        my @pkgs = split(/\|/, $cgiparams{'INSPAKS'});
-       my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
+
        print <<END;
-       <table style="width: 100%">
+        <table style="width: 100%">
                <tr>
                        <td>
-                       <p>$Lang::tr{'pakfire install package'} <strong>@{pkgs}</strong><br>$Lang::tr{'pakfire possible dependency'}</p>
+                       $Lang::tr{'pakfire install package'}  <strong>
+END
+
+       foreach (my $i = 0; $i < $#pkgs; $i++)
+       {
+               print "$pkgs[$i], ";
+       }
+       print "$pkgs[$#pkgs]";
+
+       print <<END;
+                       </strong>
+                       <br><br>$Lang::tr{'pakfire check deps'}
                        <pre>
 END
-       foreach (@output) {
-               $_ =~ s/\\e\[[0-1]\;[0-9]+m//g;
-               print "$_\n";
+
+       # get dependencies from pakfire resolvedeps output
+       my @pkgs_deps;
+       my @errors;
+       my @output = &General::system_output("/usr/local/bin/pakfire", "resolvedeps", "--no-colors", @pkgs);
+       foreach (@output)
+       {
+               if ($_ =~ /install/)
+               {
+                       (my $package) = $_ =~ /.+:\s(.+):\s.+:\s.+/;
+                       (my $dependency) = $_ =~ /.+:\s.+:\s.+:\s(.+)/;
+                       push @pkgs_deps, "$package:$dependency";
+               }
+               if ($_ =~ /ERROR/)
+               {
+                       push @errors, $_;
+               }
+       }
+
+       if (@errors)
+       {
+               chomp @errors;
+               print "\nErrors occurred:\n";
+               foreach (@errors)
+               {
+                       print "$_\n";
+               }
+       }
+
+       # get dependencies from metafiles
+       my $instdir = "/opt/pakfire/db/installed";
+       my @inst_deps = deps_from_metafiles($instdir);
+       my $metadir = "/opt/pakfire/db/meta";
+       my @meta_deps = deps_from_metafiles($metadir);
+
+       my @all_deps = @inst_deps;
+       push @all_deps, @meta_deps;
+
+       my %dedupe;
+       @all_deps = grep { ! $dedupe{ $_ }++ } @all_deps;
+
+       # build dependencies tree
+       my @search = @pkgs_deps;
+       my @pkgs_deps_tree;
+       my @temp;
+       do
+       {
+               @temp = ();
+               foreach my $i (@search)
+               {
+                       (my $child) = $i =~ /.+:(.+)/;
+                       foreach my $j (@all_deps)
+                       {
+                               (my $all_deps_parent) = $j =~ /(.+):.+/;
+                               (my $all_deps_child) = $j =~ /.+:(.+)/;
+                               if ( $child eq $all_deps_parent )
+                               {
+                                       push @temp, "$i:$all_deps_child";
+                               }
+                       }
+               }
+               push @pkgs_deps_tree, @temp;
+               @search = @temp;
+       } until ( ! (@search));
+
+       push @pkgs_deps, @pkgs_deps_tree;
+
+       @pkgs_deps = sort @pkgs_deps;
+
+       my @installed = get_package_names($instdir);
+
+       # display dependencies
+       print "\nPackage dependencies:\n";
+       foreach my $i (@pkgs)
+       {
+               print "\n  Package:  $i\n";
+               if (grep (/^$i/, @pkgs_deps))
+               {
+                       foreach my $j (@pkgs_deps)
+                       {
+                               if (grep (/$i/, $j))
+                               {
+                                       (my $child) = $j =~ /.+:(.+)/;
+                                       if (grep (/$child/, @installed))
+                                       {
+                                               print "            " . (arrow_format($j)) . "<span style='font-size:80%'> (already installed)</span>\n";
+                                       } else {
+                                               print "            " . (arrow_format($j)) . "\n";
+                                       }
+                               }
+                       }
+               } else {
+                       print "            No dependencies found.\n";
+               }
        }
+
        print <<END;
                        </pre>
                        </td>
                </tr>
                <tr>
-                       <td>$Lang::tr{'pakfire accept all'}</td>
-               </tr>
-               <tr>
-                       <td>&nbsp;</td>
-               </tr>
-               <tr>
-                       <td align='center'>
+                       <td align='center' style='padding-top:8px;padding-bottom:4px'>
                        <form method='post' action='$ENV{'SCRIPT_NAME'}'>
                        <input type='hidden' name='INSPAKS' value='$cgiparams{'INSPAKS'}' />
                        <input type='hidden' name='FORCE' value='on' />
@@ -638,3 +735,71 @@ sub _http_pagemode_redirect {
                $pagemode = $mode;
        }
 }
+
+# search package metafiles in $dir and return array of
+# dependencies in parent:child format
+sub deps_from_metafiles
+{
+        my $dir = $_[0];
+        my @packages = ();
+        my @temp = ();
+        my @found_deps = ();
+        my @files = glob("$dir/meta-*");
+
+        foreach (@files)
+        {
+                (my $pak) = $_ =~ /.+\/meta\-([\w\-]+)$/;
+                push @packages, $pak;
+        }
+
+        foreach my $i (@packages)
+        {
+                open(META, "<", "$dir/meta-$i") or die "Cannot open file meta-$i:  $!";
+                my @data = <META>;
+                close(META);
+
+                my $line = '';
+                foreach (@data)
+                {
+                        $line = $_;
+                        last if (grep(/Dependencies:/, $line));
+                }
+
+                chomp $line;
+                @temp = split(' ', $line);
+                @temp = grep {$_ ne 'Dependencies:'} @temp;
+                foreach (@temp)
+                {
+                        push @found_deps, "$i:$_";
+                }
+        }
+        return @found_deps;
+}
+
+# return package names from a metafile directory
+sub get_package_names
+{
+        my $dir = $_[0];
+        my @files = ();
+        my @temp = glob("$dir/meta-*");
+        foreach (@temp)
+        {
+                (my $name) = $_ =~ /.+\/meta\-([\w\-]+)$/;
+                push @files, $name;
+        }
+        return @files;
+}
+
+# convert a string in 'parent:child:child...' format to
+# 'parent -> child -> child -> ...' format
+sub arrow_format
+{
+        my $line = '';
+        my @items = split(/:/, $_[0]);
+        foreach my $i (@items)
+        {
+                $line = $line . "$i -> ";
+        }
+        $line = substr($line, 0, -4);
+        return $line;
+}

diff --git a/langs/de/cgi-bin/de.pl b/langs/de/cgi-bin/de.pl
index 1666f086e8c639443de05e6e543967b3ced7f69a..3ce02b657a9eadf15a8bd38989854bf8a802b2fa 100644 (file)
--- a/langs/de/cgi-bin/de.pl
+++ b/langs/de/cgi-bin/de.pl
@@ -2021,6 +2021,7 @@
 'pakfire ago' => 'her.',
 '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 check deps' => 'Überprüfung der Abhängigkeiten...',
 'pakfire configuration' => 'Pakfire Konfiguration',
 'pakfire confirm upgrades' => 'Möchten Sie alle Upgrades installieren?',
 'pakfire core update auto' => 'Core- und Add-on-Updates automatisch installieren:',
@@ -2031,7 +2032,7 @@
 'pakfire health check' => 'Mirrors auf Erreichbarkeit prüfen (Ping):',
 '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 install package' => 'Zu installierende Pakete:',
 'pakfire installed addons' => 'Installierte Add-ons:',
 'pakfire invalid tree' => '',
 'pakfire last core list update' => 'Letztes Corelisten Update ist',

diff --git a/langs/en/cgi-bin/en.pl b/langs/en/cgi-bin/en.pl
index 3fd6c2e5770f6dbfcd4f39606cbef760f7f7dc7a..3e647e6e53dc9937fa9aeac0403a42a16913fa05 100644 (file)
--- a/langs/en/cgi-bin/en.pl
+++ b/langs/en/cgi-bin/en.pl
@@ -2092,6 +2092,7 @@
 'pakfire ago' => 'ago.',
 'pakfire already busy' => 'Pakfire is already performing a task. Please try again later.',
 'pakfire available addons' => 'Available Add-ons:',
+'pakfire check deps' => 'Checking dependencies...',
 'pakfire configuration' => 'Pakfire Configuration',
 'pakfire confirm upgrades' => 'Do you want to install all upgrades?',
 'pakfire core update auto' => 'Install core and add-on updates automatically:',
@@ -2102,7 +2103,7 @@
 'pakfire health check' => 'Check if mirror is reachable (ping):',
 '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 install package' => 'Packages to install:',
 'pakfire installed addons' => 'Installed Add-ons:',
 'pakfire invalid tree' => 'Invalid repository selected',
 'pakfire last core list update' => 'Last core list update made',

diff --git a/langs/es/cgi-bin/es.pl b/langs/es/cgi-bin/es.pl
index 48d4596cc0f09ae7d130d0e431abccdb7d967a4b..a830b215ca2a7bab0357c3d80183b7f4d9565b46 100644 (file)
--- a/langs/es/cgi-bin/es.pl
+++ b/langs/es/cgi-bin/es.pl
@@ -2072,6 +2072,7 @@
 'pakfire ago' => '',
 'pakfire already busy' => 'Pakfire ya está realizando una tarea. Por favor, inténtelo de nuevo más tarde.',
 'pakfire available addons' => 'Complementos disponibles:',
+'pakfire check deps' => 'Comprobando dependencias...',
 'pakfire configuration' => 'Configuración de Pakfire',
 'pakfire confirm upgrades' => '¿Quieres instalar todas las actualizaciones?',
 'pakfire core update auto' => 'Instar actualizaciones principales y complementarias automáticamente:',
@@ -2082,7 +2083,7 @@
 'pakfire health check' => 'Verificar disponibilidad del espejo (ping):',
 'pakfire install' => 'Instalar',
 'pakfire install description' => 'Seleccione uno o más complementos para instalar.',
-'pakfire install package' => 'Ud. desea instalar los siguientes paquetes:',
+'pakfire install package' => 'Paquetes a instalar:',
 'pakfire installed addons' => 'Complementos instalados:',
 'pakfire invalid tree' => 'Repositorio no válido seleccionado',
 'pakfire last core list update' => 'Última lista de actualización de núcleo hecha',

diff --git a/langs/fr/cgi-bin/fr.pl b/langs/fr/cgi-bin/fr.pl
index 6ce57e089a69ca94fe38476506bb02c211fd9c88..06f50fd93af58db5edda82efee046428afaed69f 100644 (file)
--- a/langs/fr/cgi-bin/fr.pl
+++ b/langs/fr/cgi-bin/fr.pl
@@ -2070,6 +2070,7 @@
 'pakfire ago' => '',
 '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 check deps' => 'Vérification des dépendances...',
 'pakfire configuration' => 'Configuration Pakfire',
 'pakfire confirm upgrades' => 'Voulez-vous installer toutes les mises à niveau ?',
 'pakfire core update auto' => 'Installer automatiquement les mises à jour du noyau et des modules :',
@@ -2080,7 +2081,7 @@
 'pakfire health check' => 'Vérifier si le miroir est accessible (ping) :',
 '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 install package' => 'Paquets à installer :',
 'pakfire installed addons' => 'Modules installés :',
 'pakfire invalid tree' => 'Dépôt choisi invalide',
 'pakfire last core list update' => 'Dernière mise à jour de la liste du noyau : ',

diff --git a/langs/it/cgi-bin/it.pl b/langs/it/cgi-bin/it.pl
index 3527432178fd75116e0d0a88f892097c737a2e85..df3c1f9eb9bfe02a399fa570fcea2248eb45a2c0 100644 (file)
--- a/langs/it/cgi-bin/it.pl
+++ b/langs/it/cgi-bin/it.pl
@@ -1710,6 +1710,7 @@
 'pakfire accept all' => 'Vuoi installare tutti i pacchetti?',
 'pakfire ago' => 'ago.',
 'pakfire available addons' => 'Addons disponibili:',
+'pakfire check deps' => 'Controllo delle dipendenze...',
 'pakfire configuration' => 'Configurazione Pakfire',
 'pakfire confirm upgrades' => 'Vuoi installare tutti gli aggiornamenti?',
 'pakfire core update auto' => 'Install core and addon updates automatically:',
@@ -1718,7 +1719,7 @@
 'pakfire health check' => 'Controllare se il mirror è raggiungibile (ping):',
 '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 install package' => 'Pacchetti da installare:',
 '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',

diff --git a/langs/nl/cgi-bin/nl.pl b/langs/nl/cgi-bin/nl.pl
index 970758c2fca035a7f1b785a4a2559ba7d0559bfe..da01276a81e249eb2fda9a3226bdf61f9202f458 100644 (file)
--- a/langs/nl/cgi-bin/nl.pl
+++ b/langs/nl/cgi-bin/nl.pl
@@ -1685,6 +1685,7 @@
 'pakfire accept all' => 'Wilt u alle pakketten installeren?',
 'pakfire ago' => 'geleden.',
 'pakfire available addons' => 'Beschikbare add-ons:',
+'pakfire check deps' => 'Afhankelijkheden controleren...',
 'pakfire configuration' => 'Pakfire configuratie',
 'pakfire confirm upgrades' => 'Wilt u alle upgrades installeren?',
 'pakfire core update auto' => 'Installeer core- en extensie-updates automatisch:',
@@ -1693,7 +1694,7 @@
 'pakfire health check' => 'Controleer of de mirror bereikbaar is  (ping):',
 '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 install package' => 'Pakketten om te 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',

diff --git a/langs/pl/cgi-bin/pl.pl b/langs/pl/cgi-bin/pl.pl
index 3ca8bd35ee17c54502dee659a789b8973ea3490b..9223fb152c98b4392467ad1457ba0350d437d085 100644 (file)
--- a/langs/pl/cgi-bin/pl.pl
+++ b/langs/pl/cgi-bin/pl.pl
@@ -1350,6 +1350,7 @@
 'pakfire accept all' => 'Czy chcesz zainstalować wszystkie pakiety?',
 'pakfire ago' => 'temu.',
 'pakfire available addons' => 'Dostępne dodatki:',
+'pakfire check deps' => 'Sprawdzanie zależności...',
 'pakfire configuration' => 'Konfiguracja Pakfire',
 'pakfire confirm upgrades' => 'Czy chcesz zainstalować wszystkie aktualizacje?',
 'pakfire core update auto' => 'Instaluj aktualizacje jądra automatycznie:',
@@ -1358,7 +1359,7 @@
 'pakfire health check' => 'Sprawdź czy mirror jest dostępny (ping):',
 '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 install package' => 'Pakiety do zainstalowania:',
 'pakfire installed addons' => 'Zainstalowane dodatki:',
 'pakfire last core list update' => 'Sprawdzenie aktualizacja jądra:',
 'pakfire last package update' => 'Ostatnia aktualizacja listy pakietów:',

diff --git a/langs/ru/cgi-bin/ru.pl b/langs/ru/cgi-bin/ru.pl
index a9781e121e1f3c13354f8f43e73d04bc84107027..34da20ecc1fbebba35f854f19a2ab3e23f19da5f 100644 (file)
--- a/langs/ru/cgi-bin/ru.pl
+++ b/langs/ru/cgi-bin/ru.pl
@@ -1345,6 +1345,7 @@
 'pakfire accept all' => 'Do you want to install all packages?',
 'pakfire ago' => 'назад.',
 'pakfire available addons' => 'Доступные Аддоны:',
+'pakfire check deps' => 'Проверка зависимостей...',
 'pakfire configuration' => 'Pakfire Configuration',
 'pakfire confirm upgrades' => 'Вы хотите установить все обновления?',
 'pakfire core update auto' => 'Устанавливать обновления ядра и аддонов автоматически:',
@@ -1353,7 +1354,7 @@
 'pakfire health check' => 'Пинговать зеркало на доступность:',
 'pakfire install' => 'Установить',
 'pakfire install description' => 'Пожалуйста, выберите одно или несколько дополнений для установки.',
-'pakfire install package' => 'Ð\92Ñ\8b Ñ\81обиÑ\80аеÑ\82еÑ\81Ñ\8c Ñ\83Ñ\81Ñ\82ановиÑ\82Ñ\8c Ñ\81ледÑ\83Ñ\8eÑ\89ие пакеÑ\82Ñ\8b: ',
+'pakfire install package' => 'Ð\9fакеÑ\82Ñ\8b длÑ\8f Ñ\83Ñ\81Ñ\82ановки:',
 'pakfire installed addons' => 'Установленные Аддоны:',
 'pakfire last core list update' => 'Обновление core-списков',
 'pakfire last package update' => 'Обновление списка пакетов',

diff --git a/langs/tr/cgi-bin/tr.pl b/langs/tr/cgi-bin/tr.pl
index 9f6fad6113fce9730b00ba377e28db0947592cea..4cba99ff16ef87897002d221d13ddcd50d94bd66 100644 (file)
--- a/langs/tr/cgi-bin/tr.pl
+++ b/langs/tr/cgi-bin/tr.pl
@@ -1854,6 +1854,7 @@
 'pakfire accept all' => 'Tüm paketleri yüklemek istiyor musunuz?',
 'pakfire ago' => 'önce yapıldı.',
 'pakfire available addons' => 'Mevcut eklentiler:',
+'pakfire check deps' => 'Bağımlılıklar kontrol ediliyor...',
 'pakfire configuration' => 'Pakfire yapılandırması',
 'pakfire confirm upgrades' => 'Tüm yükseltmeleri yüklemek istiyor musunuz?',
 'pakfire core update auto' => 'Otomatik olarak çekirdek ve eklenti güncelleştirmelerini yükle:',
@@ -1862,7 +1863,7 @@
 'pakfire health check' => 'Yansımanın ulaşılabilir olup olmadığını kontrol et (ping):',
 '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 install package' => 'Kurulacak paketler:',
 'pakfire installed addons' => 'Kurulu eklentiler:',
 'pakfire last core list update' => 'Son çekirdek listesi güncellemesi',
 'pakfire last package update' => 'Son paket listesi güncellemesi',