[PackageKit-commit] packagekit: Branch 'master' - 24 commits
Richard Hughes
hughsient at kemper.freedesktop.org
Sun Oct 26 10:47:45 PDT 2008
backends/yum/yumBackend.py | 192 +++++++----
backends/zypp/zypp-utils.cpp | 2
client/pk-console.c | 5
client/pk-generate-pack.c | 52 +++
docs/html/files/session.c | 4
docs/html/files/system.c | 10
docs/html/pk-faq.html | 2
lib/packagekit-glib/egg-test.c | 2
lib/packagekit-glib/pk-obj-list.c | 40 +-
lib/packagekit-glib/pk-obj-list.h | 4
lib/packagekit-glib/pk-package-list.c | 10
lib/packagekit-glib/pk-service-pack.c | 177 ++++++++--
lib/packagekit-glib/pk-service-pack.h | 12
lib/python/packagekit/backend.py | 7
po/de.po | 242 ++++----------
po/fr.po | 160 +++------
po/gu.po | 560 ++++++++++++++++++++++++++++++++++
po/pl.po | 82 +---
po/pt_BR.po | 282 ++++++-----------
po/sr.po | 217 +++++--------
po/sr at latin.po | 223 +++++--------
po/sv.po | 402 ++++++++++--------------
22 files changed, 1557 insertions(+), 1130 deletions(-)
New commits:
commit 801eafe10ef8fc748148bd795b86bec664ca2ece
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Oct 26 17:46:52 2008 +0000
yum: do some testing when yum has _no_ metadata and the user is offline, and make sure we don't send internal error in these cases
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 7ae195f..9e87086 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -295,35 +295,34 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
@param filters: package types to search (all, installed, available)
@param key: key to seach for
'''
- try:
- res = self.yumbase.searchGenerator(searchlist, [key])
- except yum.Errors.RepoError, e:
- self.error(ERROR_NO_CACHE, str(e))
- else:
- fltlist = filters.split(';')
- pkgfilter = YumFilter(fltlist)
- package_list = [] #we can't do emitting as found if we are post-processing
- installed = []
- available = []
-
- if FILTER_NOT_COLLECTIONS not in fltlist:
- self._do_meta_package_search(fltlist, key)
-
- if FILTER_COLLECTIONS in fltlist:
- return
+ fltlist = filters.split(';')
+ pkgfilter = YumFilter(fltlist)
+ package_list = []
- for (pkg, inst) in res:
- if pkg.repo.id == 'installed':
- installed.append(pkg)
- else:
- available.append(pkg)
+ # get collection objects
+ if FILTER_NOT_COLLECTIONS not in fltlist:
+ self._do_meta_package_search(fltlist, key)
- pkgfilter.add_installed(installed)
- pkgfilter.add_available(available)
+ # return, as we only want collection objects
+ if FILTER_COLLECTIONS not in fltlist:
+ installed = []
+ available = []
+ try:
+ res = self.yumbase.searchGenerator(searchlist, [key])
+ for (pkg, inst) in res:
+ if pkg.repo.id == 'installed':
+ installed.append(pkg)
+ else:
+ available.append(pkg)
+ except yum.Errors.RepoError, e:
+ self.error(ERROR_NO_CACHE, str(e))
+ else:
+ pkgfilter.add_installed(installed)
+ pkgfilter.add_available(available)
- # we couldn't do this when generating the list
- package_list = pkgfilter.post_process()
- self._show_package_list(package_list)
+ # we couldn't do this when generating the list
+ package_list = pkgfilter.post_process()
+ self._show_package_list(package_list)
def _show_package_list(self, lst):
for (pkg, status) in lst:
@@ -365,7 +364,12 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
return found
def _get_available_from_names(self, name_list):
- return self.yumbase.pkgSack.searchNames(names=name_list)
+ pkgs = None
+ try:
+ pkgs = self.yumbase.pkgSack.searchNames(names=name_list)
+ except yum.Errors.RepoError, e:
+ self.error(ERROR_NO_CACHE, str(e))
+ return pkgs
def _handle_newest(self, fltlist):
"""
@@ -415,15 +419,19 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
show_avail = FILTER_INSTALLED not in fltlist
show_inst = FILTER_NOT_INSTALLED not in fltlist
package_id = "%s;;;meta" % grpid
- grp = self.yumbase.comps.return_group(grpid)
- if grp:
- name = grp.nameByLang(self._lang)
- if grp.installed:
- if show_inst:
- self.package(package_id, INFO_COLLECTION_INSTALLED, name)
- else:
- if show_avail:
- self.package(package_id, INFO_COLLECTION_AVAILABLE, name)
+ try:
+ grp = self.yumbase.comps.return_group(grpid)
+ except yum.Errors.RepoError, e:
+ self.error(ERROR_NO_CACHE, str(e))
+ else:
+ if grp:
+ name = grp.nameByLang(self._lang)
+ if grp.installed:
+ if show_inst:
+ self.package(package_id, INFO_COLLECTION_INSTALLED, name)
+ else:
+ if show_avail:
+ self.package(package_id, INFO_COLLECTION_AVAILABLE, name)
def search_group(self, filters, group_key):
'''
@@ -580,7 +588,14 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
'''
self.status(STATUS_QUERY)
self.allow_cancel(True)
- for cat in self.yumbase.comps.categories:
+ cats = []
+ try:
+ cats = self.yumbase.comps.categories
+ except yum.Errors.RepoError, e:
+ self.error(ERROR_NO_CACHE, str(e))
+ if len(cats) == 0:
+ self.error(ERROR_GROUP_LIST_INVALID, "no comps categories")
+ for cat in cats:
cat_id = cat.categoryid
# yum >= 3.2.10
# name = cat.nameByLang(self._lang)
commit 9baa2f3805a956cf967e0cba5db5e1d7a1ccdf3a
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Oct 26 16:09:01 2008 +0000
yum: emit a proper error message when we fail to depsolve and then have nothing to do. Fixes rh#466006
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 0bc9188..7ae195f 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1080,20 +1080,16 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
old_throttle = self.yumbase.conf.throttle
self.yumbase.conf.throttle = "60%" # Set bandwidth throttle to 60%
# to avoid taking all the system's bandwidth.
- old_skip_broken = self.yumbase.conf.skip_broken
- self.yumbase.conf.skip_broken = 1
-
try:
txmbr = self.yumbase.update() # Add all updates to Transaction
except yum.Errors.RepoError, e:
self.error(ERROR_REPO_NOT_AVAILABLE, str(e))
if txmbr:
- self._runYumTransaction()
+ self._runYumTransaction(allow_skip_broken=True)
else:
self.error(ERROR_NO_PACKAGES_TO_UPDATE, "Nothing to do")
self.yumbase.conf.throttle = old_throttle
- self.yumbase.conf.skip_broken = old_skip_broken
def refresh_cache(self):
'''
@@ -1425,7 +1421,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
except yum.Errors.RepoError, e:
self.error(ERROR_REPO_NOT_AVAILABLE, str(e))
if txmbrs:
- self._runYumTransaction()
+ self._runYumTransaction(allow_skip_broken=True)
else:
self.error(ERROR_PACKAGE_ALREADY_INSTALLED, "No available updates")
@@ -1442,22 +1438,43 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
self.require_restart(RESTART_SYSTEM, "")
break
- def _runYumTransaction(self, removedeps=None):
+ def _runYumTransaction(self, allow_remove_deps=None, allow_skip_broken=False):
'''
Run the yum Transaction
This will only work with yum 3.2.4 or higher
'''
+ message = ''
try:
- rc, msgs = self.yumbase.buildTransaction()
+ self.yumbase.conf.skip_broken = 0
+ rc, msgs = self.yumbase.buildTransaction()
+ message = _format_msgs(msgs)
except yum.Errors.RepoError, e:
self.error(ERROR_REPO_NOT_AVAILABLE, str(e))
except Exception, e:
self.error(ERROR_INTERNAL_ERROR, str(e))
+
+ # if return value is 1 (error), try again with skip-broken if allowed
+ if allow_skip_broken and rc == 1:
+ try:
+ self.yumbase.conf.skip_broken = 1
+ rc, msgs = self.yumbase.buildTransaction()
+ message += " : %s" % _format_msgs(msgs)
+ except yum.Errors.RepoError, e:
+ self.error(ERROR_REPO_NOT_AVAILABLE, str(e))
+ except Exception, e:
+ self.error(ERROR_INTERNAL_ERROR, str(e))
+
+ # we did not succeed
if rc != 2:
- self.error(ERROR_DEP_RESOLUTION_FAILED, _format_msgs(msgs))
+ if message.find ("is needed by") != -1:
+ self.error(ERROR_DEP_RESOLUTION_FAILED, message)
+ if message.find ("empty transaction") != -1:
+ self.error(ERROR_NO_PACKAGES_TO_UPDATE, message)
+ else:
+ self.error(ERROR_TRANSACTION_ERROR, message)
else:
self._check_for_reboot()
- if removedeps == False:
+ if allow_remove_deps == False:
if len(self.yumbase.tsInfo) > 1:
retmsg = 'package could not be removed, as other packages depend on it'
self.error(ERROR_DEP_RESOLUTION_FAILED, retmsg)
@@ -1530,9 +1547,9 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
self.error(ERROR_PACKAGE_NOT_INSTALLED, "The package %s is not installed" % pkg.name)
if txmbrs:
if allowdep != 'yes':
- self._runYumTransaction(removedeps=False)
+ self._runYumTransaction(allow_remove_deps=False)
else:
- self._runYumTransaction(removedeps=True)
+ self._runYumTransaction(allow_remove_deps=True)
else:
self.error(ERROR_PACKAGE_NOT_INSTALLED, "The packages failed to be removed")
commit 04687ef8ac892ee73f0f65a9a1a86602b214c8f9
Author: Richard Hughes <richard at hughsie.com>
Date: Sun Oct 26 10:27:50 2008 +0000
bugfix: catch exceptions from sys.stdin.readline to fix rh#468486
diff --git a/lib/python/packagekit/backend.py b/lib/python/packagekit/backend.py
index 8d11751..8443743 100644
--- a/lib/python/packagekit/backend.py
+++ b/lib/python/packagekit/backend.py
@@ -598,7 +598,12 @@ class PackageKitBaseBackend:
if len(args) > 0:
self.dispatch_command(args[0], args[1:])
while True:
- line = sys.stdin.readline().strip('\n')
+ try:
+ line = sys.stdin.readline().strip('\n')
+ except IOError, e:
+ self.error(ERROR_TRANSACTION_CANCELLED, 'could not read from stdin: %s' % str(e))
+ except KeyboardInterrupt, e:
+ self.error(ERROR_PROCESS_KILL, 'process was killed by ctrl-c: %s' % str(e))
if not line or line == 'exit':
break
args = line.split('\t')
commit d2e98cffa22bbcd107b17ee72c7f8641511cc37d
Merge: d0428d8... 212e308...
Author: Richard Hughes <richard at hughsie.com>
Date: Sat Oct 25 10:17:14 2008 +0100
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit 212e308e3beb7a5a8114936ec7b70ca3a58c50e0
Author: Daniel Nylander <po at danielnylander.se>
Date: Sat Oct 25 08:54:21 2008 +0000
Updated Swedish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/sv.po b/po/sv.po
index 46e0724..e730db6 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -8,7 +8,7 @@ msgstr ""
"Project-Id-Version: packagekit\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-22 13:38+0000\n"
-"PO-Revision-Date: 2008-10-22 17:58+0100\n"
+"PO-Revision-Date: 2008-10-25 10:52+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
@@ -18,7 +18,7 @@ msgstr ""
#. TRANSLATORS: this is a header for the package that can be updated
#: ../client/pk-console.c:271
msgid "Details about the update:"
-msgstr "Detaler om uppdateringen:"
+msgstr "Detaljer om uppdateringen:"
#: ../client/pk-console.c:464
msgid "Please restart the computer to complete the update."
@@ -126,21 +126,21 @@ msgstr "Detta verktyg kunde inte uppdatera \"%s\": %s"
#: ../client/pk-console.c:926
#, c-format
msgid "This tool could not get the requirements for '%s': %s"
-msgstr "Detta verktyg kunde inte få kraven för \"%s\": %s"
+msgstr "Detta verktyg kunde inte få tag på kraven för \"%s\": %s"
#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
#: ../client/pk-console.c:948
#: ../client/pk-console.c:956
#, c-format
msgid "This tool could not get the dependencies for '%s': %s"
-msgstr "Detta verktyg kunde inte få beroenden för detta \"%s\": %s"
+msgstr "Detta verktyg kunde inte få tag på beroenden för detta \"%s\": %s"
#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
#: ../client/pk-console.c:978
#: ../client/pk-console.c:986
#, c-format
msgid "This tool could not get package details for '%s': %s"
-msgstr "Detta verktyg kunde inte få paketdetaljerna för \"%s\": %s"
+msgstr "Detta verktyg kunde inte få tag på paketdetaljerna för \"%s\": %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:1008
@@ -152,7 +152,7 @@ msgstr "Detta verktyg kunde inte hitta filerna för \"%s\": %s"
#: ../client/pk-console.c:1016
#, c-format
msgid "This tool could not get the file list for '%s': %s"
-msgstr "Detta verktyg kunde inte få fillistan för \"%s\": %s"
+msgstr "Detta verktyg kunde inte få tag på fillistan för \"%s\": %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:1038
@@ -164,7 +164,7 @@ msgstr "Detta verktyg kunde inte hitta uppdateringsdetaljer för \"%s\": %s"
#: ../client/pk-console.c:1046
#, c-format
msgid "This tool could not get the update details for '%s': %s"
-msgstr "Detta verktyg kunde inte få uppdateringsdetaljer för %s\": %s"
+msgstr "Detta verktyg kunde inte få tag på uppdateringsdetaljer för \"%s\": %s"
#. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
#: ../client/pk-console.c:1092
@@ -321,7 +321,7 @@ msgstr "Du behöver ange en korrekt roll"
#: ../client/pk-console.c:1655
msgid "Failed to get last time"
-msgstr "Misslyckades med att få senaste tid"
+msgstr "Misslyckades med att få tag på senaste tid"
#: ../client/pk-console.c:1694
msgid "You need to specify a package to find the details for"
@@ -362,7 +362,7 @@ msgstr "Utdatakatalogen (den aktuella katalogen om den inte anges)"
#: ../client/pk-generate-pack.c:144
msgid "The package to be put into the service pack"
-msgstr "Paketet att läggas i servicepaketet"
+msgstr "Paket att läggas i servicepaketet"
#: ../client/pk-generate-pack.c:146
msgid "Put all updates available in the service pack"
commit 61ce8c5aaeffa0a68fc600407f141bb9cf23ddfa
Author: James Antill <james at and.org>
Date: Fri Oct 24 15:11:41 2008 -0400
Fix typo
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index e5ea822..0bc9188 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1905,7 +1905,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
self.yumbase.repos.setCache(old_cache_setting)
def _setup_yum(self):
- self.yumbase.doCVonfigSetup(errorlevel=-1, debuglevel=-1) # Setup Yum Config
+ self.yumbase.doConfigSetup(errorlevel=-1, debuglevel=-1) # Setup Yum Config
self.yumbase.conf.throttle = "90%" # Set bandwidth throttle to 40%
self.dnlCallback = DownloadCallback(self, showNames=True) # Download callback
self.yumbase.repos.setProgressBar(self.dnlCallback) # Setup the download callback class
commit 049381c2e246a5229102a07d1fd2ca01a49cc761
Author: James Antill <james at and.org>
Date: Fri Oct 24 15:10:49 2008 -0400
Use the external yum API to change the config. object and not the internal one
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index 63325aa..e5ea822 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1905,7 +1905,7 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
self.yumbase.repos.setCache(old_cache_setting)
def _setup_yum(self):
- self.yumbase._getConfig(errorlevel=-1, debuglevel=-1) # Setup Yum Config
+ self.yumbase.doCVonfigSetup(errorlevel=-1, debuglevel=-1) # Setup Yum Config
self.yumbase.conf.throttle = "90%" # Set bandwidth throttle to 40%
self.dnlCallback = DownloadCallback(self, showNames=True) # Download callback
self.yumbase.repos.setProgressBar(self.dnlCallback) # Setup the download callback class
commit 10b939b6fde630ccbe30b8780d1fbccb1a957a03
Author: Igor Pires Soares <igorsoares at gmail.com>
Date: Fri Oct 24 13:46:33 2008 +0000
Updated Brazilian Portuguese translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f5ea40d..7d537f5 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-22 11:10+0100\n"
-"PO-Revision-Date: 2008-10-20 12:07-0300\n"
+"POT-Creation-Date: 2008-10-22 13:38+0000\n"
+"PO-Revision-Date: 2008-10-24 11:43-0300\n"
"Last-Translator: Igor Pires Soares <igor at projetofedora.org>\n"
"Language-Team: Brazilian Portuguese <fedora-trans-pt_br at redhat.com>\n"
"MIME-Version: 1.0\n"
@@ -30,9 +30,7 @@ msgstr "Por favor, reinicie o computador para completar a atualização."
#: ../client/pk-console.c:466
msgid "Please logout and login to complete the update."
-msgstr ""
-"Por favor, encerre a sessão e inicie-a novamente para completar a "
-"atualização."
+msgstr "Por favor, encerre a sessão e inicie-a novamente para completar a atualização."
#: ../client/pk-console.c:468
msgid "Please restart the application as it is being used."
@@ -40,9 +38,9 @@ msgstr "Por favor, reinicie o aplicativo que está sendo usado."
#. TRANSLATORS: The package is already installed on the system
#: ../client/pk-console.c:579
-#, fuzzy, c-format
+#, c-format
msgid "The package '%s' is already installed"
-msgstr "O pacote \"%s\" não pôde ser instalado: %s"
+msgstr "O pacote \"%s\" já está instalado"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:587
@@ -51,9 +49,12 @@ msgid "The package '%s' could not be installed: %s"
msgstr "O pacote \"%s\" não pôde ser instalado: %s"
#. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
-#: ../client/pk-console.c:612 ../client/pk-console.c:639
-#: ../client/pk-console.c:735 ../client/pk-console.c:852
-#: ../client/pk-tools-common.c:55 ../client/pk-tools-common.c:74
+#: ../client/pk-console.c:612
+#: ../client/pk-console.c:639
+#: ../client/pk-console.c:735
+#: ../client/pk-console.c:852
+#: ../client/pk-tools-common.c:55
+#: ../client/pk-tools-common.c:74
#: ../client/pk-tools-common.c:81
#, c-format
msgid "Internal error: %s"
@@ -78,7 +79,8 @@ msgid "This tool could not remove '%s': %s"
msgstr "Esta ferramenta não pôde remover \"%s\": %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
-#: ../client/pk-console.c:726 ../client/pk-console.c:797
+#: ../client/pk-console.c:726
+#: ../client/pk-console.c:797
#, c-format
msgid "This tool could not remove the packages: %s"
msgstr "Esta ferramente não pôde remover os pacotes: %s"
@@ -108,8 +110,7 @@ msgstr "A remoção do pacote foi cancelada!"
#: ../client/pk-console.c:829
#, c-format
msgid "This tool could not download the package '%s' as it could not be found"
-msgstr ""
-"Esta ferramenta não pôde baixar o pacote \"%s\", pois ele não foi localizado"
+msgstr "Esta ferramenta não pôde baixar o pacote \"%s\", pois ele não foi localizado"
#. TRANSLATORS: Could not download the packages for some reason. The detailed error follows
#: ../client/pk-console.c:860
@@ -118,25 +119,29 @@ msgid "This tool could not download the packages: %s"
msgstr "Esta ferramenta não pôde baixar os pacotes: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:887 ../client/pk-console.c:896
+#: ../client/pk-console.c:887
+#: ../client/pk-console.c:896
#, c-format
msgid "This tool could not update '%s': %s"
msgstr "Esta ferramenta não pôde atualizar \"%s\": %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:918 ../client/pk-console.c:926
+#: ../client/pk-console.c:918
+#: ../client/pk-console.c:926
#, c-format
msgid "This tool could not get the requirements for '%s': %s"
msgstr "Esta ferramenta não pôde obter os requerimentos de \"%s\": %s"
#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
-#: ../client/pk-console.c:948 ../client/pk-console.c:956
+#: ../client/pk-console.c:948
+#: ../client/pk-console.c:956
#, c-format
msgid "This tool could not get the dependencies for '%s': %s"
msgstr "Esta ferramenta não pôde obter as dependências para \"%s\": %s"
#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
-#: ../client/pk-console.c:978 ../client/pk-console.c:986
+#: ../client/pk-console.c:978
+#: ../client/pk-console.c:986
#, c-format
msgid "This tool could not get package details for '%s': %s"
msgstr "Esta ferramenta não pôde obter os detalhes do pacote para \"%s\": %s"
@@ -157,15 +162,13 @@ msgstr "Esta ferramenta não pôde obter a lista de arquivos para \"%s\": %s"
#: ../client/pk-console.c:1038
#, c-format
msgid "This tool could not find the update details for '%s': %s"
-msgstr ""
-"Esta ferramenta não pôde localizar os detalhes de atualização para \"%s\": %s"
+msgstr "Esta ferramenta não pôde localizar os detalhes de atualização para \"%s\": %s"
#. TRANSLATORS: There was an error getting the details about the update for the package. The detailed error follows
#: ../client/pk-console.c:1046
#, c-format
msgid "This tool could not get the update details for '%s': %s"
-msgstr ""
-"Esta ferramenta não pôde obter os detalhes de atualização para \"%s\": %s"
+msgstr "Esta ferramenta não pôde obter os detalhes de atualização para \"%s\": %s"
#. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
#: ../client/pk-console.c:1092
@@ -194,7 +197,6 @@ msgstr "A assinatura do repositório é necessária"
#. TRANSLATORS: This a prompt asking the user to import the security key
#: ../client/pk-console.c:1181
-#, fuzzy
msgid "Do you accept this signature?"
msgstr "Você aceita essa assinatura?"
@@ -232,12 +234,15 @@ msgstr "Interface em Console do PackageKit"
msgid "Subcommands:"
msgstr "Subcomandos:"
-#: ../client/pk-console.c:1403 ../client/pk-generate-pack.c:138
-#: ../client/pk-monitor.c:115 ../src/pk-main.c:196
+#: ../client/pk-console.c:1403
+#: ../client/pk-generate-pack.c:138
+#: ../client/pk-monitor.c:115
+#: ../src/pk-main.c:196
msgid "Show extra debugging information"
msgstr "Mostrar informações extras de depuração"
-#: ../client/pk-console.c:1405 ../client/pk-monitor.c:117
+#: ../client/pk-console.c:1405
+#: ../client/pk-monitor.c:117
msgid "Show the program version and exit"
msgstr "Mostrar a versão do programa e sair"
@@ -258,10 +263,14 @@ msgstr "Esta ferramenta não pôde conectar ao DBUS do sistema."
msgid "You need to specify a search type, e.g. name"
msgstr "Você precisa especificar um tipo de pesquisa, p. ex. nome"
-#: ../client/pk-console.c:1531 ../client/pk-console.c:1538
-#: ../client/pk-console.c:1545 ../client/pk-console.c:1552
-#: ../client/pk-console.c:1663 ../client/pk-console.c:1673
-#: ../client/pk-console.c:1680 ../client/pk-console.c:1687
+#: ../client/pk-console.c:1531
+#: ../client/pk-console.c:1538
+#: ../client/pk-console.c:1545
+#: ../client/pk-console.c:1552
+#: ../client/pk-console.c:1663
+#: ../client/pk-console.c:1673
+#: ../client/pk-console.c:1680
+#: ../client/pk-console.c:1687
msgid "You need to specify a search term"
msgstr "Você precisa especificar um termo de pesquisa"
@@ -282,12 +291,8 @@ msgid "You need to specify a package to remove"
msgstr "Você precisa especificar um pacote a ser removido"
#: ../client/pk-console.c:1582
-msgid ""
-"You need to specify the destination directory and then the packages to "
-"download"
-msgstr ""
-"Você precisa especificar o diretório de destino e em seguida os pacotes a "
-"serem baixados"
+msgid "You need to specify the destination directory and then the packages to download"
+msgstr "Você precisa especificar o diretório de destino e em seguida os pacotes a serem baixados"
#: ../client/pk-console.c:1587
msgid "Directory not found"
@@ -301,7 +306,8 @@ msgstr "Você precisa especificar um identificador de licença (eula-id)"
msgid "You need to specify a package name to resolve"
msgstr "Você precisa especificar um nome de pacote a ser analisado"
-#: ../client/pk-console.c:1618 ../client/pk-console.c:1625
+#: ../client/pk-console.c:1618
+#: ../client/pk-console.c:1625
msgid "You need to specify a repository name"
msgstr "Você precisa especificar um nome de repositório"
@@ -323,13 +329,11 @@ msgstr "Falha ao obter o último horário"
#: ../client/pk-console.c:1694
msgid "You need to specify a package to find the details for"
-msgstr ""
-"Você precisa especificar o pacote para o qual você quer localizar os detalhes"
+msgstr "Você precisa especificar o pacote para o qual você quer localizar os detalhes"
#: ../client/pk-console.c:1701
msgid "You need to specify a package to find the files for"
-msgstr ""
-"Você precisa especificar o pacote para o qual você quer localizar os arquivos"
+msgstr "Você precisa especificar o pacote para o qual você quer localizar os arquivos"
#. TRANSLATORS: The user tried to use an unsupported option on the command line
#: ../client/pk-console.c:1754
@@ -381,8 +385,7 @@ msgstr "Ambas opções selecionadas."
#. TRANSLATORS: This is when file already exists
#: ../client/pk-generate-pack.c:207
msgid "A pack with the same name already exists, do you want to overwrite it?"
-msgstr ""
-"Um pacote de serviços com o mesmo nome já existe, você deseja sobrescrevê-lo?"
+msgstr "Um pacote de serviços com o mesmo nome já existe, você deseja sobrescrevê-lo?"
#. TRANSLATORS: This is when the pack was not overwritten
#: ../client/pk-generate-pack.c:210
@@ -433,7 +436,6 @@ msgstr "Monitor do PackageKit"
#. TRANSLATORS: The package was not found in any software sources
#: ../client/pk-tools-common.c:108
-#, c-format
msgid "The package could not be found"
msgstr "O pacote não pôde ser encontrado"
@@ -517,98 +519,6 @@ msgstr "Pacote de serviços do PackageKit"
msgid "PackageKit Package List"
msgstr "Lista de Pacotes do PackageKit"
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr "Aceitar a licença EULA"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr "É necessário autenticar para aceitar uma licença EULA"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid "Authentication is required to change software source parameters"
-msgstr ""
-"É necessário autenticar para alterar os parâmetros das fontes de programas"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-#, fuzzy
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr "É necessário autenticar para recarregar a lista de pacotes"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-#, fuzzy
-msgid "Authentication is required to install a signed package"
-msgstr "É necessário autenticar para instalar um pacote"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-#, fuzzy
-msgid "Authentication is required to install an untrusted package"
-msgstr "É necessário autenticar para instalar um pacote"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-#, fuzzy
-msgid "Authentication is required to refresh the system sources"
-msgstr "É necessário autenticar para recarregar a lista de pacotes"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to remove packages"
-msgstr "É necessário autenticar para remover pacotes"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to rollback a transaction"
-msgstr "É necessário autenticar para retroceder uma transação"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-#, fuzzy
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr "É necessário autenticar para remover pacotes"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to update packages"
-msgstr "É necessário autenticar para atualizar os pacotes"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Change software source parameters"
-msgstr "Altere parâmetros das fontes de programas"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Install local file"
-msgstr "Instalar um arquivo local"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-#, fuzzy
-msgid "Install untrusted local file"
-msgstr "Instalar um arquivo local"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Remove package"
-msgstr "Remover pacote"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Rollback to a previous transaction"
-msgstr "Retroceder para uma transação anterior"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-#, fuzzy
-msgid "Update packages"
-msgstr "Atualizar pacote"
-
#: ../src/pk-main.c:85
msgid "Startup failed due to security policies on this machine."
msgstr "A inicialização falhou devido à polÃticas de segurança desta máquina"
@@ -622,12 +532,8 @@ msgid "The correct user is not launching the executable (usually root)"
msgstr "O usuário correto não está iniciando o executável (normalmente o root)"
#: ../src/pk-main.c:88
-msgid ""
-"The org.freedesktop.PackageKit.conf file is not installed in the system "
-"directory:"
-msgstr ""
-"O arquivo org.freedesktop.PackageKit.conf não está instalado no diretório do "
-"sistema:"
+msgid "The org.freedesktop.PackageKit.conf file is not installed in the system directory:"
+msgstr "O arquivo org.freedesktop.PackageKit.conf não está instalado no diretório do sistema:"
#: ../src/pk-main.c:192
msgid "Packaging backend to use, e.g. dummy"
@@ -666,158 +572,172 @@ msgstr "Não foi possÃvel conectar ao barramento do sistema"
msgid "Error trying to start: %s\n"
msgstr "Erro ao tentar iniciar: %s\n"
+#~ msgid "Accept EULA"
+#~ msgstr "Aceitar a licença EULA"
+#~ msgid "Authentication is required to accept a EULA"
+#~ msgstr "É necessário autenticar para aceitar uma licença EULA"
+#~ msgid "Authentication is required to change software source parameters"
+#~ msgstr ""
+#~ "É necessário autenticar para alterar os parâmetros das fontes de programas"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to consider a key used for signing packages as "
+#~ "trusted"
+#~ msgstr "É necessário autenticar para recarregar a lista de pacotes"
+
+#, fuzzy
+#~ msgid "Authentication is required to install a signed package"
+#~ msgstr "É necessário autenticar para instalar um pacote"
+
+#, fuzzy
+#~ msgid "Authentication is required to install an untrusted package"
+#~ msgstr "É necessário autenticar para instalar um pacote"
+
+#, fuzzy
+#~ msgid "Authentication is required to refresh the system sources"
+#~ msgstr "É necessário autenticar para recarregar a lista de pacotes"
+#~ msgid "Authentication is required to remove packages"
+#~ msgstr "É necessário autenticar para remover pacotes"
+#~ msgid "Authentication is required to rollback a transaction"
+#~ msgstr "É necessário autenticar para retroceder uma transação"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to set the network proxy used for downloading "
+#~ "packages"
+#~ msgstr "É necessário autenticar para remover pacotes"
+#~ msgid "Authentication is required to update packages"
+#~ msgstr "É necessário autenticar para atualizar os pacotes"
+#~ msgid "Change software source parameters"
+#~ msgstr "Altere parâmetros das fontes de programas"
+#~ msgid "Install local file"
+#~ msgstr "Instalar um arquivo local"
+
+#, fuzzy
+#~ msgid "Install untrusted local file"
+#~ msgstr "Instalar um arquivo local"
+#~ msgid "Remove package"
+#~ msgstr "Remover pacote"
+#~ msgid "Rollback to a previous transaction"
+#~ msgstr "Retroceder para uma transação anterior"
+
+#, fuzzy
+#~ msgid "Update packages"
+#~ msgstr "Atualizar pacote"
#~ msgid "Okay to import key?"
#~ msgstr "A chave pode ser importada?"
-
#~ msgid "Did not import key"
#~ msgstr "Não importar a chave"
-
#~ msgid "Eula required"
#~ msgstr "Uma Eula é necessária"
-
#~ msgid "Do you agree?"
#~ msgstr "Você concorda?"
-
#~ msgid "You need to specify a time term"
#~ msgstr "Você precisa especificar um termo de horário"
-
#~ msgid "Update detail"
#~ msgstr "Detalhe da atualização"
-
#~ msgid "A system restart is required"
#~ msgstr "É necessário reiniciar o sistema"
-
#~ msgid "A logout and login is required"
#~ msgstr "É necessário sair da sessão e autenticar novamente"
-
#~ msgid "An application restart is required"
#~ msgstr "É necessário reiniciar a aplicação"
-
#~ msgid "Could not find package to remove"
#~ msgstr "Não foi possÃvel localizar o pacote a ser removido"
-
#~ msgid "Cancelled!"
#~ msgstr "Cancelado!"
-
#~ msgid "Could not find package to update"
#~ msgstr "Não foi possÃvel localizar o pacote a ser atualizado"
-
#~ msgid "Could not find what packages require"
#~ msgstr "Não foi possÃvel localizar quais pacotes necessitam desse pacote"
-
#~ msgid "Could not find details for"
#~ msgstr "Não foi possÃvel localizar os detalhes para"
-
#~ msgid "Could not find a package match"
#~ msgstr "Não foi possÃvel encontrar um pacote correspondente"
-
#~ msgid "failed to download: invalid package_id and/or directory"
#~ msgstr "falha ao baixar: package_id e/ou diretório inválidos"
-
#~ msgid "Could not find a valid metadata file"
#~ msgstr "Não foi possÃvel localizar um arquivo de metadados válido"
-
#~ msgid "Okay to download the additional packages"
#~ msgstr "Os pacotes adicionais podem ser baixados"
-
#~ msgid "You need to specify the pack name and packages to be packed\n"
#~ msgstr ""
#~ "Você precisa especificar o nome do pacote de serviços e os pacotes a "
#~ "serem incluÃdos\n"
-
#~ msgid ""
#~ "Invalid name for the service pack, Specify a name with .servicepack "
#~ "extension\n"
#~ msgstr ""
#~ "Nome inválido para o pacote de serviços. Especifique um nome com a "
#~ "extensão .servicepack\n"
-
#~ msgid "Could not set database readonly"
#~ msgstr "Não foi possÃvel configurar o banco de dados para somente leitura"
-
#~ msgid "Could not open database: %s"
#~ msgstr "Não foi possÃvel abrir o banco de dados: %s"
-
#~ msgid "You probably need to run this program as the root user"
#~ msgstr "Você provavelmente precisa executar este programa como usuário root"
-
#~ msgid "<span color='#%06x' underline='single' size='larger'>Run %s</span>"
#~ msgstr ""
#~ "<span color='#%06x' underline='single' size='larger'>Executar %s</span>"
-
#~ msgid "<big>%s</big>"
#~ msgstr "<big>%s</big>"
-
#~ msgid ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Run version %s now</span>"
#~ msgstr ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Executar versão %s agora</span>"
-
#~ msgid ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Run now</span>"
#~ msgstr ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Executar agora</span>"
-
#~ msgid ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Upgrade to version %s</span>"
#~ msgstr ""
#~ "\n"
#~ "<span color='#%06x' underline='single'>Atualizar para a versão %s</span>"
-
#~ msgid ""
#~ "<span color='#%06x' underline='single' size='larger'>Install %s Now</span>"
#~ msgstr ""
#~ "<span color='#%06x' underline='single' size='larger'>Instalar %s agora</"
#~ "span>"
-
#~ msgid ""
#~ "\n"
#~ "<small>Version: %s</small>"
#~ msgstr ""
#~ "\n"
#~ "<small>Versão: %s</small>"
-
#~ msgid ""
#~ "You need to specify the package to download and the destination directory"
#~ msgstr ""
#~ "Você precisa especificar o pacote a ser baixado e o diretório de destino"
-
#~ msgid ""
#~ "Could not find a package with that name to install, or package already "
#~ "installed"
#~ msgstr ""
#~ "Não foi possÃvel encontrar um pacote com esse nome para instalar ou o "
#~ "pacote já está instalado"
-
#~ msgid "Could not find a package with that name to update"
#~ msgstr ""
#~ "Não foi possÃvel encontrar um pacote com esse nome para ser atualizado"
-
#~ msgid "Authentication is required to install a local file"
#~ msgstr "É necessário autenticar para instalar um arquivo local"
-
#~ msgid "Authentication is required to install a security signature"
#~ msgstr "É necessário autenticar para instalar uma assinatura de segurança"
-
#~ msgid "Authentication is required to update all packages"
#~ msgstr "É necessário autenticar para atualizar todos os pacotes"
-
#~ msgid "Install package"
#~ msgstr "Instalar um pacote"
-
#~ msgid "Install security signature"
#~ msgstr "Instalar uma assinatura de segurança"
-
#~ msgid "Refresh package lists"
#~ msgstr "Recarregar listas de pacotes"
-
#~ msgid "Update all packages"
#~ msgstr "Atualizar todos os pacotes"
-
#~ msgid "Could not find a description for this package"
#~ msgstr "Não foi possÃvel encontrar uma descrição para esse pacote"
+
commit d0428d878485e222166c02343cc5fe3593a8e798
Merge: 70a3cca... 344ee17...
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Oct 24 14:09:40 2008 +0100
Merge branch 'master' of git+ssh://hughsie@git.packagekit.org/srv/git/PackageKit
commit 344ee17281aad1840fc98bc619df10393b5825ec
Author: Richard Hughes <hughsie at localhost.localdomain>
Date: Fri Oct 24 14:07:10 2008 +0100
yum: be cleverer when installing service packs of different types
diff --git a/backends/yum/yumBackend.py b/backends/yum/yumBackend.py
index ce574a9..63325aa 100755
--- a/backends/yum/yumBackend.py
+++ b/backends/yum/yumBackend.py
@@ -1271,32 +1271,50 @@ class PackageKitYumBackend(PackageKitBaseBackend, PackagekitPackage):
for mem in members:
pack.extract(mem, path = tempdir)
files = os.listdir(tempdir)
- for fn in files:
- if fn.endswith('.rpm'):
- inst_files.append(os.path.join(tempdir, fn))
-
- to_remove = []
- # remove files of packages that already exist
- for inst_file in inst_files:
- try:
- pkg = YumLocalPackage(ts=self.yumbase.rpmdb.readOnlyTS(), filename=inst_file)
- if self._is_inst(pkg):
- to_remove.append(inst_file)
- except yum.Errors.YumBaseError, e:
- self.error(ERROR_INVALID_PACKAGE_FILE, 'Package could not be decompressed')
- except:
- self.error(ERROR_UNKNOWN, "Failed to open local file -- please report")
+ # find the metadata file
+ packtype = 'unknown'
+ for fn in files:
+ if fn == "metadata.conf":
+ config = ConfigParser.ConfigParser()
+ config.read(os.path.join(tempdir, fn))
+ if config.has_option('PackageKit Service Pack', 'type'):
+ packtype = config.get('PackageKit Service Pack', 'type')
+ break
- # Some fiddly code to get the messaging right
- if len(inst_files) == 1 and len(to_remove) == 1:
- # The single pkg to be installed was already installed
- self.error(ERROR_PACKAGE_ALREADY_INSTALLED, '%s is already installed' % inst_files[0])
+ # we only support update and install
+ if packtype != 'install' and packtype != 'update':
+ self.error(ERROR_INVALID_PACKAGE_FILE, 'no support for type %s' % packtype)
- for inst_file in to_remove:
- # More than one pkg to be installed, 1 or more are already installed
- inst_files.remove(inst_file)
- self.message(MESSAGE_PACKAGE_ALREADY_INSTALLED, '%s is already installed' % inst_file)
+ # add the file if it's an install, or update if installed
+ for fn in files:
+ if fn.endswith('.rpm'):
+ inst_file = os.path.join(tempdir, fn)
+ try:
+ # read the file
+ pkg = YumLocalPackage(ts=self.yumbase.rpmdb.readOnlyTS(), filename=inst_file)
+ pkgs_local = self.yumbase.rpmdb.searchNevra(name=pkg.name)
+ except yum.Errors.YumBaseError, e:
+ self.error(ERROR_INVALID_PACKAGE_FILE, 'Package could not be decompressed')
+ except:
+ self.error(ERROR_UNKNOWN, "Failed to open local file -- please report")
+ else:
+ # trying to install package that already exists
+ if len(pkgs_local) == 1 and pkgs_local[0].EVR == pkg.EVR:
+ self.message(MESSAGE_PACKAGE_ALREADY_INSTALLED, '%s is already installed and the latest version' % pkg.name)
+
+ # trying to install package older than already exists
+ elif len(pkgs_local) == 1 and pkgs_local[0].EVR > pkg.EVR:
+ self.message(MESSAGE_PACKAGE_ALREADY_INSTALLED, 'a newer version of %s is already installed' % pkg.name)
+
+ # only update if installed
+ elif packtype == 'update':
+ if len(pkgs_local) > 0:
+ inst_files.append(inst_file)
+
+ # only install if we passed the checks above
+ elif packtype == 'install':
+ inst_files.append(inst_file)
if len(inst_files) == 0:
# More than one pkg to be installed, all of them already installed
commit 70a3ccaea367d2ddabd45b67fa715a10cc76a9e2
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Oct 24 13:44:02 2008 +0100
feature: print service pack creation status in pkgenpack and cancel it if we ctrl-c to cancel
diff --git a/client/pk-generate-pack.c b/client/pk-generate-pack.c
index b04c210..55ff826 100644
--- a/client/pk-generate-pack.c
+++ b/client/pk-generate-pack.c
@@ -22,6 +22,7 @@
#include "config.h"
+#include <unistd.h>
#include <glib.h>
#include <glib/gi18n.h>
#include <glib/gstdio.h>
@@ -32,6 +33,7 @@
#include "pk-tools-common.h"
static guint last_percentage = 0;
+static PkServicePack *pack = NULL;
/**
* pk_generate_pack_get_filename:
@@ -106,6 +108,49 @@ pk_generate_pack_percentage_cb (PkServicePack *pack, guint percentage, gpointer
}
/**
+ * pk_generate_pack_status_cb:
+ **/
+static void
+pk_generate_pack_status_cb (PkServicePack *pack, PkServicePackStatus status, gpointer data)
+{
+ if (status == PK_SERVICE_PACK_STATUS_DOWNLOAD_PACKAGES) {
+ /* TRANSLATORS: This is when the main packages are being downloaded */
+ g_print ("%s\n", _("Downloading packages"));
+ return;
+ }
+ if (status == PK_SERVICE_PACK_STATUS_DOWNLOAD_DEPENDENCIES) {
+ /* TRANSLATORS: This is when the dependency packages are being downloaded */
+ g_print ("%s\n", _("Downloading dependencies"));
+ return;
+ }
+}
+
+/**
+ * pk_generate_pack_sigint_cb:
+ **/
+static void
+pk_generate_pack_sigint_cb (int sig)
+{
+ gboolean ret;
+ GError *error = NULL;
+ egg_debug ("Handling SIGINT");
+
+ /* restore default */
+ signal (SIGINT, SIG_DFL);
+
+ /* cancel downloads */
+ ret = pk_service_pack_cancel (pack, &error);
+ if (!ret) {
+ egg_warning ("failed to cancel: %s", error->message);
+ g_error_free (error);
+ }
+
+ /* kill ourselves */
+ egg_debug ("Retrying SIGINT");
+ kill (getpid (), SIGINT);
+}
+
+/**
* main:
**/
int
@@ -117,14 +162,13 @@ main (int argc, char *argv[])
gboolean ret;
guint retval;
gchar *filename = NULL;
+ PkClient *client = NULL;
PkControl *control = NULL;
PkBitfield roles;
gchar *tempdir = NULL;
gboolean exists;
gboolean overwrite;
- PkServicePack *pack = NULL;
PkPackageList *list = NULL;
- PkClient *client = NULL;
gchar *package_id = NULL;
gboolean verbose = FALSE;
@@ -152,6 +196,9 @@ main (int argc, char *argv[])
g_type_init ();
+ /* do stuff on ctrl-c */
+ signal (SIGINT, pk_generate_pack_sigint_cb);
+
context = g_option_context_new ("PackageKit Pack Generator");
g_option_context_add_main_entries (context, options, NULL);
g_option_context_parse (context, &argc, &argv, NULL);
@@ -252,6 +299,7 @@ main (int argc, char *argv[])
pack = pk_service_pack_new ();
g_signal_connect (pack, "package", G_CALLBACK (pk_generate_pack_package_cb), pack);
g_signal_connect (pack, "percentage", G_CALLBACK (pk_generate_pack_percentage_cb), pack);
+ g_signal_connect (pack, "status", G_CALLBACK (pk_generate_pack_status_cb), pack);
pk_service_pack_set_filename (pack, filename);
pk_service_pack_set_temp_directory (pack, tempdir);
pk_service_pack_set_exclude_list (pack, list);
commit feed2b5c0ca93e83fd9f300799e2051723bd6c71
Author: Richard Hughes <richard at hughsie.com>
Date: Fri Oct 24 13:43:21 2008 +0100
feature: provide more feedback to what is going on when we create a service pack, and allow it to be cancelled
diff --git a/lib/packagekit-glib/pk-service-pack.c b/lib/packagekit-glib/pk-service-pack.c
index 129d130..678e9e2 100644
--- a/lib/packagekit-glib/pk-service-pack.c
+++ b/lib/packagekit-glib/pk-service-pack.c
@@ -63,6 +63,7 @@ struct PkServicePackPrivate
typedef enum {
PK_SERVICE_PACK_PACKAGE,
PK_SERVICE_PACK_PERCENTAGE,
+ PK_SERVICE_PACK_STATUS,
PK_SERVICE_PACK_LAST_SIGNAL
} PkSignals;
@@ -386,6 +387,16 @@ out:
}
/**
+ * pk_service_pack_status_changed:
+ **/
+static void
+pk_service_pack_status_changed (PkServicePack *pack, PkServicePackStatus status)
+{
+ egg_debug ("emit status %i", status);
+ g_signal_emit (pack, signals [PK_SERVICE_PACK_STATUS], 0, status);
+}
+
+/**
* pk_service_pack_set_filename:
* @pack: a valid #PkServicePack instance
* @filename: the filename to use
@@ -795,12 +806,9 @@ pk_service_pack_create_for_package_ids_internal (PkServicePack *pack, gchar **pa
gchar **package_ids_deps = NULL;
PkPackageList *list = NULL;
guint length;
- guint i;
- const PkPackageObj *obj;
GPtrArray *file_array = NULL;
GError *error_local = NULL;
gboolean ret = FALSE;
- gchar *text;
g_return_val_if_fail (PK_IS_SERVICE_PACK (pack), FALSE);
g_return_val_if_fail (package_ids != NULL, FALSE);
@@ -812,6 +820,7 @@ pk_service_pack_create_for_package_ids_internal (PkServicePack *pack, gchar **pa
pk_service_pack_setup_client (pack);
/* download this package */
+ pk_service_pack_status_changed (pack, PK_SERVICE_PACK_STATUS_DOWNLOAD_PACKAGES);
ret = pk_service_pack_download_package_ids (pack, package_ids, &error_local);
if (!ret) {
*error = g_error_new (PK_SERVICE_PACK_ERROR, error_local->code,
@@ -845,20 +854,12 @@ pk_service_pack_create_for_package_ids_internal (PkServicePack *pack, gchar **pa
pk_package_list_set_fuzzy_arch (list, TRUE);
pk_service_pack_exclude_packages (pack, list);
- /* list deps */
+ /* get the deps */
length = pk_package_list_get_size (list);
- g_print ("Downloading %i packages for dependencies.\n", length);
- for (i=0; i<length; i++) {
- obj = pk_package_list_get_obj (list, i);
- text = pk_package_obj_to_string (obj);
- g_print ("downloading %s\n", text);
- g_free (text);
- }
-
- /* confirm we want the deps */
if (length != 0) {
/* download additional package_ids */
package_ids_deps = pk_package_list_to_strv (list);
+ pk_service_pack_status_changed (pack, PK_SERVICE_PACK_STATUS_DOWNLOAD_DEPENDENCIES);
ret = pk_service_pack_download_package_ids (pack, package_ids_deps, &error_local);
g_strfreev (package_ids_deps);
@@ -1013,6 +1014,38 @@ out:
}
/**
+ * pk_service_pack_cancel:
+ * @pack: a valid #PkServicePack instance
+ * @error: a %GError to put the error code and message in, or %NULL
+ *
+ * Cancels the pack creation
+ *
+ * Return value: %TRUE if we cancelled okay
+ **/
+gboolean
+pk_service_pack_cancel (PkServicePack *pack, GError **error)
+{
+ gboolean ret;
+ GError *error_local = NULL;
+
+ g_return_val_if_fail (PK_IS_SERVICE_PACK (pack), FALSE);
+
+ /* nothing to cancel */
+ if (pack->priv->client == NULL)
+ return TRUE;
+
+ /* cancel the client */
+ egg_debug ("cancelling the client");
+ ret = pk_client_cancel (pack->priv->client, &error_local);
+ if (!ret) {
+ *error = g_error_new (PK_SERVICE_PACK_ERROR, PK_SERVICE_PACK_ERROR_FAILED_SETUP,
+ "failed to cancel: %s", error_local->message);
+ g_error_free (error_local);
+ }
+ return ret;
+}
+
+/**
* pk_service_pack_finalize:
**/
static void
@@ -1060,7 +1093,7 @@ pk_service_pack_class_init (PkServicePackClass *klass)
/**
* PkServicePack::percentage:
* @pack: the #PkServicePack instance that emitted the signal
- * @percentage: the #PkPackageObj that has just been downloaded
+ * @percentage: the percentage complete
*
* The ::package signal is emitted when a file is being downloaded.
**/
@@ -1071,6 +1104,20 @@ pk_service_pack_class_init (PkServicePackClass *klass)
NULL, NULL, g_cclosure_marshal_VOID__UINT,
G_TYPE_NONE, 1, G_TYPE_UINT);
+ /**
+ * PkServicePack::status:
+ * @pack: the #PkServicePack instance that emitted the signal
+ * @status: the #PkPackageObj that has just been downloaded
+ *
+ * The %PkServicePackStatus enum describing what we are doing
+ **/
+ signals [PK_SERVICE_PACK_STATUS] =
+ g_signal_new ("status",
+ G_TYPE_FROM_CLASS (object_class), G_SIGNAL_RUN_LAST,
+ G_STRUCT_OFFSET (PkServicePackClass, status),
+ NULL, NULL, g_cclosure_marshal_VOID__UINT,
+ G_TYPE_NONE, 1, G_TYPE_UINT);
+
g_type_class_add_private (klass, sizeof (PkServicePackPrivate));
}
diff --git a/lib/packagekit-glib/pk-service-pack.h b/lib/packagekit-glib/pk-service-pack.h
index 64c0d95..4d249be 100644
--- a/lib/packagekit-glib/pk-service-pack.h
+++ b/lib/packagekit-glib/pk-service-pack.h
@@ -52,6 +52,13 @@ typedef enum
PK_SERVICE_PACK_ERROR_NOT_COMPATIBLE
} PkServicePackError;
+typedef enum
+{
+ PK_SERVICE_PACK_STATUS_DOWNLOAD_PACKAGES,
+ PK_SERVICE_PACK_STATUS_DOWNLOAD_DEPENDENCIES,
+ PK_SERVICE_PACK_STATUS_UNKNOWN
+} PkServicePackStatus;
+
typedef struct
{
GObject parent;
@@ -65,12 +72,13 @@ typedef struct
const PkPackageObj *obj);
void (* percentage) (PkServicePack *pack,
guint percentage);
+ void (* status) (PkServicePack *pack,
+ PkServicePackStatus status);
/* Padding for future expansion */
void (*_pk_reserved1) (void);
void (*_pk_reserved2) (void);
void (*_pk_reserved3) (void);
void (*_pk_reserved4) (void);
- void (*_pk_reserved5) (void);
} PkServicePackClass;
GQuark pk_service_pack_error_quark (void);
@@ -98,6 +106,8 @@ gboolean pk_service_pack_create_for_package_ids (PkServicePack *pack,
GError **error);
gboolean pk_service_pack_create_for_updates (PkServicePack *pack,
GError **error);
+gboolean pk_service_pack_cancel (PkServicePack *pack,
+ GError **error);
G_END_DECLS
commit 3b60e46feda52a75a98954e7a15a9d3602a27ed3
Author: Piotr DrÄ…g <piotrdrag at gmail.com>
Date: Thu Oct 23 20:09:51 2008 +0000
Updated Polish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/pl.po b/po/pl.po
index ebe0a36..e11c8ca 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,7 +6,7 @@ msgstr ""
"Project-Id-Version: pl\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-10-22 11:10+0100\n"
-"PO-Revision-Date: 2008-10-16 16:25+0200\n"
+"PO-Revision-Date: 2008-10-23 22:07+0200\n"
"Last-Translator: Piotr DrÄ…g <piotrdrag at gmail.com>\n"
"Language-Team: Polish <pl at li.org>\n"
"MIME-Version: 1.0\n"
@@ -32,9 +32,9 @@ msgstr "Proszę uruchomić program ponownie, ponieważ jest używany."
#. TRANSLATORS: The package is already installed on the system
#: ../client/pk-console.c:579
-#, fuzzy, c-format
+#, c-format
msgid "The package '%s' is already installed"
-msgstr "Nie można zainstalować pakietu \"%s\": %s"
+msgstr "Pakiet \"%s\" jest już zainstalowany"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:587
@@ -59,9 +59,9 @@ msgstr "To narzędzie nie może zainstalować pakietów: %s"
#. TRANSLATORS: There was an error installing the files. The detailed error follows
#: ../client/pk-console.c:647
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not install the files: %s"
-msgstr "To narzędzie nie może zainstalować pakietów: %s"
+msgstr "To narzędzie nie może zainstalować plików: %s"
#. TRANSLATORS: The package name was not found in the installed list. The detailed error follows
#: ../client/pk-console.c:703
@@ -83,9 +83,8 @@ msgstr "To narzędzie nie może usunąć pakietów: \"%s\""
#. TRANSLATORS: When removing, we might have to remove other dependencies
#: ../client/pk-console.c:776
-#, fuzzy
msgid "The following packages have to be removed:"
-msgstr "Następujące pakiety muszą zostać usunięte"
+msgstr "Następujące pakiety muszą zostać usunięte:"
#. TRANSLATORS: We are checking if it's okay to remove a list of packages
#: ../client/pk-console.c:783
@@ -94,21 +93,21 @@ msgstr "Kontynuować usuwanie dodatkowych pakietów?"
#. TRANSLATORS: We did not remove any packages
#: ../client/pk-console.c:788
-#, fuzzy
msgid "The package removal was canceled!"
msgstr "Anulowano usunięcie pakietu!"
#. TRANSLATORS: The package name was not found in any software sources
#: ../client/pk-console.c:829
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not download the package '%s' as it could not be found"
-msgstr "To narzędzie nie może znaleźć pakietu \"%s\" do pobrania"
+msgstr ""
+"To narzędzie nie może pobrać pakietu \"%s\", ponieważ nie można go znaleźć"
#. TRANSLATORS: Could not download the packages for some reason. The detailed error follows
#: ../client/pk-console.c:860
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not download the packages: %s"
-msgstr "To narzędzie nie może zainstalować pakietów: %s"
+msgstr "To narzędzie nie może pobrać pakietów: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:887 ../client/pk-console.c:896
@@ -118,13 +117,13 @@ msgstr "To narzędzie nie może zaktualizować \"%s\": %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:918 ../client/pk-console.c:926
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not get the requirements for '%s': %s"
-msgstr "To narzędzie nie może uzyskać wymaganych pakietów dla \"%s\": %s"
+msgstr "To narzędzie nie może uzyskać wymagań dla \"%s\": %s"
#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
#: ../client/pk-console.c:948 ../client/pk-console.c:956
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not get the dependencies for '%s': %s"
msgstr "To narzędzie nie może uzyskać zależności dla \"%s\": %s"
@@ -186,29 +185,27 @@ msgstr "Wymagany jest podpis repozytorium"
#. TRANSLATORS: This a prompt asking the user to import the security key
#: ../client/pk-console.c:1181
msgid "Do you accept this signature?"
-msgstr ""
+msgstr "Zaakceptować ten podpis?"
#. TRANSLATORS: This is where the user declined the security key
#: ../client/pk-console.c:1185
-#, fuzzy
msgid "The signature was not accepted."
-msgstr "Pakiet nie został zastąpiony."
+msgstr "Podpis nie został zaakceptowany."
#. TRANSLATORS: This a request for a EULA
#: ../client/pk-console.c:1219
msgid "End user license agreement required"
-msgstr ""
+msgstr "Licencja jest wymagana"
#. TRANSLATORS: This a prompt asking the user to agree to the license
#: ../client/pk-console.c:1226
-#, fuzzy
msgid "Do you agree to this license?"
-msgstr "Nie zaakceptowano licencji"
+msgstr "Zaakceptować tę licencję?"
#. TRANSLATORS: This is where the user declined the license
#: ../client/pk-console.c:1230
msgid "The license was refused."
-msgstr ""
+msgstr "Odrzucono licencjÄ™."
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
#: ../client/pk-console.c:1259
@@ -284,16 +281,14 @@ msgid "Directory not found"
msgstr "Nie znaleziono katalogu"
#: ../client/pk-console.c:1593
-#, fuzzy
msgid "You need to specify a licence identifier (eula-id)"
-msgstr "Należy podać eula-id"
+msgstr "Należy podać identyfikator licencji (eula-id)"
#: ../client/pk-console.c:1609
msgid "You need to specify a package name to resolve"
msgstr "Należy podać nazwę pakietu do rozwiązania"
#: ../client/pk-console.c:1618 ../client/pk-console.c:1625
-#, fuzzy
msgid "You need to specify a repository name"
msgstr "Należy podać nazwę repozytorium"
@@ -302,9 +297,8 @@ msgid "You need to specify a repo name/parameter and value"
msgstr "Należy podać nazwę/parametr repozytorium i wartość"
#: ../client/pk-console.c:1645
-#, fuzzy
msgid "You need to specify an action, e.g. 'update-system'"
-msgstr "Należy podać typ wyszukiwania, np. po nazwie"
+msgstr "Należy podać działanie, np. \"update-system\""
#: ../client/pk-console.c:1650
msgid "You need to specify a correct role"
@@ -324,7 +318,7 @@ msgstr "Należy podać pakiet do znalezienia plików dla"
#. TRANSLATORS: The user tried to use an unsupported option on the command line
#: ../client/pk-console.c:1754
-#, fuzzy, c-format
+#, c-format
msgid "Option '%s' is not supported"
msgstr "Opcja \"%s\" nie jest obsługiwana"
@@ -344,24 +338,19 @@ msgid "Downloading"
msgstr "Pobieranie"
#: ../client/pk-generate-pack.c:140
-#, fuzzy
msgid "Set the file name of dependencies to be excluded"
msgstr "Proszę ustawić nazwy plików zależności do wykluczenia"
#: ../client/pk-generate-pack.c:142
-#, fuzzy
msgid "The output directory (the current directory is used if ommitted)"
msgstr ""
-"Katalog do umieszczenia pliku pakietu, lub bieżący katalog, jeśli zostanie "
-"pominięty"
+"Katalog wyjścia (użyty zostanie bieżący katalog, jeśli zostanie pominięty)"
#: ../client/pk-generate-pack.c:144
-#, fuzzy
msgid "The package to be put into the service pack"
msgstr "Pakiet do umieszczenia w pakiecie serwisowym"
#: ../client/pk-generate-pack.c:146
-#, fuzzy
msgid "Put all updates available in the service pack"
msgstr "Wszystkie dostępne aktualizacje w pakiecie serwisowym"
@@ -387,9 +376,8 @@ msgstr "Pakiet nie został zastąpiony."
#. TRANSLATORS: This is when the temporary directory cannot be created, the directory name follows
#: ../client/pk-generate-pack.c:222
-#, fuzzy
msgid "Failed to create directory:"
-msgstr "Utworzenie katalogu nie powiodło się."
+msgstr "Utworzenie katalogu nie powiodło się:"
#. TRANSLATORS: This is when the list of packages from the remote computer cannot be opened
#: ../client/pk-generate-pack.c:231
@@ -477,13 +465,13 @@ msgstr "Uruchom teraz"
#. TRANSLATORS: update to a new version of the package
#: ../contrib/packagekit-plugin/src/contents.cpp:330
-#, fuzzy, c-format
+#, c-format
msgid "Update to version %s"
msgstr "Zaktualizuj do wersji %s"
#. TRANSLATORS: To install a package
#: ../contrib/packagekit-plugin/src/contents.cpp:336
-#, fuzzy, c-format
+#, c-format
msgid "Install %s now"
msgstr "Zainstaluj %s"
@@ -618,13 +606,12 @@ msgstr ""
"Prawidłowy użytkownik nie uruchamiania pliku wykonywalnego (zwykle root)"
#: ../src/pk-main.c:88
-#, fuzzy
msgid ""
"The org.freedesktop.PackageKit.conf file is not installed in the system "
"directory:"
msgstr ""
"Plik org.freedesktop.PackageKit.conf nie jest zainstalowany w katalogu "
-"systemowym /etc/dbus-1/system.d"
+"systemowym:"
#: ../src/pk-main.c:192
msgid "Packaging backend to use, e.g. dummy"
@@ -662,18 +649,3 @@ msgstr "Nie można połączyć się z magistralą systemową"
#, c-format
msgid "Error trying to start: %s\n"
msgstr "Błąd podczas próbowania uruchomienia: %s\n"
-
-#~ msgid "Okay to import key?"
-#~ msgstr "Zaimportować klucz?"
-
-#~ msgid "Did not import key"
-#~ msgstr "Nie zaimportowano klucza"
-
-#~ msgid "Eula required"
-#~ msgstr "Wymagana jest licencja"
-
-#~ msgid "Do you agree?"
-#~ msgstr "Zgadzasz siÄ™?"
-
-#~ msgid "You need to specify a time term"
-#~ msgstr "Należy podać termin czasu"
commit ce68103d0ee42d61eb3e33b4078e51a3f0a957f4
Author: Stefan Posdzich <cheekyboinc at foresightlinux.org>
Date: Thu Oct 23 17:47:52 2008 +0000
Updated German translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/de.po b/po/de.po
index 9a254ba..607927c 100644
--- a/po/de.po
+++ b/po/de.po
@@ -13,13 +13,14 @@
# PGP-KeyID: 0x037FD3CF <ttrinks at redhat.com>, 2008.
# Thomas Spura <tomspur at fedoraproject.org>, 2008.
# Daniela Kugelmann <dkugelma at redhat.com >, 2008.
+# Stefan Posdzich <cheekyboinc at foresightlinux.org>, 2008.
msgid ""
msgstr ""
"Project-Id-Version: packagekit.master.de\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-22 11:10+0100\n"
+"POT-Creation-Date: 2008-10-22 13:38+0000\n"
"PO-Revision-Date: 2008-10-16 15:50+1000\n"
-"Last-Translator: Daniela Kugelmann <dkugelma at redhat.com >\n"
+"Last-Translator: Stefan Posdzich <cheekyboinc at foresightlinux.org>\n"
"Language-Team: German <i18 at redhat.com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -30,15 +31,15 @@ msgstr ""
#. TRANSLATORS: this is a header for the package that can be updated
#: ../client/pk-console.c:271
msgid "Details about the update:"
-msgstr ""
+msgstr "Details über die Aktualisierung"
#: ../client/pk-console.c:464
msgid "Please restart the computer to complete the update."
-msgstr ""
+msgstr "Bitte starten Sie den Computer neu, um das Update abzuschließen."
#: ../client/pk-console.c:466
msgid "Please logout and login to complete the update."
-msgstr ""
+msgstr "Bitte erneut einloggen um das Update abzuschließen."
#: ../client/pk-console.c:468
msgid "Please restart the application as it is being used."
@@ -48,13 +49,13 @@ msgstr ""
#: ../client/pk-console.c:579
#, c-format
msgid "The package '%s' is already installed"
-msgstr ""
+msgstr "Das Paket '%s' ist bereits installiert"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:587
#, c-format
msgid "The package '%s' could not be installed: %s"
-msgstr ""
+msgstr "Das Paket '%s' konnte nicht installiert werden: %s"
#. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
#: ../client/pk-console.c:612 ../client/pk-console.c:639
@@ -63,129 +64,129 @@ msgstr ""
#: ../client/pk-tools-common.c:81
#, c-format
msgid "Internal error: %s"
-msgstr ""
+msgstr "Interner Fehler: %s"
#. TRANSLATORS: There was an error installing the packages. The detailed error follows
#: ../client/pk-console.c:620
#, c-format
msgid "This tool could not install the packages: %s"
-msgstr ""
+msgstr "Konnte folgende Pakete nicht installieren: %s"
#. TRANSLATORS: There was an error installing the files. The detailed error follows
#: ../client/pk-console.c:647
#, fuzzy, c-format
msgid "This tool could not install the files: %s"
-msgstr "Die Datei-Liste konnte nicht erstellt werden"
+msgstr "Die Datei-Liste konnte nicht erstellt werden: %s"
#. TRANSLATORS: The package name was not found in the installed list. The detailed error follows
#: ../client/pk-console.c:703
#, c-format
msgid "This tool could not remove '%s': %s"
-msgstr ""
+msgstr "Konnte nicht entfernen '%s': %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
#: ../client/pk-console.c:726 ../client/pk-console.c:797
#, c-format
msgid "This tool could not remove the packages: %s"
-msgstr ""
+msgstr "Konnte folgende Pakete nicht entfernen: %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
#: ../client/pk-console.c:764
#, c-format
msgid "This tool could not remove the packages: '%s'"
-msgstr ""
+msgstr "This tool could not remove the packages: '%s'"
#. TRANSLATORS: When removing, we might have to remove other dependencies
#: ../client/pk-console.c:776
#, fuzzy
msgid "The following packages have to be removed:"
-msgstr "Die folgenden Packeten müssen entfernt werden"
+msgstr "Die folgenden Pakete müssen entfernt werden"
#. TRANSLATORS: We are checking if it's okay to remove a list of packages
#: ../client/pk-console.c:783
#, fuzzy
msgid "Proceed removing additional packages?"
-msgstr "Sollen die zusätzlichen Packete entfernt werden?"
+msgstr "Sollen die zusätzlichen Pakete entfernt werden?"
#. TRANSLATORS: We did not remove any packages
#: ../client/pk-console.c:788
msgid "The package removal was canceled!"
-msgstr ""
+msgstr "Die entfernung der Pakete wurde abgebrochen!"
#. TRANSLATORS: The package name was not found in any software sources
#: ../client/pk-console.c:829
#, c-format
msgid "This tool could not download the package '%s' as it could not be found"
-msgstr ""
+msgstr "Das Paket '%s' konnte nicht gefunden und heruntergeladen werden"
#. TRANSLATORS: Could not download the packages for some reason. The detailed error follows
#: ../client/pk-console.c:860
#, c-format
msgid "This tool could not download the packages: %s"
-msgstr ""
+msgstr "Konnte folgende Pakete nicht herunterladen: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:887 ../client/pk-console.c:896
#, c-format
msgid "This tool could not update '%s': %s"
-msgstr ""
+msgstr "Konnte nicht aktualisieren '%s': %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:918 ../client/pk-console.c:926
#, c-format
msgid "This tool could not get the requirements for '%s': %s"
-msgstr ""
+msgstr "Konnte die Vorraussetzungen nicht bekommen für '%s': %s"
#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
#: ../client/pk-console.c:948 ../client/pk-console.c:956
#, fuzzy, c-format
msgid "This tool could not get the dependencies for '%s': %s"
-msgstr "Konnte keine Abhängigkeiten bekommen für"
+msgstr "Konnte keine Abhängigkeiten bekommen für '%s': %s"
#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
#: ../client/pk-console.c:978 ../client/pk-console.c:986
#, c-format
msgid "This tool could not get package details for '%s': %s"
-msgstr ""
+msgstr "Konnte die Paketdetails nicht abrufen für '%s': %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:1008
#, fuzzy, c-format
msgid "This tool could not find the files for '%s': %s"
-msgstr "Die Dateien für dieses Packet konnten nicht gefunden werden"
+msgstr "Die Dateien für dieses Paket konnten nicht gefunden werden '%s': %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:1016
#, fuzzy, c-format
msgid "This tool could not get the file list for '%s': %s"
-msgstr "Die Datei-Liste konnte nicht erstellt werden"
+msgstr "Die Datei-Liste konnte nicht erstellt werden für '%s': %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:1038
#, fuzzy, c-format
msgid "This tool could not find the update details for '%s': %s"
-msgstr "Konnte keine Aktualisierungsdetails nicht finden für"
+msgstr "Konnte keine Aktualisierungsdetails finden für '%s': %s"
#. TRANSLATORS: There was an error getting the details about the update for the package. The detailed error follows
#: ../client/pk-console.c:1046
#, fuzzy, c-format
msgid "This tool could not get the update details for '%s': %s"
-msgstr "Konnte keine Aktualisierungsdetails nicht finden für"
+msgstr "Konnte keine Aktualisierungsdetails finden für '%s': %s"
#. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
#: ../client/pk-console.c:1092
msgid "Error:"
-msgstr ""
+msgstr "Fehler:"
#. TRANSLATORS: This a list of details about the package
#: ../client/pk-console.c:1106
msgid "Package description"
-msgstr "Packet-Beschreibung"
+msgstr "Paketbeschreibung"
#. TRANSLATORS: This a list files contained in the package
#: ../client/pk-console.c:1139
msgid "Package files"
-msgstr "Packet-Dateien"
+msgstr "Paket-Dateien"
#. TRANSLATORS: This where the package has no files
#: ../client/pk-console.c:1148
@@ -195,22 +196,22 @@ msgstr "Keine Dateien"
#. TRANSLATORS: This a request for a GPG key signature from the backend, which the client will prompt for later
#: ../client/pk-console.c:1171
msgid "Repository signature required"
-msgstr ""
+msgstr "Signatur der Paketquellen benötigt"
#. TRANSLATORS: This a prompt asking the user to import the security key
#: ../client/pk-console.c:1181
msgid "Do you accept this signature?"
-msgstr ""
+msgstr "Akzeptieren Sie diese Signatur?"
#. TRANSLATORS: This is where the user declined the security key
#: ../client/pk-console.c:1185
msgid "The signature was not accepted."
-msgstr ""
+msgstr "Diese Signatur wurde nicht akzeptiert."
#. TRANSLATORS: This a request for a EULA
#: ../client/pk-console.c:1219
msgid "End user license agreement required"
-msgstr ""
+msgstr "Endbenutzer Lizenzvereinbarung benötigt"
#. TRANSLATORS: This a prompt asking the user to agree to the license
#: ../client/pk-console.c:1226
@@ -221,7 +222,7 @@ msgstr "Sind Sie einverstanden?"
#. TRANSLATORS: This is where the user declined the license
#: ../client/pk-console.c:1230
msgid "The license was refused."
-msgstr ""
+msgstr "Die Lizenz wurde zurückgewiesen."
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
#: ../client/pk-console.c:1259
@@ -240,7 +241,7 @@ msgstr "Unterbefehle:"
#: ../client/pk-console.c:1403 ../client/pk-generate-pack.c:138
#: ../client/pk-monitor.c:115 ../src/pk-main.c:196
msgid "Show extra debugging information"
-msgstr "Zeige extra Debup-Informationen"
+msgstr "Zeige extra Debug-Informationen"
#: ../client/pk-console.c:1405 ../client/pk-monitor.c:117
msgid "Show the program version and exit"
@@ -258,7 +259,7 @@ msgstr "Beende, ohne auf Beendigung der Aktionen zu warten"
#: ../client/pk-console.c:1431
#, fuzzy
msgid "This tool could not connect to system DBUS."
-msgstr "Konnte nicht zum System-DBUS verbinden"
+msgstr "Konnte nicht zum System-DBUS verbinden."
#: ../client/pk-console.c:1526
msgid "You need to specify a search type, e.g. name"
@@ -277,22 +278,19 @@ msgstr "Ungültiger Suchtyp"
#: ../client/pk-console.c:1562
msgid "You need to specify a package or file to install"
-msgstr "Sie müssen ein Packet oder eine Datei zum Installieren angeben"
+msgstr "Sie müssen ein Paket oder eine Datei zum installieren angeben"
#: ../client/pk-console.c:1569
msgid "You need to specify a type, key_id and package_id"
-msgstr "Sie müssen einen Typ, Schlüssel_id und Packet_id auswählen"
+msgstr "Sie müssen einen Typ, Schlüssel_id und Paket_id auswählen"
#: ../client/pk-console.c:1576
msgid "You need to specify a package to remove"
-msgstr "Sie müssen ein Packet zum Löschen angeben"
+msgstr "Sie müssen ein Paket zum Löschen angeben"
#: ../client/pk-console.c:1582
-msgid ""
-"You need to specify the destination directory and then the packages to "
-"download"
-msgstr ""
-"Sie müssen ein Zielverzeichnis und dann die Packete zum Herunterladen angeben"
+msgid "You need to specify the destination directory and then the packages to download"
+msgstr "Sie müssen ein Zielverzeichnis und dann die Pakete zum herunterladen angeben"
#: ../client/pk-console.c:1587
msgid "Directory not found"
@@ -305,7 +303,7 @@ msgstr "Sie müssen eine eula-id auswählen"
#: ../client/pk-console.c:1609
msgid "You need to specify a package name to resolve"
-msgstr "Sie müssen einen Packetnamen zum Auflösen angeben"
+msgstr "Sie müssen einen Paketnamen zum Auflösen angeben"
#: ../client/pk-console.c:1618 ../client/pk-console.c:1625
#, fuzzy
@@ -331,17 +329,17 @@ msgstr "Die letzte Zeit konnte nicht herausgefunden werden"
#: ../client/pk-console.c:1694
msgid "You need to specify a package to find the details for"
-msgstr "Sie müssen ein Packet, für das nach Details gesucht wird, angeben"
+msgstr "Sie müssen ein Paket, für das nach Details gesucht wird, angeben"
#: ../client/pk-console.c:1701
msgid "You need to specify a package to find the files for"
-msgstr "Sie müssen ein Packet, für das nach Dateien gesucht wird, angeben"
+msgstr "Sie müssen ein Paket, für das nach Dateien gesucht wird, angeben"
#. TRANSLATORS: The user tried to use an unsupported option on the command line
#: ../client/pk-console.c:1754
#, fuzzy, c-format
msgid "Option '%s' is not supported"
-msgstr "Optino '%s' nicht unterstützt"
+msgstr "Option '%s' wird nicht unterstützt"
#. TRANSLATORS: User does not have permission to do this
#: ../client/pk-console.c:1767
@@ -356,14 +354,12 @@ msgstr "Befehl fehlgeschlagen"
#. TRANSLATORS: This is the state of the transaction
#: ../client/pk-generate-pack.c:96
msgid "Downloading"
-msgstr ""
+msgstr "Lade herunter"
#: ../client/pk-generate-pack.c:140
#, fuzzy
msgid "Set the file name of dependencies to be excluded"
-msgstr ""
-"Setze den Pfad der Datei mit der Paket- /Abhängigkeitsliste, die "
-"ausgeschlossen werden"
+msgstr "Setze den Pfad der Datei mit der Paket- /Abhängigkeitsliste, die ausgeschlossen werden"
#: ../client/pk-generate-pack.c:142
msgid "The output directory (the current directory is used if ommitted)"
@@ -380,19 +376,17 @@ msgstr ""
#. TRANSLATORS: This is when the user fails to supply the correct arguments
#: ../client/pk-generate-pack.c:166
msgid "Neither --package or --updates option selected."
-msgstr ""
+msgstr "Weder --package noch --updates wurden als Option gewählt."
#. TRANSLATORS: This is when the user fails to supply just one argument
#: ../client/pk-generate-pack.c:174
msgid "Both options selected."
-msgstr ""
+msgstr "Beide Optionen ausgewählt."
#. TRANSLATORS: This is when file already exists
#: ../client/pk-generate-pack.c:207
msgid "A pack with the same name already exists, do you want to overwrite it?"
-msgstr ""
-"Ein Pack mit dem selben Namen existiert bereits, möchten Sie es "
-"überschreiben?"
+msgstr "Ein Pack mit dem selben Namen existiert bereits, möchten Sie es überschreiben?"
#. TRANSLATORS: This is when the pack was not overwritten
#: ../client/pk-generate-pack.c:210
@@ -414,24 +408,24 @@ msgstr "Pack konnte nicht erstellt werden"
#. TRANSLATORS: The package name is being matched up to available packages
#: ../client/pk-generate-pack.c:241
msgid "Finding package name."
-msgstr ""
+msgstr "Suche Paketname."
#. TRANSLATORS: This is when the package cannot be found in any software source. The detailed error follows
#: ../client/pk-generate-pack.c:245
#, fuzzy, c-format
msgid "Failed to find package '%s': %s"
-msgstr "Packet zum Installieren konnte nicht gefunden werden"
+msgstr "Paket konnte nicht gefunden werden '%s': %s"
#. TRANSLATORS: This is telling the user we are in the process of making the pack
#: ../client/pk-generate-pack.c:260
msgid "Creating service pack..."
-msgstr ""
+msgstr "Erstelle Servicepack..."
#. TRANSLATORS: we succeeded in making the file
#: ../client/pk-generate-pack.c:267
#, c-format
msgid "Service pack created '%s'"
-msgstr ""
+msgstr "Servicepack erstellt '%s'"
#. TRANSLATORS: we failed to make te file
#: ../client/pk-generate-pack.c:271
@@ -445,21 +439,20 @@ msgstr "PackageKit Monitor"
#. TRANSLATORS: The package was not found in any software sources
#: ../client/pk-tools-common.c:108
-#, c-format
msgid "The package could not be found"
-msgstr ""
+msgstr "Das Paket konnte nicht gefunden werden"
#. TRANSLATORS: more than one package could be found that matched, to follow is a list of possible packages
#: ../client/pk-tools-common.c:119
#, fuzzy
msgid "More than one package matches:"
-msgstr "Es passen mehrere Packete zu Ihrer Anfrage"
+msgstr "Es passen mehrere Pakete zu Ihrer Anfrage"
#. TRANSLATORS: This finds out which package in the list to use
#: ../client/pk-tools-common.c:126
#, fuzzy
msgid "Please choose the correct package: "
-msgstr "Bitte geben Sie die Packet-Nummer ein: "
+msgstr "Bitte wählen Sie das korrekte Paket: "
#: ../client/pk-tools-common.c:152
#, c-format
@@ -469,64 +462,58 @@ msgstr "Bitte geben Sie eine Zahl zwischen 1 und %i ein: "
#. TRANSLATORS: when we are getting data from the daemon
#: ../contrib/packagekit-plugin/src/contents.cpp:299
msgid "Getting package information..."
-msgstr "Bekomme Packet-Informationen..."
+msgstr "Bekomme Paket-Informationen..."
#. TRANSLATORS: run an applicaiton
#: ../contrib/packagekit-plugin/src/contents.cpp:305
#, c-format
msgid "Run %s"
-msgstr ""
+msgstr "Starte %s"
#. TRANSLATORS: show the installed version of a package
#: ../contrib/packagekit-plugin/src/contents.cpp:311
#, fuzzy
msgid "Installed version"
-msgstr ""
-"\n"
-"<small>Installierte Version: %s</small>"
+msgstr "Installierte Version"
#. TRANSLATORS: run the application now
#: ../contrib/packagekit-plugin/src/contents.cpp:319
#, c-format
msgid "Run version %s now"
-msgstr ""
+msgstr "Starte Version %s jetzt"
#: ../contrib/packagekit-plugin/src/contents.cpp:325
msgid "Run now"
-msgstr ""
+msgstr "Starte jetzt"
#. TRANSLATORS: update to a new version of the package
#: ../contrib/packagekit-plugin/src/contents.cpp:330
#, c-format
msgid "Update to version %s"
-msgstr ""
+msgstr "Aktualisiere auf Version %s"
#. TRANSLATORS: To install a package
#: ../contrib/packagekit-plugin/src/contents.cpp:336
#, c-format
msgid "Install %s now"
-msgstr ""
+msgstr "Installiere %s jetzt"
#. TRANSLATORS: the version of the package
#: ../contrib/packagekit-plugin/src/contents.cpp:339
msgid "Version"
-msgstr ""
+msgstr "Version"
#. TRANSLATORS: noting found, so can't install
#: ../contrib/packagekit-plugin/src/contents.cpp:344
#, fuzzy
msgid "No packages found for your system"
-msgstr ""
-"\n"
-"<small>Es wurden keine Packete für Ihren Rechner gefunden</small>"
+msgstr "Keine Pakete für Ihr System gefunden"
#. TRANSLATORS: package is being installed
#: ../contrib/packagekit-plugin/src/contents.cpp:349
#, fuzzy
msgid "Installing..."
-msgstr ""
-"\n"
-"<small>Installiere...</small>"
+msgstr "Installiere..."
#: ../data/packagekit-catalog.xml.in.h:1
msgid "PackageKit Catalog"
@@ -534,96 +521,12 @@ msgstr "PackageKit Katalog"
#: ../data/packagekit-servicepack.xml.in.h:1
msgid "PackageKit Service Pack"
-msgstr "PackageKit Service Pack"
+msgstr "PackageKit Service-Pack"
#: ../data/packagekit-package-list.xml.in.h:1
#, fuzzy
msgid "PackageKit Package List"
-msgstr "PackageKit Katalog"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid "Authentication is required to change software source parameters"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-msgid "Authentication is required to install a signed package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-msgid "Authentication is required to install an untrusted package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-msgid "Authentication is required to refresh the system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to remove packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to rollback a transaction"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to update packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Change software source parameters"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Install local file"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-msgid "Install untrusted local file"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Remove package"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Rollback to a previous transaction"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-msgid "Update packages"
-msgstr ""
+msgstr "PackageKit Paketliste"
#: ../src/pk-main.c:85
msgid "Startup failed due to security policies on this machine."
@@ -635,8 +538,7 @@ msgstr "Dies kann aus zwei Gründen passieren:"
#: ../src/pk-main.c:87
msgid "The correct user is not launching the executable (usually root)"
-msgstr ""
-"Der korrekte Benutzer führt nicht das Programm aus (normalerweise root)"
+msgstr "Der korrekte Benutzer führt nicht das Programm aus (normalerweise root)"
#: ../src/pk-main.c:88
#, fuzzy
@@ -673,7 +575,7 @@ msgstr "Beende, nachdem die Maschine geladen wurde"
#: ../src/pk-main.c:214
msgid "PackageKit service"
-msgstr "PackageKIt-Dienst"
+msgstr "PackageKit-Dienst"
#: ../src/pk-main.c:250
msgid "Cannot connect to the system bus"
commit d01e811a7b94c4160316fef65c0469d044adc9c8
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Oct 23 17:37:53 2008 +0100
bugfix: fix excluding a list of packages in pkgenpack by adding and using a proper equality function
diff --git a/lib/packagekit-glib/pk-obj-list.c b/lib/packagekit-glib/pk-obj-list.c
index 60630f8..73be2a4 100644
--- a/lib/packagekit-glib/pk-obj-list.c
+++ b/lib/packagekit-glib/pk-obj-list.c
@@ -37,6 +37,7 @@ struct PkObjListPrivate
PkObjListCopyFunc func_copy;
PkObjListFreeFunc func_free;
PkObjListCompareFunc func_compare;
+ PkObjListEqualFunc func_equal;
PkObjListToStringFunc func_to_string;
PkObjListFromStringFunc func_from_string;
GPtrArray *array;
@@ -101,6 +102,20 @@ pk_obj_list_set_compare (PkObjList *list, PkObjListCompareFunc func)
}
/**
+ * pk_obj_list_set_equal:
+ * @list: a valid #PkObjList instance
+ * @func: typedef'd function
+ *
+ * Adds a equal func
+ **/
+void
+pk_obj_list_set_equal (PkObjList *list, PkObjListEqualFunc func)
+{
+ g_return_if_fail (PK_IS_OBJ_LIST (list));
+ list->priv->func_equal = func;
+}
+
+/**
* pk_obj_list_set_to_string:
* @list: a valid #PkObjList instance
* @func: typedef'd function
@@ -355,17 +370,16 @@ pk_obj_list_remove_list (PkObjList *list, const PkObjList *data)
static gboolean
pk_obj_list_obj_equal (PkObjList *list, gconstpointer obj1, gconstpointer obj2)
{
- PkObjListCompareFunc func_compare;
+ /* use equal */
+ if (list->priv->func_equal != NULL)
+ return list->priv->func_equal (obj1, obj2);
- /* two less pointer deferences... */
- func_compare = list->priv->func_compare;
+ /* use compare */
+ if (list->priv->func_compare != NULL)
+ return list->priv->func_compare (obj1, obj2) == 0;
- /* trivial case */
- if (func_compare == NULL)
- return obj1 == obj2;
-
- /* use helper function */
- return func_compare (obj1, obj2) == 0;
+ /* don't use helper function */
+ return obj1 == obj2;
}
/**
@@ -406,13 +420,9 @@ pk_obj_list_find_obj (PkObjList *list, gconstpointer obj)
{
guint i;
gconstpointer obj_tmp;
- PkObjListCompareFunc func_compare;
-
- /* remove data items from list */
- func_compare = list->priv->func_compare;
/* usual case, don't compare in the fast path */
- if (func_compare == NULL) {
+ if (list->priv->func_compare == NULL && list->priv->func_equal == NULL) {
for (i=0; i < list->len; i++) {
obj_tmp = pk_obj_list_index (list, i);
if (obj_tmp == obj)
@@ -424,7 +434,7 @@ pk_obj_list_find_obj (PkObjList *list, gconstpointer obj)
/* use a comparison function */
for (i=0; i < list->len; i++) {
obj_tmp = pk_obj_list_index (list, i);
- if (func_compare (obj_tmp, obj) == 0)
+ if (pk_obj_list_obj_equal (list, obj_tmp, obj))
return (gpointer) obj_tmp;
}
diff --git a/lib/packagekit-glib/pk-obj-list.h b/lib/packagekit-glib/pk-obj-list.h
index e7eea60..b4d0adb 100644
--- a/lib/packagekit-glib/pk-obj-list.h
+++ b/lib/packagekit-glib/pk-obj-list.h
@@ -52,6 +52,8 @@ typedef gpointer (*PkObjListCopyFunc) (gconstpointer data);
typedef void (*PkObjListFreeFunc) (gpointer data);
typedef gint (*PkObjListCompareFunc) (gconstpointer data1,
gconstpointer data2);
+typedef gboolean (*PkObjListEqualFunc) (gconstpointer data1,
+ gconstpointer data2);
typedef gpointer (*PkObjListFromStringFunc) (const gchar *data);
typedef gchar *(*PkObjListToStringFunc) (gconstpointer data);
@@ -66,6 +68,8 @@ void pk_obj_list_set_free (PkObjList *list,
PkObjListFreeFunc func);
void pk_obj_list_set_compare (PkObjList *list,
PkObjListCompareFunc func);
+void pk_obj_list_set_equal (PkObjList *list,
+ PkObjListEqualFunc func);
void pk_obj_list_set_to_string (PkObjList *list,
PkObjListToStringFunc func);
void pk_obj_list_set_from_string (PkObjList *list,
diff --git a/lib/packagekit-glib/pk-package-list.c b/lib/packagekit-glib/pk-package-list.c
index 3e45b5f..810259d 100644
--- a/lib/packagekit-glib/pk-package-list.c
+++ b/lib/packagekit-glib/pk-package-list.c
@@ -78,6 +78,13 @@ pk_package_list_set_fuzzy_arch (PkPackageList *plist, gboolean fuzzy_arch)
{
g_return_val_if_fail (PK_IS_PACKAGE_LIST (plist), FALSE);
plist->priv->fuzzy_arch = fuzzy_arch;
+
+ /* use a different equality function */
+ if (fuzzy_arch)
+ pk_obj_list_set_equal (PK_OBJ_LIST(plist), (PkObjListCompareFunc) pk_package_obj_equal_fuzzy_arch);
+ else
+ pk_obj_list_set_equal (PK_OBJ_LIST(plist), (PkObjListCompareFunc) pk_package_obj_equal);
+
return TRUE;
}
@@ -315,12 +322,11 @@ pk_package_list_init (PkPackageList *plist)
g_return_if_fail (PK_IS_PACKAGE_LIST (plist));
plist->priv = PK_PACKAGE_LIST_GET_PRIVATE (plist);
- plist->priv->fuzzy_arch = FALSE;
-
pk_obj_list_set_copy (PK_OBJ_LIST(plist), (PkObjListCopyFunc) pk_package_obj_copy);
pk_obj_list_set_free (PK_OBJ_LIST(plist), (PkObjListFreeFunc) pk_package_obj_free);
pk_obj_list_set_to_string (PK_OBJ_LIST(plist), (PkObjListToStringFunc) pk_package_obj_to_string);
pk_obj_list_set_from_string (PK_OBJ_LIST(plist), (PkObjListFromStringFunc) pk_package_obj_from_string);
+ pk_package_list_set_fuzzy_arch (plist, FALSE);
}
/**
commit 14aad0ff9d049e1843e263993cd00a24812abd97
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Oct 23 17:37:15 2008 +0100
bugfix: add a type= key to metadata.conf so we can tell if the service pack is an update or install pack. Also return the error if the service pack is invalid.
diff --git a/lib/packagekit-glib/pk-service-pack.c b/lib/packagekit-glib/pk-service-pack.c
index 85e284a..129d130 100644
--- a/lib/packagekit-glib/pk-service-pack.c
+++ b/lib/packagekit-glib/pk-service-pack.c
@@ -45,12 +45,19 @@
#define PK_SERVICE_PACK_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), PK_TYPE_SERVICE_PACK, PkServicePackPrivate))
+typedef enum {
+ PK_SERVICE_PACK_TYPE_UPDATE,
+ PK_SERVICE_PACK_TYPE_INSTALL,
+ PK_SERVICE_PACK_TYPE_UNKNOWN
+} PkServicePackType;
+
struct PkServicePackPrivate
{
PkPackageList *exclude_list;
gchar *filename;
gchar *directory;
PkClient *client;
+ PkServicePackType type;
};
typedef enum {
@@ -105,28 +112,46 @@ pk_service_pack_error_get_type (void)
* pk_service_pack_check_metadata_file:
**/
static gboolean
-pk_service_pack_check_metadata_file (const gchar *full_path)
+pk_service_pack_check_metadata_file (const gchar *full_path, GError **error)
{
GKeyFile *file;
gboolean ret;
- GError *error = NULL;
+ GError *error_local = NULL;
+ gchar *type = NULL;
gchar *distro_id = NULL;
gchar *distro_id_us = NULL;
/* load the file */
file = g_key_file_new ();
- ret = g_key_file_load_from_file (file, full_path, G_KEY_FILE_NONE, &error);
+ ret = g_key_file_load_from_file (file, full_path, G_KEY_FILE_NONE, &error_local);
if (!ret) {
- egg_warning ("failed to load file: %s", error->message);
- g_error_free (error);
+ *error = g_error_new (1, 0, "failed to load file: %s", error_local->message);
+ g_error_free (error_local);
goto out;
}
/* read the value */
- distro_id = g_key_file_get_string (file, PK_SERVICE_PACK_GROUP_NAME, "distro_id", &error);
- if (!ret) {
- egg_warning ("failed to get value: %s", error->message);
- g_error_free (error);
+ distro_id = g_key_file_get_string (file, PK_SERVICE_PACK_GROUP_NAME, "distro_id", &error_local);
+ if (distro_id == NULL) {
+ *error = g_error_new (1, 0, "failed to get value: %s", error_local->message);
+ g_error_free (error_local);
+ ret = FALSE;
+ goto out;
+ }
+
+ /* read the value */
+ type = g_key_file_get_string (file, PK_SERVICE_PACK_GROUP_NAME, "type", &error_local);
+ if (type == NULL) {
+ *error = g_error_new (1, 0, "failed to get type: %s", error_local->message);
+ g_error_free (error_local);
+ ret = FALSE;
+ goto out;
+ }
+
+ /* check the types we support */
+ if (!egg_strequal (type, "update") && !egg_strequal (type, "install")) {
+ *error = g_error_new (1, 0, "does not have correct type key: %s", type);
+ ret = FALSE;
goto out;
}
@@ -135,9 +160,12 @@ pk_service_pack_check_metadata_file (const gchar *full_path)
/* do we match? */
ret = egg_strequal (distro_id_us, distro_id);
+ if (!ret)
+ *error = g_error_new (1, 0, "distro id did not match %s == %s", distro_id_us, distro_id);
out:
g_key_file_free (file);
+ g_free (type);
g_free (distro_id);
g_free (distro_id_us);
return ret;
@@ -338,10 +366,11 @@ pk_service_pack_check_valid (PkServicePack *pack, GError **error)
while ((filename_entry = g_dir_read_name (dir))) {
metafile = g_build_filename (directory, filename_entry, NULL);
if (egg_strequal (filename_entry, "metadata.conf")) {
- ret = pk_service_pack_check_metadata_file (metafile);
+ ret = pk_service_pack_check_metadata_file (metafile, &error_local);
if (!ret) {
*error = g_error_new (PK_SERVICE_PACK_ERROR, PK_SERVICE_PACK_ERROR_NOT_COMPATIBLE,
- "Service Pack %s not compatible with your distro", pack->priv->filename);
+ "Service Pack %s not compatible with your distro: %s", pack->priv->filename, error_local->message);
+ g_error_free (error_local);
ret = FALSE;
goto out;
}
@@ -481,7 +510,7 @@ pk_service_pack_exclude_packages (PkServicePack *pack, PkPackageList *list)
* pk_service_pack_create_metadata_file:
**/
static gboolean
-pk_service_pack_create_metadata_file (const gchar *filename)
+pk_service_pack_create_metadata_file (PkServicePack *pack, const gchar *filename)
{
gboolean ret = FALSE;
gchar *distro_id = NULL;
@@ -490,7 +519,9 @@ pk_service_pack_create_metadata_file (const gchar *filename)
GKeyFile *file = NULL;
gchar *data = NULL;
+ g_return_val_if_fail (PK_IS_SERVICE_PACK (pack), FALSE);
g_return_val_if_fail (filename != NULL, FALSE);
+ g_return_val_if_fail (pack->priv->type != PK_SERVICE_PACK_TYPE_UNKNOWN, FALSE);
file = g_key_file_new ();
@@ -505,6 +536,11 @@ pk_service_pack_create_metadata_file (const gchar *filename)
g_key_file_set_string (file, PK_SERVICE_PACK_GROUP_NAME, "distro_id", distro_id);
g_key_file_set_string (file, PK_SERVICE_PACK_GROUP_NAME, "created", iso_time);
+ if (pack->priv->type == PK_SERVICE_PACK_TYPE_INSTALL)
+ g_key_file_set_string (file, PK_SERVICE_PACK_GROUP_NAME, "type", "install");
+ else if (pack->priv->type == PK_SERVICE_PACK_TYPE_UPDATE)
+ g_key_file_set_string (file, PK_SERVICE_PACK_GROUP_NAME, "type", "update");
+
/* convert to text */
data = g_key_file_to_data (file, NULL, &error);
if (data == NULL) {
@@ -618,7 +654,7 @@ pk_service_pack_create_from_files (PkServicePack *pack, GPtrArray *file_array, G
/* create a file with metadata in it */
filename = g_build_filename (g_get_tmp_dir (), "metadata.conf", NULL);
- ret = pk_service_pack_create_metadata_file (filename);
+ ret = pk_service_pack_create_metadata_file (pack, filename);
if (!ret) {
*error = g_error_new (PK_SERVICE_PACK_ERROR, PK_SERVICE_PACK_ERROR_FAILED_CREATE,
"failed to generate metadata file %s", filename);
@@ -751,17 +787,10 @@ pk_service_pack_setup_client (PkServicePack *pack)
}
/**
- * pk_service_pack_create_for_package_ids:
- * @pack: a valid #PkServicePack instance
- * @package_ids: A list of package_ids to download
- * @error: a %GError to put the error code and message in, or %NULL
- *
- * Adds the packages specified to a service pack.
- *
- * Return value: %TRUE if the service pack was created successfully
+ * pk_service_pack_create_for_package_ids_internal:
**/
-gboolean
-pk_service_pack_create_for_package_ids (PkServicePack *pack, gchar **package_ids, GError **error)
+static gboolean
+pk_service_pack_create_for_package_ids_internal (PkServicePack *pack, gchar **package_ids, GError **error)
{
gchar **package_ids_deps = NULL;
PkPackageList *list = NULL;
@@ -818,6 +847,7 @@ pk_service_pack_create_for_package_ids (PkServicePack *pack, gchar **package_ids
/* list deps */
length = pk_package_list_get_size (list);
+ g_print ("Downloading %i packages for dependencies.\n", length);
for (i=0; i<length; i++) {
obj = pk_package_list_get_obj (list, i);
text = pk_package_obj_to_string (obj);
@@ -869,6 +899,25 @@ out:
}
/**
+ * pk_service_pack_create_for_package_ids:
+ * @pack: a valid #PkServicePack instance
+ * @package_ids: A list of package_ids to download
+ * @error: a %GError to put the error code and message in, or %NULL
+ *
+ * Adds the packages specified to a service pack.
+ *
+ * Return value: %TRUE if the service pack was created successfully
+ **/
+gboolean
+pk_service_pack_create_for_package_ids (PkServicePack *pack, gchar **package_ids, GError **error)
+{
+ g_return_val_if_fail (PK_IS_SERVICE_PACK (pack), FALSE);
+
+ pack->priv->type = PK_SERVICE_PACK_TYPE_INSTALL;
+ return pk_service_pack_create_for_package_ids_internal (pack, package_ids, error);
+}
+
+/**
* pk_service_pack_create_for_package_id:
* @pack: a valid #PkServicePack instance
* @package_id: A single package_id to download
@@ -891,7 +940,8 @@ pk_service_pack_create_for_package_id (PkServicePack *pack, const gchar *package
g_return_val_if_fail (pack->priv->directory != NULL, FALSE);
package_ids = pk_package_ids_from_id (package_id);
- ret = pk_service_pack_create_for_package_ids (pack, package_ids, error);
+ pack->priv->type = PK_SERVICE_PACK_TYPE_INSTALL;
+ ret = pk_service_pack_create_for_package_ids_internal (pack, package_ids, error);
g_strfreev (package_ids);
return ret;
}
@@ -954,7 +1004,9 @@ pk_service_pack_create_for_updates (PkServicePack *pack, GError **error)
package_ids = pk_package_list_to_strv (list);
g_object_unref (list);
- ret = pk_service_pack_create_for_package_ids (pack, package_ids, error);
+
+ pack->priv->type = PK_SERVICE_PACK_TYPE_UPDATE;
+ ret = pk_service_pack_create_for_package_ids_internal (pack, package_ids, error);
out:
g_strfreev (package_ids);
return ret;
@@ -1032,10 +1084,12 @@ pk_service_pack_init (PkServicePack *pack)
pack->priv->exclude_list = NULL;
pack->priv->filename = NULL;
pack->priv->directory = NULL;
+ pack->priv->type = PK_SERVICE_PACK_TYPE_UNKNOWN;
}
/**
* pk_service_pack_new:
+ *
* Return value: A new service_pack class instance.
**/
PkServicePack *
commit c5b8682ed2a006260a6bc8e26ee146901901300c
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Oct 23 15:42:00 2008 +0100
trivial: fix up the session and system examples for the new api and library names
diff --git a/docs/html/files/session.c b/docs/html/files/session.c
index cfdb1a6..a445ba1 100644
--- a/docs/html/files/session.c
+++ b/docs/html/files/session.c
@@ -10,6 +10,8 @@ main (int argc, char *argv[])
DBusGProxy *proxy;
GError *error = NULL;
gboolean ret;
+ guint32 xid = 0;
+ guint32 timestamp = 0;
/* init the types system */
g_type_init ();
@@ -25,6 +27,8 @@ main (int argc, char *argv[])
/* execute sync method */
ret = dbus_g_proxy_call (proxy, "InstallPackageName", &error,
+ G_TYPE_UINT, xid, /* window xid, 0 for none */
+ G_TYPE_UINT, timestamp, /* action timestamp,, 0 for unknown */
G_TYPE_STRING, "openoffice-clipart",
G_TYPE_INVALID, G_TYPE_INVALID);
if (!ret) {
diff --git a/docs/html/files/system.c b/docs/html/files/system.c
index 47b499f..7b95998 100644
--- a/docs/html/files/system.c
+++ b/docs/html/files/system.c
@@ -1,6 +1,4 @@
-#include <pk-enum.h>
-#include <pk-client.h>
-#include <pk-control.h>
+#include <packagekit-glib/packagekit.h>
/**
* main:
@@ -16,15 +14,15 @@ main (int argc, char *argv[])
PkPackageList *list = NULL;
PkControl *control = NULL;
PkClient *client = NULL;
- PkRoleEnum roles;
+ PkBitfield roles;
/* init the types system */
g_type_init ();
/* find out if we can do GetUpdates */
control = pk_control_new ();
- roles = pk_control_get_actions (control);
- if (!pk_enums_contain (roles, PK_ROLE_ENUM_GET_UPDATES)) {
+ roles = pk_control_get_actions (control, NULL);
+ if (!pk_bitfield_contain (roles, PK_ROLE_ENUM_GET_UPDATES)) {
g_warning ("Backend does not support GetUpdates()");
goto out;
}
diff --git a/docs/html/pk-faq.html b/docs/html/pk-faq.html
index 4514595..33cb51c 100644
--- a/docs/html/pk-faq.html
+++ b/docs/html/pk-faq.html
@@ -214,7 +214,7 @@ Compile with:
</p>
<pre>
gcc -o session -Wall session.c `pkg-config --cflags --libs dbus-glib-1`
-gcc -o system -Wall system.c `pkg-config --cflags --libs packagekit`
+gcc -o system -Wall system.c `pkg-config --cflags --libs packagekit-glib`
</pre>
<hr>
diff --git a/lib/packagekit-glib/egg-test.c b/lib/packagekit-glib/egg-test.c
index ef7df8e..bba2cce 100644
--- a/lib/packagekit-glib/egg-test.c
+++ b/lib/packagekit-glib/egg-test.c
@@ -167,7 +167,7 @@ egg_test_elapsed (EggTest *test)
gboolean
egg_test_start (EggTest *test, const gchar *name)
{
- if (test->started == TRUE) {
+ if (test->started) {
g_print ("Not ended test! Cannot start!\n");
exit (1);
}
commit a28fb22557de49dae171def0f4e1f3a44ab1ba54
Author: PabloMartin-Gomez <pablo.martin-gomez at laposte.net>
Date: Thu Oct 23 11:29:24 2008 +0000
Correcting two fuzzy in French translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/fr.po b/po/fr.po
index 61858a8..659cd11 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -9,7 +9,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PackageKit HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-22 11:10+0100\n"
+"POT-Creation-Date: 2008-10-21 13:41+0000\n"
"PO-Revision-Date: 2008-10-21 20:12+0200\n"
"Last-Translator: Pablo Martin-Gomez <pablo.martin-gomez at laposte.net>\n"
"Language-Team: Français <fedora-trans-fr at redhat.com>\n"
@@ -40,7 +40,7 @@ msgstr "Veuillez redémarrer l'application car elle est en cours d'utilisation"
#: ../client/pk-console.c:579
#, fuzzy, c-format
msgid "The package '%s' is already installed"
-msgstr "Le paquet « %s » n'a pas pu être installé : %s"
+msgstr "Le paquet « %s » est déjà installé"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:587
@@ -197,7 +197,6 @@ msgstr "Signature du dépôt nécessaire"
#. TRANSLATORS: This a prompt asking the user to import the security key
#: ../client/pk-console.c:1181
-#, fuzzy
msgid "Do you accept this signature?"
msgstr "Acceptez-vous cette signature ?"
@@ -435,7 +434,6 @@ msgstr "Contrôleur PackageKit"
#. TRANSLATORS: The package was not found in any software sources
#: ../client/pk-tools-common.c:108
-#, c-format
msgid "The package could not be found"
msgstr "Le paquet n'a pas pu être trouvé"
@@ -519,97 +517,6 @@ msgstr "Service Pack PackageKit"
msgid "PackageKit Package List"
msgstr "Liste des paquets de PackageKit"
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr "Accepter la licence du logiciel"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr "Authentification requise pour accepter une licence"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid "Authentication is required to change software source parameters"
-msgstr "Authentification requise pour changer les dépôts de logiciels"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-#, fuzzy
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr "Authentification requise pour mettre à jour la liste des paquets"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-#, fuzzy
-msgid "Authentication is required to install a signed package"
-msgstr "Authentification requise pour installer un paquet"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-#, fuzzy
-msgid "Authentication is required to install an untrusted package"
-msgstr "Authentification requise pour installer un paquet"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-#, fuzzy
-msgid "Authentication is required to refresh the system sources"
-msgstr "Authentification requise pour mettre à jour la liste des paquets"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to remove packages"
-msgstr "Authentification requise pour désinstaller des paquets"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to rollback a transaction"
-msgstr "Authentification requise pour annuler une transaction"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-#, fuzzy
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr "Authentification requise pour désinstaller des paquets"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to update packages"
-msgstr "Authentification requise pour mettre à jour des paquets"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Change software source parameters"
-msgstr "Modifier les dépôts de logiciels"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Install local file"
-msgstr "Installer un fichier local"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-#, fuzzy
-msgid "Install untrusted local file"
-msgstr "Installer un fichier local"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Remove package"
-msgstr "Supprimer un paquet"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Rollback to a previous transaction"
-msgstr "Restauration"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-#, fuzzy
-msgid "Update packages"
-msgstr "Mettre à jour le paquet"
-
#: ../src/pk-main.c:85
msgid "Startup failed due to security policies on this machine."
msgstr "Les règles de sécurité de ce système empêchent le démarrage."
@@ -681,6 +588,68 @@ msgstr "Impossible de démarrer : %s\n"
#~ msgid "You need to specify a time term"
#~ msgstr "Vous devez indiquer une date"
+#~ msgid "Accept EULA"
+#~ msgstr "Accepter la licence du logiciel"
+
+#~ msgid "Authentication is required to accept a EULA"
+#~ msgstr "Authentification requise pour accepter une licence"
+
+#~ msgid "Authentication is required to change software source parameters"
+#~ msgstr "Authentification requise pour changer les dépôts de logiciels"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to consider a key used for signing packages as "
+#~ "trusted"
+#~ msgstr "Authentification requise pour mettre à jour la liste des paquets"
+
+#, fuzzy
+#~ msgid "Authentication is required to install a signed package"
+#~ msgstr "Authentification requise pour installer un paquet"
+
+#, fuzzy
+#~ msgid "Authentication is required to install an untrusted package"
+#~ msgstr "Authentification requise pour installer un paquet"
+
+#, fuzzy
+#~ msgid "Authentication is required to refresh the system sources"
+#~ msgstr "Authentification requise pour mettre à jour la liste des paquets"
+
+#~ msgid "Authentication is required to remove packages"
+#~ msgstr "Authentification requise pour désinstaller des paquets"
+
+#~ msgid "Authentication is required to rollback a transaction"
+#~ msgstr "Authentification requise pour annuler une transaction"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to set the network proxy used for downloading "
+#~ "packages"
+#~ msgstr "Authentification requise pour désinstaller des paquets"
+
+#~ msgid "Authentication is required to update packages"
+#~ msgstr "Authentification requise pour mettre à jour des paquets"
+
+#~ msgid "Change software source parameters"
+#~ msgstr "Modifier les dépôts de logiciels"
+
+#~ msgid "Install local file"
+#~ msgstr "Installer un fichier local"
+
+#, fuzzy
+#~ msgid "Install untrusted local file"
+#~ msgstr "Installer un fichier local"
+
+#~ msgid "Remove package"
+#~ msgstr "Supprimer un paquet"
+
+#~ msgid "Rollback to a previous transaction"
+#~ msgstr "Restauration"
+
+#, fuzzy
+#~ msgid "Update packages"
+#~ msgstr "Mettre à jour le paquet"
+
#~ msgid "Update detail"
#~ msgstr "Détails de mise à jour"
@@ -766,3 +735,4 @@ msgstr "Impossible de démarrer : %s\n"
#~ msgid "You need to specify a package to find the description for"
#~ msgstr "Vous devez indiquer un paquet dont vous souhaitez la description"
+
commit 85afc2b5cc7e68c8184ae4ca7df4e1d7ed1d5258
Author: Richard Hughes <richard at hughsie.com>
Date: Thu Oct 23 12:08:50 2008 +0100
bugfix: don't reuse a variable to check for installed, else we fail the resolve in pkcon
diff --git a/client/pk-console.c b/client/pk-console.c
index 78ff544..8a0af52 100644
--- a/client/pk-console.c
+++ b/client/pk-console.c
@@ -553,6 +553,7 @@ static gboolean
pk_console_install_stuff (PkClient *client, gchar **packages, GError **error)
{
gboolean ret = TRUE;
+ gboolean installed;
gboolean is_local;
gchar *package_id = NULL;
gchar **package_ids = NULL;
@@ -573,8 +574,8 @@ pk_console_install_stuff (PkClient *client, gchar **packages, GError **error)
g_ptr_array_add (array_files, g_strdup (packages[i]));
} else {
/* if already installed, then abort */
- ret = pk_console_is_installed (packages[i]);
- if (ret) {
+ installed = pk_console_is_installed (packages[i]);
+ if (installed) {
/* TRANSLATORS: The package is already installed on the system */
*error = g_error_new (1, 0, _("The package '%s' is already installed"), packages[i]);
ret = FALSE;
commit b762e12b7da02883fba195617da4648ddbecd1a3
Author: Scott Reeves <sreeves at novell.com>
Date: Wed Oct 22 19:26:59 2008 -0600
update includes to match the new header layout
diff --git a/backends/zypp/zypp-utils.cpp b/backends/zypp/zypp-utils.cpp
index 2097053..40c9b93 100644
--- a/backends/zypp/zypp-utils.cpp
+++ b/backends/zypp/zypp-utils.cpp
@@ -53,7 +53,7 @@
#include <zypp/base/Logger.h>
#include <pk-backend.h>
-#include <pk-package-ids.h>
+#include <packagekit-glib/packagekit.h>
#include "zypp-utils.h"
commit c1c888fa2bac0dfbcfacb42f14db4c96e40a8d54
Author: Igor Miletic <grejigl-gnomeprevod at yahoo.ca>
Date: Wed Oct 22 16:34:31 2008 +0000
Spelling corrections for sr at latin
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/sr at latin.po b/po/sr at latin.po
index 3902966..a6808ba 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-22 11:10+0100\n"
-"PO-Revision-Date: 2008-10-22 01:01-0400\n"
+"POT-Creation-Date: 2008-10-22 13:38+0000\n"
+"PO-Revision-Date: 2008-10-22 12:31-0400\n"
"Last-Translator: Goran Rakić <grakic at devbase.net>\n"
"Language-Team: Serbian (sr) <gnom at prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -40,13 +40,13 @@ msgstr "Neophodno je ponovno pokretanje programa"
#: ../client/pk-console.c:579
#, c-format
msgid "The package '%s' is already installed"
-msgstr "paket „%s“ je već instaliran"
+msgstr "Paket „%s“ je već instaliran"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:587
#, c-format
msgid "The package '%s' could not be installed: %s"
-msgstr "Paket „%s“ se nije moga instalirati: %s"
+msgstr "Paket „%s“ se nije mogao instalirati: %s"
#. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
#: ../client/pk-console.c:612 ../client/pk-console.c:639
@@ -55,7 +55,7 @@ msgstr "Paket „%s“ se nije moga instalirati: %s"
#: ../client/pk-tools-common.c:81
#, c-format
msgid "Internal error: %s"
-msgstr "Unutrašnje greška: %s"
+msgstr "Unutrašnja greška: %s"
#. TRANSLATORS: There was an error installing the packages. The detailed error follows
#: ../client/pk-console.c:620
@@ -79,13 +79,13 @@ msgstr "Ova alaka nije mogla ukloniti „%s“: %s"
#: ../client/pk-console.c:726 ../client/pk-console.c:797
#, c-format
msgid "This tool could not remove the packages: %s"
-msgstr "Ova alatka nije mogla izbaciti pakete: %s"
+msgstr "Ova alatka nije mogla ukloniti pakete: %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
#: ../client/pk-console.c:764
#, c-format
msgid "This tool could not remove the packages: '%s'"
-msgstr "Ova alatka nije mogla izbaciti pakete: „%s“"
+msgstr "Ova alatka nije mogla ukloniti pakete: „%s“"
#. TRANSLATORS: When removing, we might have to remove other dependencies
#: ../client/pk-console.c:776
@@ -124,7 +124,7 @@ msgstr "Ova alatka nije mogla ažurirati „%s“: %s"
#: ../client/pk-console.c:918 ../client/pk-console.c:926
#, c-format
msgid "This tool could not get the requirements for '%s': %s"
-msgstr "Ova alatka nije mogla dobaviti zahteve za „%s“: %s"
+msgstr "Ova alatka nije mogla srediti sve uslove za „%s“: %s"
#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
#: ../client/pk-console.c:948 ../client/pk-console.c:956
@@ -189,19 +189,18 @@ msgstr "Potpis riznice je obavezan"
#. TRANSLATORS: This a prompt asking the user to import the security key
#: ../client/pk-console.c:1181
-#, fuzzy
msgid "Do you accept this signature?"
msgstr "Prihvatate li ovaj potpis?"
#. TRANSLATORS: This is where the user declined the security key
#: ../client/pk-console.c:1185
msgid "The signature was not accepted."
-msgstr "Ovaj potpis nije prihvaćen"
+msgstr "Ovaj potpis nije prihvaćen."
#. TRANSLATORS: This a request for a EULA
#: ../client/pk-console.c:1219
msgid "End user license agreement required"
-msgstr "Licenci dogovor sa krajnjim korisnikog je obavezan"
+msgstr "Licenci dogovor sa krajnjim korisnikom je obavezan"
#. TRANSLATORS: This a prompt asking the user to agree to the license
#: ../client/pk-console.c:1226
@@ -211,7 +210,7 @@ msgstr "Slažete li se sa ovom licencom?"
#. TRANSLATORS: This is where the user declined the license
#: ../client/pk-console.c:1230
msgid "The license was refused."
-msgstr "Licenca je odbijena"
+msgstr "Licenca je odbijena."
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
#: ../client/pk-console.c:1259
@@ -225,7 +224,7 @@ msgstr "Tekstualno suÄelje programa PaketKit"
#: ../client/pk-console.c:1312
msgid "Subcommands:"
-msgstr "Komande:"
+msgstr "Naredbe:"
#: ../client/pk-console.c:1403 ../client/pk-generate-pack.c:138
#: ../client/pk-monitor.c:115 ../src/pk-main.c:196
@@ -238,7 +237,7 @@ msgstr "Prikaži verziju programa i završi rad"
#: ../client/pk-console.c:1407
msgid "Set the filter, e.g. installed"
-msgstr "Postavi filter, npr. instalirani"
+msgstr "Namesti filter, npr. instalirani"
#: ../client/pk-console.c:1409
msgid "Exit without waiting for actions to complete"
@@ -251,26 +250,26 @@ msgstr "Ne mogu da se povežem na sistemsku komunikacionu magistralu (DBUS)."
#: ../client/pk-console.c:1526
msgid "You need to specify a search type, e.g. name"
-msgstr "Moraš navesti vrstu pretrage, npr. ime"
+msgstr "Morate navesti vrstu pretrage, npr. ime"
#: ../client/pk-console.c:1531 ../client/pk-console.c:1538
#: ../client/pk-console.c:1545 ../client/pk-console.c:1552
#: ../client/pk-console.c:1663 ../client/pk-console.c:1673
#: ../client/pk-console.c:1680 ../client/pk-console.c:1687
msgid "You need to specify a search term"
-msgstr "Moraš navesti uslov pretrage"
+msgstr "Morate navesti tremin za pretragu"
#: ../client/pk-console.c:1557
msgid "Invalid search type"
-msgstr "Neispravan tip pretrage"
+msgstr "Neispravana vrsta pretrage"
#: ../client/pk-console.c:1562
msgid "You need to specify a package or file to install"
-msgstr "Moraš navesti paket ili datoteku za instaliranje"
+msgstr "Morate navesti paket ili datoteku za instalaciju"
#: ../client/pk-console.c:1569
msgid "You need to specify a type, key_id and package_id"
-msgstr "Moraš navesti tip, key_id i package_id"
+msgstr "MoraÅ¡ navesti vrstu, IB kljuÄa i IB paketa (key_id i package_id)"
#: ../client/pk-console.c:1576
msgid "You need to specify a package to remove"
@@ -280,8 +279,7 @@ msgstr "Moraš navesti paket za uklanjanje"
msgid ""
"You need to specify the destination directory and then the packages to "
"download"
-msgstr ""
-"Morate navesti odredišni direktorijum pa tek onda pakete za preuzimanje"
+msgstr "Morate navesti odredišni direktorijum pa tek onda pakete za preuzimanje"
#: ../client/pk-console.c:1587
msgid "Directory not found"
@@ -293,7 +291,7 @@ msgstr "Morete navesti broj licence (eula-id)"
#: ../client/pk-console.c:1609
msgid "You need to specify a package name to resolve"
-msgstr "Moraš navesti ime paketa za upit"
+msgstr "Morate navesti ime paketa za upit"
#: ../client/pk-console.c:1618 ../client/pk-console.c:1625
msgid "You need to specify a repository name"
@@ -301,15 +299,15 @@ msgstr "Morate navesti ime riznice"
#: ../client/pk-console.c:1632
msgid "You need to specify a repo name/parameter and value"
-msgstr "Moraš navesti ime ili parametar skladišta i vrednost"
+msgstr "Morate navesti ime ili parametar riznice i vrednost"
#: ../client/pk-console.c:1645
msgid "You need to specify an action, e.g. 'update-system'"
-msgstr "Morate navesi radnju, npr. „ažuriranje sistema“"
+msgstr "Morate navesti radnju, npr. „ažuriranje sistema“"
#: ../client/pk-console.c:1650
msgid "You need to specify a correct role"
-msgstr "Moraš navesti ispravnu ulogu"
+msgstr "Morate navesti ispravnu ulogu"
#: ../client/pk-console.c:1655
msgid "Failed to get last time"
@@ -317,11 +315,11 @@ msgstr "Neuspeo pokušaj dobavljanja poslednjeg vremena"
#: ../client/pk-console.c:1694
msgid "You need to specify a package to find the details for"
-msgstr "Morate navesti ime paketa za prikaz liste datoteka"
+msgstr "Morate navesti ime paketa za prikaz detalja datoteka"
#: ../client/pk-console.c:1701
msgid "You need to specify a package to find the files for"
-msgstr "Moraš navesti ime paketa za prikaz liste datoteka"
+msgstr "Morate navesti ime paketa za prikaz spiska datoteka"
#. TRANSLATORS: The user tried to use an unsupported option on the command line
#: ../client/pk-console.c:1754
@@ -332,12 +330,12 @@ msgstr "Opcija „%s“ nije podržana"
#. TRANSLATORS: User does not have permission to do this
#: ../client/pk-console.c:1767
msgid "You don't have the necessary privileges for this operation"
-msgstr "Nemaš neophodne privilegije za ovu operaciju"
+msgstr "Nemaš neophodne ovlašćenja za ovu operaciju"
#. TRANSLATORS: Generic failure of what they asked to do
#: ../client/pk-console.c:1770
msgid "Command failed"
-msgstr "Komanda nije uspela"
+msgstr "Naredba nije uspela"
#. TRANSLATORS: This is the state of the transaction
#: ../client/pk-generate-pack.c:96
@@ -411,7 +409,7 @@ msgstr "Pravim servisnu grupu..."
#: ../client/pk-generate-pack.c:267
#, c-format
msgid "Service pack created '%s'"
-msgstr "Servisna grupa napravljena.„%s“"
+msgstr "Servisna grupa je napravljena.„%s“"
#. TRANSLATORS: we failed to make te file
#: ../client/pk-generate-pack.c:271
@@ -425,7 +423,6 @@ msgstr "PaketKit redar"
#. TRANSLATORS: The package was not found in any software sources
#: ../client/pk-tools-common.c:108
-#, c-format
msgid "The package could not be found"
msgstr "Paket nije nađen"
@@ -447,7 +444,7 @@ msgstr "Unesi broj između 1 i %i: "
#. TRANSLATORS: when we are getting data from the daemon
#: ../contrib/packagekit-plugin/src/contents.cpp:299
msgid "Getting package information..."
-msgstr "Dobavljam informacije o paketu...."
+msgstr "Dobavljam podatke o paketu...."
#. TRANSLATORS: run an applicaiton
#: ../contrib/packagekit-plugin/src/contents.cpp:305
@@ -509,100 +506,9 @@ msgstr "Servis PaketKita"
msgid "PackageKit Package List"
msgstr "PaketKit spiak paketa"
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr "Prihvati licencu"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr "Neophodna je autentifikacija za prihvatnje licence"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid "Authentication is required to change software source parameters"
-msgstr "Neophodna je autentifikacija za izmenu postavki skladišta softvera"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-#, fuzzy
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr "Neophodna je autentifikacija za osvežavanje liste paketa"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-#, fuzzy
-msgid "Authentication is required to install a signed package"
-msgstr "Neophodna je autentifikacija za instaliranje paketa"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-#, fuzzy
-msgid "Authentication is required to install an untrusted package"
-msgstr "Neophodna je autentifikacija za instaliranje paketa"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-#, fuzzy
-msgid "Authentication is required to refresh the system sources"
-msgstr "Neophodna je autentifikacija za osvežavanje liste paketa"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to remove packages"
-msgstr "Neophodna je autentifikacija za uklanjanje paketa"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to rollback a transaction"
-msgstr "Neophodna je autentifikacija za poništavanje sve-ili-ništa promena"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-#, fuzzy
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr "Neophodna je autentifikacija za uklanjanje paketa"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to update packages"
-msgstr "Neophodna je autentifikacija za nadogradnju paketa"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Change software source parameters"
-msgstr "Promeni postavke skladišta softvera"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Install local file"
-msgstr "Instaliraj lokalnu datoteku"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-#, fuzzy
-msgid "Install untrusted local file"
-msgstr "Instaliraj lokalnu datoteku"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Remove package"
-msgstr "Ukloni paket"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Rollback to a previous transaction"
-msgstr "Vrati se na stanje prethodne promene"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-#, fuzzy
-msgid "Update packages"
-msgstr "Nadogradi paket"
-
#: ../src/pk-main.c:85
msgid "Startup failed due to security policies on this machine."
-msgstr "Pokretanje nije uspelo usled sistemske sigurnosne politike."
+msgstr "Pokretanje nije uspelo usled sistemske bezbednosne polise."
#: ../src/pk-main.c:86
msgid "This can happen for two reasons:"
@@ -626,7 +532,7 @@ msgstr "Pozadinski sistem u upotrebi, npr. „dummy“ (probni)"
#: ../src/pk-main.c:194
msgid "Daemonize and detach from the terminal"
-msgstr "Odvoji od terminala i nastavi rad kao uslužni"
+msgstr "Odvoji od terminala i nastavi rad kao uslužni program"
#: ../src/pk-main.c:198
msgid "Disable the idle timer"
@@ -638,7 +544,7 @@ msgstr "Prikaži verziju i završi rad"
#: ../src/pk-main.c:202
msgid "Exit after a small delay"
-msgstr "SaÄekaj malo i zavrÅ¡i rad"
+msgstr "Izađi posle kratke zadrške"
#: ../src/pk-main.c:204
msgid "Exit after the engine has loaded"
@@ -657,6 +563,68 @@ msgstr "Ne mogu da se povežem na sistemsku magistralu"
msgid "Error trying to start: %s\n"
msgstr "Greška pri pokretanju: %s\n"
+#~ msgid "Accept EULA"
+#~ msgstr "Prihvati licencu"
+
+#~ msgid "Authentication is required to accept a EULA"
+#~ msgstr "Neophodna je autentifikacija za prihvatnje licence"
+
+#~ msgid "Authentication is required to change software source parameters"
+#~ msgstr "Neophodna je autentifikacija za izmenu postavki skladišta softvera"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to consider a key used for signing packages as "
+#~ "trusted"
+#~ msgstr "Neophodna je autentifikacija za osvežavanje liste paketa"
+
+#, fuzzy
+#~ msgid "Authentication is required to install a signed package"
+#~ msgstr "Neophodna je autentifikacija za instaliranje paketa"
+
+#, fuzzy
+#~ msgid "Authentication is required to install an untrusted package"
+#~ msgstr "Neophodna je autentifikacija za instaliranje paketa"
+
+#, fuzzy
+#~ msgid "Authentication is required to refresh the system sources"
+#~ msgstr "Neophodna je autentifikacija za osvežavanje liste paketa"
+
+#~ msgid "Authentication is required to remove packages"
+#~ msgstr "Neophodna je autentifikacija za uklanjanje paketa"
+
+#~ msgid "Authentication is required to rollback a transaction"
+#~ msgstr "Neophodna je autentifikacija za poništavanje sve-ili-ništa promena"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to set the network proxy used for downloading "
+#~ "packages"
+#~ msgstr "Neophodna je autentifikacija za uklanjanje paketa"
+
+#~ msgid "Authentication is required to update packages"
+#~ msgstr "Neophodna je autentifikacija za nadogradnju paketa"
+
+#~ msgid "Change software source parameters"
+#~ msgstr "Promeni postavke skladišta softvera"
+
+#~ msgid "Install local file"
+#~ msgstr "Instaliraj lokalnu datoteku"
+
+#, fuzzy
+#~ msgid "Install untrusted local file"
+#~ msgstr "Instaliraj lokalnu datoteku"
+
+#~ msgid "Remove package"
+#~ msgstr "Ukloni paket"
+
+#~ msgid "Rollback to a previous transaction"
+#~ msgstr "Vrati se na stanje prethodne promene"
+
+#, fuzzy
+#~ msgid "Update packages"
+#~ msgstr "Nadogradi paket"
+
#~ msgid "Okay to import key?"
#~ msgstr "Da li je u redu da uvezem kljuÄ potpisa?"
@@ -726,8 +694,7 @@ msgstr "Greška pri pokretanju: %s\n"
#~ msgid "Authentication is required to install a security signature"
#~ msgstr ""
-#~ "Neophodna je autentifikacija za instaliranje sigurnosnog digitalnog "
-#~ "potpisa"
+#~ "Neophodna je autentifikacija za instaliranje sigurnosnog digitalnog potpisa"
#~ msgid "Authentication is required to update all packages"
#~ msgstr "Neophodna je autentifikacija za nadogradnju svih paketa"
commit 3b933516ad641856dd1774c9beb7fcb694252593
Author: Igor Miletic <grejigl-gnomeprevod at yahoo.ca>
Date: Wed Oct 22 16:33:24 2008 +0000
Spelling correction for sr.po
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/sr.po b/po/sr.po
index 1af8517..cb050fd 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: PackageKit\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-22 11:10+0100\n"
-"PO-Revision-Date: 2008-10-22 01:01-0400\n"
+"POT-Creation-Date: 2008-10-22 13:38+0000\n"
+"PO-Revision-Date: 2008-10-22 12:31-0400\n"
"Last-Translator: Горан Ракић <grakic at devbase.net>\n"
"Language-Team: Serbian (sr) <gnom at prevod.org>\n"
"MIME-Version: 1.0\n"
@@ -40,13 +40,13 @@ msgstr "Ðеопходно је поновно покретање програм
#: ../client/pk-console.c:579
#, c-format
msgid "The package '%s' is already installed"
-msgstr "paket „%s“ је већ инÑталиран"
+msgstr "Пакет „%s“ је већ инÑталиран"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:587
#, c-format
msgid "The package '%s' could not be installed: %s"
-msgstr "Пакет „%s“ Ñе није мога инÑталирати: %s"
+msgstr "Пакет „%s“ Ñе није могао инÑталирати: %s"
#. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
#: ../client/pk-console.c:612 ../client/pk-console.c:639
@@ -55,7 +55,7 @@ msgstr "Пакет „%s“ Ñе није мога инÑталирати: %s"
#: ../client/pk-tools-common.c:81
#, c-format
msgid "Internal error: %s"
-msgstr "Унутрашње грешка: %s"
+msgstr "Унутрашњa грешка: %s"
#. TRANSLATORS: There was an error installing the packages. The detailed error follows
#: ../client/pk-console.c:620
@@ -79,13 +79,13 @@ msgstr "Ова алака није могла уклонити „%s“: %s"
#: ../client/pk-console.c:726 ../client/pk-console.c:797
#, c-format
msgid "This tool could not remove the packages: %s"
-msgstr "Ова алатка није могла избацити пакете: %s"
+msgstr "Ова алатка није могла уклонити пакете: %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
#: ../client/pk-console.c:764
#, c-format
msgid "This tool could not remove the packages: '%s'"
-msgstr "Ова алатка није могла избацити пакете: „%s“"
+msgstr "Ова алатка није могла уклонити пакете: „%s“"
#. TRANSLATORS: When removing, we might have to remove other dependencies
#: ../client/pk-console.c:776
@@ -124,7 +124,7 @@ msgstr "Ова алатка није могла ажурирати „%s“: %s"
#: ../client/pk-console.c:918 ../client/pk-console.c:926
#, c-format
msgid "This tool could not get the requirements for '%s': %s"
-msgstr "Ова алатка није могла добавити захтеве за „%s“: %s"
+msgstr "Ова алатка није могла Ñредити Ñве уÑлове за „%s“: %s"
#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
#: ../client/pk-console.c:948 ../client/pk-console.c:956
@@ -189,19 +189,18 @@ msgstr "ÐŸÐ¾Ñ‚Ð¿Ð¸Ñ Ñ€Ð¸Ð·Ð½Ð¸Ñ†Ðµ је обавезан"
#. TRANSLATORS: This a prompt asking the user to import the security key
#: ../client/pk-console.c:1181
-#, fuzzy
msgid "Do you accept this signature?"
msgstr "Прихватате ли овај потпиÑ?"
#. TRANSLATORS: This is where the user declined the security key
#: ../client/pk-console.c:1185
msgid "The signature was not accepted."
-msgstr "Овај Ð¿Ð¾Ñ‚Ð¿Ð¸Ñ Ð½Ð¸Ñ˜Ðµ прихваћен"
+msgstr "Овај Ð¿Ð¾Ñ‚Ð¿Ð¸Ñ Ð½Ð¸Ñ˜Ðµ прихваћен."
#. TRANSLATORS: This a request for a EULA
#: ../client/pk-console.c:1219
msgid "End user license agreement required"
-msgstr "Лиценци договор Ñа крајњим кориÑниког је обавезан"
+msgstr "Лиценци договор Ñа крајњим кориÑником је обавезан"
#. TRANSLATORS: This a prompt asking the user to agree to the license
#: ../client/pk-console.c:1226
@@ -211,7 +210,7 @@ msgstr "Слажете ли Ñе Ñа овом лиценцом?"
#. TRANSLATORS: This is where the user declined the license
#: ../client/pk-console.c:1230
msgid "The license was refused."
-msgstr "Лиценца је одбијена"
+msgstr "Лиценца је одбијена."
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
#: ../client/pk-console.c:1259
@@ -225,7 +224,7 @@ msgstr "ТекÑтуално Ñучеље програма ПакетКит"
#: ../client/pk-console.c:1312
msgid "Subcommands:"
-msgstr "Команде:"
+msgstr "Ðаредбе:"
#: ../client/pk-console.c:1403 ../client/pk-generate-pack.c:138
#: ../client/pk-monitor.c:115 ../src/pk-main.c:196
@@ -238,7 +237,7 @@ msgstr "Прикажи верзију програма и заврши рад"
#: ../client/pk-console.c:1407
msgid "Set the filter, e.g. installed"
-msgstr "ПоÑтави филтер, нпр. инÑталирани"
+msgstr "ÐамеÑти филтер, нпр. инÑталирани"
#: ../client/pk-console.c:1409
msgid "Exit without waiting for actions to complete"
@@ -251,26 +250,26 @@ msgstr "Ðе могу да Ñе повежем на ÑиÑтемÑку комуÐ
#: ../client/pk-console.c:1526
msgid "You need to specify a search type, e.g. name"
-msgstr "Мораш навеÑти врÑту претраге, нпр. име"
+msgstr "Морате навеÑти врÑту претраге, нпр. име"
#: ../client/pk-console.c:1531 ../client/pk-console.c:1538
#: ../client/pk-console.c:1545 ../client/pk-console.c:1552
#: ../client/pk-console.c:1663 ../client/pk-console.c:1673
#: ../client/pk-console.c:1680 ../client/pk-console.c:1687
msgid "You need to specify a search term"
-msgstr "Мораш навеÑти уÑлов претраге"
+msgstr "Морате навеÑти тремин за претрагу"
#: ../client/pk-console.c:1557
msgid "Invalid search type"
-msgstr "ÐеиÑправан тип претраге"
+msgstr "ÐеиÑправана врÑта претраге"
#: ../client/pk-console.c:1562
msgid "You need to specify a package or file to install"
-msgstr "Мораш навеÑти пакет или датотеку за инÑталирање"
+msgstr "Морате навеÑти пакет или датотеку за инÑталацију"
#: ../client/pk-console.c:1569
msgid "You need to specify a type, key_id and package_id"
-msgstr "Мораш навеÑти тип, key_id и package_id"
+msgstr "Мораш навеÑти врÑту, ИБ кључа и ИБ пакета (key_id и package_id)"
#: ../client/pk-console.c:1576
msgid "You need to specify a package to remove"
@@ -292,7 +291,7 @@ msgstr "Морете навеÑти број лиценце (eula-id)"
#: ../client/pk-console.c:1609
msgid "You need to specify a package name to resolve"
-msgstr "Мораш навеÑти име пакета за упит"
+msgstr "Морате навеÑти име пакета за упит"
#: ../client/pk-console.c:1618 ../client/pk-console.c:1625
msgid "You need to specify a repository name"
@@ -300,15 +299,15 @@ msgstr "Морате навеÑти име ризнице"
#: ../client/pk-console.c:1632
msgid "You need to specify a repo name/parameter and value"
-msgstr "Мораш навеÑти име или параметар Ñкладишта и вредноÑÑ‚"
+msgstr "Морате навеÑти име или параметар ризнице и вредноÑÑ‚"
#: ../client/pk-console.c:1645
msgid "You need to specify an action, e.g. 'update-system'"
-msgstr "Морате навеÑи радњу, нпр. „ажурирање ÑиÑтема“"
+msgstr "Морате навеÑти радњу, нпр. „ажурирање ÑиÑтема“"
#: ../client/pk-console.c:1650
msgid "You need to specify a correct role"
-msgstr "Мораш навеÑти иÑправну улогу"
+msgstr "Морате навеÑти иÑправну улогу"
#: ../client/pk-console.c:1655
msgid "Failed to get last time"
@@ -316,11 +315,11 @@ msgstr "ÐеуÑпео покушај добављања поÑледњег вр
#: ../client/pk-console.c:1694
msgid "You need to specify a package to find the details for"
-msgstr "Морате навеÑти име пакета за приказ лиÑте датотека"
+msgstr "Морате навеÑти име пакета за приказ детаља датотека"
#: ../client/pk-console.c:1701
msgid "You need to specify a package to find the files for"
-msgstr "Мораш навеÑти име пакета за приказ лиÑте датотека"
+msgstr "Морате навеÑти име пакета за приказ ÑпиÑка датотека"
#. TRANSLATORS: The user tried to use an unsupported option on the command line
#: ../client/pk-console.c:1754
@@ -331,12 +330,12 @@ msgstr "Опција „%s“ није подржана"
#. TRANSLATORS: User does not have permission to do this
#: ../client/pk-console.c:1767
msgid "You don't have the necessary privileges for this operation"
-msgstr "Ðемаш неопходне привилегије за ову операцију"
+msgstr "Ðемаш неопходне овлашћења за ову операцију"
#. TRANSLATORS: Generic failure of what they asked to do
#: ../client/pk-console.c:1770
msgid "Command failed"
-msgstr "Команда није уÑпела"
+msgstr "Ðаредба није уÑпела"
#. TRANSLATORS: This is the state of the transaction
#: ../client/pk-generate-pack.c:96
@@ -410,7 +409,7 @@ msgstr "Правим ÑервиÑну групу..."
#: ../client/pk-generate-pack.c:267
#, c-format
msgid "Service pack created '%s'"
-msgstr "СервиÑна група направљена.„%s“"
+msgstr "СервиÑна група је направљена.„%s“"
#. TRANSLATORS: we failed to make te file
#: ../client/pk-generate-pack.c:271
@@ -424,7 +423,6 @@ msgstr "ПакетКит редар"
#. TRANSLATORS: The package was not found in any software sources
#: ../client/pk-tools-common.c:108
-#, c-format
msgid "The package could not be found"
msgstr "Пакет није нађен"
@@ -446,7 +444,7 @@ msgstr "УнеÑи број између 1 и %i: "
#. TRANSLATORS: when we are getting data from the daemon
#: ../contrib/packagekit-plugin/src/contents.cpp:299
msgid "Getting package information..."
-msgstr "Добављам информације о пакету...."
+msgstr "Добављам податке о пакету...."
#. TRANSLATORS: run an applicaiton
#: ../contrib/packagekit-plugin/src/contents.cpp:305
@@ -508,100 +506,9 @@ msgstr "Ð¡ÐµÑ€Ð²Ð¸Ñ ÐŸÐ°ÐºÐµÑ‚ÐšÐ¸Ñ‚Ð°"
msgid "PackageKit Package List"
msgstr "ПакетКит Ñпиак пакета"
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr "Прихвати лиценцу"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr "Ðеопходна је аутентификација за прихватње лиценце"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid "Authentication is required to change software source parameters"
-msgstr "Ðеопходна је аутентификација за измену поÑтавки Ñкладишта Ñофтвера"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-#, fuzzy
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr "Ðеопходна је аутентификација за оÑвежавање лиÑте пакета"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-#, fuzzy
-msgid "Authentication is required to install a signed package"
-msgstr "Ðеопходна је аутентификација за инÑталирање пакета"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-#, fuzzy
-msgid "Authentication is required to install an untrusted package"
-msgstr "Ðеопходна је аутентификација за инÑталирање пакета"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-#, fuzzy
-msgid "Authentication is required to refresh the system sources"
-msgstr "Ðеопходна је аутентификација за оÑвежавање лиÑте пакета"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to remove packages"
-msgstr "Ðеопходна је аутентификација за уклањање пакета"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to rollback a transaction"
-msgstr "Ðеопходна је аутентификација за поништавање Ñве-или-ништа промена"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-#, fuzzy
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr "Ðеопходна је аутентификација за уклањање пакета"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to update packages"
-msgstr "Ðеопходна је аутентификација за надоградњу пакета"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Change software source parameters"
-msgstr "Промени поÑтавке Ñкладишта Ñофтвера"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Install local file"
-msgstr "ИнÑталирај локалну датотеку"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-#, fuzzy
-msgid "Install untrusted local file"
-msgstr "ИнÑталирај локалну датотеку"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Remove package"
-msgstr "Уклони пакет"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Rollback to a previous transaction"
-msgstr "Врати Ñе на Ñтање претходне промене"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-#, fuzzy
-msgid "Update packages"
-msgstr "Ðадогради пакет"
-
#: ../src/pk-main.c:85
msgid "Startup failed due to security policies on this machine."
-msgstr "Покретање није уÑпело уÑлед ÑиÑтемÑке ÑигурноÑне политике."
+msgstr "Покретање није уÑпело уÑлед ÑиÑтемÑке безбедноÑне полиÑе."
#: ../src/pk-main.c:86
msgid "This can happen for two reasons:"
@@ -625,7 +532,7 @@ msgstr "ПозадинÑки ÑиÑтем у употреби, нпр. „dummyâ
#: ../src/pk-main.c:194
msgid "Daemonize and detach from the terminal"
-msgstr "Одвоји од терминала и наÑтави рад као уÑлужни"
+msgstr "Одвоји од терминала и наÑтави рад као уÑлужни програм"
#: ../src/pk-main.c:198
msgid "Disable the idle timer"
@@ -637,7 +544,7 @@ msgstr "Прикажи верзију и заврши рад"
#: ../src/pk-main.c:202
msgid "Exit after a small delay"
-msgstr "Сачекај мало и заврши рад"
+msgstr "Изађи поÑле кратке задршке"
#: ../src/pk-main.c:204
msgid "Exit after the engine has loaded"
@@ -656,6 +563,68 @@ msgstr "Ðе могу да Ñе повежем на ÑиÑтемÑку магиÑ
msgid "Error trying to start: %s\n"
msgstr "Грешка при покретању: %s\n"
+#~ msgid "Accept EULA"
+#~ msgstr "Прихвати лиценцу"
+
+#~ msgid "Authentication is required to accept a EULA"
+#~ msgstr "Ðеопходна је аутентификација за прихватње лиценце"
+
+#~ msgid "Authentication is required to change software source parameters"
+#~ msgstr "Ðеопходна је аутентификација за измену поÑтавки Ñкладишта Ñофтвера"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to consider a key used for signing packages as "
+#~ "trusted"
+#~ msgstr "Ðеопходна је аутентификација за оÑвежавање лиÑте пакета"
+
+#, fuzzy
+#~ msgid "Authentication is required to install a signed package"
+#~ msgstr "Ðеопходна је аутентификација за инÑталирање пакета"
+
+#, fuzzy
+#~ msgid "Authentication is required to install an untrusted package"
+#~ msgstr "Ðеопходна је аутентификација за инÑталирање пакета"
+
+#, fuzzy
+#~ msgid "Authentication is required to refresh the system sources"
+#~ msgstr "Ðеопходна је аутентификација за оÑвежавање лиÑте пакета"
+
+#~ msgid "Authentication is required to remove packages"
+#~ msgstr "Ðеопходна је аутентификација за уклањање пакета"
+
+#~ msgid "Authentication is required to rollback a transaction"
+#~ msgstr "Ðеопходна је аутентификација за поништавање Ñве-или-ништа промена"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to set the network proxy used for downloading "
+#~ "packages"
+#~ msgstr "Ðеопходна је аутентификација за уклањање пакета"
+
+#~ msgid "Authentication is required to update packages"
+#~ msgstr "Ðеопходна је аутентификација за надоградњу пакета"
+
+#~ msgid "Change software source parameters"
+#~ msgstr "Промени поÑтавке Ñкладишта Ñофтвера"
+
+#~ msgid "Install local file"
+#~ msgstr "ИнÑталирај локалну датотеку"
+
+#, fuzzy
+#~ msgid "Install untrusted local file"
+#~ msgstr "ИнÑталирај локалну датотеку"
+
+#~ msgid "Remove package"
+#~ msgstr "Уклони пакет"
+
+#~ msgid "Rollback to a previous transaction"
+#~ msgstr "Врати Ñе на Ñтање претходне промене"
+
+#, fuzzy
+#~ msgid "Update packages"
+#~ msgstr "Ðадогради пакет"
+
#~ msgid "Okay to import key?"
#~ msgstr "Да ли је у реду да увезем кључ потпиÑа?"
commit 6f84da13e1e40d655c35a800c156602508a65535
Author: Daniel Nylander <po at danielnylander.se>
Date: Wed Oct 22 15:59:43 2008 +0000
Updated Swedish translation
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/sv.po b/po/sv.po
index 7c9358c..46e0724 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: packagekit\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-10-22 11:10+0100\n"
-"PO-Revision-Date: 2008-10-21 09:47+0100\n"
+"POT-Creation-Date: 2008-10-22 13:38+0000\n"
+"PO-Revision-Date: 2008-10-22 17:58+0100\n"
"Last-Translator: Daniel Nylander <po at danielnylander.se>\n"
"Language-Team: Swedish <tp-sv at listor.tp-sv.se>\n"
"MIME-Version: 1.0\n"
@@ -18,152 +18,158 @@ msgstr ""
#. TRANSLATORS: this is a header for the package that can be updated
#: ../client/pk-console.c:271
msgid "Details about the update:"
-msgstr ""
+msgstr "Detaler om uppdateringen:"
#: ../client/pk-console.c:464
msgid "Please restart the computer to complete the update."
-msgstr ""
+msgstr "Starta om datorn för att färdigställa uppdateringen."
#: ../client/pk-console.c:466
msgid "Please logout and login to complete the update."
-msgstr ""
+msgstr "Logga ut och logga in igen för att färdigställa uppdateringen."
#: ../client/pk-console.c:468
msgid "Please restart the application as it is being used."
-msgstr ""
+msgstr "Starta om programmet eftersom det används för tillfället."
#. TRANSLATORS: The package is already installed on the system
#: ../client/pk-console.c:579
#, c-format
msgid "The package '%s' is already installed"
-msgstr ""
+msgstr "Paketet \"%s\" är redan installerat"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:587
#, c-format
msgid "The package '%s' could not be installed: %s"
-msgstr ""
+msgstr "Paketet \"%s\" kunde inte installeras: %s"
#. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
-#: ../client/pk-console.c:612 ../client/pk-console.c:639
-#: ../client/pk-console.c:735 ../client/pk-console.c:852
-#: ../client/pk-tools-common.c:55 ../client/pk-tools-common.c:74
+#: ../client/pk-console.c:612
+#: ../client/pk-console.c:639
+#: ../client/pk-console.c:735
+#: ../client/pk-console.c:852
+#: ../client/pk-tools-common.c:55
+#: ../client/pk-tools-common.c:74
#: ../client/pk-tools-common.c:81
#, c-format
msgid "Internal error: %s"
-msgstr ""
+msgstr "Internt fel: %s"
#. TRANSLATORS: There was an error installing the packages. The detailed error follows
#: ../client/pk-console.c:620
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not install the packages: %s"
-msgstr "Kunde inte hitta detaljer om detta paket"
+msgstr "Detta verktyg kunde inte installera paketen: %s"
#. TRANSLATORS: There was an error installing the files. The detailed error follows
#: ../client/pk-console.c:647
#, c-format
msgid "This tool could not install the files: %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte installera filerna: %s"
#. TRANSLATORS: The package name was not found in the installed list. The detailed error follows
#: ../client/pk-console.c:703
#, c-format
msgid "This tool could not remove '%s': %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte ta bort \"%s\": %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
-#: ../client/pk-console.c:726 ../client/pk-console.c:797
+#: ../client/pk-console.c:726
+#: ../client/pk-console.c:797
#, c-format
msgid "This tool could not remove the packages: %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte ta bort paketen: %s"
#. TRANSLATORS: There was an error removing the packages. The detailed error follows
#: ../client/pk-console.c:764
#, c-format
msgid "This tool could not remove the packages: '%s'"
-msgstr ""
+msgstr "Detta verktyg kunde inte ta bort paketen: \"%s\""
#. TRANSLATORS: When removing, we might have to remove other dependencies
#: ../client/pk-console.c:776
-#, fuzzy
msgid "The following packages have to be removed:"
-msgstr "Följande paket kommer att tas bort"
+msgstr "Följande paket måste tas bort:"
#. TRANSLATORS: We are checking if it's okay to remove a list of packages
#: ../client/pk-console.c:783
-#, fuzzy
msgid "Proceed removing additional packages?"
-msgstr "Ok att ta bort ytterligare paket?"
+msgstr "Fortsätt med att ta bort ytterligare paket?"
#. TRANSLATORS: We did not remove any packages
#: ../client/pk-console.c:788
msgid "The package removal was canceled!"
-msgstr ""
+msgstr "Paketborttagningen avbröts!"
#. TRANSLATORS: The package name was not found in any software sources
#: ../client/pk-console.c:829
#, c-format
msgid "This tool could not download the package '%s' as it could not be found"
-msgstr ""
+msgstr "Detta verktyg kunde inte hämta ner paketet \"%s\" eftersom det inte hittades"
#. TRANSLATORS: Could not download the packages for some reason. The detailed error follows
#: ../client/pk-console.c:860
#, c-format
msgid "This tool could not download the packages: %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte hämta ner paketen: %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:887 ../client/pk-console.c:896
+#: ../client/pk-console.c:887
+#: ../client/pk-console.c:896
#, c-format
msgid "This tool could not update '%s': %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte uppdatera \"%s\": %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
-#: ../client/pk-console.c:918 ../client/pk-console.c:926
+#: ../client/pk-console.c:918
+#: ../client/pk-console.c:926
#, c-format
msgid "This tool could not get the requirements for '%s': %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte få kraven för \"%s\": %s"
#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
-#: ../client/pk-console.c:948 ../client/pk-console.c:956
-#, fuzzy, c-format
+#: ../client/pk-console.c:948
+#: ../client/pk-console.c:956
+#, c-format
msgid "This tool could not get the dependencies for '%s': %s"
-msgstr "Kunde inte få beroenden för detta paket"
+msgstr "Detta verktyg kunde inte få beroenden för detta \"%s\": %s"
#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
-#: ../client/pk-console.c:978 ../client/pk-console.c:986
+#: ../client/pk-console.c:978
+#: ../client/pk-console.c:986
#, c-format
msgid "This tool could not get package details for '%s': %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte få paketdetaljerna för \"%s\": %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:1008
-#, fuzzy, c-format
+#, c-format
msgid "This tool could not find the files for '%s': %s"
-msgstr "Kunde inte hitta filerna för detta paket"
+msgstr "Detta verktyg kunde inte hitta filerna för \"%s\": %s"
#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
#: ../client/pk-console.c:1016
#, c-format
msgid "This tool could not get the file list for '%s': %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte få fillistan för \"%s\": %s"
#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
#: ../client/pk-console.c:1038
#, c-format
msgid "This tool could not find the update details for '%s': %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte hitta uppdateringsdetaljer för \"%s\": %s"
#. TRANSLATORS: There was an error getting the details about the update for the package. The detailed error follows
#: ../client/pk-console.c:1046
#, c-format
msgid "This tool could not get the update details for '%s': %s"
-msgstr ""
+msgstr "Detta verktyg kunde inte få uppdateringsdetaljer för %s\": %s"
#. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
#: ../client/pk-console.c:1092
msgid "Error:"
-msgstr ""
+msgstr "Fel:"
#. TRANSLATORS: This a list of details about the package
#: ../client/pk-console.c:1106
@@ -183,33 +189,32 @@ msgstr "Inga filer"
#. TRANSLATORS: This a request for a GPG key signature from the backend, which the client will prompt for later
#: ../client/pk-console.c:1171
msgid "Repository signature required"
-msgstr ""
+msgstr "Förrådssignatur krävs"
#. TRANSLATORS: This a prompt asking the user to import the security key
#: ../client/pk-console.c:1181
msgid "Do you accept this signature?"
-msgstr ""
+msgstr "Godkänner du denna signatur?"
#. TRANSLATORS: This is where the user declined the security key
#: ../client/pk-console.c:1185
msgid "The signature was not accepted."
-msgstr ""
+msgstr "Signaturen godkändes inte."
#. TRANSLATORS: This a request for a EULA
#: ../client/pk-console.c:1219
msgid "End user license agreement required"
-msgstr ""
+msgstr "Godkännande av slutanvändaravtal krävs"
#. TRANSLATORS: This a prompt asking the user to agree to the license
#: ../client/pk-console.c:1226
-#, fuzzy
msgid "Do you agree to this license?"
-msgstr "Samtycker du?"
+msgstr "Godkänner du denna licens?"
#. TRANSLATORS: This is where the user declined the license
#: ../client/pk-console.c:1230
msgid "The license was refused."
-msgstr ""
+msgstr "Licensen nekades."
#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
#: ../client/pk-console.c:1259
@@ -225,12 +230,15 @@ msgstr "Konsollgränssnitt för PackageKit"
msgid "Subcommands:"
msgstr "Underkommandon:"
-#: ../client/pk-console.c:1403 ../client/pk-generate-pack.c:138
-#: ../client/pk-monitor.c:115 ../src/pk-main.c:196
+#: ../client/pk-console.c:1403
+#: ../client/pk-generate-pack.c:138
+#: ../client/pk-monitor.c:115
+#: ../src/pk-main.c:196
msgid "Show extra debugging information"
msgstr "Visa extra felsökningsinformation"
-#: ../client/pk-console.c:1405 ../client/pk-monitor.c:117
+#: ../client/pk-console.c:1405
+#: ../client/pk-monitor.c:117
msgid "Show the program version and exit"
msgstr "Visa programversion och avsluta"
@@ -244,19 +252,21 @@ msgstr "Avsluta utan att vänta på att åtgärder ska färdigställas"
#. TRANSLATORS: This is when we could not connect to the system bus, and is fatal
#: ../client/pk-console.c:1431
-#, fuzzy
msgid "This tool could not connect to system DBUS."
-msgstr "Kunde inte ansluta till systemets DBUS."
+msgstr "Detta verktyg kunde inte ansluta till systemets DBUS."
#: ../client/pk-console.c:1526
-#, fuzzy
msgid "You need to specify a search type, e.g. name"
-msgstr "Du behöver ange en söktyp."
-
-#: ../client/pk-console.c:1531 ../client/pk-console.c:1538
-#: ../client/pk-console.c:1545 ../client/pk-console.c:1552
-#: ../client/pk-console.c:1663 ../client/pk-console.c:1673
-#: ../client/pk-console.c:1680 ../client/pk-console.c:1687
+msgstr "Du behöver ange en söktyp, t.ex. name"
+
+#: ../client/pk-console.c:1531
+#: ../client/pk-console.c:1538
+#: ../client/pk-console.c:1545
+#: ../client/pk-console.c:1552
+#: ../client/pk-console.c:1663
+#: ../client/pk-console.c:1673
+#: ../client/pk-console.c:1680
+#: ../client/pk-console.c:1687
msgid "You need to specify a search term"
msgstr "Du måste ange en sökterm"
@@ -277,27 +287,23 @@ msgid "You need to specify a package to remove"
msgstr "Du behöver ange ett paket att ta bort"
#: ../client/pk-console.c:1582
-#, fuzzy
-msgid ""
-"You need to specify the destination directory and then the packages to "
-"download"
-msgstr "Du behöver ange en type, key_id och package_id"
+msgid "You need to specify the destination directory and then the packages to download"
+msgstr "Du behöver ange målkatalogen och sedan paketen som ska hämtas"
#: ../client/pk-console.c:1587
msgid "Directory not found"
-msgstr ""
+msgstr "Katalogen hittades inte"
#: ../client/pk-console.c:1593
-#, fuzzy
msgid "You need to specify a licence identifier (eula-id)"
-msgstr "Du behöver ange ett eula-id"
+msgstr "Du behöver ange en licensidentifierare (eula-id)"
#: ../client/pk-console.c:1609
msgid "You need to specify a package name to resolve"
msgstr "Du behöver ange ett paketnamn att lösa"
-#: ../client/pk-console.c:1618 ../client/pk-console.c:1625
-#, fuzzy
+#: ../client/pk-console.c:1618
+#: ../client/pk-console.c:1625
msgid "You need to specify a repository name"
msgstr "Du behöver ange ett förrådsnamn"
@@ -306,9 +312,8 @@ msgid "You need to specify a repo name/parameter and value"
msgstr "Du behöver ange ett förrådsnamn/parameter och värde"
#: ../client/pk-console.c:1645
-#, fuzzy
msgid "You need to specify an action, e.g. 'update-system'"
-msgstr "Du behöver ange en tidsterm"
+msgstr "Du behöver ange en åtgärd, t.ex. \"update-system\""
#: ../client/pk-console.c:1650
msgid "You need to specify a correct role"
@@ -328,7 +333,7 @@ msgstr "Du behöver ange ett paket att söka efter filerna för"
#. TRANSLATORS: The user tried to use an unsupported option on the command line
#: ../client/pk-console.c:1754
-#, fuzzy, c-format
+#, c-format
msgid "Option '%s' is not supported"
msgstr "Flaggan \"%s\" stöds inte"
@@ -345,83 +350,81 @@ msgstr "Kommandot misslyckades"
#. TRANSLATORS: This is the state of the transaction
#: ../client/pk-generate-pack.c:96
msgid "Downloading"
-msgstr ""
+msgstr "Hämtar"
#: ../client/pk-generate-pack.c:140
msgid "Set the file name of dependencies to be excluded"
-msgstr ""
+msgstr "Ange filnamnet för beroenden att undanta"
#: ../client/pk-generate-pack.c:142
msgid "The output directory (the current directory is used if ommitted)"
-msgstr ""
+msgstr "Utdatakatalogen (den aktuella katalogen om den inte anges)"
#: ../client/pk-generate-pack.c:144
msgid "The package to be put into the service pack"
-msgstr ""
+msgstr "Paketet att läggas i servicepaketet"
#: ../client/pk-generate-pack.c:146
msgid "Put all updates available in the service pack"
-msgstr ""
+msgstr "Lägg alla tillgängliga uppdateringar i servicepaketet"
#. TRANSLATORS: This is when the user fails to supply the correct arguments
#: ../client/pk-generate-pack.c:166
msgid "Neither --package or --updates option selected."
-msgstr ""
+msgstr "Varken flaggan --package eller --updates angavs."
#. TRANSLATORS: This is when the user fails to supply just one argument
#: ../client/pk-generate-pack.c:174
msgid "Both options selected."
-msgstr ""
+msgstr "BÃ¥da flaggorna angavs."
#. TRANSLATORS: This is when file already exists
#: ../client/pk-generate-pack.c:207
msgid "A pack with the same name already exists, do you want to overwrite it?"
-msgstr ""
+msgstr "Ett paket med samma namn finns redan. Vill du skriva över det?"
#. TRANSLATORS: This is when the pack was not overwritten
#: ../client/pk-generate-pack.c:210
msgid "The pack was not overwritten."
-msgstr ""
+msgstr "Paketet skrevs inte över."
#. TRANSLATORS: This is when the temporary directory cannot be created, the directory name follows
#: ../client/pk-generate-pack.c:222
-#, fuzzy
msgid "Failed to create directory:"
-msgstr "Misslyckades med att få senaste tid"
+msgstr "Misslyckades med att skapa katalog:"
#. TRANSLATORS: This is when the list of packages from the remote computer cannot be opened
#: ../client/pk-generate-pack.c:231
-#, fuzzy
msgid "Failed to open package list."
-msgstr "Misslyckades med att få senaste tid"
+msgstr "Misslyckades med öppna paketlistan."
#. TRANSLATORS: The package name is being matched up to available packages
#: ../client/pk-generate-pack.c:241
msgid "Finding package name."
-msgstr ""
+msgstr "Söker efter paketnamn."
#. TRANSLATORS: This is when the package cannot be found in any software source. The detailed error follows
#: ../client/pk-generate-pack.c:245
#, c-format
msgid "Failed to find package '%s': %s"
-msgstr ""
+msgstr "Misslyckades med att hitta paketet \"%s\": %s"
#. TRANSLATORS: This is telling the user we are in the process of making the pack
#: ../client/pk-generate-pack.c:260
msgid "Creating service pack..."
-msgstr ""
+msgstr "Skapar servicepaket..."
#. TRANSLATORS: we succeeded in making the file
#: ../client/pk-generate-pack.c:267
#, c-format
msgid "Service pack created '%s'"
-msgstr ""
+msgstr "Servicepaket skapades \"%s\""
#. TRANSLATORS: we failed to make te file
#: ../client/pk-generate-pack.c:271
-#, fuzzy, c-format
+#, c-format
msgid "Failed to create '%s': %s"
-msgstr "Misslyckades med att få senaste tid"
+msgstr "Misslyckades med att skapa \"%s\": %s"
#: ../client/pk-monitor.c:128
msgid "PackageKit Monitor"
@@ -429,21 +432,18 @@ msgstr "Övervakare för PackageKit"
#. TRANSLATORS: The package was not found in any software sources
#: ../client/pk-tools-common.c:108
-#, c-format
msgid "The package could not be found"
-msgstr ""
+msgstr "Paketet kunde inte hittas"
#. TRANSLATORS: more than one package could be found that matched, to follow is a list of possible packages
#: ../client/pk-tools-common.c:119
-#, fuzzy
msgid "More than one package matches:"
-msgstr "Det finns flera matchande paket"
+msgstr "Det finns fler än ett paket som matchar:"
#. TRANSLATORS: This finds out which package in the list to use
#: ../client/pk-tools-common.c:126
-#, fuzzy
msgid "Please choose the correct package: "
-msgstr "Anget paketets nummer:"
+msgstr "Välj det korrekta paketet: "
#: ../client/pk-tools-common.c:152
#, c-format
@@ -453,161 +453,67 @@ msgstr "Ange ett tal från 1 till %i: "
#. TRANSLATORS: when we are getting data from the daemon
#: ../contrib/packagekit-plugin/src/contents.cpp:299
msgid "Getting package information..."
-msgstr ""
+msgstr "Hämtar paketinformation..."
#. TRANSLATORS: run an applicaiton
#: ../contrib/packagekit-plugin/src/contents.cpp:305
#, c-format
msgid "Run %s"
-msgstr ""
+msgstr "Kör %s"
#. TRANSLATORS: show the installed version of a package
#: ../contrib/packagekit-plugin/src/contents.cpp:311
-#, fuzzy
msgid "Installed version"
-msgstr "Installera säkerhetssignatur"
+msgstr "Installerad version"
#. TRANSLATORS: run the application now
#: ../contrib/packagekit-plugin/src/contents.cpp:319
#, c-format
msgid "Run version %s now"
-msgstr ""
+msgstr "Kör version %s nu"
#: ../contrib/packagekit-plugin/src/contents.cpp:325
msgid "Run now"
-msgstr ""
+msgstr "Kör nu"
#. TRANSLATORS: update to a new version of the package
#: ../contrib/packagekit-plugin/src/contents.cpp:330
#, c-format
msgid "Update to version %s"
-msgstr ""
+msgstr "Uppdatera till version %s"
#. TRANSLATORS: To install a package
#: ../contrib/packagekit-plugin/src/contents.cpp:336
#, c-format
msgid "Install %s now"
-msgstr ""
+msgstr "Installera %s nu"
#. TRANSLATORS: the version of the package
#: ../contrib/packagekit-plugin/src/contents.cpp:339
msgid "Version"
-msgstr ""
+msgstr "Version"
#. TRANSLATORS: noting found, so can't install
#: ../contrib/packagekit-plugin/src/contents.cpp:344
msgid "No packages found for your system"
-msgstr ""
+msgstr "Inga paket hittades för ditt system"
#. TRANSLATORS: package is being installed
#: ../contrib/packagekit-plugin/src/contents.cpp:349
msgid "Installing..."
-msgstr ""
+msgstr "Installerar..."
#: ../data/packagekit-catalog.xml.in.h:1
-#, fuzzy
msgid "PackageKit Catalog"
-msgstr "Övervakare för PackageKit"
+msgstr "Katalog för PackageKit"
#: ../data/packagekit-servicepack.xml.in.h:1
-#, fuzzy
msgid "PackageKit Service Pack"
-msgstr "PackageKit-tjänst"
+msgstr "Servicepaket för PackageKit"
#: ../data/packagekit-package-list.xml.in.h:1
-#, fuzzy
msgid "PackageKit Package List"
-msgstr "Övervakare för PackageKit"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:1
-msgid "Accept EULA"
-msgstr "Acceptera slutanvändaravtal"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:2
-msgid "Authentication is required to accept a EULA"
-msgstr "Autentisering krävs för att acceptera ett slutanvändaravtal"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:3
-msgid "Authentication is required to change software source parameters"
-msgstr "Autentisering krävs för att ändra parametrar för programvarukällor"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:4
-#, fuzzy
-msgid ""
-"Authentication is required to consider a key used for signing packages as "
-"trusted"
-msgstr "Autentisering krävs för att uppdatera paketlistorna"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:5
-#, fuzzy
-msgid "Authentication is required to install a signed package"
-msgstr "Autentisering krävs för att installera ett paket"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:6
-#, fuzzy
-msgid "Authentication is required to install an untrusted package"
-msgstr "Autentisering krävs för att installera ett paket"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:7
-#, fuzzy
-msgid "Authentication is required to refresh the system sources"
-msgstr "Autentisering krävs för att uppdatera paketlistorna"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:8
-msgid "Authentication is required to remove packages"
-msgstr "Autentisering krävs för att ta bort paket"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:9
-msgid "Authentication is required to rollback a transaction"
-msgstr "Autentisering krävs för att rulla tillbaka en transaktion"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:10
-#, fuzzy
-msgid ""
-"Authentication is required to set the network proxy used for downloading "
-"packages"
-msgstr "Autentisering krävs för att ta bort paket"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:11
-msgid "Authentication is required to update packages"
-msgstr "Autentisering krävs för att uppdatera paket"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:12
-msgid "Change software source parameters"
-msgstr "Ändra parametrar för programvarukällor"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:13
-msgid "Install local file"
-msgstr "Installera lokal fil"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:14
-msgid "Install untrusted local file"
-msgstr "Installera opålitlig lokal fil"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:15
-msgid "Refresh system sources"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:16
-msgid "Remove package"
-msgstr "Ta bort paket"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:17
-msgid "Rollback to a previous transaction"
-msgstr "Rulla tillbaka till en tidigare transaktion"
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:18
-msgid "Set network proxy"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:19
-msgid "Trust a key used for signing packages"
-msgstr ""
-
-#: ../policy/org.freedesktop.packagekit.policy.in.h:20
-#, fuzzy
-msgid "Update packages"
-msgstr "Uppdatera paket"
+msgstr "Paketlista för PackageKit"
#: ../src/pk-main.c:85
msgid "Startup failed due to security policies on this machine."
@@ -619,17 +525,11 @@ msgstr "Detta kan inträffa av två anledningar:"
#: ../src/pk-main.c:87
msgid "The correct user is not launching the executable (usually root)"
-msgstr ""
-"Den korrekta användaren startar inte den körbara filen (vanligtvis root)"
+msgstr "Den korrekta användaren startar inte den körbara filen (vanligtvis root)"
#: ../src/pk-main.c:88
-#, fuzzy
-msgid ""
-"The org.freedesktop.PackageKit.conf file is not installed in the system "
-"directory:"
-msgstr ""
-"Filen org.freedesktop.PackageKit.conf är inte installerad i "
-"systemetkatalogen /etc/dbus-1/system.d"
+msgid "The org.freedesktop.PackageKit.conf file is not installed in the system directory:"
+msgstr "Filen org.freedesktop.PackageKit.conf är inte installerad i systemkatalogen:"
#: ../src/pk-main.c:192
msgid "Packaging backend to use, e.g. dummy"
@@ -668,74 +568,104 @@ msgstr "Kan inte ansluta till systembussen"
msgid "Error trying to start: %s\n"
msgstr "Fel vid försök att starta: %s\n"
+#~ msgid "Accept EULA"
+#~ msgstr "Acceptera slutanvändaravtal"
+#~ msgid "Authentication is required to accept a EULA"
+#~ msgstr "Autentisering krävs för att acceptera ett slutanvändaravtal"
+#~ msgid "Authentication is required to change software source parameters"
+#~ msgstr "Autentisering krävs för att ändra parametrar för programvarukällor"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to consider a key used for signing packages as "
+#~ "trusted"
+#~ msgstr "Autentisering krävs för att uppdatera paketlistorna"
+
+#, fuzzy
+#~ msgid "Authentication is required to install a signed package"
+#~ msgstr "Autentisering krävs för att installera ett paket"
+
+#, fuzzy
+#~ msgid "Authentication is required to install an untrusted package"
+#~ msgstr "Autentisering krävs för att installera ett paket"
+
+#, fuzzy
+#~ msgid "Authentication is required to refresh the system sources"
+#~ msgstr "Autentisering krävs för att uppdatera paketlistorna"
+#~ msgid "Authentication is required to remove packages"
+#~ msgstr "Autentisering krävs för att ta bort paket"
+#~ msgid "Authentication is required to rollback a transaction"
+#~ msgstr "Autentisering krävs för att rulla tillbaka en transaktion"
+
+#, fuzzy
+#~ msgid ""
+#~ "Authentication is required to set the network proxy used for downloading "
+#~ "packages"
+#~ msgstr "Autentisering krävs för att ta bort paket"
+#~ msgid "Authentication is required to update packages"
+#~ msgstr "Autentisering krävs för att uppdatera paket"
+#~ msgid "Change software source parameters"
+#~ msgstr "Ändra parametrar för programvarukällor"
+#~ msgid "Install local file"
+#~ msgstr "Installera lokal fil"
+#~ msgid "Install untrusted local file"
+#~ msgstr "Installera opålitlig lokal fil"
+#~ msgid "Remove package"
+#~ msgstr "Ta bort paket"
+#~ msgid "Rollback to a previous transaction"
+#~ msgstr "Rulla tillbaka till en tidigare transaktion"
+
+#, fuzzy
+#~ msgid "Update packages"
+#~ msgstr "Uppdatera paket"
#~ msgid "Authentication is required to install a local file"
#~ msgstr "Autentisering krävs för att installera en lokal fil"
-
#~ msgid "Authentication is required to install a security signature"
#~ msgstr "Autentisering krävs för att installera en säkerhetssignatur"
-
#~ msgid "Authentication is required to update all packages"
#~ msgstr "Autentisering krävs för att uppdatera alla paket"
-
#~ msgid ""
#~ "Further authentication is required to install an untrusted local file"
#~ msgstr ""
#~ "Ytterligare autentisering krävs för att installera en opålitlig lokal fil"
-
#~ msgid "Install package"
#~ msgstr "Installera paket"
-
#~ msgid "Refresh package lists"
#~ msgstr "Uppdatera paketlistor"
-
#~ msgid "Update all packages"
#~ msgstr "Uppdatera alla paket"
-
#~ msgid "Update detail"
#~ msgstr "Uppdateringsinformation"
-
#~ msgid "A system restart is required"
#~ msgstr "En omstart av systemet krävs"
-
#~ msgid "A logout and login is required"
#~ msgstr "En utloggning och inloggning krävs"
-
#~ msgid "An application restart is required"
#~ msgstr "En omstart av programmet krävs"
-
#~ msgid "Could not find a package match"
#~ msgstr "Kunde inte hitta ett matchande paket"
-
#~ msgid ""
#~ "Could not find a package with that name to install, or package already "
#~ "installed"
#~ msgstr ""
#~ "Kunde inte hitta ett paket med det namnet att installera, eller så är "
#~ "paketet redan installerat"
-
#~ msgid "Could not find a package with that name to remove"
#~ msgstr "Kunde inte hitta ett paket att ta bort med det namnet"
-
#~ msgid "Cancelled!"
#~ msgstr "Avbruten!"
-
#~ msgid "Could not find a package with that name to update"
#~ msgstr "Kunde inte hitta ett paket att uppdatera med det namnet"
-
#~ msgid "Could not find what packages require this package"
#~ msgstr "Kunde inte hitta vilka paket som kräver detta paket"
-
#~ msgid "Okay to import key?"
#~ msgstr "Ok att importera nyckeln?"
-
#~ msgid "Did not import key"
#~ msgstr "Importerade inte nyckeln"
-
#~ msgid "Did not agree to licence, task will fail"
#~ msgstr "Godkände inte licensen, åtgärden kommer att misslyckas"
-
#~ msgid "Could not open database: %s"
#~ msgstr "Kunde inte öppna databasen: %s"
-
#~ msgid "You probably need to run this program as the root user"
#~ msgstr "Du behöver antagligen köra detta program som root-användaren"
+
commit e0f2901d8084408d072aefbb594dd6c212257c7e
Author: Ankitkumar Patel <ankit at redhat.com>
Date: Wed Oct 22 10:34:24 2008 +0000
Added Gujarati Translations!
Transmitted-via: Transifex (translate.fedoraproject.org)
diff --git a/po/gu.po b/po/gu.po
new file mode 100644
index 0000000..1afc05f
--- /dev/null
+++ b/po/gu.po
@@ -0,0 +1,560 @@
+# translation of packagekit.master.gu.po to Gujarati
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Ankit Patel <ankit at redhat.com>, 2008.
+msgid ""
+msgstr ""
+"Project-Id-Version: packagekit.master.gu\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2008-10-22 01:39+0000\n"
+"PO-Revision-Date: 2008-10-22 16:02+0530\n"
+"Last-Translator: Ankit Patel <ankit at redhat.com>\n"
+"Language-Team: Gujarati <fedora-trans-gu at redhat.com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+
+#. TRANSLATORS: this is a header for the package that can be updated
+#: ../client/pk-console.c:271
+msgid "Details about the update:"
+msgstr "સà«àª§àª¾àª°àª¾ વિશે વિગતો:"
+
+#: ../client/pk-console.c:464
+msgid "Please restart the computer to complete the update."
+msgstr "સà«àª§àª¾àª°à«‹ સમાપà«àª¤ કરવા માટે મહેરબાની કરીને કમà«àªªà«àª¯à«‚ટર પà«àª¨àªƒàª¶àª°à«‚ કરો."
+
+#: ../client/pk-console.c:466
+msgid "Please logout and login to complete the update."
+msgstr "સà«àª§àª¾àª°à«‹ સમાપà«àª¤ કરવા માટે મહેરબાની કરીને બહાર નીકળો અને પછી ફરી પà«àª°àªµà«‡àª¶ કરો."
+
+#: ../client/pk-console.c:468
+msgid "Please restart the application as it is being used."
+msgstr "મહેરબાની કરીને કારà«àª¯àª•à«àª°àª® ફરી શરૂ કરો કારણ કે તે વપરાઈ રહà«àª¯à«‹ છે."
+
+#. TRANSLATORS: The package is already installed on the system
+#: ../client/pk-console.c:579
+#, c-format
+msgid "The package '%s' is already installed"
+msgstr "પેકેજ '%s' પહેલાથી જ સà«àª¥àª¾àªªàª¿àª¤ થયેલ છે"
+
+#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
+#: ../client/pk-console.c:587
+#, c-format
+msgid "The package '%s' could not be installed: %s"
+msgstr "પેકેજ '%s' સà«àª¥àª¾àªªàª¿àª¤ કરી શકà«àª¯àª¾ નહિં: %s"
+
+#. TRANSLATORS: There was a programming error that shouldn't happen. The detailed error follows
+#: ../client/pk-console.c:612 ../client/pk-console.c:639
+#: ../client/pk-console.c:735 ../client/pk-console.c:852
+#: ../client/pk-tools-common.c:55 ../client/pk-tools-common.c:74
+#: ../client/pk-tools-common.c:81
+#, c-format
+msgid "Internal error: %s"
+msgstr "આંતરિક àªà«‚લ: %s"
+
+#. TRANSLATORS: There was an error installing the packages. The detailed error follows
+#: ../client/pk-console.c:620
+#, c-format
+msgid "This tool could not install the packages: %s"
+msgstr "આ સાધન પેકેજો સà«àª¥àª¾àªªàª¿àª¤ કરી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: There was an error installing the files. The detailed error follows
+#: ../client/pk-console.c:647
+#, c-format
+msgid "This tool could not install the files: %s"
+msgstr "આ સાધન ફાઈલો સà«àª¥àª¾àªªàª¿àª¤ કરી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: The package name was not found in the installed list. The detailed error follows
+#: ../client/pk-console.c:703
+#, c-format
+msgid "This tool could not remove '%s': %s"
+msgstr "આ સાધન '%s' દૂર કરી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: There was an error removing the packages. The detailed error follows
+#: ../client/pk-console.c:726 ../client/pk-console.c:797
+#, c-format
+msgid "This tool could not remove the packages: %s"
+msgstr "આ સાધન પેકેજો દૂર કરી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: There was an error removing the packages. The detailed error follows
+#: ../client/pk-console.c:764
+#, c-format
+msgid "This tool could not remove the packages: '%s'"
+msgstr "આ સાધન પેકેજો દૂર કરી શકà«àª¯à«àª‚ નહિં: '%s'"
+
+#. TRANSLATORS: When removing, we might have to remove other dependencies
+#: ../client/pk-console.c:776
+msgid "The following packages have to be removed:"
+msgstr "નીચેના પેકેજો દૂર કરવામાં આવવા જોઈàª:"
+
+#. TRANSLATORS: We are checking if it's okay to remove a list of packages
+#: ../client/pk-console.c:783
+msgid "Proceed removing additional packages?"
+msgstr "શà«àª‚ વધારાના પેકેજો દૂર કરવા પર પà«àª°àª•à«àª°àª¿àª¯àª¾ કરવી છે?"
+
+#. TRANSLATORS: We did not remove any packages
+#: ../client/pk-console.c:788
+msgid "The package removal was canceled!"
+msgstr "પેકેજ નિરાકરણ રદ થઈ હતી!"
+
+#. TRANSLATORS: The package name was not found in any software sources
+#: ../client/pk-console.c:829
+#, c-format
+msgid "This tool could not download the package '%s' as it could not be found"
+msgstr "આ સાધન પેકેજ '%s' દૂર કરી શકà«àª¯à«àª‚ નહિં કારણ કે તે શોધી શકાયà«àª‚ નહિં"
+
+#. TRANSLATORS: Could not download the packages for some reason. The detailed error follows
+#: ../client/pk-console.c:860
+#, c-format
+msgid "This tool could not download the packages: %s"
+msgstr "આ સાધન પેકેજો ડાઉનલોડ કરી શકà«àª¯àª¾ નહિં: %s"
+
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:887 ../client/pk-console.c:896
+#, c-format
+msgid "This tool could not update '%s': %s"
+msgstr "આ સાધન '%s' સà«àª§àª¾àª°à«€ શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:918 ../client/pk-console.c:926
+#, c-format
+msgid "This tool could not get the requirements for '%s': %s"
+msgstr "આ સાધન '%s' માટેની જરૂરીયાતો મેળવી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: There was an error getting the dependencies for the package. The detailed error follows
+#: ../client/pk-console.c:948 ../client/pk-console.c:956
+#, c-format
+msgid "This tool could not get the dependencies for '%s': %s"
+msgstr "આ સાધન '%s' માટે આધારàªà«‚તપણાઓ મેળવી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: There was an error getting the details about the package. The detailed error follows
+#: ../client/pk-console.c:978 ../client/pk-console.c:986
+#, c-format
+msgid "This tool could not get package details for '%s': %s"
+msgstr "આ સાધન '%s' માટે પેકેજ વિગતો મેળવી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
+#: ../client/pk-console.c:1008
+#, c-format
+msgid "This tool could not find the files for '%s': %s"
+msgstr "આ સાધન '%s' માટે ફાઈલો શોધી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: There was an error getting the list of files for the package. The detailed error follows
+#: ../client/pk-console.c:1016
+#, c-format
+msgid "This tool could not get the file list for '%s': %s"
+msgstr "આ સાધન '%s' માટે ફાઈલ યાદી મેળવી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: The package name was not found in any software sources. The detailed error follows
+#: ../client/pk-console.c:1038
+#, c-format
+msgid "This tool could not find the update details for '%s': %s"
+msgstr "આ સાધન '%s' માટે સà«àª§àª¾àª°àª¾ વિગતો મેળવી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: There was an error getting the details about the update for the package. The detailed error follows
+#: ../client/pk-console.c:1046
+#, c-format
+msgid "This tool could not get the update details for '%s': %s"
+msgstr "આ સાધન '%s' માટે સà«àª§àª¾àª°àª¾ વિગતો મેળવી શકà«àª¯à«àª‚ નહિં: %s"
+
+#. TRANSLATORS: This was an unhandled error, and we don't have _any_ context
+#: ../client/pk-console.c:1092
+msgid "Error:"
+msgstr "àªà«‚લ:"
+
+#. TRANSLATORS: This a list of details about the package
+#: ../client/pk-console.c:1106
+msgid "Package description"
+msgstr "પેકેજ વરà«àª£àª¨"
+
+#. TRANSLATORS: This a list files contained in the package
+#: ../client/pk-console.c:1139
+msgid "Package files"
+msgstr "પેકેજ ફાઈલો"
+
+#. TRANSLATORS: This where the package has no files
+#: ../client/pk-console.c:1148
+msgid "No files"
+msgstr "કોઈ ફાઈલો નથી"
+
+#. TRANSLATORS: This a request for a GPG key signature from the backend, which the client will prompt for later
+#: ../client/pk-console.c:1171
+msgid "Repository signature required"
+msgstr "રીપોàªà«€àªŸàª°à«€ સહી જરૂરી"
+
+#. TRANSLATORS: This a prompt asking the user to import the security key
+#: ../client/pk-console.c:1181
+msgid "You you accept this signature?"
+msgstr "શà«àª‚ તમે આ સહી સà«àªµà«€àª•àª¾àª°àª¶à«‹?"
+
+#. TRANSLATORS: This is where the user declined the security key
+#: ../client/pk-console.c:1185
+msgid "The signature was not accepted."
+msgstr "સહી સà«àªµà«€àª•àª¾àª°àª¾àª¯à«‡àª² ન હતી."
+
+#. TRANSLATORS: This a request for a EULA
+#: ../client/pk-console.c:1219
+msgid "End user license agreement required"
+msgstr "અંતિમ વપરાશકરà«àª¤àª¾ લાઈસનà«àª¸ મંજૂરીપતà«àª°àª• જરૂરી"
+
+#. TRANSLATORS: This a prompt asking the user to agree to the license
+#: ../client/pk-console.c:1226
+msgid "Do you agree to this license?"
+msgstr "શà«àª‚ તમે આ લાઈસનà«àª¸ સાથે મંજૂર છો?"
+
+#. TRANSLATORS: This is where the user declined the license
+#: ../client/pk-console.c:1230
+msgid "The license was refused."
+msgstr "લાઈસનà«àª¸ રદ થયà«àª‚ હતà«àª‚."
+
+#. TRANSLATORS: This is when the daemon crashed, and we are up shit creek without a paddle
+#: ../client/pk-console.c:1259
+msgid "The daemon crashed mid-transaction!"
+msgstr "ડિમન મધà«àª¯-પરિવહન દરમà«àª¯àª¾àª¨ àªàª¾àª‚ગી પડà«àª¯à«àª‚!"
+
+#. TRANSLATORS: This is the header to the --help menu
+#: ../client/pk-console.c:1312
+msgid "PackageKit Console Interface"
+msgstr "PackageKit કનà«àª¸à«‹àª² ઈનà«àªŸàª°àª«à«‡àª¸"
+
+#: ../client/pk-console.c:1312
+msgid "Subcommands:"
+msgstr "ઉપઆદેશો:"
+
+#: ../client/pk-console.c:1403 ../client/pk-generate-pack.c:138
+#: ../client/pk-monitor.c:115 ../src/pk-main.c:196
+msgid "Show extra debugging information"
+msgstr "વધારાની ડિબગીંગ જાણકારી બતાવો"
+
+#: ../client/pk-console.c:1405 ../client/pk-monitor.c:117
+msgid "Show the program version and exit"
+msgstr "કારà«àª¯àª•à«àª°àª® આવૃતà«àª¤àª¿ બતાવો અને બહાર નીકળો"
+
+#: ../client/pk-console.c:1407
+msgid "Set the filter, e.g. installed"
+msgstr "ગાળક સà«àª¯à«‹àªœà«€àª¤ કરો, દા.ત. સà«àª¥àª¾àªªàª¿àª¤"
+
+#: ../client/pk-console.c:1409
+msgid "Exit without waiting for actions to complete"
+msgstr "કà«àª°àª¿àª¯àª¾àª“ સમાપà«àª¤ થવાની રાહ જોયા વિના બહાર નીકળો"
+
+#. TRANSLATORS: This is when we could not connect to the system bus, and is fatal
+#: ../client/pk-console.c:1431
+msgid "This tool could not connect to system DBUS."
+msgstr "આ સાધન સિસà«àªŸàª® DBUS સાથે જોડી શકà«àª¯àª¾ નહિં."
+
+#: ../client/pk-console.c:1526
+msgid "You need to specify a search type, e.g. name"
+msgstr "તમારે શોધ પà«àª°àª•àª¾àª° સà«àªªàª·à«àªŸ કરવાની જરૂર છે, દા.ત. નામ"
+
+#: ../client/pk-console.c:1531 ../client/pk-console.c:1538
+#: ../client/pk-console.c:1545 ../client/pk-console.c:1552
+#: ../client/pk-console.c:1663 ../client/pk-console.c:1673
+#: ../client/pk-console.c:1680 ../client/pk-console.c:1687
+msgid "You need to specify a search term"
+msgstr "તમારે શોધ પદ સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1557
+msgid "Invalid search type"
+msgstr "અયોગà«àª¯ શોધ પà«àª°àª•àª¾àª°"
+
+#: ../client/pk-console.c:1562
+msgid "You need to specify a package or file to install"
+msgstr "તમારે સà«àª¥àª¾àªªàª¿àª¤ કરવા માટેનà«àª‚ પેકેજ કે ફાઈલ સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1569
+msgid "You need to specify a type, key_id and package_id"
+msgstr "તમારે પà«àª°àª•àª¾àª°, key_id અને package_id સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1576
+msgid "You need to specify a package to remove"
+msgstr "તમારે દૂર કરવાનà«àª‚ પેકેજ સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1582
+msgid ""
+"You need to specify the destination directory and then the packages to "
+"download"
+msgstr "તમારે અંતિમ મà«àª•àª¾àª® ડિરેકà«àªŸàª°à«€ અને પછી ડાઉનલોડ કરવા માટેના પેકેજો સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1587
+msgid "Directory not found"
+msgstr "ડિરેકà«àªŸàª°à«€ મળી નહિં"
+
+#: ../client/pk-console.c:1593
+msgid "You need to specify a licence identifier (eula-id)"
+msgstr "તમારે લાઈસનà«àª¸ ઓળખનાર સà«àªªàª·à«àªŸ કરવાની જરૂર છે (eula-id)"
+
+#: ../client/pk-console.c:1609
+msgid "You need to specify a package name to resolve"
+msgstr "તમારે ઉકેલવા માટેનà«àª‚ પેકેજ નામ સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1618 ../client/pk-console.c:1625
+msgid "You need to specify a repository name"
+msgstr "તમારે રીપોàªà«€àªŸàª°à«€ નામ સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1632
+msgid "You need to specify a repo name/parameter and value"
+msgstr "તમારે રીપો નામ/પરિમાણ અને કિંમત સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1645
+msgid "You need to specify an action, e.g. 'update-system'"
+msgstr "તમારે કà«àª°àª¿àª¯àª¾ સà«àªªàª·à«àªŸ કરવાની જરૂર છે, દા.ત. 'update-system'"
+
+#: ../client/pk-console.c:1650
+msgid "You need to specify a correct role"
+msgstr "તમારે યોગà«àª¯ àªà«‚મિકા સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1655
+msgid "Failed to get last time"
+msgstr "છેલà«àª²à«‹ સમય મેળવવામાં નિષà«àª«àª³"
+
+#: ../client/pk-console.c:1694
+msgid "You need to specify a package to find the details for"
+msgstr "પેકેજ માટેની વિગતો મેળવવા માટે તમારે પેકેજ સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#: ../client/pk-console.c:1701
+msgid "You need to specify a package to find the files for"
+msgstr "પેકેજ માટે ફાઈલો શોધવા માટે તમારે પેકેજ સà«àªªàª·à«àªŸ કરવાની જરૂર છે"
+
+#. TRANSLATORS: The user tried to use an unsupported option on the command line
+#: ../client/pk-console.c:1754
+#, c-format
+msgid "Option '%s' is not supported"
+msgstr "વિકલà«àªª '%s' આધારàªà«‚ત નથી"
+
+#. TRANSLATORS: User does not have permission to do this
+#: ../client/pk-console.c:1767
+msgid "You don't have the necessary privileges for this operation"
+msgstr "આ પà«àª°àª•à«àª°àª¿àª¯àª¾ કરવા માટે તમારી પાસે જરૂરી વિશેષાધિકારો નથી"
+
+#. TRANSLATORS: Generic failure of what they asked to do
+#: ../client/pk-console.c:1770
+msgid "Command failed"
+msgstr "આદેશ નિષà«àª«àª³"
+
+#. TRANSLATORS: This is the state of the transaction
+#: ../client/pk-generate-pack.c:96
+msgid "Downloading"
+msgstr "ડાઉનલોડ કરી રહà«àª¯àª¾ છીàª"
+
+#: ../client/pk-generate-pack.c:140
+msgid "Set the file name of dependencies to be excluded"
+msgstr "નહિં સમાવવાના આધારàªà«‚તપણાઓના ફાઈલ નામ સà«àª¯à«‹àªœà«€àª¤ કરો"
+
+#: ../client/pk-generate-pack.c:142
+msgid "The output directory (the current directory is used if ommitted)"
+msgstr "આઉટપà«àªŸ ડિરેકà«àªŸàª°à«€ (વરà«àª¤àª®àª¾àª¨ ડિરેકà«àªŸàª°à«€ વાપરવામાં આવશે જો અવગણવામાં આવે)"
+
+#: ../client/pk-generate-pack.c:144
+msgid "The package to be put into the service pack"
+msgstr "સેવા પેકમાં મૂકવા માટેનà«àª‚ પેકેજ"
+
+#: ../client/pk-generate-pack.c:146
+msgid "Put all updates available in the service pack"
+msgstr "સેવા પેકમાં ઉપલબà«àª§ બધા સà«àª§àª¾àª°àª¾àª“ મૂકો"
+
+#. TRANSLATORS: This is when the user fails to supply the correct arguments
+#: ../client/pk-generate-pack.c:166
+msgid "Neither --package or --updates option selected."
+msgstr "ના તો --package કે --updates વિકલà«àªª પસંદ થયેલ છે."
+
+#. TRANSLATORS: This is when the user fails to supply just one argument
+#: ../client/pk-generate-pack.c:174
+msgid "Both options selected."
+msgstr "બંને વિકલà«àªªà«‹ પસંદ થયેલ છે."
+
+#. TRANSLATORS: This is when file already exists
+#: ../client/pk-generate-pack.c:207
+msgid "A pack with the same name already exists, do you want to overwrite it?"
+msgstr "ઠજ નામ સાથેનà«àª‚ પેક પહેલાથી જ હાજર છે, શà«àª‚ તમે તેના પર ફરીથી લખવા માંગો છો?"
+
+#. TRANSLATORS: This is when the pack was not overwritten
+#: ../client/pk-generate-pack.c:210
+msgid "The pack was not overwritten."
+msgstr "પેક ઉપર ફરીથી લખાયેલ નથી."
+
+#. TRANSLATORS: This is when the temporary directory cannot be created, the directory name follows
+#: ../client/pk-generate-pack.c:222
+msgid "Failed to create directory:"
+msgstr "ડિરેકà«àªŸàª°à«€ બનાવવામાં નિષà«àª«àª³:"
+
+#. TRANSLATORS: This is when the list of packages from the remote computer cannot be opened
+#: ../client/pk-generate-pack.c:231
+msgid "Failed to open package list."
+msgstr "પેકેજ યાદી ખોલવામાં નિષà«àª«àª³."
+
+#. TRANSLATORS: The package name is being matched up to available packages
+#: ../client/pk-generate-pack.c:241
+msgid "Finding package name."
+msgstr "પેકેજ નામ શોધી રહà«àª¯àª¾ છીàª."
+
+#. TRANSLATORS: This is when the package cannot be found in any software source. The detailed error follows
+#: ../client/pk-generate-pack.c:245
+#, c-format
+msgid "Failed to find package '%s': %s"
+msgstr "પેકેજ '%s' શોધવામાં નિષà«àª«àª³: %s"
+
+#. TRANSLATORS: This is telling the user we are in the process of making the pack
+#: ../client/pk-generate-pack.c:260
+msgid "Creating service pack..."
+msgstr "સેવા પેક બનાવી રહà«àª¯àª¾ છીàª..."
+
+#. TRANSLATORS: we succeeded in making the file
+#: ../client/pk-generate-pack.c:267
+#, c-format
+msgid "Service pack created '%s'"
+msgstr "સેવા પેક બનાવાયà«àª‚ '%s'"
+
+#. TRANSLATORS: we failed to make te file
+#: ../client/pk-generate-pack.c:271
+#, c-format
+msgid "Failed to create '%s': %s"
+msgstr "'%s' બનાવવામાં નિષà«àª«àª³: %s"
+
+#: ../client/pk-monitor.c:128
+msgid "PackageKit Monitor"
+msgstr "PackageKit મોનીટર"
+
+#. TRANSLATORS: The package was not found in any software sources
+#: ../client/pk-tools-common.c:108
+msgid "The package could not be found"
+msgstr "પેકેજ શોધી શકà«àª¯àª¾ નહિં"
+
+#. TRANSLATORS: more than one package could be found that matched, to follow is a list of possible packages
+#: ../client/pk-tools-common.c:119
+msgid "More than one package matches:"
+msgstr "àªàª• પેકેજ કરતાં વધૠજોડણીઓ:"
+
+#. TRANSLATORS: This finds out which package in the list to use
+#: ../client/pk-tools-common.c:126
+msgid "Please choose the correct package: "
+msgstr "મહેરબાની કરીને યોગà«àª¯ પેકેજ પસંદ કરો: "
+
+#: ../client/pk-tools-common.c:152
+#, c-format
+msgid "Please enter a number from 1 to %i: "
+msgstr "મહેરબાની કરીને ૧ થી %i સà«àª§à«€àª¨à«‹ નંબર દાખલ કરો: "
+
+#. TRANSLATORS: when we are getting data from the daemon
+#: ../contrib/packagekit-plugin/src/contents.cpp:299
+msgid "Getting package information..."
+msgstr "પેકેજ જાણકારી મેળવી રહà«àª¯àª¾ છીàª..."
+
+#. TRANSLATORS: run an applicaiton
+#: ../contrib/packagekit-plugin/src/contents.cpp:305
+#, c-format
+msgid "Run %s"
+msgstr "%s ચલાવો"
+
+#. TRANSLATORS: show the installed version of a package
+#: ../contrib/packagekit-plugin/src/contents.cpp:311
+msgid "Installed version"
+msgstr "સà«àª¥àª¾àªªàª¿àª¤ આવૃતà«àª¤àª¿"
+
+#. TRANSLATORS: run the application now
+#: ../contrib/packagekit-plugin/src/contents.cpp:319
+#, c-format
+msgid "Run version %s now"
+msgstr "આવૃતà«àª¤àª¿ %s હમણાં ચલાવો"
+
+#: ../contrib/packagekit-plugin/src/contents.cpp:325
+msgid "Run now"
+msgstr "હમણાં ચલાવો"
+
+#. TRANSLATORS: update to a new version of the package
+#: ../contrib/packagekit-plugin/src/contents.cpp:330
+#, c-format
+msgid "Update to version %s"
+msgstr "આવૃતà«àª¤àª¿ %s માં સà«àª§àª¾àª°à«‹"
+
+#. TRANSLATORS: To install a package
+#: ../contrib/packagekit-plugin/src/contents.cpp:336
+#, c-format
+msgid "Install %s now"
+msgstr "%s હમણાં સà«àª¥àª¾àªªàª¿àª¤ કરો"
+
+#. TRANSLATORS: the version of the package
+#: ../contrib/packagekit-plugin/src/contents.cpp:339
+msgid "Version"
+msgstr "આવૃતà«àª¤àª¿"
+
+#. TRANSLATORS: noting found, so can't install
+#: ../contrib/packagekit-plugin/src/contents.cpp:344
+msgid "No packages found for your system"
+msgstr "તમારી સિસà«àªŸàª® માટે કોઈ પેકેજો મળà«àª¯àª¾ નહિં"
+
+#. TRANSLATORS: package is being installed
+#: ../contrib/packagekit-plugin/src/contents.cpp:349
+msgid "Installing..."
+msgstr "સà«àª¥àª¾àªªàª¿àª¤ કરી રહà«àª¯àª¾ છીàª..."
+
+#: ../data/packagekit-catalog.xml.in.h:1
+msgid "PackageKit Catalog"
+msgstr "PackageKit કેટલોગ"
+
+#: ../data/packagekit-servicepack.xml.in.h:1
+msgid "PackageKit Service Pack"
+msgstr "PackageKit સેવા પેક"
+
+#: ../data/packagekit-package-list.xml.in.h:1
+msgid "PackageKit Package List"
+msgstr "PackageKit પેકેજ યાદી"
+
+#: ../src/pk-main.c:85
+msgid "Startup failed due to security policies on this machine."
+msgstr "આ મશીન પરની સà«àª°àª•à«àª·àª¾ નીતિઓને કારણે શરૂઆત કરવામાં નિષà«àª«àª³."
+
+#: ../src/pk-main.c:86
+msgid "This can happen for two reasons:"
+msgstr "આ બે કારણોસર થઈ શકે:"
+
+#: ../src/pk-main.c:87
+msgid "The correct user is not launching the executable (usually root)"
+msgstr "યોગà«àª¯ વપરાશકરà«àª¤àª¾ àªàª•à«àªà«‡àª•à«àª¯à«àªŸà«‡àª¬àª² લોનà«àªš કરી રહà«àª¯à«‹ નથી (સામાનà«àª¯ રીતે રà«àªŸ)"
+
+#: ../src/pk-main.c:88
+msgid ""
+"The org.freedesktop.PackageKit.conf file is not installed in the system "
+"directory:"
+msgstr "org.freedesktop.PackageKit.conf ફાઈલ સિસà«àªŸàª® ડિરેકà«àªŸàª°à«€àª®àª¾àª‚ સà«àª¥àª¾àªªàª¿àª¤ થયેલ નથી:"
+
+#: ../src/pk-main.c:192
+msgid "Packaging backend to use, e.g. dummy"
+msgstr "વાપરવા માટે બેકેનà«àª¡ પેકેજ કરી રહà«àª¯àª¾ છીàª, દા.ત. dummy"
+
+#: ../src/pk-main.c:194
+msgid "Daemonize and detach from the terminal"
+msgstr "ડિમનવાળà«àª‚ કરો અને ટરà«àª®àª¿àª¨àª²àª®àª¾àª‚થી છોડો"
+
+#: ../src/pk-main.c:198
+msgid "Disable the idle timer"
+msgstr "ફાજલ સમય નિષà«àª•à«àª°àª¿àª¯ કરો"
+
+#: ../src/pk-main.c:200
+msgid "Show version and exit"
+msgstr "આવૃતà«àª¤àª¿ બતાવો અને બહાર નીકળો"
+
+#: ../src/pk-main.c:202
+msgid "Exit after a small delay"
+msgstr "નાના વિલંબ પછી બહાર નીકળો"
+
+#: ../src/pk-main.c:204
+msgid "Exit after the engine has loaded"
+msgstr "àªàª‚જીન લવાઈ જાય પછી બહાર નીકળો"
+
+#: ../src/pk-main.c:214
+msgid "PackageKit service"
+msgstr "PackageKit સેવા"
+
+#: ../src/pk-main.c:250
+msgid "Cannot connect to the system bus"
+msgstr "સિસà«àªŸàª® બસ સાથે જોડાઈ શકતા નથી"
+
+#: ../src/pk-main.c:296
+#, c-format
+msgid "Error trying to start: %s\n"
+msgstr "શરૂ કરવાનો પà«àª°àª¯àª¾àª¸ કરવામાં àªà«‚લ: %s\n"
+
More information about the PackageKit-commit
mailing list