diff -Nru muon-1.9.60/CMakeLists.txt muon-2.0.0/CMakeLists.txt --- muon-1.9.60/CMakeLists.txt 2012-10-29 18:36:20.000000000 +0000 +++ muon-2.0.0/CMakeLists.txt 2013-04-01 20:34:44.000000000 +0000 @@ -10,29 +10,39 @@ find_package(QCA2 REQUIRED) #required by QtOAuth find_package(QJSON REQUIRED) find_package(LibAttica QUIET) +find_package(BODEGA QUIET) -include (KDE4Defaults) +include (KDE4Defaults) include( FindPkgConfig ) +if(NOT qjson_LIBRARIES) #hack to compatibilize different qjson finder versions + set(qjson_LIBRARIES ${QJSON_LIBRARIES}) +endif() + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x") -include_directories(${KDE4_INCLUDES} ${QT_INCLUDES} ${QAPT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QCA2_INCLUDE_DIR}) +include_directories(${KDE4_INCLUDES} ${QT_INCLUDES} ${QAPT_INCLUDE_DIR} + ${CMAKE_CURRENT_BINARY_DIR} ${QCA2_INCLUDE_DIR} + ${CMAKE_SOURCE_DIR}/libmuon ${CMAKE_BINARY_DIR}/libmuon) add_subdirectory(libmuon) if(QAPT_FOUND) + add_subdirectory(libmuonapt) add_subdirectory(muon) add_subdirectory(installer) add_subdirectory(updater) add_subdirectory(kded) endif(QAPT_FOUND) add_subdirectory(discover) +add_subdirectory(exporter) macro_log_feature(QAPT_FOUND "LibQApt" "Qt wrapper around the libapt-pkg library" "http://www.kde.org" FALSE "" "Required to build the APT backend") - macro_log_feature(LIBATTICA_FOUND "LibAttica" "Qt library that implements the Open Collaboration Services API" "http://www.kde.org" FALSE "" "Required to build the KNewStuff3 backend") +macro_log_feature(BODEGA_FOUND "Bodega" "Library that exposes Bodega resources" + "http://www.kde.org" FALSE "" "Required to build the Bodega backend") macro_display_feature_log() diff -Nru muon-1.9.60/ChangeLog muon-2.0.0/ChangeLog --- muon-1.9.60/ChangeLog 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/ChangeLog 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,30 @@ +2.0 +====== +- Features: + * Added a KNewStuff backend, adding categories for Plasma Widgets and Plasma Comics. + * Added a Bodega resource backend to Muon Discover and the Muon Software Center. + * The QApt backend is now optional for Muon Discover, and other backends can be used + on platforms other than Debian-based linux distributions. + * Miscellaenous improvements/polish for Muon Discover + * Port QApt backend plugin to LibQApt2. + * User interface consistency improvements for Muon Discover, integrating better with KDE. +- Bugfixes: + * Prevent changelog fetch jobs from being processed during a cache reload, by manually + controlling the lifetime of the KJobs and deleting them before we start reloading. + (BKO: #301161) + * Fix a bug in the transaction advancement system. (Fixed by switching to QApt2) + (BKO: #299131) + * Reparent Application objects created in a separate thread by QtConcurrent, fixing + a crash when reloading the ApplicationBackend. (BKO: #306536) + * Fixed a bug where applications that had been removed from the archive, but could + still be referenced locally by APT despite not being installed would show up as + Applications if their data had not been removed from app-install-data. (BKO: #309283) + * Fix the display of KNS services' description. Remove \r characters that would break + the layout. +- Optimizations: + * Improve startup time by 2% by using a fast integer-to-power approximation when + calculating the normal distribution for an application rating. [MSC] + 1.4.0 ====== - Features: diff -Nru muon-1.9.60/Messages.sh muon-2.0.0/Messages.sh --- muon-1.9.60/Messages.sh 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/Messages.sh 2013-04-01 20:32:05.000000000 +0000 @@ -3,8 +3,9 @@ $EXTRACTRC `find muon/ -name \*.rc` >> muonrc.cpp $EXTRACTRC `find updater/ -name \*.rc` >> updaterrc.cpp $EXTRACTRC `find kded/ -name \*.rc` >> notifierrc.cpp +$EXTRACTRC `find libmuonapt/ -name \*.rc` >> libmuonapt.cpp $EXTRACTRC --context="Category" --tag-group=none --tag=Name libmuon/categories.xml >> categoriesxml.cpp -$XGETTEXT categoriesxml.cpp `find libmuon -name \*.cpp` -o $podir/libmuon.pot +$XGETTEXT categoriesxml.cpp libmuonapt.cpp `find libmuon -name \*.cpp` -o $podir/libmuon.pot $XGETTEXT rc.cpp muonrc.cpp `find muon -name \*.cpp` -o $podir/muon.pot $XGETTEXT rc.cpp updaterrc.cpp `find updater -name \*.cpp` -o $podir/muon-updater.pot $XGETTEXT rc.cpp `find installer -name \*.cpp` -o $podir/muon-installer.pot @@ -14,3 +15,4 @@ rm -f notifierrc.cpp rm -f updaterrc.cpp rm -f categoriesxml.cpp +rm -f libmuonapt.cpp diff -Nru muon-1.9.60/debian/changelog muon-2.0.0/debian/changelog --- muon-1.9.60/debian/changelog 2012-10-30 22:07:03.000000000 +0000 +++ muon-2.0.0/debian/changelog 2013-04-02 22:39:32.000000000 +0000 @@ -1,8 +1,49 @@ -muon (1.9.60-0ubuntu1~quantal1) quantal; urgency=low +muon (2.0.0-0ubuntu1~quantal1) quantal; urgency=low + + * Backport to quantal, no changes + + -- Jonathan Thomas Tue, 02 Apr 2013 18:39:20 -0400 + +muon (2.0.0-0ubuntu1) raring; urgency=low + + * New upstream release + + -- Jonathan Thomas Mon, 01 Apr 2013 16:40:06 -0400 + +muon (1.9.97-0ubuntu1) raring; urgency=low + + * New upstream release candidate + + -- Jonathan Thomas Tue, 12 Mar 2013 21:44:05 -0400 + +muon (1.9.95-0ubuntu1) raring; urgency=low + + * New upstream release candidate + + -- Jonathan Thomas Sun, 10 Mar 2013 12:50:02 -0400 + +muon (1.9.80-0ubuntu1) raring; urgency=low + + * New upstream beta release + + -- Jonathan Thomas Thu, 24 Jan 2013 14:08:46 -0500 + +muon (1.9.65-0ubuntu1) raring; urgency=low + + * New upstream alpha release + + -- Jonathan Thomas Thu, 06 Dec 2012 15:15:04 -0500 + +muon (1.9.60-0ubuntu2) raring-proposed; urgency=low + + * Replace Depends on libqapt-runtime with libqapt2-runtime + + -- Jonathan Thomas Wed, 31 Oct 2012 18:10:17 -0400 + +muon (1.9.60-0ubuntu1) raring-proposed; urgency=low * New upstream alpha release: - Add build-depend on libattica-dev for KNewStuff backend support. - * Quantal backport, no changes. -- Jonathan Thomas Mon, 29 Oct 2012 15:21:15 -0400 diff -Nru muon-1.9.60/debian/control muon-2.0.0/debian/control --- muon-1.9.60/debian/control 2012-10-30 15:08:17.000000000 +0000 +++ muon-2.0.0/debian/control 2013-04-01 20:39:49.000000000 +0000 @@ -4,14 +4,14 @@ Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Jonathan Thomas Build-Depends: debhelper (>= 9), pkg-kde-tools (>= 0.5.0), cmake, - pkg-config, kdelibs5-dev, libqapt-dev (>= 1.9.60), libdebconf-kde-dev, + pkg-config, kdelibs5-dev, libqapt-dev (>= 1.9.80), libdebconf-kde-dev, libqjson-dev, libqoauth-dev, libattica-dev -Standards-Version: 3.9.3.1 +Standards-Version: 3.9.4 Homepage: https://projects.kde.org/projects/extragear/sysadmin/muon/ Package: muon Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt-runtime, +Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime, apt-xapian-index, libmuonprivate1 (= ${binary:Version}) Recommends: muon-updater Description: package manager for KDE @@ -35,7 +35,7 @@ Package: muon-installer Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt-runtime, +Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime, app-install-data, apt-xapian-index, libmuonprivate1 (= ${binary:Version}) Recommends: app-install-data-partner Description: Utility for browsing, installing, and removing applications @@ -50,7 +50,7 @@ Package: muon-discover Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt-runtime, +Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime, app-install-data, apt-xapian-index, libmuonprivate1 (= ${binary:Version}) Recommends: app-install-data-partner, ubuntu-sso-client Description: Utility for browsing, installing, and removing applications @@ -62,7 +62,7 @@ Package: muon-updater Architecture: any -Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt-runtime, +Depends: ${shlibs:Depends}, ${misc:Depends}, libqapt2-runtime, libmuonprivate1 (= ${binary:Version}) Recommends: muon-notifier Description: update manager for KDE diff -Nru muon-1.9.60/debian/libmuonprivate1.install muon-2.0.0/debian/libmuonprivate1.install --- muon-1.9.60/debian/libmuonprivate1.install 2012-10-29 19:21:11.000000000 +0000 +++ muon-2.0.0/debian/libmuonprivate1.install 2013-04-01 20:39:49.000000000 +0000 @@ -1,7 +1,12 @@ -usr/lib/libmuonprivate.so.1.3.65 +usr/lib/libmuonprivate.so.1.9.97 usr/lib/libmuonprivate.so.1 -usr/share/kde4/apps/libmuon/ClickableImage.qml -usr/share/kde4/apps/libmuon/ThumbnailView.qml +usr/lib/libmuonapt.so +usr/lib/kde4/muon-appsbackend.so +usr/lib/kde4/muon-knsbackend.so usr/share/kde4/apps/libmuon/moo.ogg -usr/share/kde4/apps/muon-installer/categories.xml +usr/share/kde4/apps/libmuon/categories/* +usr/share/kde4/services/muon-applications-backend.desktop +usr/share/kde4/services/muon-knsplasmoids-backend.desktop +usr/share/kde4/services/muon-knscomics-backend.desktop +usr/share/kde4/servicetypes/muonbackendplugin.desktop usr/share/locale/*/LC_MESSAGES/libmuon.mo diff -Nru muon-1.9.60/debian/muon-discover.install muon-2.0.0/debian/muon-discover.install --- muon-1.9.60/debian/muon-discover.install 2012-10-29 19:21:11.000000000 +0000 +++ muon-2.0.0/debian/muon-discover.install 2013-04-01 20:39:49.000000000 +0000 @@ -1,4 +1,5 @@ usr/bin/muon-discover +usr/lib/kde4/imports/* usr/share/applications/kde4/muon-discover.desktop usr/share/applications/kde4/muon-discover-category.desktop usr/share/icons/hicolor/16x16/apps/muondiscover.png @@ -6,5 +7,8 @@ usr/share/icons/hicolor/32x32/apps/muondiscover.png usr/share/icons/hicolor/48x48/apps/muondiscover.png usr/share/icons/hicolor/128x128/apps/muondiscover.png +usr/share/kde4/apps/desktoptheme/muon-contenttheme/ +usr/share/kde4/apps/muon-discover/featured.json +usr/share/kde4/apps/muon-discover/muon-discoverui.rc usr/share/locale/*/LC_MESSAGES/muon-discover.mo diff -Nru muon-1.9.60/debian/muon-installer.install muon-2.0.0/debian/muon-installer.install --- muon-1.9.60/debian/muon-installer.install 2012-10-29 19:21:11.000000000 +0000 +++ muon-2.0.0/debian/muon-installer.install 2013-04-01 20:39:49.000000000 +0000 @@ -1,5 +1,7 @@ usr/bin/muon-installer usr/share/applications/kde4/muon-installer.desktop +usr/share/kde4/apps/muon-installer/ClickableImage.qml +usr/share/kde4/apps/muon-installer/ThumbnailView.qml usr/share/kde4/apps/muon-installer/muon-installerui.rc usr/share/kde4/config.kcfg/muon-installer.kcfg usr/share/locale/*/LC_MESSAGES/muon-installer.mo diff -Nru muon-1.9.60/discover/ApplicationAddonsModel.cpp muon-2.0.0/discover/ApplicationAddonsModel.cpp --- muon-1.9.60/discover/ApplicationAddonsModel.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/ApplicationAddonsModel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,115 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ApplicationAddonsModel.h" -#include -#include -#include -#include - -ApplicationAddonsModel::ApplicationAddonsModel(QObject* parent) - : QAbstractListModel(parent) - , m_app(0) -{} - -void ApplicationAddonsModel::setApplication(AbstractResource* app) -{ - discardChanges(); - m_app = app; - m_initial = m_app->addonsInformation(); - - QHash roles = roleNames(); - roles.insert(Qt::CheckStateRole, "checked"); - setRoleNames(roles); - emit applicationChanged(); -} - -AbstractResource* ApplicationAddonsModel::application() const -{ - return m_app; -} - -int ApplicationAddonsModel::rowCount(const QModelIndex& parent) const -{ - return parent.isValid()? 0 : m_initial.size(); -} - -QVariant ApplicationAddonsModel::data(const QModelIndex& index, int role) const -{ - if(!index.isValid() || index.row()>=m_initial.size()) - return QVariant(); - - switch(role) { - case Qt::DisplayRole: - return m_initial[index.row()].name(); - case Qt::ToolTipRole: - return m_initial[index.row()].description(); - case Qt::CheckStateRole: { - QHash::const_iterator it = m_state.constFind(m_initial[index.row()].name()); - if(it==m_state.constEnd()) { - return m_initial[index.row()].isInstalled(); - } else { - return it.value(); - } - } - } - - return QVariant(); -} - -void ApplicationAddonsModel::discardChanges() -{ - //dataChanged should suffice, but it doesn't - beginResetModel(); - m_state.clear(); - emit stateChanged(); - endResetModel(); -} - -void ApplicationAddonsModel::applyChanges() -{ - ResourcesModel::global()->installApplication(m_app, m_state); -} - -void ApplicationAddonsModel::changeState(const QString& packageName, bool installed) -{ - QList::const_iterator it=m_initial.constBegin(), itEnd=m_initial.constEnd(); - for(; it!=itEnd; ++it) { - if(it->name()==packageName) - break; - } - - bool restored = it->isInstalled()==installed; - if(restored) - m_state.remove(packageName); - else - m_state.insert(packageName, installed); - emit stateChanged(); -} - -bool ApplicationAddonsModel::hasChanges() const -{ - return !m_state.isEmpty(); -} - -bool ApplicationAddonsModel::isEmpty() const -{ - return m_initial.isEmpty(); -} diff -Nru muon-1.9.60/discover/ApplicationAddonsModel.h muon-2.0.0/discover/ApplicationAddonsModel.h --- muon-1.9.60/discover/ApplicationAddonsModel.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/ApplicationAddonsModel.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,61 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef APPLICATIONADDONSMODEL_H -#define APPLICATIONADDONSMODEL_H - -#include -#include - -class AbstractResource; - -class ApplicationAddonsModel : public QAbstractListModel -{ - Q_OBJECT - Q_PROPERTY(AbstractResource* application READ application WRITE setApplication) - Q_PROPERTY(bool hasChanges READ hasChanges NOTIFY stateChanged) - Q_PROPERTY(bool isEmpty READ isEmpty NOTIFY applicationChanged) - public: - explicit ApplicationAddonsModel(QObject* parent = 0); - - AbstractResource* application() const; - void setApplication(AbstractResource* app); - bool hasChanges() const; - - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; - bool isEmpty() const; - - public slots: - void discardChanges(); - void applyChanges(); - void changeState(const QString& packageName, bool installed); - - signals: - void stateChanged(); - void applicationChanged(); - - private: - AbstractResource* m_app; - QList m_initial; - QHash m_state; -}; - -#endif // APPLICATIONADDONSMODEL_H diff -Nru muon-1.9.60/discover/ApplicationProxyModelHelper.cpp muon-2.0.0/discover/ApplicationProxyModelHelper.cpp --- muon-1.9.60/discover/ApplicationProxyModelHelper.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/ApplicationProxyModelHelper.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,78 +0,0 @@ -/* - * Copyright (C) 2012 Aleix Pol Gonzalez - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library/Lesser General Public License - * version 2, or (at your option) any later version, as published by the - * Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library/Lesser General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "ApplicationProxyModelHelper.h" -#include -#include - -ApplicationProxyModelHelper::ApplicationProxyModelHelper(QObject* parent) - : ResourcesProxyModel(parent) -{ - init(); -} - -void ApplicationProxyModelHelper::init() -{ - setSourceModel(ResourcesModel::global()); - - if(!m_sortRoleString.isEmpty()) - setStringSortRole_hack(m_sortRoleString); - - connect(ResourcesModel::global(), SIGNAL(modelReset()), - SLOT(sortModel())); - sortModel(); -} - -void ApplicationProxyModelHelper::sortModel() -{ - QSortFilterProxyModel::sort(sortColumn(), sortOrder()); -} - -int ApplicationProxyModelHelper::stringToRole(const QByteArray& strRole) const -{ - return roleNames().key(strRole); -} - -QByteArray ApplicationProxyModelHelper::roleToString(int role) const -{ - return roleNames().value(role); -} - -void ApplicationProxyModelHelper::setSortRole_hack(int role) -{ - setSortRole(role); - emit sortRoleChanged(); -} - -void ApplicationProxyModelHelper::setSortOrder_hack(Qt::SortOrder order) -{ - sort(0, order); - emit sortOrderChanged(); -} - -void ApplicationProxyModelHelper::setStringSortRole_hack(const QString& role) -{ - setSortRole_hack(stringToRole(role.toUtf8())); - m_sortRoleString = role; -} - -QString ApplicationProxyModelHelper::stringSortRole() const -{ - return roleToString(sortRole()); -} diff -Nru muon-1.9.60/discover/ApplicationProxyModelHelper.h muon-2.0.0/discover/ApplicationProxyModelHelper.h --- muon-1.9.60/discover/ApplicationProxyModelHelper.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/ApplicationProxyModelHelper.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -/* - * Copyright (C) 2012 Aleix Pol Gonzalez - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library/Lesser General Public License - * version 2, or (at your option) any later version, as published by the - * Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library/Lesser General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef APPLICATIONPROXYMODELHELPER_H -#define APPLICATIONPROXYMODELHELPER_H - -#include - - -class ApplicationProxyModelHelper : public ResourcesProxyModel -{ - Q_OBJECT - Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole_hack NOTIFY sortRoleChanged) - Q_PROPERTY(QString stringSortRole READ stringSortRole WRITE setStringSortRole_hack NOTIFY sortRoleChanged) - Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder_hack NOTIFY sortOrderChanged) - public: - void setStateFilter_hack(int state); - explicit ApplicationProxyModelHelper(QObject* parent = 0); - - void setSortRole_hack(int role); - void setSortOrder_hack(Qt::SortOrder order); - void setStringSortRole_hack(const QString& role); - QString stringSortRole() const; - - public slots: - void init(); - void sortModel(); - - signals: - void sortRoleChanged(); - void sortOrderChanged(); - - private: - int stringToRole(const QByteArray& strRole) const; - QByteArray roleToString(int role) const; - - QString m_sortRoleString; -}; - -#endif // APPLICATIONPROXYMODELHELPER_H diff -Nru muon-1.9.60/discover/CMakeLists.txt muon-2.0.0/discover/CMakeLists.txt --- muon-1.9.60/discover/CMakeLists.txt 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -1,28 +1,15 @@ -add_subdirectory(tests) add_subdirectory(icons) +add_subdirectory(muon-contenttheme) -include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libmuon ${CMAKE_CURRENT_BINARY_DIR}/..) +include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/..) set(muon_discover_SRCS main.cpp MuonDiscoverMainWindow.cpp - ApplicationProxyModelHelper.cpp - ReviewsModel.cpp - ApplicationAddonsModel.cpp - ScreenshotsModel.cpp -) -if(QAPT_FOUND) - set(muon_discover_SRCS ${muon_discover_SRCS} - OriginsBackend.cpp - ) - add_definitions(-DQAPT_ENABLED) -endif(QAPT_FOUND) - -option(LIBATTICA_ENABLED "Enable KNS backend" ON) -if (LIBATTICA_FOUND AND LIBATTICA_ENABLED) - add_definitions(-DATTICA_ENABLED) -endif (LIBATTICA_FOUND AND LIBATTICA_ENABLED) + DiscoverAction.cpp + NativeScrollBar.cpp +) qt4_add_resources(muon_discover_SRCS resources.qrc) @@ -41,3 +28,5 @@ install(PROGRAMS muon-discover.desktop muon-discover-category.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) +install(FILES featured.json DESTINATION ${DATA_INSTALL_DIR}/muon-discover) +install(FILES muon-discoverui.rc DESTINATION ${DATA_INSTALL_DIR}/muon-discover) diff -Nru muon-1.9.60/discover/DiscoverAction.cpp muon-2.0.0/discover/DiscoverAction.cpp --- muon-1.9.60/discover/DiscoverAction.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/DiscoverAction.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,78 @@ +/* + * Copyright (C) 2013 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "DiscoverAction.h" +#include +#include +#include + +DiscoverAction::DiscoverAction(QObject* parent) + : KAction(parent) + , m_actionsGroup(nullptr) +{} + +void DiscoverAction::setIconName(const QString& name) +{ + setIcon(KIcon(name)); +} + +QString DiscoverAction::iconName() const +{ + return icon().themeName(); +} + +KXmlGuiWindow* DiscoverAction::mainWindow() const +{ + return qobject_cast(KAction::parentWidget()); +} + +void DiscoverAction::setMainWindow(KXmlGuiWindow* w) +{ + if(m_actionsGroup && !m_actionsGroup->parent()) + m_actionsGroup->setParent(w); + w->actionCollection()->addAction(objectName(), this); +} + +QString DiscoverAction::actionsGroup() const +{ + return m_actionsGroup ? m_actionsGroup->objectName() : QString(); +} + +void DiscoverAction::setActionsGroup(const QString& name) +{ + static QHash availableGroups; + QString oldName = actionsGroup(); + if(m_actionsGroup && name != oldName) { + if(m_actionsGroup->actions().count()<=1) { + availableGroups.remove(oldName); + delete m_actionsGroup; + } else + m_actionsGroup->removeAction(this); + } + + if(!name.isEmpty()) { + m_actionsGroup = availableGroups.value(name); + if(!m_actionsGroup) { + m_actionsGroup = new QActionGroup(mainWindow()); + m_actionsGroup->setObjectName(name); + availableGroups.insert(name, m_actionsGroup); + } + m_actionsGroup->addAction(this); + } +} diff -Nru muon-1.9.60/discover/DiscoverAction.h muon-2.0.0/discover/DiscoverAction.h --- muon-1.9.60/discover/DiscoverAction.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/DiscoverAction.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,50 @@ +/* + * Copyright (C) 2013 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef DISCOVERACTION_H +#define DISCOVERACTION_H + +#include +#include + +class KXmlGuiWindow; +class DiscoverAction : public KAction +{ + Q_OBJECT + Q_PROPERTY(QString iconName READ iconName WRITE setIconName) + Q_PROPERTY(KXmlGuiWindow* mainWindow READ mainWindow WRITE setMainWindow) + Q_PROPERTY(QAction::Priority priority READ priority WRITE setPriority) + Q_PROPERTY(QString actionsGroup READ actionsGroup WRITE setActionsGroup) + public: + explicit DiscoverAction(QObject* parent = 0); + + QString iconName() const; + void setIconName(const QString& name); + + KXmlGuiWindow* mainWindow() const; + void setMainWindow(KXmlGuiWindow* w); + + QString actionsGroup() const; + void setActionsGroup(const QString& name); + + private: + QActionGroup* m_actionsGroup; +}; + +#endif // DISCOVERACTION_H diff -Nru muon-1.9.60/discover/MuonDiscoverMainWindow.cpp muon-2.0.0/discover/MuonDiscoverMainWindow.cpp --- muon-1.9.60/discover/MuonDiscoverMainWindow.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/MuonDiscoverMainWindow.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -18,6 +18,8 @@ */ #include "MuonDiscoverMainWindow.h" +#include "DiscoverAction.h" +#include "NativeScrollBar.h" // Qt includes #include @@ -27,6 +29,8 @@ #include #include #include +#include +#include #include #include #include @@ -43,68 +47,37 @@ #include #include #include +#include +#include +#include +#include +#include +#include // Libmuon includes #include #include #include #include +#include #include #include #include #include +#include -#ifdef QAPT_ENABLED -#include "OriginsBackend.h" -#include -#endif - -#ifdef ATTICA_ENABLED -#include -#endif - -// Own includes -#include "ApplicationProxyModelHelper.h" -#include "ReviewsModel.h" -#include "ApplicationAddonsModel.h" -#include "ScreenshotsModel.h" - -QML_DECLARE_TYPE(ResourcesModel) -QML_DECLARE_TYPE(AbstractResourcesBackend) - - -class CachedNetworkAccessManager : public QNetworkAccessManager { - public: - explicit CachedNetworkAccessManager(QObject* parent = 0) : QNetworkAccessManager(parent) {} - - virtual QNetworkReply* createRequest(Operation op, const QNetworkRequest& request, QIODevice* outgoingData = 0) { - QNetworkRequest req(request); - req.setAttribute(QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache); - return QNetworkAccessManager::createRequest(op, request, outgoingData); - } -}; - -class CachedNAMFactory : public QDeclarativeNetworkAccessManagerFactory -{ - virtual QNetworkAccessManager* create(QObject* parent) { - CachedNetworkAccessManager* ret = new CachedNetworkAccessManager(parent); - QString cacheDir = KStandardDirs::locateLocal("cache", "screenshotsCache", true); - QNetworkDiskCache* cache = new QNetworkDiskCache(ret); - cache->setCacheDirectory(cacheDir); - ret->setCache(cache); - return ret; - } -}; +Q_DECLARE_METATYPE(ResourcesModel*); MuonDiscoverMainWindow::MuonDiscoverMainWindow() : MuonMainWindow() { - setupActions(); + initialize(); m_view = new QDeclarativeView(this); - m_view->setBackgroundRole(QPalette::Background); + m_view->setBackgroundRole(QPalette::AlternateBase); + qreal bgGrayness = m_view->backgroundBrush().color().blackF(); Plasma::Theme::defaultTheme()->setUseGlobalSettings(false); //don't change every plasma theme! - Plasma::Theme::defaultTheme()->setThemeName("appdashboard"); + Plasma::Theme::defaultTheme()->setThemeName(bgGrayness>0.5 ? "muon-contenttheme" : "oxygen"); KDeclarative kdeclarative; kdeclarative.setDeclarativeEngine(m_view->engine()); @@ -112,35 +85,18 @@ //binds things like kconfig and icons kdeclarative.setupBindings(); - qmlRegisterType("org.kde.muon", 1, 0, "CategoryModel"); - qmlRegisterType("org.kde.muon", 1, 0, "ApplicationProxyModel"); - qmlRegisterType("org.kde.muon", 1, 0, "TransactionListener"); - qmlRegisterType("org.kde.muon", 1, 0, "ReviewsModel"); - qmlRegisterType("org.kde.muon", 1, 0, "ApplicationAddonsModel"); - qmlRegisterType("org.kde.muon", 1, 0, "ScreenshotsModel"); - qmlRegisterType("org.kde.muon", 1, 0, "ResourcesUpdatesModel"); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); - qmlRegisterType(); -#ifdef QAPT_ENABLED - qmlRegisterType("org.kde.muon", 1, 0, "OriginsBackend"); - qmlRegisterType(); - qmlRegisterType(); -#endif + qmlRegisterType("org.kde.muon.discover", 1, 0, "DiscoverAction"); + qmlRegisterType("org.kde.muon.discover", 1, 0, "NativeScrollBar"); + qmlRegisterType(); + + m_searchText = new KLineEdit; + m_searchText->setPlaceholderText(i18n("Search...")); //Here we set up a cache for the screenshots -// m_view->engine()->setNetworkAccessManagerFactory(new CachedNAMFactory); m_view->engine()->rootContext()->setContextProperty("resourcesModel", qVariantFromValue(ResourcesModel::global())); m_view->engine()->rootContext()->setContextProperty("app", this); m_view->setResizeMode(QDeclarativeView::SizeRootObjectToView); -// #if !defined(QT_NO_OPENGL) -// m_view->setViewport(new QGLWidget); -// #endif m_view->setSource(QUrl("qrc:/qml/Main.qml")); if(!m_view->errors().isEmpty()) { @@ -162,29 +118,22 @@ restoreState(window.readEntry("windowState", QByteArray())); setCentralWidget(m_view); - initialize(); + setupActions(); } void MuonDiscoverMainWindow::initialize() { - QList backends; + // Initialize singleton ResourcesModel instance. It will live in the main thread + // and all future calls to ResourcesModel::global() will refer to it. + Q_ASSERT(ResourcesModel::global() == nullptr); + ResourcesModel *m = new ResourcesModel(this); + + MuonBackendsFactory factory; + QList backends = factory.allBackends(); -#ifdef ATTICA_ENABLED - backends += new KNSBackend("comic.knsrc", "face-smile-big", this); - backends += new KNSBackend("plasmoids.knsrc", "plasma", this); -#endif - -#ifdef QAPT_ENABLED - ApplicationBackend* applicationBackend = new ApplicationBackend(this); - applicationBackend->integrateMainWindow(this); - backends += applicationBackend; -#else - m_canExit = true; -#endif - - ResourcesModel* m = ResourcesModel::global(); foreach(AbstractResourcesBackend* b, backends) { m->addResourcesBackend(b); + b->integrateMainWindow(this); } } @@ -201,6 +150,37 @@ return actionCollection()->action(name); } +QStringList MuonDiscoverMainWindow::modes() const +{ + QStringList ret; + QGraphicsObject* obj = m_view->rootObject(); + for(int i = obj->metaObject()->propertyOffset(); imetaObject()->propertyCount(); i++) { + QMetaProperty p = obj->metaObject()->property(i); + QByteArray name = p.name(); + if(name.startsWith("top") && name.endsWith("Comp")) { + name = name.mid(3); + name = name.left(name.length()-4); + name[0] = name[0] - 'A' + 'a'; + ret += name; + } + } + return ret; +} + +void MuonDiscoverMainWindow::openMode(const QByteArray& _mode) +{ + if(!modes().contains(_mode)) + kWarning() << "unknown mode" << _mode; + + QByteArray mode = _mode; + if(mode[0]>'Z') + mode[0] = mode[0]-'a'+'A'; + QGraphicsObject* obj = m_view->rootObject(); + QByteArray propertyName = "top"+mode+"Comp"; + QVariant modeComp = obj->property(propertyName); + obj->setProperty("currentTopLevel", modeComp); +} + void MuonDiscoverMainWindow::openMimeType(const QString& mime) { emit listMimeInternal(mime); @@ -208,8 +188,7 @@ void MuonDiscoverMainWindow::openCategory(const QString& category) { - Category* c = new Category(category, this); - emit listCategoryInternal(c); + emit listCategoryInternal(category); } void MuonDiscoverMainWindow::openApplication(const QString& app) @@ -240,3 +219,39 @@ { return MuonDataSources::featuredSource(); } + +QUrl MuonDiscoverMainWindow::prioritaryFeaturedSource() const +{ + return QUrl::fromLocalFile(KGlobal::dirs()->findResource("appdata", "featured.json")); +} + +void MuonDiscoverMainWindow::setupActions() +{ + setupGUI(StandardWindowOption(KXmlGuiWindow::Default & ~KXmlGuiWindow::StatusBar)); + MuonMainWindow::setupActions(); + + menuBar()->setVisible(false); + + QToolBar* t = toolBar(); + QMenu* configMenu = new QMenu(this); + configMenu->addMenu(qobject_cast(factory()->container("settings", this))); + configMenu->addMenu(helpMenu()); + + KToolBarPopupAction* configureButton = new KToolBarPopupAction(KIcon("applications-system"), i18n("Menu"), t); + configureButton->setToolTip(i18n("Configure and learn about Muon Discover")); + configureButton->setMenu(configMenu); + configureButton->setDelayed(false); + configureButton->setPriority(QAction::LowPriority); + + QWidget* wideWidget = new QWidget(t); + t->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed); + + t->addWidget(wideWidget); + t->addWidget(m_searchText); + t->addAction(configureButton); +} + +QObject* MuonDiscoverMainWindow::searchWidget() const +{ + return m_searchText; +} diff -Nru muon-1.9.60/discover/MuonDiscoverMainWindow.h muon-2.0.0/discover/MuonDiscoverMainWindow.h --- muon-1.9.60/discover/MuonDiscoverMainWindow.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/MuonDiscoverMainWindow.h 2013-04-01 20:32:05.000000000 +0000 @@ -21,9 +21,11 @@ #define MUONDISCOVERMAINWINDOW_H #include +#include #include "MuonMainWindow.h" +class KLineEdit; class QAptIntegration; class AbstractResource; class Category; @@ -32,6 +34,7 @@ class MuonDiscoverMainWindow : public MuonMainWindow { Q_OBJECT + Q_PROPERTY(QObject* searchWidget READ searchWidget CONSTANT) public: explicit MuonDiscoverMainWindow(); ~MuonDiscoverMainWindow(); @@ -40,12 +43,17 @@ QSize sizeHint() const; void initialize(); + QStringList modes() const; + void setupActions(); + QObject* searchWidget() const; public slots: void openApplication(const QString& app); + QUrl prioritaryFeaturedSource() const; QUrl featuredSource() const; void openMimeType(const QString& mime); void openCategory(const QString& category); + void openMode(const QByteArray& mode); private slots: void triggerOpenApplication(); @@ -53,11 +61,12 @@ signals: void openApplicationInternal(AbstractResource* app); void listMimeInternal(const QString& mime); - void listCategoryInternal(Category* c); + void listCategoryInternal(const QString& name); private: QString m_appToBeOpened; QDeclarativeView* m_view; + KLineEdit* m_searchText; }; #endif // MUONINSTALLERDECLARATIVEVIEW_H diff -Nru muon-1.9.60/discover/NativeScrollBar.cpp muon-2.0.0/discover/NativeScrollBar.cpp --- muon-1.9.60/discover/NativeScrollBar.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/NativeScrollBar.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2013 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "NativeScrollBar.h" +#include +#include + +NativeScrollBar::NativeScrollBar(QDeclarativeItem* parent) + : QDeclarativeItem(parent) +{ + m_scrollBar = new QScrollBar; + m_scrollBar->setAttribute(Qt::WA_NoSystemBackground); + connect(m_scrollBar, SIGNAL(sliderMoved(int)), SIGNAL(valueChanged(int))); + m_proxy = new QGraphicsProxyWidget(this); + m_proxy->setWidget(m_scrollBar); + + setImplicitWidth(m_scrollBar->sizeHint().width()); +} + +NativeScrollBar::~NativeScrollBar() +{ + delete m_scrollBar; +} + +void NativeScrollBar::geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry) +{ + QDeclarativeItem::geometryChanged(newGeometry, oldGeometry); + m_proxy->setGeometry(QRectF(QPointF(0,0), newGeometry.size())); +} + +int NativeScrollBar::minimum() const { return m_scrollBar->minimum(); } +int NativeScrollBar::maximum() const { return m_scrollBar->maximum(); } +int NativeScrollBar::pageStep() const { return m_scrollBar->pageStep(); } +Qt::Orientation NativeScrollBar::orientation() const { return m_scrollBar->orientation(); } +int NativeScrollBar::value() const { return m_scrollBar->value(); } +void NativeScrollBar::setMaximum(int max) { m_scrollBar->setMaximum(max); emit maximumChanged(); } +void NativeScrollBar::setMinimum(int min) { m_scrollBar->setMinimum(min); emit minimumChanged(); } +void NativeScrollBar::setPageStep(int pageStep) { m_scrollBar->setPageStep(pageStep); emit pageStepChanged(); } +void NativeScrollBar::setOrientation(Qt::Orientation orientation) { m_scrollBar->setOrientation(orientation); } +void NativeScrollBar::setValue(int val) { m_scrollBar->setValue(val); } diff -Nru muon-1.9.60/discover/NativeScrollBar.h muon-2.0.0/discover/NativeScrollBar.h --- muon-1.9.60/discover/NativeScrollBar.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/NativeScrollBar.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,67 @@ +/* + * Copyright (C) 2013 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef NATIVESCROLLBAR_H +#define NATIVESCROLLBAR_H + +#include + +class QPropertyAnimation; +class QScrollBar; +class NativeScrollBar : public QDeclarativeItem +{ + Q_OBJECT + Q_PROPERTY(int maximum READ maximum WRITE setMaximum NOTIFY maximumChanged) + Q_PROPERTY(int minimum READ minimum WRITE setMinimum NOTIFY minimumChanged) + Q_PROPERTY(int pageStep READ pageStep WRITE setPageStep NOTIFY pageStepChanged) + Q_PROPERTY(int value READ value WRITE setValue NOTIFY valueChanged) + Q_PROPERTY(Qt::Orientation orientation READ orientation WRITE setOrientation) + public: + NativeScrollBar(QDeclarativeItem* parent = 0); + virtual ~NativeScrollBar(); + + int maximum() const; + void setMaximum(int max); + + int minimum() const; + void setMinimum(int min); + + int pageStep() const; + void setPageStep(int pageStep); + + int value() const; + void setValue(int val); + + Qt::Orientation orientation() const; + void setOrientation(Qt::Orientation orientation); + + virtual void geometryChanged(const QRectF& newGeometry, const QRectF& oldGeometry); + + Q_SIGNALS: + void valueChanged(int value); + void maximumChanged(); + void minimumChanged(); + void pageStepChanged(); + + private: + QScrollBar* m_scrollBar; + QGraphicsProxyWidget* m_proxy; +}; + +#endif // NATIVESCROLLBAR_H diff -Nru muon-1.9.60/discover/OriginsBackend.cpp muon-2.0.0/discover/OriginsBackend.cpp --- muon-1.9.60/discover/OriginsBackend.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/OriginsBackend.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,246 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "OriginsBackend.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -static ApplicationBackend* applicationBackend() -{ - foreach(AbstractResourcesBackend* b, ResourcesModel::global()->backends()) { - ApplicationBackend* appbackend = qobject_cast(b); - if(qobject_cast(b)) - return appbackend; - } - return 0; -} - -OriginsBackend::OriginsBackend(QObject* parent) - : QObject(parent) -{ - load(); -} - -OriginsBackend::~OriginsBackend() -{ - qDeleteAll(m_sources); -} - -void OriginsBackend::load() -{ - QApt::Backend* backend = applicationBackend()->backend(); - if(!backend) { - connect(applicationBackend(), SIGNAL(backendReady()), SLOT(load())); - return; - } - - qDeleteAll(m_sources); - m_sources.clear(); - //load /etc/apt/sources.list - load(backend->config()->findFile("Dir::Etc::sourcelist")); - - //load /etc/apt/sources.list.d/*.list - QDir d(backend->config()->findDirectory("Dir::Etc::sourceparts")); - foreach(const QString& file, d.entryList(QStringList() << "*.list")) { - load(d.filePath(file)); - } -} - -void OriginsBackend::load(const QString& file) -{ - Q_ASSERT(QFile::exists(file)); - QFile f(file); - - if(!f.open(QFile::Text|QFile::ReadOnly)) - return; - //skip comments and empty lines - QRegExp rxComment("(\\s*#\\s*)|(^\\s+$)"); - QRegExp rxArchitecture("\\[(.+)\\] "); - while(!f.atEnd()) { - QByteArray line = f.readLine(); - int comment = rxComment.indexIn(line); - bool enabled = true; - if(comment==0) { - line = line.mid(rxComment.matchedLength()); - if(!line.startsWith(QByteArray("deb"))) { - continue; - } - enabled = false; - } else if(comment>0) - line = line.left(comment); - - if(!line.isEmpty()) { - QString architecture; - int arch = rxArchitecture.indexIn(line); - if(arch>=0) { - architecture = rxArchitecture.cap(1); - line.remove(arch, rxArchitecture.matchedLength()); - } - - QList source = line.split(' '); - if(source.count() < 3) { - return; - } - QByteArray uri; - int opened = 0; - for(int i=1; isetArch(architecture); - entry->setSource(source.first().endsWith(QByteArray("deb-src"))); - entry->setSuite(source[2]); - entry->setEnabled(enabled); - - QStringList args; - foreach(const QByteArray& arg, source.mid(3)) { - args += arg; - } - newSource->addEntry(entry); - } - } - - emit originsChanged(); -} - -Source* OriginsBackend::sourceForUri(const QString& uri) -{ - foreach(Source* s, m_sources) { - if(s->uri()==uri) - return s; - } - Source* s = new Source(this); - s->setUri(uri); - m_sources += s; - return s; -} - -void OriginsBackend::addRepository(const QString& repository) -{ - QProcess* p = new QProcess(this); - p->setProcessChannelMode(QProcess::MergedChannels); - connect(p, SIGNAL(finished(int)), SLOT(additionDone(int))); - connect(p, SIGNAL(finished(int)), p, SLOT(deleteLater())); - p->start("kdesudo", QStringList("--") << "apt-add-repository" << "-y" << repository); -} - -void OriginsBackend::removeRepository(const QString& repository) -{ - QProcess* p = new QProcess(this); - p->setProcessChannelMode(QProcess::MergedChannels); - connect(p, SIGNAL(finished(int)), SLOT(removalDone(int))); - connect(p, SIGNAL(finished(int)), p, SLOT(deleteLater())); - p->start("kdesudo", QStringList("--") << "apt-add-repository" << "--remove" << "-y" << repository); -} - -void OriginsBackend::additionDone(int processErrorCode) -{ - if(processErrorCode==0) { - load(); - applicationBackend()->reload(); - } else { - QProcess* p = qobject_cast(sender()); - Q_ASSERT(p); - QByteArray errorMessage = p->readAllStandardOutput(); - if(errorMessage.isEmpty()) - KMessageBox::error(0, errorMessage, i18n("Adding Origins...")); - } -} - -void OriginsBackend::removalDone(int processErrorCode) -{ - if(processErrorCode==0) { - load(); - applicationBackend()->reload(); - } else { - QProcess* p = qobject_cast(sender()); - Q_ASSERT(p); - QByteArray errorMessage = p->readAllStandardOutput(); - if(errorMessage.isEmpty()) - KMessageBox::error(0, errorMessage, i18n("Removing Origins...")); - } -} - -QVariantList OriginsBackend::sourcesVariant() const -{ - QVariantList ret; - foreach(QObject* source, m_sources) { - ret += qVariantFromValue(source); - } - return ret; -} - - -bool Source::enabled() const -{ - bool ret = false; - foreach(Entry* e, m_entries) { - ret |= e->isEnabled(); - } - return ret; -} - -QDeclarativeListProperty Source::entries() -{ - return QDeclarativeListProperty(this, m_entries); -} - -QString Source::name() const -{ - QUrl uri(m_uri); - QStringList origins = applicationBackend()->backend()->originsForHost(uri.host()); - if(origins.size()==1) - return origins.first(); - else if(origins.size()==0) - return QString(); - else { - QString path = uri.path(); - int firstSlash = path.indexOf('/', 1); - int secondSlash = path.indexOf('/', firstSlash+1); - QString launchpadifyUri = path.mid(1,secondSlash-1).replace('/', '-'); - QStringList results = origins.filter(launchpadifyUri, Qt::CaseInsensitive); - if(results.isEmpty()) { - launchpadifyUri = path.mid(1,firstSlash-1).replace('/', '-'); - results = origins.filter(launchpadifyUri, Qt::CaseInsensitive); - } - return results.isEmpty() ? QString() : results.first(); - } -} - -#include "moc_OriginsBackend.cpp" diff -Nru muon-1.9.60/discover/OriginsBackend.h muon-2.0.0/discover/OriginsBackend.h --- muon-1.9.60/discover/OriginsBackend.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/OriginsBackend.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,112 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef ORIGINSBACKEND_H -#define ORIGINSBACKEND_H - -#include -#include -#include -#include - -class Entry : public QObject -{ - Q_OBJECT - Q_PROPERTY(bool hasSource READ hasSource CONSTANT) - Q_PROPERTY(QStringList args READ args CONSTANT) - Q_PROPERTY(QString suite READ suite CONSTANT) - Q_PROPERTY(QString arch READ arch CONSTANT) - Q_PROPERTY(bool enabled READ isEnabled CONSTANT) - - public: - Entry(QObject* parent) : QObject(parent), m_isSource(false) {} - - bool hasSource() const { return m_isSource; } - void setSource(bool s) { m_isSource = s; } - - QStringList args() const { return m_args; } - void setArgs(const QStringList& args) { m_args = args; } - - QString suite() const { return m_suite; } - void setSuite(const QByteArray& suite) { m_suite = suite; } - - void setArch(const QString& arch) { m_arch = arch; } - QString arch() const { return m_arch; } - - void setEnabled(bool enabled) { m_enabled = enabled; } - bool isEnabled() const { return m_enabled; } - private: - bool m_enabled; - bool m_isSource; - QStringList m_args; - QByteArray m_suite; - QString m_arch; -}; - -class Source : public QObject -{ - Q_OBJECT - Q_PROPERTY(QString name READ name CONSTANT) - Q_PROPERTY(QString uri READ uri CONSTANT) - Q_PROPERTY(bool enabled READ enabled CONSTANT) - Q_PROPERTY(QDeclarativeListProperty entries READ entries CONSTANT) - public: - Source(QObject* parent) : QObject(parent) {} - QString uri() { return m_uri; } - void setUri(const QString& uri) { m_uri = uri; } - void addEntry(Entry* entry) { m_entries.append(entry); } - QDeclarativeListProperty entries(); - QString name() const; - bool enabled() const; - private: - QString m_uri; - QList m_entries; -}; - -class OriginsBackend : public QObject -{ - Q_OBJECT - Q_PROPERTY(QVariantList sources READ sourcesVariant NOTIFY originsChanged); - public: - explicit OriginsBackend(QObject* parent = 0); - virtual ~OriginsBackend(); - - void load(const QString& file); - QVariantList sourcesVariant() const; - QList sources() const { return m_sources; } - Source* sourceForUri(const QString& uri); - - public slots: - void addRepository(const QString& repository); - void removeRepository(const QString& repository); - void load(); - - private slots: - void additionDone(int processErrorCode); - void removalDone(int processErrorCode); - - signals: - void originsChanged(); - - private: - QList m_sources; -}; - -#endif // ORIGINSBACKEND_H diff -Nru muon-1.9.60/discover/ReviewsModel.cpp muon-2.0.0/discover/ReviewsModel.cpp --- muon-1.9.60/discover/ReviewsModel.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/ReviewsModel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,166 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ReviewsModel.h" -#include -#include -#include -#include -#include -#include - -ReviewsModel::ReviewsModel(QObject* parent) - : QAbstractListModel(parent) - , m_app(0) - , m_backend(0) - , m_lastPage(0) - , m_canFetchMore(true) -{ - QHash roles = roleNames(); - roles.insert(ShouldShow, "shouldShow"); - roles.insert(Reviewer, "reviewer"); - roles.insert(CreationDate, "date"); - roles.insert(UsefulnessTotal, "usefulnessTotal"); - roles.insert(UsefulnessFavorable, "usefulnessFavorable"); - roles.insert(Rating, "rating"); - roles.insert(Summary, "summary"); - setRoleNames(roles); -} - -QVariant ReviewsModel::data(const QModelIndex& index, int role) const -{ - if(!index.isValid()) - return QVariant(); - switch(role) { - case Qt::DisplayRole: - return m_reviews.at(index.row())->reviewText(); - case ShouldShow: - return m_reviews.at(index.row())->shouldShow(); - case Reviewer: - return m_reviews.at(index.row())->reviewer(); - case CreationDate: - return m_reviews.at(index.row())->creationDate(); - case UsefulnessTotal: - return m_reviews.at(index.row())->usefulnessTotal(); - case UsefulnessFavorable: - return m_reviews.at(index.row())->usefulnessFavorable(); - case Rating: - return m_reviews.at(index.row())->rating(); - case Summary: - return m_reviews.at(index.row())->summary(); - } - return QVariant(); -} - -int ReviewsModel::rowCount(const QModelIndex& parent) const -{ - if(parent.isValid()) - return 0; - return m_reviews.count(); -} - -AbstractResource* ReviewsModel::resource() const -{ - return m_app; -} - -AbstractReviewsBackend* ReviewsModel::backend() const -{ - return m_backend; -} - -void ReviewsModel::setResource(AbstractResource* app) -{ - if(m_app!=app) { - reset(); - m_reviews.clear(); - - m_app = app; - if(m_backend) { - disconnect(m_backend, SIGNAL(reviewsReady(AbstractResource*,QList)), - this, SLOT(addReviews(AbstractResource*,QList))); - } - m_backend = app->backend()->reviewsBackend(); - Q_ASSERT(m_backend); - connect(m_backend, SIGNAL(reviewsReady(AbstractResource*,QList)), - this, SLOT(addReviews(AbstractResource*,QList))); - - restartFetching(); - } -} - -void ReviewsModel::restartFetching() -{ - if(!m_app || !m_backend) - return; - - m_canFetchMore=true; - m_lastPage = 0; - fetchMore(); -} - -void ReviewsModel::fetchMore(const QModelIndex& parent) -{ - if(!m_backend || !m_app || m_backend->isFetching() || parent.isValid() || !m_canFetchMore) - return; - - m_lastPage++; - m_backend->fetchReviews(m_app, m_lastPage); - qDebug() << "fetching reviews... " << m_lastPage; -} - -void ReviewsModel::addReviews(AbstractResource* app, const QList& reviews) -{ - if(app!=m_app) - return; - - m_canFetchMore=!reviews.isEmpty(); - qDebug() << "reviews arrived..." << m_lastPage << reviews.size(); - - if(!reviews.isEmpty()) { - beginInsertRows(QModelIndex(), rowCount(), rowCount()+reviews.size()-1); - m_reviews += reviews; - endInsertRows(); - } -} - -bool ReviewsModel::canFetchMore(const QModelIndex&) const -{ - return m_canFetchMore; -} - -void ReviewsModel::markUseful(int row, bool useful) -{ - Review* r = m_reviews[row]; - qDebug() << "submitting usefulness" << r->applicationName() << r->id() << useful; - m_backend->submitUsefulness(r, useful); -} - -void ReviewsModel::deleteReview(int row) -{ - Review* r = m_reviews[row]; - m_backend->deleteReview(r); -} - -void ReviewsModel::flagReview(int row, const QString& reason, const QString& text) -{ - Review* r = m_reviews[row]; - m_backend->flagReview(r, reason, text); -} diff -Nru muon-1.9.60/discover/ReviewsModel.h muon-2.0.0/discover/ReviewsModel.h --- muon-1.9.60/discover/ReviewsModel.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/ReviewsModel.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef REVIEWSMODEL_H -#define REVIEWSMODEL_H - -#include - -class Review; -class AbstractResource; -class AbstractReviewsBackend; -class ReviewsModel : public QAbstractListModel -{ - Q_OBJECT - Q_PROPERTY(AbstractReviewsBackend* backend READ backend) - Q_PROPERTY(AbstractResource* resource READ resource WRITE setResource) - public: - enum Roles { - ShouldShow=Qt::UserRole+1, - Reviewer, - CreationDate, - UsefulnessTotal, - UsefulnessFavorable, - Rating, - Summary - }; - explicit ReviewsModel(QObject* parent = 0); - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; - - AbstractReviewsBackend* backend() const; - void setResource(AbstractResource* app); - AbstractResource* resource() const; - virtual void fetchMore(const QModelIndex& parent=QModelIndex()); - virtual bool canFetchMore(const QModelIndex&) const; - - public slots: - void deleteReview(int row); - void flagReview(int row, const QString& reason, const QString& text); - void markUseful(int row, bool useful); - - private slots: - void addReviews(AbstractResource* app, const QList& reviews); - - private: - void restartFetching(); - - AbstractResource* m_app; - AbstractReviewsBackend* m_backend; - QList m_reviews; - int m_lastPage; - bool m_canFetchMore; -}; - -#endif // REVIEWSMODEL_H - diff -Nru muon-1.9.60/discover/ScreenshotsModel.cpp muon-2.0.0/discover/ScreenshotsModel.cpp --- muon-1.9.60/discover/ScreenshotsModel.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/ScreenshotsModel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ScreenshotsModel.h" -#include -#include -#include - -ScreenshotsModel::ScreenshotsModel(QObject* parent) - : QAbstractListModel(parent) - , m_resource(0) -{ - QHash roles = roleNames(); - roles.insert(ThumbnailUrl, "small_image_url"); - roles.insert(ScreenshotUrl, "large_image_url"); - setRoleNames(roles); -} - -void ScreenshotsModel::setResource(AbstractResource* res) -{ - if(m_resource) { - disconnect(m_resource, SIGNAL(screenshotsFetched(QList,QList)), this, - SLOT(screenshotsFetched(QList,QList))); - } - m_resource = res; - - if(res) { - connect(m_resource, SIGNAL(screenshotsFetched(QList,QList)), - SLOT(screenshotsFetched(QList,QList))); - res->fetchScreenshots(); - } else - kDebug() << "empty resource!"; -} - -AbstractResource* ScreenshotsModel::resource() const -{ - return m_resource; -} - -void ScreenshotsModel::screenshotsFetched(const QList< QUrl >& thumbnails, const QList< QUrl >& screenshots) -{ - Q_ASSERT(thumbnails.count()==screenshots.count()); - - beginInsertRows(QModelIndex(), m_thumbnails.size(), m_thumbnails.size()+thumbnails.size()-1); - m_thumbnails += thumbnails; - m_screenshots += screenshots; - endInsertRows(); - emit countChanged(); -} - -QVariant ScreenshotsModel::data(const QModelIndex& index, int role) const -{ - if(!index.isValid() || index.parent().isValid()) - return QVariant(); - - switch(role) { - case ThumbnailUrl: return m_thumbnails[index.row()]; - case ScreenshotUrl: return m_screenshots[index.row()]; - } - - return QVariant(); -} - -int ScreenshotsModel::rowCount(const QModelIndex& parent) const -{ - return !parent.isValid() ? m_screenshots.count() : 0; -} - -QUrl ScreenshotsModel::screenshotAt(int row) const -{ - return m_screenshots[row]; -} - -int ScreenshotsModel::count() const -{ - return m_screenshots.count(); -} diff -Nru muon-1.9.60/discover/ScreenshotsModel.h muon-2.0.0/discover/ScreenshotsModel.h --- muon-1.9.60/discover/ScreenshotsModel.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/ScreenshotsModel.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,60 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef SCREENSHOTSMODEL_H -#define SCREENSHOTSMODEL_H - -#include -#include - -class AbstractResource; - -class ScreenshotsModel : public QAbstractListModel -{ - Q_OBJECT - Q_PROPERTY(AbstractResource* application READ resource WRITE setResource) - Q_PROPERTY(int count READ count NOTIFY countChanged) - public: - enum Roles { ThumbnailUrl=Qt::UserRole+1, ScreenshotUrl }; - - ScreenshotsModel(QObject* parent = 0); - - AbstractResource* resource() const; - void setResource(AbstractResource* res); - - virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; - virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; - Q_SCRIPTABLE QUrl screenshotAt(int row) const; - int count() const; - - private slots: - void screenshotsFetched(const QList& thumbnails, const QList& screenshots); - - signals: - void countChanged(); - - private: - AbstractResource* m_resource; - QList m_thumbnails; - QList m_screenshots; - -}; - -#endif // SCREENSHOTSMODEL_H diff -Nru muon-1.9.60/discover/featured.json muon-2.0.0/discover/featured.json --- muon-1.9.60/discover/featured.json 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/featured.json 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,17 @@ +[ + { + "icon": "kde", + "image": "qrc:/qml/DefaultBanner.qml", + "text": "KDE", + "comment": "Awesomeness!", + "url": "http://kde.org", + "color": "blue" + }, + { + "icon": "kde", + "image": "http://kde.org/images/teaser/jointhegame.gif", + "text": "Support KDE", + "comment": "Join the Game!", + "url": "http://jointhegame.kde.org" + } +] diff -Nru muon-1.9.60/discover/main.cpp muon-2.0.0/discover/main.cpp --- muon-1.9.60/discover/main.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/main.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -28,7 +28,7 @@ static const char description[] = I18N_NOOP("An application discoverer"); -static const char version[] = "1.9.60"; +static const char version[] = "2.0.0"; int main(int argc, char** argv) { @@ -44,6 +44,8 @@ options.add("application ", ki18n("Directly open the specified application by its package name.")); options.add("mime ", ki18n("Open with a program that can deal with the given mimetype.")); options.add("category ", ki18n("Display a list of entries with a category.")); + options.add("mode ", ki18n("Open Muon Discover in a said mode. Modes correspond to the toolbar buttons.")); + options.add("listmodes", ki18n("List all the available modes and output them on stdout.")); KCmdLineArgs::addCmdLineOptions( options ); if (!KUniqueApplication::start()) { @@ -52,11 +54,6 @@ } KUniqueApplication app; - // Translations - KGlobal::locale()->insertCatalog("app-install-data"); - KGlobal::locale()->insertCatalog("libmuon"); - // Needed for KIcon compatibility w/ application icons from app-install-data - KGlobal::dirs()->addResourceDir("appicon", "/usr/share/app-install/icons/"); app.disableSessionManagement(); KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); @@ -67,6 +64,14 @@ mainWindow->openMimeType(args->getOption("mime")); else if(args->isSet("category")) mainWindow->openCategory(args->getOption("category")); + else if(args->isSet("mode")) + mainWindow->openMode(args->getOption("mode").toLocal8Bit()); + else if(args->isSet("listmodes")) { + fprintf(stdout, "%s", qPrintable(i18n("Available modes:\n"))); + foreach(const QString& mode, mainWindow->modes()) + fprintf(stdout, " * %s\n", qPrintable(mode)); + return 0; + } mainWindow->show(); return app.exec(); diff -Nru muon-1.9.60/discover/muon-contenttheme/CMakeLists.txt muon-2.0.0/discover/muon-contenttheme/CMakeLists.txt --- muon-1.9.60/discover/muon-contenttheme/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/muon-contenttheme/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,7 @@ + +install(FILES metadata.desktop DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/muon-contenttheme/) + +FILE(GLOB widgets widgets/*.svgz) +install( FILES ${widgets} DESTINATION ${DATA_INSTALL_DIR}/desktoptheme/muon-contenttheme/widgets/ ) + + diff -Nru muon-1.9.60/discover/muon-contenttheme/metadata.desktop muon-2.0.0/discover/muon-contenttheme/metadata.desktop --- muon-1.9.60/discover/muon-contenttheme/metadata.desktop 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/muon-contenttheme/metadata.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,70 @@ +[Desktop Entry] +Name=Application dashboard +Name[bs]=Aplikacijska kontrolna ploča +Name[ca]=Tauler d'aplicacions +Name[cs]=Pracovní plocha aplikace +Name[da]=Programinstrumentbræt +Name[de]=Anwendungsübersicht +Name[es]=Tablero de mandos de la aplicación +Name[fi]=Sovelluskojelauta +Name[fr]=Tableau de bord des applications +Name[it]=Quadro delle applicazioni +Name[kk]=Қолданбаның аспаптар панелі +Name[nl]=Dashboard van toepassing +Name[pt]=Painel da aplicação +Name[pt_BR]=Painel de aplicativos +Name[ru]=Панель приложений +Name[sk]=Aplikačná prístrojová doska +Name[sl]=Nadzorna plošča s programi +Name[sr]=Инструмент-табла програма +Name[sr@ijekavian]=Инструмент-табла програма +Name[sr@ijekavianlatin]=Instrument-tabla programa +Name[sr@latin]=Instrument-tabla programa +Name[sv]=Instrumentpanel för program +Name[tr]=Uygulama paneli +Name[uk]=Панель приладів програм +Name[x-test]=xxApplication dashboardxx +Name[zh_TW]=應用程式資訊看板 +Comment=Intended as Application dashboard default +Comment[bs]=Planirano kao podrazumijevana aplikacijska kontrolna ploča +Comment[ca]=Proposat com a tauler d'aplicacions per defecte +Comment[cs]=Zamýšleno jako výchozí pracovní plocha aplikace +Comment[da]=Tiltænkt som standard for programinstrumentbræt +Comment[de]=Als Voreinstellung für Anwendungsübersicht angedacht +Comment[es]=Pensado como tablero de mandos por omisión de la aplicación +Comment[fi]=Tarkoitettu oletussovelluskojelaudaksi +Comment[fr]=Prévu comme tableau de bord par défaut des applications +Comment[hu]=Alapértelmezésként alkalmazásáttekintőnek tervezett +Comment[it]=Inteso come quadro delle applicazioni predefinito +Comment[kk]=Қолданбаның аспаптар панелі болуға бағытталған +Comment[nl]=Bedoeld als standaard dashboard van toepassing +Comment[pt]=Pretendido como predefinição do painel da aplicação +Comment[pt_BR]=Pretende ser o painel de aplicativos padrão +Comment[ru]=Панель приложений по умолчанию +Comment[sk]=Určené ako predvolená prístrojová doska aplikácie +Comment[sl]=Namenjena kot privzeta za nadzorno ploščo s programi +Comment[sr]=Замишљена као подразумевана инструмент-табла програма +Comment[sr@ijekavian]=Замишљена као подразумевана инструмент-табла програма +Comment[sr@ijekavianlatin]=Zamišljena kao podrazumevana instrument-tabla programa +Comment[sr@latin]=Zamišljena kao podrazumevana instrument-tabla programa +Comment[sv]=Avsett som förvald instrumentpanel för program +Comment[tr]=Uygulama paneli varsayılanı olarak amaçlandı +Comment[uk]=Призначено бути типовою панеллю приладів програм +Comment[x-test]=xxIntended as Application dashboard defaultxx +Comment[zh_TW]=做為應用程式資訊看板預設值 + +NoDisplay=true + +X-KDE-PluginInfo-Author=Aleix Pol Gonzalez +X-KDE-PluginInfo-Email=aleixpol@kde.org +X-KDE-PluginInfo-Name=muon-contenttheme +X-KDE-PluginInfo-Version=0.1 +X-KDE-PluginInfo-Website=http://kde.org +X-KDE-PluginInfo-Category= +X-KDE-PluginInfo-Depends= +X-KDE-PluginInfo-License=GPL +X-KDE-PluginInfo-EnabledByDefault=true + +[Settings] +UseNativeWidgetStyle=true +FallbackTheme=appdashboard Binary files /tmp/N4tNvE_QsG/muon-1.9.60/discover/muon-contenttheme/widgets/listitem.svgz and /tmp/UnwRy5itwH/muon-2.0.0/discover/muon-contenttheme/widgets/listitem.svgz differ diff -Nru muon-1.9.60/discover/muon-discover-category.desktop muon-2.0.0/discover/muon-discover-category.desktop --- muon-1.9.60/discover/muon-discover-category.desktop 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/muon-discover-category.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -1,19 +1,29 @@ [Desktop Entry] Name=Install More... +Name[bs]=Instaliraj još... +Name[ca]=Instal·la'n més... +Name[ca@valencia]=Instal·la'n més... +Name[cs]=Nainstalovat více ... Name[da]=Installér mere... +Name[de]=Mehr installieren ... Name[el]=Εγκατάσταση περισσότερων... Name[es]=Instalar más... Name[et]=Rohkem tarkvara... Name[fi]=Asenna lisää... Name[fr]=Installer plus... +Name[ga]=Suiteáil Tuilleadh... +Name[gl]=Instalar máis... Name[hu]=Több telepítése… Name[it]=Installa altro... Name[kk]=Тағы орнату... Name[lt]=Įdiegti daugiau... +Name[mr]=अजुन प्रतिष्ठापीत करा... Name[nb]=Installer flere … Name[nl]=Meer installeren... +Name[pl]=Zainstaluj więcej... Name[pt]=Instalar Mais... Name[pt_BR]=Instalar mais... +Name[ro]=Instalează mai multe... Name[ru]=Установить ещё... Name[sk]=Inštalovať viac... Name[sl]=Namesti več ... @@ -22,8 +32,10 @@ Name[sr@ijekavianlatin]=Instalirajte još... Name[sr@latin]=Instalirajte još... Name[sv]=Installera fler... +Name[tr]=Daha Fazla Yükle... Name[uk]=Встановити ще… Name[x-test]=xxInstall More...xx +Name[zh_CN]=安装更多软件... Name[zh_TW]=安裝更多... Exec=muon-discover --category @category Icon=muondiscover diff -Nru muon-1.9.60/discover/muon-discover.desktop muon-2.0.0/discover/muon-discover.desktop --- muon-1.9.60/discover/muon-discover.desktop 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/muon-discover.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -1,5 +1,8 @@ [Desktop Entry] Name=Muon Discover +Name[bs]=Muon otkrivač +Name[ca]=Muon Discover +Name[ca@valencia]=Descobridor Muon Name[cs]=Muon Discover Name[da]=Muon Discover Name[el]=Muon Discover @@ -7,13 +10,15 @@ Name[et]=Muoni avastusretk Name[fi]=Muon-sovellushaku Name[fr]=Découvreur Muon +Name[ga]=Aimsiú Muon +Name[gl]=Descubridor do Muon Name[hu]=Muon Discover Name[it]=Muon Discover Name[kk]=Muon тапқышы Name[lt]=Muon apžvalga +Name[mr]=म्युओन डिस्कव्हर Name[nb]=Muon-oppdager Name[nl]=Muon-zoeken -Name[pa]=ਮੂਓਨ ਖੋਜ Name[pl]=Odkrywca Muon Name[pt]=Descoberta do Muon Name[pt_BR]=Descobridor do Muon @@ -29,7 +34,8 @@ Name[tr]=Muon Keşfet Name[uk]=Шукач Muon Name[x-test]=xxMuon Discoverxx -Name[zh_TW]=Muon 探詢器 +Name[zh_CN]=Muon 通知器 +Name[zh_TW]=Muon 探測器 Exec=muon-discover Icon=muondiscover Type=Application @@ -48,10 +54,12 @@ GenericName[fi]=Sovellusvalikoima GenericName[fr]=Logithèque GenericName[ga]=Lárionad Bogearraí +GenericName[gl]=Centro de Software GenericName[hu]=Szoftverközpont GenericName[it]=Software Center GenericName[kk]=Бағдарлама орталығы GenericName[lt]=Programų centras +GenericName[mr]=सॉफ़्टवेअर केंद्र GenericName[nb]=Programvaresenter GenericName[nds]=Programmzentrum GenericName[nl]=Softwarecentrum diff -Nru muon-1.9.60/discover/muon-discoverui.rc muon-2.0.0/discover/muon-discoverui.rc --- muon-1.9.60/discover/muon-discoverui.rc 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/muon-discoverui.rc 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,15 @@ + + + + + + + + + + diff -Nru muon-1.9.60/discover/qml/AddonsView.qml muon-2.0.0/discover/qml/AddonsView.qml --- muon-1.9.60/discover/qml/AddonsView.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/AddonsView.qml 2013-04-01 20:32:05.000000000 +0000 @@ -38,7 +38,7 @@ } } - ScrollBar { + NativeScrollBar { id: scroll orientation: Qt.Vertical flickableItem: parent diff -Nru muon-1.9.60/discover/qml/ApplicationOverview.qml muon-2.0.0/discover/qml/ApplicationOverview.qml --- muon-1.9.60/discover/qml/ApplicationOverview.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/ApplicationOverview.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.plasma.components 0.1 import org.kde.qtextracomponents 0.1 @@ -8,7 +27,7 @@ property QtObject application: null property variant reviewsBackend: application.backend.reviewsBackend - ScrollBar { + NativeScrollBar { id: scroll orientation: Qt.Vertical flickableItem: overviewContentsFlickable @@ -34,7 +53,7 @@ width: parent.width spacing: 10 - property QtObject ratingInstance: appInfo.reviewsBackend.ratingForApplication(appInfo.application) + property QtObject ratingInstance: appInfo.reviewsBackend!=null ? appInfo.reviewsBackend.ratingForApplication(appInfo.application) : null Rating { anchors.horizontalCenter: parent.horizontalCenter visible: overviewContents.ratingInstance!=null @@ -55,16 +74,15 @@ } Button { - visible: application.isInstalled + visible: application.isInstalled && application.canExecute anchors.horizontalCenter: parent.horizontalCenter text: i18n("Launch") - enabled: application.canExecute onClicked: application.invokeApplication() } Button { anchors.horizontalCenter: parent.horizontalCenter - visible: application.isInstalled + visible: appInfo.reviewsBackend != null && application.isInstalled text: i18n("Review") onClicked: reviewDialog.open() } @@ -119,6 +137,7 @@ asynchronous: true fillMode: Image.PreserveAspectFit source: thumbnailsView.currentIndex>=0 ? screenshotsModel.screenshotAt(thumbnailsView.currentIndex) : "image://icon/image-missing" + smooth: true onStatusChanged: if(status==Image.Error) { sourceSize.width = sourceSize.height = 200 @@ -145,9 +164,13 @@ PropertyChanges { target: thumbnailsView; opacity: 0.3 } } ] - Behavior on y { NumberAnimation { easing.type: Easing.OutQuad; duration: 500 } } - Behavior on width { NumberAnimation { easing.type: Easing.OutQuad; duration: 500 } } - Behavior on height { NumberAnimation { easing.type: Easing.OutQuad; duration: 500 } } + transitions: Transition { + SequentialAnimation { + PropertyAction { target: screenshot; property: "smooth"; value: false } + NumberAnimation { properties: "y,width,height"; easing.type: Easing.OutQuad; duration: 500 } + PropertyAction { target: screenshot; property: "smooth"; value: true } + } + } MouseArea { anchors.fill: parent diff -Nru muon-1.9.60/discover/qml/ApplicationPage.qml muon-2.0.0/discover/qml/ApplicationPage.qml --- muon-1.9.60/discover/qml/ApplicationPage.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/ApplicationPage.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.plasma.components 0.1 import org.kde.qtextracomponents 0.1 @@ -75,12 +94,12 @@ TabButton { tab: reviewsView text: i18n("Reviews") + visible: reviewsView.hasReviews } } TabGroup { - id: currentView - currentTab: tabs.currentTab + currentTab: tabs.currentTab.tab anchors { top: tabs.bottom left: parent.left diff -Nru muon-1.9.60/discover/qml/ApplicationsGrid.qml muon-2.0.0/discover/qml/ApplicationsGrid.qml --- muon-1.9.60/discover/qml/ApplicationsGrid.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/ApplicationsGrid.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.plasma.components 0.1 @@ -42,7 +61,7 @@ } } - ScrollBar { + NativeScrollBar { id: scroll orientation: Qt.Vertical flickableItem: viewFlickable diff -Nru muon-1.9.60/discover/qml/ApplicationsGridDelegate.qml muon-2.0.0/discover/qml/ApplicationsGridDelegate.qml --- muon-1.9.60/discover/qml/ApplicationsGridDelegate.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/ApplicationsGridDelegate.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,125 +1,150 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import org.kde.plasma.components 0.1 import org.kde.qtextracomponents 0.1 import "navigation.js" as Navigation import QtQuick 1.1 -ListItem { +GridItem { id: delegateRoot clip: true width: parentItem.cellWidth height: parentItem.cellHeight property bool requireClick: false - - MouseArea { - id: delegateArea - anchors.fill: parent - hoverEnabled: true - property bool displayDescription: false - onPositionChanged: if(!delegateRoot.requireClick) timer.restart() - onExited: { if(!delegateRoot.requireClick) timer.stop(); displayDescription=false} - Timer { - id: timer - interval: 200 - onTriggered: delegateArea.displayDescription=true - } - onClicked: { - if(delegateRoot.requireClick && !displayDescription) { - displayDescription=true - } else - Navigation.openApplication(application) + property bool displayDescription: false + enabled: true + onClicked: { + if(delegateRoot.requireClick && !displayDescription) { + displayDescription=true + } else + Navigation.openApplication(application) + } + Timer { + id: timer + interval: 200 + onTriggered: delegateRoot.displayDescription=true + } + onPositionChanged: if(!delegateRoot.requireClick) timer.restart() + onContainsMouseChanged: { + if(!containsMouse) { + if(!delegateRoot.requireClick) + timer.stop(); + displayDescription=false } - - Flickable { - id: delegateFlickable - anchors.fill: parent - contentHeight: delegateRoot.height*2 - interactive: false - Behavior on contentY { NumberAnimation { duration: 200; easing.type: Easing.InQuad } } - - Image { - id: screen - anchors { - horizontalCenter: parent.horizontalCenter - top: parent.top - topMargin: 5 - } - fillMode: Image.PreserveAspectFit - source: model.application.thumbnailUrl - width: parent.width; height: delegateRoot.height*0.7 - sourceSize { - width: screen.width - height: screen.height - } - cache: false - asynchronous: true - onStatusChanged: { - if(status==Image.Error) { - fallbackToIcon() - } - } - Component.onCompleted: { - if(model.application.thumbnailUrl=="") - fallbackToIcon(); - } - - function fallbackToIcon() { - sourceSize.width = height - sourceSize.height = height - source="image://icon/"+model.application.icon - smallIcon.visible = false - } - } - QIconItem { - id: smallIcon - anchors { - right: screen.right - } - width: 48 - height: width - icon: model.application.icon - Behavior on y { NumberAnimation { duration: 200; easing.type: Easing.InQuad } } - } - Label { - anchors { - top: screen.bottom - left: parent.left - right: parent.right - leftMargin: 5 - } - horizontalAlignment: Text.AlignHCenter - elide: Text.ElideRight - text: name + } + + Flickable { + id: delegateFlickable + anchors.fill: parent + contentHeight: delegateRoot.height*2 + interactive: false + Behavior on contentY { NumberAnimation { duration: 200; easing.type: Easing.InQuad } } + + Image { + id: screen + anchors { + horizontalCenter: parent.horizontalCenter + top: parent.top + topMargin: 5 + } + source: model.application.thumbnailUrl + height: delegateRoot.height*0.7 + sourceSize { + width: parent.width + height: screen.height + } + cache: false + asynchronous: true + onStatusChanged: { + if(status==Image.Error) { + fallbackToIcon() + } + } + Component.onCompleted: { + if(model.application.thumbnailUrl=="") + fallbackToIcon(); } - Loader { - id: descriptionLoader - anchors { - left: parent.left - right: parent.right - bottom: parent.bottom - top: parent.verticalCenter + + function fallbackToIcon() { state = "fallback" } + state: "normal" + states: [ + State { name: "normal" }, + State { name: "fallback" + PropertyChanges { target: screen; smooth: true } + PropertyChanges { target: screen; source: "image://icon/"+model.application.icon} + PropertyChanges { target: screen; sourceSize.width: screen.height } + PropertyChanges { target: smallIcon; visible: false } } - } + ] } - onStateChanged: { - if(state=="description") - descriptionLoader.sourceComponent=extraInfoComponent + QIconItem { + id: smallIcon + anchors { + right: parent.right + rightMargin: 5 + } + width: 48 + height: width + icon: model.application.icon + Behavior on y { NumberAnimation { duration: 200; easing.type: Easing.InQuad } } } - - state: "screenshot" - states: [ - State { name: "screenshot" - when: !delegateArea.displayDescription - PropertyChanges { target: smallIcon; y: 5+screen.height-height } - PropertyChanges { target: delegateFlickable; contentY: 0 } - }, - State { name: "description" - when: delegateArea.displayDescription - PropertyChanges { target: smallIcon; y: 5+delegateRoot.height } - PropertyChanges { target: delegateFlickable; contentY: delegateRoot.height } + Label { + anchors { + top: screen.bottom + left: parent.left + right: parent.right + leftMargin: 5 + } + horizontalAlignment: Text.AlignHCenter + elide: Text.ElideRight + text: name + } + Loader { + id: descriptionLoader + anchors { + left: parent.left + right: parent.right + bottom: parent.bottom + top: parent.verticalCenter } - ] + } + } + onStateChanged: { + if(state=="description") + descriptionLoader.sourceComponent=extraInfoComponent } + state: "screenshot" + states: [ + State { name: "screenshot" + when: !delegateRoot.displayDescription + PropertyChanges { target: smallIcon; y: 5+screen.height-height } + PropertyChanges { target: delegateFlickable; contentY: 0 } + }, + State { name: "description" + when: delegateRoot.displayDescription + PropertyChanges { target: smallIcon; y: 5+delegateRoot.height } + PropertyChanges { target: delegateFlickable; contentY: delegateRoot.height } + } + ] + Component { id: extraInfoComponent Item { @@ -168,6 +193,7 @@ anchors.fill: parent text: i18n("Update") visible: model.application.canUpgrade + onClicked: resourcesModel.installApplication(model.application) } } } diff -Nru muon-1.9.60/discover/qml/ApplicationsList.qml muon-2.0.0/discover/qml/ApplicationsList.qml --- muon-1.9.60/discover/qml/ApplicationsList.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/ApplicationsList.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.plasma.components 0.1 import org.kde.qtextracomponents 0.1 @@ -103,6 +122,7 @@ width: ratingsItem.width visible: model.application.canUpgrade onClicked: resourcesModel.installApplication(model.application) + enabled: !installButton.isActive } InstallApplicationButton { @@ -118,7 +138,7 @@ } } - ScrollBar { + NativeScrollBar { id: scroll orientation: Qt.Vertical flickableItem: view diff -Nru muon-1.9.60/discover/qml/ApplicationsListPage.qml muon-2.0.0/discover/qml/ApplicationsListPage.qml --- muon-1.9.60/discover/qml/ApplicationsListPage.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/ApplicationsListPage.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.plasma.components 0.1 import org.kde.qtextracomponents 0.1 @@ -44,19 +63,24 @@ tools: Row { id: buttonsRow width: 100 + height: theme.defaultFont.pointSize*2 visible: page.visible + spacing: 3 MuonMenuToolButton { id: button icon: "view-sort-ascending" anchors.verticalCenter: parent.verticalCenter model: paramModel + minimumHeight: parent.height delegate: ToolButton { width: parent.width + height: button.height text: display onClicked: { appsModel.stringSortRole=role appsModel.sortOrder=sorting page.sectionProperty = section + page.sectionDelegate = null button.checked=false } checked: appsModel.stringSortRole==role @@ -65,11 +89,13 @@ MuonMenuToolButton { id: listViewShown - checkable: true icon: "tools-wizard" model: ["list", "grid2"] + minimumHeight: parent.height + anchors.verticalCenter: parent.verticalCenter delegate: ToolButton { width: parent.width + height: listViewShown.height text: modelData onClicked: { page.state=modelData diff -Nru muon-1.9.60/discover/qml/ApplicationsTop.qml muon-2.0.0/discover/qml/ApplicationsTop.qml --- muon-1.9.60/discover/qml/ApplicationsTop.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/ApplicationsTop.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.plasma.components 0.1 import org.kde.qtextracomponents 0.1 @@ -10,9 +29,7 @@ property alias filteredCategory: appsModel.filteredCategory property Component roleDelegate: null property string title: "" - - function sortModel() { appsModel.sortModel() } - + interactive: false model: ApplicationProxyModel { id: appsModel @@ -24,20 +41,27 @@ width: parent.width horizontalAlignment: Text.AlignHCenter font.weight: Font.Bold + height: paintedHeight*1.5 } delegate: ListItem { - width: view.width - height: 30 + width: ListView.view.width + height: (view.height-nameLabel.paintedHeight*1.5-view.spacing*5)/5 enabled: true QIconItem { id: iconItem anchors { left: parent.left; verticalCenter: parent.verticalCenter } height: parent.height*0.9 width: height - icon: model["icon"] + icon: model.icon } Label { - anchors { left: iconItem.right; right: pointsLabel.left; verticalCenter: parent.verticalCenter } + id: nameLabel + anchors { + left: iconItem.right + right: pointsLabel.left + verticalCenter: parent.verticalCenter + leftMargin: 5 + } text: name elide: Text.ElideRight } diff -Nru muon-1.9.60/discover/qml/Breadcrumbs.qml muon-2.0.0/discover/qml/Breadcrumbs.qml --- muon-1.9.60/discover/qml/Breadcrumbs.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/Breadcrumbs.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.plasma.components 0.1 @@ -32,6 +51,13 @@ } } + function removeAllItems() { + var pos = items.count-1 + for(; pos>0; --pos) { + items.remove(items.count-1) + } + } + ListView { id: view diff -Nru muon-1.9.60/discover/qml/BrowsingPage.qml muon-2.0.0/discover/qml/BrowsingPage.qml --- muon-1.9.60/discover/qml/BrowsingPage.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/BrowsingPage.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,2 +1,21 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + CategoryPage {} diff -Nru muon-1.9.60/discover/qml/CategoryHeader.qml muon-2.0.0/discover/qml/CategoryHeader.qml --- muon-1.9.60/discover/qml/CategoryHeader.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/CategoryHeader.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.qtextracomponents 0.1 import org.kde.plasma.components 0.1 @@ -21,8 +40,10 @@ anchors { verticalCenter: parent.verticalCenter left: iconItem.right + right: parent.right leftMargin: 50 } + elide: Text.ElideRight font.pixelSize: parent.height*0.5 text: category.name } diff -Nru muon-1.9.60/discover/qml/CategoryPage.qml muon-2.0.0/discover/qml/CategoryPage.qml --- muon-1.9.60/discover/qml/CategoryPage.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/CategoryPage.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,22 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.1 import org.kde.plasma.components 0.1 import org.kde.qtextracomponents 0.1 @@ -8,6 +27,7 @@ id: page property QtObject category property real actualWidth: width-Math.pow(width/70, 2) + property alias categories: categoryModel function searchFor(text) { if(category) @@ -18,7 +38,7 @@ Component { id: categoryDelegate - ListItem { + GridItem { property int minCellWidth: 130 width: parent.width/Math.ceil(parent.width/minCellWidth)-10 height: 100 @@ -42,23 +62,15 @@ wrapMode: Text.WordWrap } } - onClicked: { - switch(categoryType) { - case CategoryModel.CategoryType: - Navigation.openApplicationList(category.icon, category.name, category, "") - break; - case CategoryModel.SubCatType: - Navigation.openCategory(category) - break; - } - } + onClicked: Navigation.openCategory(category) } } - ScrollBar { + NativeScrollBar { id: scroll orientation: Qt.Vertical flickableItem: flick + anchors { top: parent.top right: parent.right @@ -69,17 +81,16 @@ Flickable { id: flick anchors { - horizontalCenter: parent.horizontalCenter - top: parent.top - bottom: parent.bottom + fill: parent bottomMargin: 10 + rightMargin: scroll.width } - width: page.actualWidth contentHeight: conts.height Column { id: conts - width: parent.width + width: page.actualWidth + anchors.horizontalCenter: parent.horizontalCenter spacing: 10 Loader { width: parent.width @@ -106,6 +117,7 @@ spacing: 10 Repeater { model: CategoryModel { + id: categoryModel displayedCategory: page.category } delegate: categoryDelegate @@ -122,10 +134,10 @@ left: parent.left bottom: parent.bottom } - sortRole: "popcon" + sortRole: "sortableRating" filteredCategory: page.category title: i18n("Popularity Contest") - roleDelegate: Label { property variant model; text: i18n("points: %1", model.popcon) } + roleDelegate: Label { property variant model; text: i18n("points: %1", model.sortableRating.toFixed(2)) } } ApplicationsTop { width: parent.width/2-5 diff -Nru muon-1.9.60/discover/qml/DefaultBanner.qml muon-2.0.0/discover/qml/DefaultBanner.qml --- muon-1.9.60/discover/qml/DefaultBanner.qml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/qml/DefaultBanner.qml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,27 @@ +import QtQuick 1.1 +import org.kde.plasma.components 0.1 +import org.kde.qtextracomponents 0.1 + +Item +{ + QIconItem { + id: icon + icon: "kde" + y: 30 + width: 200 + height: 200 + } + + Label { + text: i18n("Welcome to\nMuon Discover!") + anchors { + topMargin: 50 + rightMargin: 50 + right: parent.right + verticalCenter: icon.verticalCenter + left: icon.right + } + font.pointSize: parent.height/7 + horizontalAlignment: Text.AlignHCenter + } +} diff -Nru muon-1.9.60/discover/qml/FeaturedBanner.qml muon-2.0.0/discover/qml/FeaturedBanner.qml --- muon-1.9.60/discover/qml/FeaturedBanner.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/FeaturedBanner.qml 2013-04-01 20:32:05.000000000 +0000 @@ -2,104 +2,41 @@ import org.kde.plasma.components 0.1 import org.kde.qtextracomponents 0.1 import "navigation.js" as Navigation -import "Helpers.js" as Helpers Information { id: info - Component.onCompleted: { - var xhr = new XMLHttpRequest; - xhr.open("GET", app.featuredSource()); - xhr.onreadystatechange = function() { - if (xhr.readyState == XMLHttpRequest.DONE) { - featuredData = JSON.parse(xhr.responseText) - } - } - xhr.send(); - } - property variant featuredData: null - onFeaturedDataChanged: Helpers.getFeatured(noCategoryModel, featuredData) - Connections { - target: resourcesModel - onRowsInserted: { - //TODO: Inefficient? - if(info.featuredData!=null) { - Helpers.getFeatured(noCategoryModel, featuredData) - } - } - } - - model: ListModel { - id: noCategoryModel -// ListElement { text: "Kubuntu"; color: "#84D1FF"; icon: "kde"; comment: ""; image: "http://www.kubuntu.org/files/12.04-lts-banner.png"; packageName: "" } - } + model: FeaturedModel {} delegate: MouseArea { property QtObject modelData: model enabled: modelData.package!="" - width: Math.min(image.width, parent.width); height: parent.height - onClicked: Navigation.openApplication(resourcesModel.resourceByPackageName(modelData.packageName)) + width: Math.min(flick.width, parent.width) + height: parent.height + + onClicked: { + if(modelData.packageName!=null) + Navigation.openApplication(resourcesModel.resourceByPackageName(modelData.packageName)) + else + Qt.openUrlExternally(modelData.url) + } clip: true z: PathView.isCurrentItem && !PathView.view.moving ? 1 : -1 id: itemDelegate - states: [ - State { - name: "shownSmall" - when: image.status==Image.Ready && image.height<(flick.height-titleBar.height) - PropertyChanges { target: flick; contentY: (flick.contentHeight+titleBar.height)/2-flick.height/2 } - }, - State { - name: "shownIdeal" - when: image.status==Image.Ready && image.height + * Copyright 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library General Public License as + * published by the Free Software Foundation; either version 2, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Library General Public License for more details + * + * You should have received a copy of the GNU Library General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +///This is a fork of ListItem so that it can be used for GridView + +import QtQuick 1.0 +import org.kde.plasma.core 0.1 as PlasmaCore + +MouseArea { + id: listItem + default property alias content: paddingItem.data + + //this defines if the item will emit clicked and look pressed on mouse down + property alias enabled: listItem.enabled + property alias containsMouse: listItem.containsMouse + + property bool checked: false + property bool sectionDelegate: false + + width: parent ? parent.width : childrenRect.width + height: paddingItem.childrenRect.height + background.margins.top + background.margins.bottom + + property int implicitHeight: paddingItem.childrenRect.height + background.margins.top + background.margins.bottom + + property bool changeBackgroundOnPress: !listItem.checked && !listItem.sectionDelegate + hoverEnabled: true + onPressed: if (changeBackgroundOnPress) background.prefix = "pressed" + onReleased: if (changeBackgroundOnPress) background.prefix = "normal" + onCanceled: if (changeBackgroundOnPress) background.prefix = "normal" + + Connections { + target: listItem + onCheckedChanged: background.prefix = (listItem.checked ? "pressed" : "normal") + onSectionDelegateChanged: background.prefix = (listItem.sectionDelegate ? "section" : "normal") + } + + PlasmaCore.FrameSvgItem { + id : background + imagePath: "widgets/listitem" + prefix: "normal" + + anchors.fill: parent + opacity: listItem.containsMouse && !listItem.pressed ? 0.5 : 1 + Component.onCompleted: { + prefix = (listItem.sectionDelegate ? "section" : (listItem.checked ? "pressed" : "normal")) + } + Behavior on opacity { NumberAnimation { duration: 200 } } + } + PlasmaCore.SvgItem { + svg: PlasmaCore.Svg {imagePath: "widgets/listitem"} + elementId: "separator" + anchors { + left: parent.left + right: parent.right + top: parent.top + } + height: naturalSize.height + visible: listItem.sectionDelegate || (typeof(index) != "undefined" && index > 0 && !listItem.checked && !listItem.pressed) + } + + Item { + id: paddingItem + anchors { + fill: background + leftMargin: background.margins.left + topMargin: background.margins.top + rightMargin: background.margins.right + bottomMargin: background.margins.bottom + } + } +} diff -Nru muon-1.9.60/discover/qml/Helpers.js muon-2.0.0/discover/qml/Helpers.js --- muon-1.9.60/discover/qml/Helpers.js 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/Helpers.js 1970-01-01 00:00:00.000000000 +0000 @@ -1,23 +0,0 @@ -function getFeatured(model, data) { - if(data==null) - return - - for(var packageName in data) { - var currentData = data[packageName] - var resource = resourcesModel.resourceByPackageName(currentData.package) - if(resource==null) { -// console.log("resource "+ currentData.package+" not found") - continue - } - var image = currentData.image - if(image == null) - image = resource.screenshotUrl - model.append({ - "text": resource.name, - "color": "red", - "image": image, - "icon": resource.icon, - "comment": resource.comment, - "packageName": currentData.package }) - } -} \ No newline at end of file diff -Nru muon-1.9.60/discover/qml/InstallApplicationButton.qml muon-2.0.0/discover/qml/InstallApplicationButton.qml --- muon-1.9.60/discover/qml/InstallApplicationButton.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/InstallApplicationButton.qml 2013-04-01 20:32:05.000000000 +0000 @@ -20,7 +20,7 @@ Button { id: button visible: parent.state=="idle" - width: parent.width + minimumWidth: parent.width anchors.fill: parent onClicked: { diff -Nru muon-1.9.60/discover/qml/InstalledPage.qml muon-2.0.0/discover/qml/InstalledPage.qml --- muon-1.9.60/discover/qml/InstalledPage.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/InstalledPage.qml 2013-04-01 20:32:05.000000000 +0000 @@ -5,10 +5,12 @@ id: page stateFilter: 2 sortRole: "canUpgrade" - sortOrder: 1 + sortOrder: Qt.AscendingOrder sectionProperty: "canUpgrade" sectionDelegate: Label { - text: section=="true" ? i18n("Update") : i18n("Installed") + text: (section=="true" ? i18n("Update") : + section=="false" ? i18n("Installed") : + section) anchors { right: parent.right rightMargin: page.proposedMargin diff -Nru muon-1.9.60/discover/qml/Main.qml muon-2.0.0/discover/qml/Main.qml --- muon-1.9.60/discover/qml/Main.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/Main.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,5 +1,6 @@ import QtQuick 1.1 import org.kde.plasma.components 0.1 +import org.kde.muon.discover 1.0 import "navigation.js" as Navigation Item { @@ -7,15 +8,32 @@ property Component applicationListComp: Qt.createComponent("qrc:/qml/ApplicationsListPage.qml") property Component applicationComp: Qt.createComponent("qrc:/qml/ApplicationPage.qml") property Component categoryComp: Qt.createComponent("qrc:/qml/CategoryPage.qml") - + //toplevels - property Component browsingComp: Qt.createComponent("qrc:/qml/BrowsingPage.qml") - property Component installedComp: Qt.createComponent("qrc:/qml/InstalledPage.qml") - property Component sourcesComp: Qt.createComponent("qrc:/qml/SourcesPage.qml") - property Component currentTopLevel: defaultStartup ? browsingComp : loadingComponent + property Component topBrowsingComp: Qt.createComponent("qrc:/qml/BrowsingPage.qml") + property Component topInstalledComp: Qt.createComponent("qrc:/qml/InstalledPage.qml") + property Component topSourcesComp: Qt.createComponent("qrc:/qml/SourcesPage.qml") + property Component currentTopLevel: defaultStartup ? topBrowsingComp : loadingComponent property bool defaultStartup: true property bool navigationEnabled: true + //text search + property bool searchVisible: pageStack.currentPage!=null && pageStack.currentPage.searchFor!=null + + Binding { + target: app.searchWidget + property: "visible" + value: window.searchVisible + } + function clearSearch() { app.searchWidget.text="" } + Connections { + target: app.searchWidget + onTextChanged: { + if(app.searchWidget.text.length>3) + pageStack.currentPage.searchFor(app.searchWidget.text) + } + } + Component { id: loadingComponent Page { @@ -30,110 +48,71 @@ onCurrentTopLevelChanged: { if(currentTopLevel==null) return - searchField.text="" + window.clearSearch() if(currentTopLevel.status==Component.Error) { console.log("status error: "+currentTopLevel.errorString()) } while(pageStack.depth>1) { var obj = pageStack.pop() if(obj) - obj.destroy(1000) - } - - try { - var obj = currentTopLevel.createObject(pageStack) - pageStack.push(obj) -// console.log("created "+currentTopLevel) - } catch (e) { - console.log("error: "+e) - console.log("comp error: "+currentTopLevel.errorString()) - } - } - - Item { - id:toolbar - z: 10 - height: 50 - width: parent.width - anchors.top: parent.top - - Row { - id: toplevelsRow - spacing: 5 - anchors { - top: parent.top - bottom: parent.bottom - left: parent.left - } - - MuonToolButton { - height: toplevelsRow.height - icon: "go-previous" - enabled: window.navigationEnabled && breadcrumbsItem.count>1 - onClicked: { - breadcrumbsItem.popItem(false) - searchField.text = "" - } - } - - Item { - //we add some extra space - width: 20 - height: 20 - } - - property list sectionsModel: [ - TopLevelPageData { icon: "tools-wizard"; text: i18n("Discover"); component: browsingComp }, - TopLevelPageData { - icon: "applications-other"; text: i18n("Installed"); component: installedComp - overlay: resourcesModel.updatesCount==0 ? "" : resourcesModel.updatesCount - }, - TopLevelPageData { icon: "document-import"; text: i18n("Sources"); component: sourcesComp } - ] - Repeater { - model: toplevelsRow.sectionsModel - - delegate: MuonToolButton { - height: toplevelsRow.height - text: modelData.text - icon: modelData.icon - overlayText: modelData.overlay - checked: currentTopLevel==modelData.component - enabled: window.navigationEnabled - onClicked: { - Navigation.clearPages() - if(currentTopLevel!=modelData.component) - currentTopLevel=modelData.component - } - } - } - } - - TextField { - id: searchField - anchors { - right: parent.right - rightMargin: 10 - verticalCenter: parent.verticalCenter - } - visible: pageStack.currentPage!=null && pageStack.currentPage.searchFor!=null - placeholderText: i18n("Search...") - onTextChanged: if(text.length>3) pageStack.currentPage.searchFor(text) -// onAccepted: pageStack.currentPage.searchFor(text) //TODO: uncomment on kde 4.9 + obj.destroy(2000) } + var page = Navigation.rootPagesCache[currentTopLevel] + if(page == undefined) { + try { + page = currentTopLevel.createObject(pageStack) + Navigation.rootPagesCache[currentTopLevel] = page +// console.log("created ", currentTopLevel, Navigation.rootPagesCache[currentTopLevel]) + } catch (e) { + console.log("error: "+e) + console.log("comp error: "+currentTopLevel.errorString()) + } + } + pageStack.replace(page, {}, window.status!=Component.Ready) + } + + DiscoverAction { + objectName: "back" + iconName: "go-previous" + enabled: window.navigationEnabled && breadcrumbsItem.count>1 + mainWindow: app + text: i18n("Back") + onTriggered: { + breadcrumbsItem.popItem(false) + window.clearSearch() + } + priority: "LowPriority" + } + TopLevelPageData { + iconName: "tools-wizard" + text: i18n("Discover") + component: topBrowsingComp + objectName: "discover" + } + TopLevelPageData { + iconName: "applications-other" + text: resourcesModel.updatesCount==0 ? i18n("Installed") : i18np("Installed (%1 update)", "Installed (%1 updates)", resourcesModel.updatesCount) + component: topInstalledComp + objectName: "installed" + } + TopLevelPageData { + iconName: "document-import" + text: i18n("Sources") + component: topSourcesComp + objectName: "sources" } Connections { target: app onOpenApplicationInternal: Navigation.openApplication(app) onListMimeInternal: Navigation.openApplicationMime(mime) - onListCategoryInternal: Navigation.openApplicationList(c.icon, c.name, c, "") + onListCategoryInternal: Navigation.openCategoryByName(name) } ToolBar { id: breadcrumbsItemBar anchors { - top: toolbar.bottom + top: parent.top left: parent.left right: pageToolBar.left rightMargin: pageToolBar.visible ? 10 : 0 @@ -144,7 +123,7 @@ id: breadcrumbsItem anchors.fill: parent pageStack: pageStack - onPoppedPages: searchField.text="" + onPoppedPages: window.clearSearch() Component.onCompleted: breadcrumbsItem.pushItem("go-home") } Behavior on height { NumberAnimation { duration: 250 } } @@ -153,10 +132,10 @@ ToolBar { id: pageToolBar anchors { - top: toolbar.bottom + top: parent.top right: parent.right } - height: 30 + height: visible ? 30 : 0 width: tools!=null ? tools.childrenRect.width+5 : 0 visible: width>0 @@ -165,13 +144,18 @@ PageStack { id: pageStack - clip: true toolBar: pageToolBar anchors { bottom: progressBox.top - top: pageToolBar.bottom + top: parent.top left: parent.left right: parent.right + topMargin: Math.max(breadcrumbsItemBar.height, pageToolBar.height) + } + onDepthChanged: { + if(depth==1) { + breadcrumbsItem.removeAllItems() + } } } diff -Nru muon-1.9.60/discover/qml/MuonMenuToolButton.qml muon-2.0.0/discover/qml/MuonMenuToolButton.qml --- muon-1.9.60/discover/qml/MuonMenuToolButton.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/MuonMenuToolButton.qml 2013-04-01 20:32:05.000000000 +0000 @@ -3,16 +3,17 @@ MuonToolButton { id: button - property alias delegate: menuRepeater.delegate - property alias model: menuRepeater.model + property alias delegate: menuItem.delegate + property alias model: menuItem.model checkable: true checked: false - Item { + ListView { id: menuItem width: 100 - height: buttons.height + height: button.height*count + clip: true anchors.right: parent.right anchors.top: parent.bottom visible: button.checked @@ -20,15 +21,7 @@ anchors.fill: parent radius: 10 opacity: 0.4 - } - - Column { - id: buttons - width: parent.width - - Repeater { - id: menuRepeater - } + z: -33 } } } diff -Nru muon-1.9.60/discover/qml/NativeScrollBar.qml muon-2.0.0/discover/qml/NativeScrollBar.qml --- muon-1.9.60/discover/qml/NativeScrollBar.qml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/discover/qml/NativeScrollBar.qml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,46 @@ +/* + * Copyright (C) 2013 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +import QtQuick 1.1 +import org.kde.muon.discover 1.0 + +NativeScrollBar { + id: scroll + property QtObject flickableItem: null + + orientation: Qt.Vertical + minimum: 0 + maximum: Math.max(flickableItem.contentHeight-flickableItem.height, 0) + pageStep: flickableItem.height + opacity: maximum!=minimum ? 1 : 0 + + onValueChanged: flickableItem.contentY=value + onFlickableItemChanged: flickableItem.boundsBehavior=Flickable.StopAtBounds + + Behavior on opacity { NumberAnimation { easing.type: Easing.OutQuad; duration: 500 } } + + Connections { + target: scroll.flickableItem + onContentYChanged: { + if(flickableItem.movingVertically) { + scroll.value=flickableItem.contentY + } + } + } +} diff -Nru muon-1.9.60/discover/qml/ReviewsView.qml muon-2.0.0/discover/qml/ReviewsView.qml --- muon-1.9.60/discover/qml/ReviewsView.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/ReviewsView.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,10 +1,12 @@ import QtQuick 1.1 import org.kde.plasma.components 0.1 +import org.kde.plasma.extras 0.1 import org.kde.muon 1.0 Item { property alias application: reviewsModel.resource + property bool hasReviews: reviewsView.count>0 ListView { id: reviewsView @@ -16,7 +18,7 @@ visible: reviewsView.count>0 spacing: 5 - header: Label { text: i18n("Reviews:") } + header: Heading { text: i18n("Reviews:") } delegate: ListItem { visible: model["shouldShow"] @@ -37,11 +39,11 @@ Label { anchors { left: parent.left - right: parent.right + right: rating.left } id: content - text: i18n("%1 by %2

%3
%4", summary, reviewer, + text: i18n("

%1 by %2

%3

%4

", summary, reviewer, display, usefulnessToString(usefulnessFavorable, usefulnessTotal)) wrapMode: Text.WordWrap } @@ -59,6 +61,7 @@ } Rating { + id: rating anchors.top: parent.top anchors.right: parent.right rating: model["rating"] @@ -72,7 +75,7 @@ } } - ScrollBar { + NativeScrollBar { id: scroll orientation: Qt.Vertical flickableItem: reviewsView diff -Nru muon-1.9.60/discover/qml/SourcesPage.qml muon-2.0.0/discover/qml/SourcesPage.qml --- muon-1.9.60/discover/qml/SourcesPage.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/SourcesPage.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,6 +1,7 @@ import QtQuick 1.0 import org.kde.plasma.components 0.1 import org.kde.muon 1.0 +import org.kde.muonapt 1.0 import "navigation.js" as Navigation Page { @@ -93,7 +94,7 @@ } OriginsBackend { id: origins } - ScrollBar { + NativeScrollBar { id: scroll orientation: Qt.Vertical flickableItem: view diff -Nru muon-1.9.60/discover/qml/TopLevelPageData.qml muon-2.0.0/discover/qml/TopLevelPageData.qml --- muon-1.9.60/discover/qml/TopLevelPageData.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/TopLevelPageData.qml 2013-04-01 20:32:05.000000000 +0000 @@ -1,8 +1,37 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + import QtQuick 1.0 +import org.kde.muon.discover 1.0 +import "navigation.js" as Navigation -QtObject { - property string icon - property string text +DiscoverAction { property string overlay property Component component + mainWindow: app + checkable: true + checked: window.currentTopLevel==component + enabled: window.navigationEnabled && component && component.status == Component.Ready + actionsGroup: "topLevelPagesGroup" + + onTriggered: { + if(window.currentTopLevel!=component) + window.currentTopLevel=component + } } diff -Nru muon-1.9.60/discover/qml/UpdatesPage.qml muon-2.0.0/discover/qml/UpdatesPage.qml --- muon-1.9.60/discover/qml/UpdatesPage.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/UpdatesPage.qml 2013-04-01 20:32:05.000000000 +0000 @@ -31,14 +31,14 @@ maximumValue: 100 Label { - anchors.fill: parent + anchors.centerIn: parent text: updatesModel.remainingTime horizontalAlignment: Text.AlignHCenter verticalAlignment: Text.AlignVCenter visible: text!="" } } - ScrollBar { + NativeScrollBar { orientation: Qt.Vertical flickableItem: messageFlickable anchors { @@ -46,7 +46,6 @@ bottom: parent.bottom right: parent.right } - interactive: false //TODO: Remove this line when ScrollBar has been fixed } PlasmaCore.FrameSvgItem { id: base diff -Nru muon-1.9.60/discover/qml/navigation.js muon-2.0.0/discover/qml/navigation.js --- muon-1.9.60/discover/qml/navigation.js 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/qml/navigation.js 2013-04-01 20:32:05.000000000 +0000 @@ -1,3 +1,24 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +var rootPagesCache = {} + function openApplicationList(icon, name, cat, search) { openPage(icon, name, applicationListComp, { category: cat, search: search, preferList: search!="" }) } @@ -10,8 +31,16 @@ openPage("document-open-data", mime, applicationListComp, { mimeTypeFilter: mime }) } +function openCategoryByName(catname) { + currentTopLevel = topBrowsingComp + openCategory(pageStack.currentPage.categories.findCategoryByName(catname)) +} + function openCategory(cat) { - openPage(cat.icon, cat.name, categoryComp, { category: cat }) + if(cat.hasSubCategories) + openPage(cat.icon, cat.name, categoryComp, { category: cat }) + else + openApplicationList(cat.icon, cat.name, cat, "") } function openApplication(app) { @@ -19,9 +48,8 @@ } function openPage(icon, name, component, props) { - if(breadcrumbsItem.currentItem()==name || pageStack.busy) + if(breadcrumbsItem.currentItem()==name) return - var obj try { obj = component.createObject(pageStack.currentPage, props) @@ -34,8 +62,3 @@ } return obj } - -function clearPages() -{ - breadcrumbsItem.doClick(0) -} \ No newline at end of file diff -Nru muon-1.9.60/discover/resources.qrc muon-2.0.0/discover/resources.qrc --- muon-1.9.60/discover/resources.qrc 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/resources.qrc 2013-04-01 20:32:05.000000000 +0000 @@ -26,8 +26,12 @@ qml/InstalledPage.qml qml/Information.qml qml/SourcesPage.qml + qml/FeaturedModel.qml + qml/DefaultBanner.qml + qml/FeaturedImage.qml + qml/GridItem.qml + qml/NativeScrollBar.qml qml/navigation.js - qml/Helpers.js \ No newline at end of file diff -Nru muon-1.9.60/discover/tests/CMakeLists.txt muon-2.0.0/discover/tests/CMakeLists.txt --- muon-1.9.60/discover/tests/CMakeLists.txt 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,18 +0,0 @@ -include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libmuon ..) - -macro(muon_add_unit_test name) - kde4_add_unit_test(${name} ${ARGN}) - target_link_libraries(${name} - muonprivate - - ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} - ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KIO_LIBS} ${QAPT_LIBRARY} attica - ) -endmacro(muon_add_unit_test) - -if(QAPT_FOUND) - add_definitions(-DQAPT_ENABLED) - muon_add_unit_test(originsbackendtest OriginsBackendTest.cpp ../OriginsBackend.cpp) - muon_add_unit_test(reviewstest ReviewsTest.cpp ${CMAKE_SOURCE_DIR}/libmuon/tests/modeltest.cpp ../ReviewsModel.cpp) -endif(QAPT_FOUND) -muon_add_unit_test(knsbackendtest KNSBackendTest.cpp ) diff -Nru muon-1.9.60/discover/tests/KNSBackendTest.cpp muon-2.0.0/discover/tests/KNSBackendTest.cpp --- muon-1.9.60/discover/tests/KNSBackendTest.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/KNSBackendTest.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,76 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "KNSBackendTest.h" -#include -#include -#include -#include -#include - -#include - -QTEST_KDEMAIN_CORE( KNSBackendTest ) - -KNSBackendTest::KNSBackendTest(QObject* parent) - : QObject(parent) - , m_r(0) -{ - ResourcesModel* model = ResourcesModel::global(); -// m_backend = new KNSBackend("comic.knsrc", "face-smile-big", this); - m_backend = new KNSBackend("plasmoids.knsrc", "plasma", this); - model->addResourcesBackend(m_backend); - QTest::kWaitForSignal(m_backend, SIGNAL(backendReady())); - connect(m_backend->reviewsBackend(), SIGNAL(reviewsReady(AbstractResource*,QList)), - SLOT(reviewsArrived(AbstractResource*,QList))); -} - -void KNSBackendTest::testRetrieval() -{ - ResourcesModel* model = ResourcesModel::global(); - QVector resources = m_backend->allResources(); - QVERIFY(!resources.isEmpty()); - QCOMPARE(resources.count(), model->rowCount()); - - foreach(AbstractResource* res, resources) { - QVERIFY(!res->name().isEmpty()); - QVERIFY(!res->categories().isEmpty()); - } -} - -void KNSBackendTest::testReviews() -{ - QVector resources = m_backend->allResources(); - AbstractReviewsBackend* rev = m_backend->reviewsBackend(); - foreach(AbstractResource* res, resources) { - Rating* r = rev->ratingForApplication(res); - QVERIFY(r); - QCOMPARE(r->packageName(), res->packageName()); - QVERIFY(r->rating()>0 && r->rating()<=10); -// rev->fetchReviews(res); -// QTest::kWaitForSignal(rev, SIGNAL(reviewsReady(AbstractResource*,QList))); - } -} - -void KNSBackendTest::reviewsArrived(AbstractResource* r, const QList< Review* >& revs) -{ - m_r = r; - m_revs = revs; -} diff -Nru muon-1.9.60/discover/tests/KNSBackendTest.h muon-2.0.0/discover/tests/KNSBackendTest.h --- muon-1.9.60/discover/tests/KNSBackendTest.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/KNSBackendTest.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef KNSBACKENDTEST_H -#define KNSBACKENDTEST_H - -#include - -class AbstractResource; -class Review; -class KNSBackend; - -class KNSBackendTest : public QObject -{ - Q_OBJECT - public: - explicit KNSBackendTest(QObject* parent = 0); - - private slots: - void testRetrieval(); - void testReviews(); - - public slots: - void reviewsArrived(AbstractResource *r, const QList& revs); - - private: - KNSBackend* m_backend; - AbstractResource* m_r; - QList m_revs; -}; - -#endif // KNSBACKENDTEST_H diff -Nru muon-1.9.60/discover/tests/OCSBackendTest.cpp muon-2.0.0/discover/tests/OCSBackendTest.cpp --- muon-1.9.60/discover/tests/OCSBackendTest.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/OCSBackendTest.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "OCSBackendTest.h" -#include - -#include - -QTEST_KDEMAIN_CORE( OCSBackendTest ) - -OCSBackendTest::OCSBackendTest(QObject* parent) - : QObject(parent) -{ -} - -void OCSBackendTest::testRetrieval() -{ - m_backend = new OCSBackend(this); - - QTest::kWaitForSignal(m_backend, SIGNAL(backendReady())); -} diff -Nru muon-1.9.60/discover/tests/OCSBackendTest.h muon-2.0.0/discover/tests/OCSBackendTest.h --- muon-1.9.60/discover/tests/OCSBackendTest.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/OCSBackendTest.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,41 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef OCSBACKENDTEST_H -#define OCSBACKENDTEST_H - -#include - -class OCSBackend; - -class OCSBackendTest : public QObject -{ - Q_OBJECT - public: - explicit OCSBackendTest(QObject* parent = 0); - - private slots: - void testRetrieval(); - - private: - OCSBackend* m_backend; -}; - -#endif // OCSBACKENDTEST_H diff -Nru muon-1.9.60/discover/tests/OriginsBackendTest.cpp muon-2.0.0/discover/tests/OriginsBackendTest.cpp --- muon-1.9.60/discover/tests/OriginsBackendTest.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/OriginsBackendTest.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,74 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "OriginsBackendTest.h" -#include -#include -#include - -QTEST_MAIN( OriginsBackendTest ) - -OriginsBackendTest::OriginsBackendTest(QObject* parent) - : QObject(parent) -{ - ApplicationBackend* appBackend = new ApplicationBackend(this); - ResourcesModel::global()->addResourcesBackend(appBackend); -} - -void OriginsBackendTest::testLoad() -{ - { - QFile f("testsource.list"); - QVERIFY(f.open(QFile::WriteOnly|QFile::Text)); - f.write("deb file:/home/jason/debian stable main contrib non-free\n"); - f.write("deb ftp://ftp.debian.org/debian stable contrib\n"); - f.write("deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free\n"); - f.write("deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/\n"); - f.write("deb [arch=i386,amd64] http://ftp.de.debian.org/debian-non-US unstable\n"); - f.write("# deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/\n"); - f.write("deb cdrom:[Kubuntu 11.10 _Oneiric Ocelot_ - Release amd64 (20111012)]/ dists/oneiric/main/binary-i386/"); - f.write("#hola companys!\n"); - f.write(" #com anem?\n"); - f.write(" \n"); - f.write("\n"); - f.close(); - } - - OriginsBackend origins; - origins.load("testsource.list"); - - QCOMPARE(origins.sources().size(), 5); - foreach(Source* s, origins.sources()) { - QVERIFY(!s->uri().isEmpty()); - QVERIFY(s->uri().contains('[') == s->uri().contains(']')); - } - - QFile::remove("testsource.list"); -} - -void OriginsBackendTest::testLocal() -{ - OriginsBackend origins; - origins.load("/etc/apt/sources.list"); - QDir d("/etc/apt/sources.list.d/"); - foreach(const QString& f, d.entryList(QStringList("*.list"))) { - origins.load(d.filePath(f)); - } -} diff -Nru muon-1.9.60/discover/tests/OriginsBackendTest.h muon-2.0.0/discover/tests/OriginsBackendTest.h --- muon-1.9.60/discover/tests/OriginsBackendTest.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/OriginsBackendTest.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,38 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef ORIGINSBACKENDTEST_H -#define ORIGINSBACKENDTEST_H - -#include -#include <../OriginsBackend.h> - -class OriginsBackendTest : public QObject -{ - Q_OBJECT - public: - explicit OriginsBackendTest(QObject* parent = 0); - - private slots: - void testLoad(); - void testLocal(); -}; - -#endif // ORIGINSBACKENDTEST_H diff -Nru muon-1.9.60/discover/tests/ReviewsTest.cpp muon-2.0.0/discover/tests/ReviewsTest.cpp --- muon-1.9.60/discover/tests/ReviewsTest.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/ReviewsTest.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,77 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ReviewsTest.h" -#include <../ReviewsModel.h> -#include -#include -#include -#include -#include -#include -#include - -QTEST_KDEMAIN_CORE( ReviewsTest ) - -ReviewsTest::ReviewsTest(QObject* parent): QObject(parent) -{ - m_backend = new QApt::Backend; - m_backend->init(); - - m_appBackend = new ApplicationBackend; - m_appBackend->setBackend(m_backend); - QTest::kWaitForSignal(m_appBackend, SIGNAL(backendReady())); - m_revBackend = m_appBackend->reviewsBackend(); -} - -void ReviewsTest::testReviewsFetch() -{ - if(m_revBackend->isFetching()) - QTest::kWaitForSignal(m_revBackend, SIGNAL(ratingsReady())); - QVERIFY(!m_revBackend->isFetching()); -} - -void ReviewsTest::testReviewsModel_data() -{ - QTest::addColumn( "application" ); - QTest::newRow( "kate" ) << "kate"; - QTest::newRow( "gedit" ) << "gedit"; -} - -void ReviewsTest::testReviewsModel() -{ - QFETCH(QString, application); - ReviewsModel* model = new ReviewsModel(this); - new ModelTest(model, model); - - AbstractResource* app = m_appBackend->resourceByPackageName(application); - QVERIFY(app); - model->setResource(app); - QTest::kWaitForSignal(model, SIGNAL(rowsInserted(QModelIndex,int,int))); - - QModelIndex root; - while(model->canFetchMore(root)) { - model->fetchMore(root); - bool arrived = QTest::kWaitForSignal(model, SIGNAL(rowsInserted(QModelIndex,int,int)), 2000); - QCOMPARE(arrived, model->canFetchMore(root)); - } - - delete model; -} diff -Nru muon-1.9.60/discover/tests/ReviewsTest.h muon-2.0.0/discover/tests/ReviewsTest.h --- muon-1.9.60/discover/tests/ReviewsTest.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/discover/tests/ReviewsTest.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef REVIEWSTEST_H -#define REVIEWSTEST_H - -#include - -class ApplicationBackend; -class AbstractReviewsBackend; -namespace QApt { -class Backend; -} - -class ReviewsTest : public QObject -{ - Q_OBJECT - public: - explicit ReviewsTest(QObject* parent = 0); - - private slots: - void testReviewsFetch(); - - void testReviewsModel_data(); - void testReviewsModel(); - - private: - QApt::Backend* m_backend; - AbstractReviewsBackend* m_revBackend; - ApplicationBackend* m_appBackend; - -}; - -#endif // REVIEWSTEST_H diff -Nru muon-1.9.60/exporter/CMakeLists.txt muon-2.0.0/exporter/CMakeLists.txt --- muon-1.9.60/exporter/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/exporter/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,7 @@ +include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_SOURCE_DIR}/libmuon ${CMAKE_CURRENT_BINARY_DIR}/..) + +kde4_add_executable(muon-exporter main.cpp MuonExporter.cpp) + +target_link_libraries(muon-exporter muonprivate + ${KDE4_KDEUI_LIBRARY} ${QJSON_LIBRARIES} ${qjson_LIBRARIES}) + diff -Nru muon-1.9.60/exporter/MuonExporter.cpp muon-2.0.0/exporter/MuonExporter.cpp --- muon-1.9.60/exporter/MuonExporter.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/exporter/MuonExporter.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,118 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "MuonExporter.h" +#include +#include +#include +#include +#include +#include +#include +#include + +MuonExporter::MuonExporter() + : QObject(0) +{ + m_startExportingTimer = new QTimer(this); + m_startExportingTimer->setInterval(200); + m_startExportingTimer->setSingleShot(true); + connect(m_startExportingTimer, SIGNAL(timeout()), SLOT(exportModel())); + initialize(); + + m_exculdedProperties += "executables"; + m_exculdedProperties += "canExecute"; +} + +MuonExporter::~MuonExporter() +{} + +void MuonExporter::initialize() +{ + MuonBackendsFactory f; + QList backends = f.allBackends(); + + m_backendsToInitialize = backends.count(); + if(m_backendsToInitialize>0) { + ResourcesModel* m = ResourcesModel::global(); + foreach(AbstractResourcesBackend* b, backends) { + connect(b, SIGNAL(backendReady()), SLOT(backendReady())); + m->addResourcesBackend(b); + } + } else { + m_startExportingTimer->start(); + } +} + +void MuonExporter::setExportPath(const KUrl& url) +{ + m_path = url; +} + +void MuonExporter::backendReady() +{ + m_backendsToInitialize--; + if(m_backendsToInitialize==0) { + m_startExportingTimer->start(); + connect(ResourcesModel::global(), SIGNAL(rowsInserted(QModelIndex,int,int)), m_startExportingTimer, SLOT(start())); + } +} + +QVariantMap itemDataToMap(const AbstractResource* res, const QSet& excluded) +{ + QVariantMap ret; + int propsCount = res->metaObject()->propertyCount(); + for(int i = 0; imetaObject()->property(i); + if(prop.type() == QVariant::UserType || excluded.contains(prop.name())) + continue; + QVariant val = res->property(prop.name()); + + if(val.isNull()) + continue; + + ret.insert(prop.name(), val); + } + return ret; +} + +void MuonExporter::exportModel() +{ + QVariantList data; + ResourcesModel* m = ResourcesModel::global(); + + for(int i = 0; irowCount(); i++) { + QModelIndex idx = m->index(i, 0); + AbstractResource* res = qobject_cast(m->data(idx, ResourcesModel::ApplicationRole).value()); + Q_ASSERT(res); + data += itemDataToMap(res, m_exculdedProperties); + } + qDebug() << "found items: " << data.count(); + QFile f(m_path.toLocalFile()); + if(f.open(QIODevice::WriteOnly|QIODevice::Text)) { + bool ok=true; + QJson::Serializer s; + s.serialize(data, &f, &ok); + if(!ok) + qWarning() << "Could not completely export the data to " << m_path; + } else { + qWarning() << "Could not write to " << m_path; + } + emit exportDone(); +} diff -Nru muon-1.9.60/exporter/MuonExporter.h muon-2.0.0/exporter/MuonExporter.h --- muon-1.9.60/exporter/MuonExporter.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/exporter/MuonExporter.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef MUONEXPORTER_H +#define MUONEXPORTER_H + +#include "MuonMainWindow.h" +#include +#include + +class MuonExporter : public QObject +{ + Q_OBJECT + public: + explicit MuonExporter(); + ~MuonExporter(); + + void initialize(); + void setExportPath(const KUrl& url); + + public slots: + void backendReady(); + void exportModel(); + + signals: + void exportDone(); + + private: + KUrl m_path; + int m_backendsToInitialize; + QTimer* m_startExportingTimer; + QSet m_exculdedProperties; +}; + +#endif // MUONEXPORTER_H diff -Nru muon-1.9.60/exporter/main.cpp muon-2.0.0/exporter/main.cpp --- muon-1.9.60/exporter/main.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/exporter/main.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,55 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include +#include +#include +#include +#include +#include +#include "MuonExporter.h" + +static const char description[] = + I18N_NOOP("An application exporterer"); + +static const char version[] = "1.9.60"; + +int main(int argc, char** argv) +{ + KAboutData about("muon-exporter", "muon-exporter", ki18n("Muon Exporter"), version, ki18n(description), + KAboutData::License_GPL, ki18n("©2010-2012 Jonathan Thomas"), KLocalizedString(), 0); + about.addAuthor(ki18n("Jonathan Thomas"), KLocalizedString(), "echidnaman@kubuntu.org"); + about.addAuthor(ki18n("Aleix Pol Gonzalez"), KLocalizedString(), "aleixpol@blue-systems.com"); + about.setProgramIconName("muonexporter"); + about.setProductName("muon/exporter"); + + KCmdLineArgs::init(argc, argv, &about); + KCmdLineOptions options; + options.add("+file", ki18n("File to which we'll export")); + KCmdLineArgs::addCmdLineOptions( options ); + + KApplication app; + KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + + MuonExporter exp; + exp.setExportPath(args->url(0)); + QObject::connect(&exp, SIGNAL(exportDone()), &app, SLOT(quit())); + + return app.exec(); +} diff -Nru muon-1.9.60/installer/AbstractViewBase.cpp muon-2.0.0/installer/AbstractViewBase.cpp --- muon-1.9.60/installer/AbstractViewBase.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/AbstractViewBase.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -37,10 +37,6 @@ m_crumb = new BreadcrumbItem(this); } -AbstractViewBase::~AbstractViewBase() -{ -} - void AbstractViewBase::search(const QString &text) { Q_UNUSED(text); @@ -55,5 +51,3 @@ { return m_searchable; } - -#include "AbstractViewBase.moc" diff -Nru muon-1.9.60/installer/AbstractViewBase.h muon-2.0.0/installer/AbstractViewBase.h --- muon-1.9.60/installer/AbstractViewBase.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/AbstractViewBase.h 2013-04-01 20:32:05.000000000 +0000 @@ -32,7 +32,6 @@ Q_OBJECT public: AbstractViewBase(QWidget *parent); - ~AbstractViewBase(); BreadcrumbItem *breadcrumbItem(); bool isSearchable(); @@ -44,7 +43,8 @@ bool m_searchable; Q_SIGNALS: - void subviewCreated(AbstractViewBase *view); + void switchToSubView(AbstractViewBase *view); + void registerNewSubView(AbstractViewBase *view); }; #endif diff -Nru muon-1.9.60/installer/ApplicationLauncher.cpp muon-2.0.0/installer/ApplicationLauncher.cpp --- muon-1.9.60/installer/ApplicationLauncher.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/ApplicationLauncher.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright © 2010 by Daniel Nicoletti * - * Copyright © 2010 Jonathan Thomas * + * Copyright © 2010-2012 Jonathan Thomas * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -20,9 +20,7 @@ #include "ApplicationLauncher.h" -#include -#include -#include +#include "LaunchListModel.h" #include #include @@ -31,14 +29,12 @@ #include #include -#include -#include #include -#include #include -ApplicationLauncher::ApplicationLauncher(ApplicationBackend* backend, QWidget* parent) +ApplicationLauncher::ApplicationLauncher(LaunchListModel* model, QWidget* parent) : QDialog(parent) + , m_model(model) { QVBoxLayout *layout = new QVBoxLayout(this); setLayout(layout); @@ -46,12 +42,12 @@ QLabel *label = new QLabel(this); label->setText(i18np("The following application was just installed, click on it to launch:", "The following applications were just installed, click on them to launch:", - backend->launchList().size())); + model->rowCount())); QListView *appView = new QListView(this); appView->setIconSize(QSize(32, 32)); connect(appView, SIGNAL(activated(QModelIndex)), - this, SLOT(onAppClicked(QModelIndex))); + m_model, SLOT(invokeApplication(QModelIndex))); QWidget *bottomBox = new QWidget(this); QHBoxLayout *bottomLayout = new QHBoxLayout(bottomBox); @@ -71,22 +67,9 @@ bottomLayout->addWidget(bottomSpacer); bottomLayout->addWidget(closeButton); - m_model = new LaunchListModel(this); - m_model->setBackend(backend); appView->setModel(m_model); layout->addWidget(label); layout->addWidget(appView); layout->addWidget(bottomBox); } - -ApplicationLauncher::~ApplicationLauncher() -{ -} - -void ApplicationLauncher::onAppClicked(const QModelIndex &index) -{ - m_model->invokeApplication(index.row()); -} - -#include "ApplicationLauncher.moc" diff -Nru muon-1.9.60/installer/ApplicationLauncher.h muon-2.0.0/installer/ApplicationLauncher.h --- muon-1.9.60/installer/ApplicationLauncher.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/ApplicationLauncher.h 2013-04-01 20:32:05.000000000 +0000 @@ -1,6 +1,6 @@ /*************************************************************************** * Copyright © 2008 by Daniel Nicoletti * - * Copyright © 2010 Jonathan Thomas * + * Copyright © 2010-2012 Jonathan Thomas * * * * This program is free software; you can redistribute it and/or modify * * it under the terms of the GNU General Public License as published by * @@ -23,11 +23,8 @@ #include -class ApplicationBackend; -class Application; class LaunchListModel; class QModelIndex; -class QStandardItemModel; class KService; @@ -35,14 +32,10 @@ { Q_OBJECT public: - explicit ApplicationLauncher(ApplicationBackend* backend, QWidget* parent = 0); - ~ApplicationLauncher(); + explicit ApplicationLauncher(LaunchListModel* backend, QWidget* parent = nullptr); private: LaunchListModel *m_model; - -private Q_SLOTS: - void onAppClicked(const QModelIndex &index); }; #endif diff -Nru muon-1.9.60/installer/AvailableView.cpp muon-2.0.0/installer/AvailableView.cpp --- muon-1.9.60/installer/AvailableView.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/AvailableView.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -33,6 +33,7 @@ #include #include "BreadcrumbWidget/BreadcrumbWidget.h" #include "CategoryView/CategoryViewWidget.h" +#include "ResourceDetailsView/ResourceDetailsView.h" AvailableView::AvailableView(QWidget *parent) : AbstractViewContainer(parent) @@ -56,3 +57,23 @@ connect(m_categoryViewWidget, SIGNAL(switchToSubView(AbstractViewBase*)), this, SLOT(switchToSubView(AbstractViewBase*))); } + +void AvailableView::setResource(AbstractResource *res) +{ + // Check to see if a view for this app already exists + if (m_currentPair.second == res) { + QMetaObject::invokeMethod(this, "switchToSubView", Q_ARG(AbstractViewBase*, m_currentPair.first)); + return; + } + + // Create one if not + m_detailsView = new ResourceDetailsView(this); + m_detailsView->setResource(res); + m_currentPair.first = m_detailsView; + + connect(m_detailsView, SIGNAL(destroyed(QObject*)), + this, SLOT(onSubViewDestroyed())); + + // Tell our parent that we can exist, so that they can forward it + QMetaObject::invokeMethod(this, "registerNewSubView", Q_ARG(AbstractViewBase*, m_detailsView)); +} diff -Nru muon-1.9.60/installer/AvailableView.h muon-2.0.0/installer/AvailableView.h --- muon-1.9.60/installer/AvailableView.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/AvailableView.h 2013-04-01 20:32:05.000000000 +0000 @@ -23,8 +23,10 @@ #include "AbstractViewContainer.h" +class AbstractResource; class AbstractResourcesBackend; class CategoryViewWidget; +class ResourceDetailsView; class AvailableView : public AbstractViewContainer { @@ -32,8 +34,13 @@ public: AvailableView(QWidget *parent); + void setResource(AbstractResource *res); + private: CategoryViewWidget *m_categoryViewWidget; + QPair m_currentPair; + + ResourceDetailsView *m_detailsView; }; #endif diff -Nru muon-1.9.60/installer/CMakeLists.txt muon-2.0.0/installer/CMakeLists.txt --- muon-1.9.60/installer/CMakeLists.txt 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -1,10 +1,4 @@ -include_directories(../libmuon) - -add_definitions(-DQAPT_ENABLED) - -if (LIBATTICA_FOUND) - add_definitions(-DATTICA_ENABLED) -endif (LIBATTICA_FOUND) +include_directories(../libmuon ../libmuonapt/) set(muon_installer_SRCS main.cpp @@ -29,16 +23,19 @@ ClickableLabel.cpp effects/GraphicsOpacityDropShadowEffect.cpp ProgressView.cpp + qml/src/mousecursor.cpp ReviewsWidget/ReviewWidget.cpp ReviewsWidget/ReviewsWidget.cpp ScreenShotOverlay.cpp - ViewSwitcher.cpp) + ViewSwitcher.cpp + LaunchListModel.cpp +) kde4_add_kcfg_files(muon_installer_SRCS GENERATE_MOC config/MuonInstallerSettings.kcfgc) kde4_add_executable(muon-installer ${muon_installer_SRCS}) -target_link_libraries(muon-installer muonprivate +target_link_libraries(muon-installer muonprivate muonapt ${KDE4_KIO_LIBS} ${QAPT_LIBRARY} ${qjson_LIBRARIES} @@ -48,6 +45,8 @@ ########### install files ############### +file(GLOB muon_QMLS "${CMAKE_CURRENT_SOURCE_DIR}/qml/qml/*.qml") install( PROGRAMS muon-installer.desktop DESTINATION ${XDG_APPS_INSTALL_DIR} ) install(FILES muon-installerui.rc DESTINATION ${DATA_INSTALL_DIR}/muon-installer) +install(FILES ${muon_QMLS} DESTINATION ${DATA_INSTALL_DIR}/muon-installer) install(FILES config/muon-installer.kcfg DESTINATION ${KCFG_INSTALL_DIR}) diff -Nru muon-1.9.60/installer/CategoryView/CategoryViewWidget.cpp muon-2.0.0/installer/CategoryView/CategoryViewWidget.cpp --- muon-1.9.60/installer/CategoryView/CategoryViewWidget.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/CategoryView/CategoryViewWidget.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -145,10 +145,18 @@ void CategoryViewWidget::onSubViewDestroyed() { - m_subViewHash.remove(m_subViewHash.key(m_subView)); + auto iter = m_subViewHash.begin(); + while (iter != m_subViewHash.end()) { + auto prev = iter; + if (prev.value() == m_subView) { + m_subViewHash.erase(prev); + break; // Found our subview, guaranteed to be only one since we don't use insertMulti + } + ++iter; + } } void CategoryViewWidget::onSearchViewDestroyed() { - m_searchView = 0; + m_searchView = nullptr; } diff -Nru muon-1.9.60/installer/CategoryView/CategoryViewWidget.h muon-2.0.0/installer/CategoryView/CategoryViewWidget.h --- muon-1.9.60/installer/CategoryView/CategoryViewWidget.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/CategoryView/CategoryViewWidget.h 2013-04-01 20:32:05.000000000 +0000 @@ -47,7 +47,7 @@ const QIcon &rootIcon); void search(const QString &text); -private:\ +private: CategoryModel *m_categoryModel; QHash m_subViewHash; @@ -59,10 +59,6 @@ void onIndexActivated(const QModelIndex &index); void onSubViewDestroyed(); void onSearchViewDestroyed(); - -Q_SIGNALS: - void switchToSubView(AbstractViewBase *view); - void registerNewSubView(AbstractViewBase *view); }; #endif diff -Nru muon-1.9.60/installer/LaunchListModel.cpp muon-2.0.0/installer/LaunchListModel.cpp --- muon-1.9.60/installer/LaunchListModel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/installer/LaunchListModel.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,78 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "LaunchListModel.h" + +// Qt includes +#include + +// KDE includes +#include +#include +#include + +// Libmuon includes +#include +#include +#include + +LaunchListModel::LaunchListModel(QObject* parent) + : QStandardItemModel(parent) +{ + connect(ResourcesModel::global(), SIGNAL(transactionRemoved(Transaction*)), SLOT(transactionFinished(Transaction*))); +} + +void LaunchListModel::transactionFinished(Transaction* t) +{ + if(t->resource()->canExecute() && t->state()==DoneState && t->action()==InstallApp) + addApplication(t->resource()); +} + +void LaunchListModel::addApplication(AbstractResource* app) +{ + QList items; + QStringList execs = app->executables(); + + for (const QString& exec : execs) { + KService::Ptr service = KService::serviceByStorageId(exec); + + QString name = service->property("Name").toString(); + if (!service->genericName().isEmpty()) + name += QLatin1String(" - ") % service->genericName(); + + QStandardItem *item = new QStandardItem(name); + item->setIcon(KIcon(service->icon())); + item->setData(service->desktopEntryPath(), Qt::UserRole); + items += item; + } + if(!items.isEmpty()) + invisibleRootItem()->appendRows(items); +} + +void LaunchListModel::invokeApplication(const QModelIndex &idx) const +{ + KToolInvocation::startServiceByDesktopPath(idx.data(Qt::UserRole).toString()); +} + +void LaunchListModel::invokeApplication(int row) const +{ + invokeApplication(index(row, 0)); +} diff -Nru muon-1.9.60/installer/LaunchListModel.h muon-2.0.0/installer/LaunchListModel.h --- muon-1.9.60/installer/LaunchListModel.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/installer/LaunchListModel.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,45 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef LAUNCHLISTMODEL_H +#define LAUNCHLISTMODEL_H + +#include "libmuonprivate_export.h" +#include + +class AbstractResource; +class Transaction; + +class MUONPRIVATE_EXPORT LaunchListModel : public QStandardItemModel +{ + Q_OBJECT +public: + explicit LaunchListModel(QObject* parent = nullptr); + + void addApplication(AbstractResource* a); + +public slots: + void invokeApplication(const QModelIndex &idx) const; + void invokeApplication(int row) const; + void transactionFinished(Transaction* t); +}; + +#endif // LAUNCHLISTMODEL_H + diff -Nru muon-1.9.60/installer/MainWindow.cpp muon-2.0.0/installer/MainWindow.cpp --- muon-1.9.60/installer/MainWindow.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/MainWindow.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -42,17 +42,13 @@ // LibQApt includes #include -// Libmuon includes -#include "MuonStrings.h" -#include -#include +//libmuonapt includes #include -#include -#include +#include "../libmuonapt/QAptActions.h" -#ifdef ATTICA_ENABLED -#include -#endif +// Libmuon includes +#include +#include // Own includes #include "ApplicationLauncher.h" @@ -60,6 +56,7 @@ #include "AvailableView.h" #include "ProgressView.h" #include "ViewSwitcher.h" +#include "LaunchListModel.h" #include "MuonInstallerSettings.h" enum ViewModelRole { @@ -88,6 +85,8 @@ MainWindow::MainWindow() : MuonMainWindow() + , m_appBackend(nullptr) + , m_launches(nullptr) , m_launcherMessage(nullptr) , m_appLauncher(nullptr) , m_progressItem(nullptr) @@ -112,7 +111,7 @@ // Set up the navigational sidebar on the right m_viewSwitcher = new ViewSwitcher(this); connect(m_viewSwitcher, SIGNAL(activated(QModelIndex)), - this, SLOT(changeView(QModelIndex))); + this, SLOT(changeView(QModelIndex))); m_mainWidget->addWidget(m_viewSwitcher); // Set up the main pane @@ -140,70 +139,50 @@ m_viewModel = new QStandardItemModel(this); m_viewSwitcher->setModel(m_viewModel); - m_backend = new QApt::Backend(this); - m_actions = new QAptActions(this, m_backend); + QAptActions *actions = QAptActions::self(); + actions->setMainWindow(this); + setupActions(); - setupGUI((StandardWindowOption)(KXmlGuiWindow::Default & ~KXmlGuiWindow::StatusBar)); + setupGUI(StandardWindowOption(KXmlGuiWindow::Default & ~KXmlGuiWindow::StatusBar)); } void MainWindow::initObject() { - ResourcesModel *resourcesModel = ResourcesModel::global(); + // Initialize singleton ResourcesModel instance. It will live in the main thread + // and all future calls to ResourcesModel::global() will refer to it. + Q_ASSERT(ResourcesModel::global() == nullptr); + ResourcesModel *resourcesModel = new ResourcesModel(this); connect(resourcesModel, SIGNAL(transactionAdded(Transaction*)), this, SLOT(transactionAdded())); connect(resourcesModel, SIGNAL(transactionRemoved(Transaction*)), this, SLOT(transactionRemoved())); - // Create APT backend - m_appBackend = new ApplicationBackend(this); - connect(m_appBackend, SIGNAL(backendReady()), - this, SLOT(populateViews())); - connect(m_appBackend, SIGNAL(reloadStarted()), - this, SLOT(removeProgressItem())); - connect(m_appBackend, SIGNAL(reloadFinished()), - this, SLOT(showLauncherMessage())); - connect(m_appBackend, SIGNAL(startingFirstTransaction()), - this, SLOT(addProgressItem())); - connect(m_appBackend, SIGNAL(sourcesEditorFinished()), - this, SLOT(sourcesEditorFinished())); - - if (!m_backend->init()) - initError(); - - if (m_backend->xapianIndexNeedsUpdate()) - m_backend->updateXapianIndex(); - - m_appBackend->setBackend(m_backend); - - // Other backends - QList backends; - -#ifdef ATTICA_ENABLED - backends += new KNSBackend("comic.knsrc", "face-smile-big", this); - backends += new KNSBackend("plasmoids.knsrc", "plasma", this); -#endif + m_launches = new LaunchListModel(this); + MuonBackendsFactory f; + QList backends = f.allBackends(); + + //TODO: should add the appBackend here too for (AbstractResourcesBackend *backend : backends) { resourcesModel->addResourcesBackend(backend); + backend->integrateMainWindow(this); + + if(backend->metaObject()->className()==QLatin1String("ApplicationBackend")) { + m_appBackend = backend; + connect(m_appBackend, SIGNAL(backendReady()), + this, SLOT(populateViews())); + connect(m_appBackend, SIGNAL(reloadStarted()), //TODO: use ResourcesModel signals + this, SLOT(removeProgressItem())); + connect(m_appBackend, SIGNAL(reloadFinished()), + this, SLOT(showLauncherMessage())); + connect(m_appBackend, SIGNAL(startingFirstTransaction()), + this, SLOT(addProgressItem())); + connect(m_appBackend, SIGNAL(sourcesEditorFinished()), + this, SLOT(sourcesEditorFinished())); + } } - - setActionsEnabled(); } -void MainWindow::initError() -{ - QString details = m_backend->initErrorMessage(); - - MuonStrings *muonStrings = MuonStrings::global(); - - QString title = muonStrings->errorTitle(QApt::InitError); - QString text = muonStrings->errorText(QApt::InitError, nullptr); - - KMessageBox::detailedError(this, text, details, title); - exit(-1); -} - - void MainWindow::loadSplitterSizes() { QList sizes = MuonInstallerSettings::self()->splitterSizes(); @@ -220,20 +199,9 @@ MuonInstallerSettings::self()->writeConfig(); } -void MainWindow::setupActions() -{ - MuonMainWindow::setupActions(); - m_actions->setupActions(); -} - -void MainWindow::setActionsEnabled(bool enabled) -{ - m_actions->setActionsEnabled(enabled); -} - void MainWindow::clearViews() { - m_canExit = false; // APT is reloading at this point + setCanExit(false); // APT is reloading at this point foreach (QWidget *widget, m_viewHash) { delete widget; } @@ -241,48 +209,86 @@ m_viewModel->clear(); } -void MainWindow::populateViews() +QStandardItem* createOriginItem(const QString& originName, const QString& originLabel) { - ResourcesModel *resourcesModel = ResourcesModel::global(); - resourcesModel->addResourcesBackend(m_appBackend); - m_canExit = true; // APT is done reloading at this point - QStringList originNames = m_appBackend->appOrigins().toList(); - QStringList originLabels; - foreach (const QString &originName, originNames) { - originLabels << m_backend->originLabel(originName); - } - - if (originNames.contains("Ubuntu")) { - int index = originNames.indexOf("Ubuntu"); - originNames.move(index, 0); // Move to front of the list - - if (originNames.contains("Canonical")) { - int index = originNames.indexOf("Canonical"); - if (originNames.size() >= 2) - originNames.move(index, 1); // Move to 2nd spot - } + // We must spread the word of Origin. Hallowed are the Ori! ;P + QStandardItem *viewItem = new QStandardItem; + viewItem->setEditable(false); + viewItem->setText(originLabel); + viewItem->setData(originName, OriginFilterRole); + viewItem->setData(AppView, ViewTypeRole); - if (originNames.contains("LP-PPA-app-review-board")) { - int index = originNames.indexOf("LP-PPA-app-review-board"); - if (originNames.size() >= 3) - originNames.move(index, 2); // Move to third spot - } + if (originName == "Ubuntu") { + viewItem->setText(i18nc("@item:inlistbox", "Provided by Kubuntu")); + viewItem->setIcon(KIcon("ubuntu-logo")); } - if (originNames.contains("Debian")) { - int index = originNames.indexOf("Debian"); - originNames.move(index, 0); // Move to front of the list + if (originName == "Debian") { + viewItem->setText(i18nc("@item:inlistbox", "Provided by Debian")); + viewItem->setIcon(KIcon("emblem-debian")); } - QStandardItem *parentItem = m_viewModel->invisibleRootItem(); + if (originName == "Canonical") { + viewItem->setText(i18nc("@item:inlistbox The name of the repository provided by Canonical, Ltd. ", + "Canonical Partners")); + viewItem->setIcon(KIcon("partner")); + } + + if (originName.startsWith(QLatin1String("LP-PPA"))) { + viewItem->setIcon(KIcon("user-identity")); + + if (originName == QLatin1String("LP-PPA-app-review-board")) { + viewItem->setText(i18nc("@item:inlistbox An independent software source", + "Independent")); + viewItem->setIcon(KIcon("system-users")); + } else + viewItem->setIcon(KIcon("user-identity")); + } + return viewItem; +} + +bool repositoryNameLessThan(const QString& a, const QString& b) +{ + static QStringList prioritary(QStringList() << "Debian" << "Ubuntu" << "Canonical" << "LP-PPA-app-review-board"); + int idxA = prioritary.indexOf(a), idxB = prioritary.indexOf(b); + if(idxA == idxB) + return a fetchOrigins() +{ + QSet originSet, instOriginSet; + + ResourcesModel *resourcesModel = ResourcesModel::global(); + for(int i=0; irowCount(); i++) { + AbstractResource* app = resourcesModel->resourceAt(i); + if (app->isInstalled()) + instOriginSet << app->origin(); + else + originSet << app->origin(); + } + + originSet.remove(QString()); + instOriginSet.remove(QString()); + originSet += instOriginSet; + + QStringList originList=originSet.toList(), instOriginList=instOriginSet.toList(); + qSort(originList.begin(), originList.end(), repositoryNameLessThan); + qSort(instOriginList.begin(), instOriginList.end(), repositoryNameLessThan); + return qMakePair(originList, instOriginList); +} +void MainWindow::populateViews() +{ QStandardItem *availableItem = new QStandardItem; availableItem->setEditable(false); availableItem->setIcon(KIcon("applications-other").pixmap(32,32)); availableItem->setText(i18nc("@item:inlistbox Parent item for available software", "Get Software")); availableItem->setData(CatView, ViewTypeRole); - parentItem->appendRow(availableItem); - m_viewHash[availableItem->index()] = 0; QStandardItem *installedItem = new QStandardItem; installedItem->setEditable(false); @@ -290,121 +296,34 @@ installedItem->setText(i18nc("@item:inlistbox Parent item for installed software", "Installed Software")); installedItem->setData(AppView, ViewTypeRole); installedItem->setData(AbstractResource::State::Installed, StateFilterRole); - parentItem->appendRow(installedItem); - m_viewHash[installedItem->index()] = 0; - - parentItem = availableItem; + + QPair< QStringList, QStringList > origins = fetchOrigins(); + QStringList originNames = origins.first; + QApt::Backend* backend = qobject_cast(m_appBackend->property("backend").value()); foreach(const QString &originName, originNames) { - QString originLabel = m_backend->originLabel(originName); - QStandardItem *viewItem = new QStandardItem; - viewItem->setEditable(false); - viewItem->setText(originLabel); - viewItem->setData(originName, OriginFilterRole); - viewItem->setData(AppView, ViewTypeRole); - - if (originName == "Ubuntu") { - viewItem->setText(i18nc("@item:inlistbox", "Provided by Kubuntu")); - viewItem->setIcon(KIcon("ubuntu-logo")); - } - - if (originName == "Debian") { - viewItem->setText(i18nc("@item:inlistbox", "Provided by Debian")); - viewItem->setIcon(KIcon("emblem-debian")); - } - - if (originName == "Canonical") { - viewItem->setText(i18nc("@item:inlistbox The name of the repository provided by Canonical, Ltd. ", - "Canonical Partners")); - viewItem->setIcon(KIcon("partner")); - } - - if (originName.startsWith(QLatin1String("LP-PPA"))) { - viewItem->setIcon(KIcon("user-identity")); - - if (originName == QLatin1String("LP-PPA-app-review-board")) { - viewItem->setText(i18nc("@item:inlistbox An independent software source", - "Independent")); - viewItem->setIcon(KIcon("system-users")); - } - } - - availableItem->appendRow(viewItem); - m_viewHash[viewItem->index()] = 0; - } - - QStringList instOriginNames = m_appBackend->installedAppOrigins().toList(); - QStringList instOriginLabels; - foreach (const QString &originName, instOriginNames) { - instOriginLabels << m_backend->originLabel(originName); + availableItem->appendRow(createOriginItem(originName, backend->originLabel(originName))); } - if (instOriginNames.contains("Ubuntu")) { - int index = instOriginNames.indexOf("Ubuntu"); - instOriginNames.move(index, 0); // Move to front of the list - - if (instOriginNames.contains("Canonical")) { - int index = instOriginNames.indexOf("Canonical"); - if (originNames.size() >= 2) - instOriginNames.move(index, 1); // Move to 2nd spot - } - - if (instOriginNames.contains("LP-PPA-app-review-board")) { - int index = instOriginNames.indexOf("LP-PPA-app-review-board"); - if (originNames.size() >= 3) - originNames.move(index, 2); // Move to third spot - } - } - - if (instOriginNames.contains("Debian")) { - int index = instOriginNames.indexOf("Debian"); - instOriginNames.move(index, 0); // Move to front of the list - } - - parentItem = installedItem; + QStringList instOriginNames = origins.second; foreach(const QString & originName, instOriginNames) { - // We must spread the word of Origin. Hallowed are the Ori! ;P - QString originLabel = m_backend->originLabel(originName); - QStandardItem *viewItem = new QStandardItem; - viewItem->setEditable(false); - viewItem->setText(originLabel); - viewItem->setData(AbstractResource::State::Installed, StateFilterRole); - viewItem->setData(originName, OriginFilterRole); - viewItem->setData(AppView, ViewTypeRole); - - if (originName == "Ubuntu") { - viewItem->setText(i18nc("@item:inlistbox", "Provided by Kubuntu")); - viewItem->setIcon(KIcon("ubuntu-logo")); - } - - if (originName == "Canonical") { - viewItem->setText(i18nc("@item:inlistbox The name of the repository provided by Canonical, Ltd. ", - "Canonical Partners")); - viewItem->setIcon(KIcon("partner")); - } - - if (originName.startsWith(QLatin1String("LP-PPA"))) { - if (originName == QLatin1String("LP-PPA-app-review-board")) { - viewItem->setText(i18nc("@item:inlistbox An independent software source", - "Independent")); - } - viewItem->setIcon(KIcon("user-identity")); - } + QStandardItem* viewItem = createOriginItem(originName, backend->originLabel(originName)); + viewItem->setData(AbstractResource::State::Installed, StateFilterRole); installedItem->appendRow(viewItem); - m_viewHash[viewItem->index()] = 0; } - parentItem = m_viewModel->invisibleRootItem(); - QStandardItem *historyItem = new QStandardItem; historyItem->setEditable(false); historyItem->setIcon(KIcon("view-history").pixmap(32,32)); historyItem->setText(i18nc("@item:inlistbox Item for showing the history view", "History")); historyItem->setData(History, ViewTypeRole); - parentItem->appendRow(historyItem); - m_viewHash[historyItem->index()] = 0; + m_viewModel->appendRow(availableItem); + m_viewModel->appendRow(installedItem); + m_viewModel->appendRow(historyItem); selectFirstRow(m_viewSwitcher); + + emit viewsPopulated(); } void MainWindow::changeView(const QModelIndex &index) @@ -427,7 +346,7 @@ if (originFilter != QLatin1String("Ubuntu") && originFilter != QLatin1String("Debian")) appView->setShouldShowTechnical(true); } - break; + break; case CatView: view = new AvailableView(this); break; @@ -461,13 +380,6 @@ changeView(firstRow); } -void MainWindow::runSourcesEditor() -{ - // Let QApt Batch handle the update GUI - // FIXME? - //MuonMainWindow::runSourcesEditor(true); -} - void MainWindow::sourcesEditorFinished() { clearViews(); @@ -479,32 +391,18 @@ { clearMessageActions(); - QVector apps; - foreach (Application *app, m_appBackend->launchList()) { - app->clearPackage(); - app->package(); // Regenerate package - if (!app->isInstalled()) { - continue; - } - apps << app->executables(); - } - - m_appBackend->clearLaunchList(); - m_launchableApps = apps; - - if (apps.size() == 1) { - KService::Ptr service = apps.first(); - QString name = service->genericName().isEmpty() ? - service->property("Name").toString() : - service->property("Name").toString() % QLatin1Literal(" - ") % service->genericName(); + if (m_launches->rowCount()==1) { + QModelIndex index = m_launches->index(0, 0); + QString name = index.data().toString(); m_launcherMessage->setText(i18nc("@info", "%1 was successfully installed.", name)); - KAction *launchAction = new KAction(KIcon(service->icon()), i18nc("@action", "Start"), this); + KIcon launchIcon = KIcon(index.data(Qt::DecorationRole).value()); + KAction *launchAction = new KAction(launchIcon, i18nc("@action", "Start"), this); connect(launchAction, SIGNAL(activated()), this, SLOT(launchSingleApp())); m_launcherMessage->addAction(launchAction); m_launcherMessage->animatedShow(); - } else if (apps.size() > 1) { + } else if (m_launches->rowCount() > 1) { m_launcherMessage->setText(i18nc("@info", "Applications successfully installed.")); KAction *launchAction = new KAction(i18nc("@action", "Run New Applications..."), this); connect(launchAction, SIGNAL(activated()), this, SLOT(showAppLauncher())); @@ -515,19 +413,19 @@ void MainWindow::launchSingleApp() { - KToolInvocation::startServiceByDesktopPath(m_launchableApps.first()->desktopEntryPath()); + m_launches->invokeApplication(0); m_launcherMessage->animatedHide(); m_launcherMessage->removeAction(m_launcherMessage->actions().first()); } void MainWindow::showAppLauncher() { - if (!m_appLauncher && !m_launchableApps.isEmpty()) { - m_appLauncher = new ApplicationLauncher(m_appBackend); + if (!m_appLauncher && !m_launches->rowCount()==0) { + m_appLauncher = new ApplicationLauncher(m_launches); connect(m_appLauncher, SIGNAL(destroyed(QObject*)), - this, SLOT(onAppLauncherClosed())); + this, SLOT(onAppLauncherClosed())); connect(m_appLauncher, SIGNAL(finished(int)), - this, SLOT(onAppLauncherClosed())); + this, SLOT(onAppLauncherClosed())); m_appLauncher->setWindowTitle(i18nc("@title:window", "Installation Complete")); m_appLauncher->show(); } @@ -582,11 +480,32 @@ if (!m_progressItem) return; - QObject *progressView = m_viewHash[m_progressItem->index()]; + QObject *progressView = m_viewHash.take(m_progressItem->index()); if (progressView) - progressView->deleteLater(); + progressView->deleteLater(); - m_viewHash.remove(m_progressItem->index()); - m_viewModel->removeRow(m_viewModel->indexFromItem(m_progressItem).row()); + m_viewModel->removeRow(m_progressItem->row()); m_progressItem = nullptr; } + +void MainWindow::openApplication(const QString &app) +{ + setEnabled(false); + m_appToBeOpened = app; + triggerOpenApplication(); + if(!m_appToBeOpened.isEmpty()) + connect(this, SIGNAL(viewsPopulated()), SLOT(triggerOpenApplication())); +} + +void MainWindow::triggerOpenApplication() +{ + AbstractResource* app = ResourcesModel::global()->resourceByPackageName(m_appToBeOpened); + if(app) { + AvailableView *view = qobject_cast(m_viewStack->currentWidget()); + view->setResource(app); + + m_appToBeOpened.clear(); + disconnect(this, SIGNAL(viewsPopulated()), this, SLOT(triggerOpenApplication())); + setEnabled(true); + } +} diff -Nru muon-1.9.60/installer/MainWindow.h muon-2.0.0/installer/MainWindow.h --- muon-1.9.60/installer/MainWindow.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/MainWindow.h 2013-04-01 20:32:05.000000000 +0000 @@ -24,12 +24,11 @@ // KDE includes #include -// LibQApt includes -#include - // Own includes #include "../libmuon/MuonMainWindow.h" +class AbstractResourcesBackend; +class LaunchListModel; class QAbstractItemView; class QModelIndex; class QSplitter; @@ -54,8 +53,11 @@ MainWindow(); ~MainWindow(); + void openApplication(const QString &app); + private: - ApplicationBackend *m_appBackend; + AbstractResourcesBackend *m_appBackend; + QString m_appToBeOpened; QSplitter *m_mainWidget; QStackedWidget *m_viewStack; QWidget *m_busyWidget; @@ -64,28 +66,23 @@ QHash m_viewHash; KAction *m_loadSelectionsAction; KAction *m_saveSelectionsAction; + LaunchListModel *m_launches; KMessageWidget *m_launcherMessage; ApplicationLauncher *m_appLauncher; ProgressView *m_progressView; QStandardItem *m_progressItem; - QApt::Backend *m_backend; - QVector m_launchableApps; int m_transactionCount; private Q_SLOTS: void initGUI(); void initObject(); - void initError(); void loadSplitterSizes(); void saveSplitterSizes(); - void setupActions(); void clearViews(); - void setActionsEnabled(bool enabled = true); void populateViews(); void changeView(const QModelIndex &index); void selectFirstRow(const QAbstractItemView *itemView); - void runSourcesEditor(); void sourcesEditorFinished(); void showLauncherMessage(); void launchSingleApp(); @@ -96,6 +93,10 @@ void transactionRemoved(); void addProgressItem(); void removeProgressItem(); + void triggerOpenApplication(); + +signals: + void viewsPopulated(); }; #endif diff -Nru muon-1.9.60/installer/ProgressView.cpp muon-2.0.0/installer/ProgressView.cpp --- muon-1.9.60/installer/ProgressView.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/ProgressView.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -24,9 +24,7 @@ #include #include -#include -#include #include #include diff -Nru muon-1.9.60/installer/ResourceDetailsView/ResourceDetailsWidget.cpp muon-2.0.0/installer/ResourceDetailsView/ResourceDetailsWidget.cpp --- muon-1.9.60/installer/ResourceDetailsView/ResourceDetailsWidget.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/ResourceDetailsView/ResourceDetailsWidget.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -57,13 +57,12 @@ #include // Libmuon includes -#include +#include #include #include #include #include #include -#include #include // std includes @@ -72,6 +71,7 @@ // Own includes #include "AddonsWidget.h" #include "ClickableLabel.h" +#include "qml/src/mousecursor.h" #include "ReviewsWidget/ReviewsWidget.h" #include "ScreenShotOverlay.h" @@ -207,7 +207,7 @@ m_screenshotView->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); m_screenshotView->setMinimumSize(170, 130); m_screenshotView->rootContext()->setContextProperty("view", m_screenshotView); - m_screenshotView->setSource(KStandardDirs::locate("data", QLatin1String("libmuon/ThumbnailView.qml"))); + m_screenshotView->setSource(KStandardDirs::locate("data", QLatin1String("muon-installer/ThumbnailView.qml"))); QObject *item = m_screenshotView->rootObject(); connect(item, SIGNAL(thumbnailClicked()), this, SLOT(screenshotLabelClicked())); @@ -313,7 +313,7 @@ m_listener->setResource(m_resource); m_listener->setBackend(m_resource->backend()); - Application *app = qobject_cast(resource); + AbstractResource *app = qobject_cast(resource); // FIXME: Always keep label size at 48x48, and render the largest size // we can up to that point. Otherwise some icons will be blurry @@ -335,7 +335,7 @@ } if (app) { - QString menuPathString = app->menuPath(); + QString menuPathString = app->property("menuPath").toString(); if (!menuPathString.isEmpty()) { m_menuPathLabel->setText(menuPathString); } else { @@ -536,13 +536,12 @@ if (!m_resource) return; + m_statusLabel->setText(m_resource->status()); if (!m_resource->isInstalled()) { - m_statusLabel->setText(MuonStrings::global()->packageStateName(QApt::Package::NotInstalled)); m_actionButton->setText(i18nc("@action", "Install")); m_actionButton->setIcon(KIcon("download")); m_actionButton->show(); } else { - m_statusLabel->setText(MuonStrings::global()->packageStateName(QApt::Package::Installed)); m_actionButton->setText(i18nc("@action", "Remove")); m_actionButton->setIcon(KIcon("edit-delete")); } diff -Nru muon-1.9.60/installer/ResourceView/ResourceDelegate.cpp muon-2.0.0/installer/ResourceView/ResourceDelegate.cpp --- muon-1.9.60/installer/ResourceView/ResourceDelegate.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/ResourceView/ResourceDelegate.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -37,12 +37,10 @@ #include #include -// LibQApt includes -#include - //Libmuon includes #include #include +#include // Own includes #include "ResourceExtender.h" @@ -55,7 +53,8 @@ ResourceDelegate::ResourceDelegate(QAbstractItemView *parent) : KExtendableItemDelegate(parent), m_extender(0), - m_showInfoButton(true) + m_showInfoButton(true), + m_transactionListener(new TransactionListener(this)) { // To get sizing. QPushButton button, button2; @@ -127,12 +126,15 @@ m_ratingPainter->paint(painter, rect, rating); } } else { + AbstractResource* res = qobject_cast( index.data(ResourcesModel::ApplicationRole).value()); + m_transactionListener->setResource(res); + m_transactionListener->setBackend(res->backend()); QStyleOptionProgressBar progressBarOption; progressBarOption.rect = rect; progressBarOption.minimum = 0; progressBarOption.maximum = 100; - progressBarOption.progress = index.data(ResourcesModel::ProgressRole).toInt(); - progressBarOption.text = index.data(ResourcesModel::ProgressTextRole).toString(); + progressBarOption.progress = m_transactionListener->progress(); + progressBarOption.text = m_transactionListener->comment(); progressBarOption.textVisible = true; KApplication::style()->drawControl(QStyle::CE_ProgressBar, &progressBarOption, painter); } diff -Nru muon-1.9.60/installer/ResourceView/ResourceDelegate.h muon-2.0.0/installer/ResourceView/ResourceDelegate.h --- muon-1.9.60/installer/ResourceView/ResourceDelegate.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/ResourceView/ResourceDelegate.h 2013-04-01 20:32:05.000000000 +0000 @@ -26,6 +26,7 @@ #include #include +class TransactionListener; class AbstractResource; class KIconLoader; class KRatingPainter; @@ -56,6 +57,7 @@ KRatingPainter *m_ratingPainter; QPixmap m_emblem; bool m_showInfoButton; + TransactionListener* m_transactionListener; int calcItemHeight(const QStyleOptionViewItem &option) const; diff -Nru muon-1.9.60/installer/ResourceView/ResourceViewWidget.h muon-2.0.0/installer/ResourceView/ResourceViewWidget.h --- muon-1.9.60/installer/ResourceView/ResourceViewWidget.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/ResourceView/ResourceViewWidget.h 2013-04-01 20:32:05.000000000 +0000 @@ -77,10 +77,6 @@ void setFiltersFromCategory(Category *category); void setShouldShowTechnical(bool show); void setCanShowTechnical(bool canShow); - -Q_SIGNALS: - void switchToSubView(AbstractViewBase *view); - void registerNewSubView(AbstractViewBase *view); }; #endif diff -Nru muon-1.9.60/installer/ReviewsWidget/ReviewWidget.cpp muon-2.0.0/installer/ReviewsWidget/ReviewWidget.cpp --- muon-1.9.60/installer/ReviewsWidget/ReviewWidget.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/ReviewsWidget/ReviewWidget.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -28,9 +28,8 @@ #include #include -#include - #include +#include ReviewWidget::ReviewWidget(QWidget *parent) : KVBox(parent) @@ -76,6 +75,40 @@ { } +static int compareVersion(const QString& a, const QString& b) +{ + if(a==b) + return 0; + QStringList verA = a.split('.'); + QStringList verB = b.split('.'); + while(!verA.isEmpty() && !verB.isEmpty()) { + QString curA = verA.takeFirst(), curB = verB.takeFirst(); + int diff = curB.compare(curA); + if(diff!=0) + return diff; + } + return verB.size()-verA.size(); +} + +static QString upstreamVersion(const QString& ver) +{ + QString ret = ver; + + int idx = ret.indexOf(':'); + if(idx>=0) + ret= ret.mid(idx+1); + + idx = ret.indexOf('-'); + if(idx>=0) + ret= ret.left(idx); + + idx = ret.indexOf('+'); + if(idx>=0) + ret= ret.left(idx); + + return ret; +} + void ReviewWidget::setReview(Review *review) { if (!review->package()) @@ -93,15 +126,15 @@ m_reviewLabel->setText(review->reviewText()); - const QString reviewUpstream = QApt::Package::upstreamVersion(review->packageVersion()); - const QString currentUpstream = review->package()->upstreamVersion(); + const QString reviewUpstream = upstreamVersion(review->packageVersion()); + const QString currentUpstream = upstreamVersion(review->package()->installedVersion()); - int res = QApt::Package::compareVersion(reviewUpstream, currentUpstream); + int res = compareVersion(reviewUpstream, currentUpstream); if (res < 0) { m_versionLabel->setText(QLatin1Literal("") % i18nc("@label", "This review was written for an older version " - "(Version: %1)", review->packageVersion()) % + "(Version: %1)", reviewUpstream) % QLatin1Literal("")); m_versionLabel->show(); } diff -Nru muon-1.9.60/installer/main.cpp muon-2.0.0/installer/main.cpp --- muon-1.9.60/installer/main.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/main.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2010-2012 Jonathan Thomas * + * Copyright © 2010-2013 Jonathan Thomas * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * @@ -30,7 +30,7 @@ static const char description[] = I18N_NOOP("An application manager"); -static const char version[] = "1.9.60"; +static const char version[] = "2.0.0"; int main(int argc, char **argv) { @@ -41,6 +41,10 @@ about.setProductName("muon/installer"); KCmdLineArgs::init(argc, argv, &about); + KCmdLineOptions options; + options.add("application ", KLocalizedString()); // FIXME Undocumented due to string freeze, fix for 2.1. + options.add("backends ", KLocalizedString()); + KCmdLineArgs::addCmdLineOptions(options); if (!KUniqueApplication::start()) { fprintf(stderr, "Software Center is already running!\n"); @@ -55,7 +59,13 @@ KGlobal::dirs()->addResourceDir("appicon", "/usr/share/app-install/icons/"); app.disableSessionManagement(); + KCmdLineArgs* args = KCmdLineArgs::parsedArgs(); + MainWindow *mainWindow = new MainWindow; + + if(args->isSet("application")) + mainWindow->openApplication(args->getOption("application")); + mainWindow->show(); return app.exec(); diff -Nru muon-1.9.60/installer/muon-installer.desktop muon-2.0.0/installer/muon-installer.desktop --- muon-1.9.60/installer/muon-installer.desktop 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/installer/muon-installer.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -13,10 +13,12 @@ Name[fi]=Muon-sovellusvalikoima Name[fr]=Logithèque Muon Name[ga]=Lárionad Bogearraí Muon +Name[gl]=Centro de software Muon Name[hu]=Muon szoftverközpont Name[it]=Muon Software Center Name[kk]=Muon бағдарлама орталығы Name[lt]=Muon programų centras +Name[mr]=म्युओन सॉफ़्टवेअर केंद्र Name[nb]=Muon programvaresenter Name[nds]=Muon-Programmzentrum Name[nl]=Muon softwarecentrum @@ -57,10 +59,12 @@ GenericName[fi]=Sovellusvalikoima GenericName[fr]=Logithèque GenericName[ga]=Lárionad Bogearraí +GenericName[gl]=Centro de Software GenericName[hu]=Szoftverközpont GenericName[it]=Software Center GenericName[kk]=Бағдарлама орталығы GenericName[lt]=Programų centras +GenericName[mr]=सॉफ़्टवेअर केंद्र GenericName[nb]=Programvaresenter GenericName[nds]=Programmzentrum GenericName[nl]=Softwarecentrum diff -Nru muon-1.9.60/installer/qml/qml/ClickableImage.qml muon-2.0.0/installer/qml/qml/ClickableImage.qml --- muon-1.9.60/installer/qml/qml/ClickableImage.qml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/installer/qml/qml/ClickableImage.qml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,58 @@ +/* + Copyright (C) 2011 Jonathan Thomas + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), Nokia Corporation + (or its successors, if any) and the KDE Free Qt Foundation, which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +import QtQuick 1.0 +import MuonMobile 1.0 + +Image { + id: image + fillMode: Image.PreserveAspectFit + asynchronous: true + opacity: 0.0 + visible: true + + signal buttonClicked + + MouseArea { + anchors.fill: parent + acceptedButtons: Qt.LeftButton + Component.onCompleted: clicked.connect(parent.buttonClicked) + } + + MouseCursor { + anchors.fill: parent + shape: Qt.PointingHandCursor + } + + transitions: Transition { + from: "*" + to: "loaded" + PropertyAnimation { target: image; property: "opacity"; duration: 500 } + } + + states: [ + State { + name: 'loaded' + when: image.status == Image.Ready + PropertyChanges { target: image; opacity: 1.0 } + } + ] +} diff -Nru muon-1.9.60/installer/qml/qml/ThumbnailView.qml muon-2.0.0/installer/qml/qml/ThumbnailView.qml --- muon-1.9.60/installer/qml/qml/ThumbnailView.qml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/installer/qml/qml/ThumbnailView.qml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,51 @@ +/* + Copyright (C) 2011 Jonathan Thomas + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), Nokia Corporation + (or its successors, if any) and the KDE Free Qt Foundation, which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +import QtQuick 1.0 +import Effects 1.0 + +Rectangle { + id: rectangle1 + width: 170 + height: 130 + + property alias source: image.source + signal thumbnailClicked() + signal thumbnailLoaded() + + ClickableImage { + id: image + width: 160 + height: 120 + + effect: DropShadow { + blurRadius: 10 + } + + onStatusChanged: { + if (image.status == Image.Error) + view.hide() + else if (image.status == Image.Ready) + parent.thumbnailLoaded() + } + onButtonClicked: parent.thumbnailClicked() + } +} diff -Nru muon-1.9.60/installer/qml/src/mousecursor.cpp muon-2.0.0/installer/qml/src/mousecursor.cpp --- muon-1.9.60/installer/qml/src/mousecursor.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/installer/qml/src/mousecursor.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,42 @@ +/* + Copyright (C) 2011 Harald Sitter + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), Nokia Corporation + (or its successors, if any) and the KDE Free Qt Foundation, which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#include "mousecursor.h" + +MouseCursor::MouseCursor() +{ +} + +Qt::CursorShape MouseCursor::cursorShape() const +{ + return cursor().shape(); +} + +void MouseCursor::setCursorShape(Qt::CursorShape shape) +{ + setCursor(QCursor(shape)); + emit cursorShapeChanged(); +} + +void MouseCursor::reset() +{ + setCursor(QCursor()); +} diff -Nru muon-1.9.60/installer/qml/src/mousecursor.h muon-2.0.0/installer/qml/src/mousecursor.h --- muon-1.9.60/installer/qml/src/mousecursor.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/installer/qml/src/mousecursor.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,43 @@ +/* + Copyright (C) 2011 Harald Sitter + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) version 3, or any + later version accepted by the membership of KDE e.V. (or its + successor approved by the membership of KDE e.V.), Nokia Corporation + (or its successors, if any) and the KDE Free Qt Foundation, which shall + act as a proxy defined in Section 6 of version 3 of the license. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library. If not, see . +*/ + +#ifndef MOUSECURSOR_H +#define MOUSECURSOR_H + +#include + +class MouseCursor : public QDeclarativeItem +{ + Q_OBJECT + Q_PROPERTY(Qt::CursorShape shape READ cursorShape WRITE setCursorShape NOTIFY cursorShapeChanged) +public: + MouseCursor(); + + Qt::CursorShape cursorShape() const; + void setCursorShape(Qt::CursorShape shape); + + Q_INVOKABLE void reset(); + +signals: + void cursorShapeChanged(); +}; + +#endif // MOUSECURSOR_H diff -Nru muon-1.9.60/kded/muon-notifier.desktop muon-2.0.0/kded/muon-notifier.desktop --- muon-1.9.60/kded/muon-notifier.desktop 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/kded/muon-notifier.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -13,10 +13,12 @@ Name[fi]=Muon-ilmoitukset Name[fr]=Notificateur pour Muon Name[ga]=Fógróir Muon +Name[gl]=Notificador de Muon Name[hu]=Muon értesítő Name[it]=Notifiche di Muon Name[kk]=Muon құлақтандырғышы Name[lt]=Muon pranešėjas +Name[mr]=म्युओन डिस्कव्हर Name[nb]=Muon-varsler Name[nds]=Muon-Bescheden Name[nl]=Muon-melder diff -Nru muon-1.9.60/kded/muon-notifier.notifyrc muon-2.0.0/kded/muon-notifier.notifyrc --- muon-1.9.60/kded/muon-notifier.notifyrc 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/kded/muon-notifier.notifyrc 2013-04-01 20:32:05.000000000 +0000 @@ -14,10 +14,12 @@ Comment[fi]=Järjestelmäilmoitus Comment[fr]=Notification du système Comment[ga]=Fógairt an Chórais +Comment[gl]=Notificacións do sistema Comment[hu]=Rendszerértesítések Comment[it]=Notifica di sistema Comment[kk]=Жүйелік құлақтандыру Comment[lt]=Sistemos pranešimas +Comment[mr]=प्रणाली सूचना Comment[nb]=Systemvarsling Comment[nds]=Systeembescheden Comment[nl]=Systeemnotificatie @@ -56,10 +58,12 @@ Name[fi]=Versiopäivitys saatavilla Name[fr]=Mise à niveau disponible Name[ga]=Nuashonrú Le Fáil +Name[gl]=Dispoñíbel unha actualización Name[hu]=Disztribúciófrissítés érhető el Name[it]=Aggiornamento disponibile Name[kk]=Жаңартуы бар Name[lt]=Galimas atnaujinimas +Name[mr]=अद्ययावत सॉफ़्टवेअर उपलब्ध आहे Name[nb]=Oppgradering tilgjengelig Name[nds]=Opgraderen verföögbor Name[nl]=Opwaardering beschikbaar @@ -96,10 +100,12 @@ Comment[fi]=Uusi Kubuntun versio on saatavilla Comment[fr]=Une nouvelle version de Kubuntu est disponible Comment[ga]=Tá leagan nua de Kubuntu ar fáil +Comment[gl]=Está dispoñíbel unha nova versión de Kubuntu Comment[hu]=Új Kubuntu kiadás érhető el Comment[it]=È disponibile una nuova versione di Kubuntu Comment[kk]=Жаңа Kubuntu нұсқасы бар Comment[lt]=Nauja Kubuntu versija pasiekiama +Comment[mr]=कुबुन्टुची नवीन आवृत्ती उपलब्ध आहे Comment[nb]=En ny versjon av Kubuntu er tilgjengelig Comment[nds]=En nieg Verschoon vun Kubuntu is verföögbor. Comment[nl]=Er is een nieuwe versie van Kubuntu beschikbaar @@ -120,6 +126,7 @@ Comment[ug]=يېڭى نەشردىكى Kubuntu بار Comment[uk]=Доступна нова версія Kubuntu Comment[x-test]=xxA new version of Kubuntu is availablexx +Comment[zh_CN]=有新版本的 Kubuntu 可用 Comment[zh_TW]=已經有新版本的 Kubuntu Action=Popup @@ -138,10 +145,12 @@ Name[fi]=Päivityksiä on saatavilla Name[fr]=Des mises à jour sont disponibles Name[ga]=Tá Nuashonruithe Le Fáil +Name[gl]=Hai actualizacións dispoñíbeis Name[hu]=Frissítések érhetők el Name[it]=Sono disponibili aggiornamenti Name[kk]=Жаңартулар бар Name[lt]=Atnaujinimai yra pasiekiami +Name[mr]=अद्ययावत सॉफ़्टवेअर उपलब्ध आहे Name[nb]=Oppgraderinger er tilgjengelige Name[nds]=Opfrischen verföögbor Name[nl]=Bijwerken is beschikbaar @@ -178,10 +187,12 @@ Comment[fi]=Päivityksiä saatavilla Comment[fr]=Mises à jour disponibles Comment[ga]=Nuashonruithe Le Fáil +Comment[gl]=Actualizacións dispoñíbeis Comment[hu]=Frissítések érhetők el Comment[it]=Aggiornamenti disponibili Comment[kk]=Жаңартулар бар Comment[lt]=Atnaujinimai yra pasiekiami +Comment[mr]=अद्ययावत सॉफ़्टवेअर उपलब्ध आहे Comment[nb]=Oppgraderinger tilgjengelige Comment[nds]=Opfrischen verföögbor Comment[nl]=Bijwerken is beschikbaar diff -Nru muon-1.9.60/libmuon/ApplicationAddonsModel.cpp muon-2.0.0/libmuon/ApplicationAddonsModel.cpp --- muon-1.9.60/libmuon/ApplicationAddonsModel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationAddonsModel.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,115 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ApplicationAddonsModel.h" +#include +#include +#include +#include + +ApplicationAddonsModel::ApplicationAddonsModel(QObject* parent) + : QAbstractListModel(parent) + , m_app(0) +{} + +void ApplicationAddonsModel::setApplication(AbstractResource* app) +{ + discardChanges(); + m_app = app; + m_initial = m_app->addonsInformation(); + + QHash roles = roleNames(); + roles.insert(Qt::CheckStateRole, "checked"); + setRoleNames(roles); + emit applicationChanged(); +} + +AbstractResource* ApplicationAddonsModel::application() const +{ + return m_app; +} + +int ApplicationAddonsModel::rowCount(const QModelIndex& parent) const +{ + return parent.isValid()? 0 : m_initial.size(); +} + +QVariant ApplicationAddonsModel::data(const QModelIndex& index, int role) const +{ + if(!index.isValid() || index.row()>=m_initial.size()) + return QVariant(); + + switch(role) { + case Qt::DisplayRole: + return m_initial[index.row()].name(); + case Qt::ToolTipRole: + return m_initial[index.row()].description(); + case Qt::CheckStateRole: { + QHash::const_iterator it = m_state.constFind(m_initial[index.row()].name()); + if(it==m_state.constEnd()) { + return m_initial[index.row()].isInstalled(); + } else { + return it.value(); + } + } + } + + return QVariant(); +} + +void ApplicationAddonsModel::discardChanges() +{ + //dataChanged should suffice, but it doesn't + beginResetModel(); + m_state.clear(); + emit stateChanged(); + endResetModel(); +} + +void ApplicationAddonsModel::applyChanges() +{ + ResourcesModel::global()->installApplication(m_app, m_state); +} + +void ApplicationAddonsModel::changeState(const QString& packageName, bool installed) +{ + QList::const_iterator it=m_initial.constBegin(), itEnd=m_initial.constEnd(); + for(; it!=itEnd; ++it) { + if(it->name()==packageName) + break; + } + + bool restored = it->isInstalled()==installed; + if(restored) + m_state.remove(packageName); + else + m_state.insert(packageName, installed); + emit stateChanged(); +} + +bool ApplicationAddonsModel::hasChanges() const +{ + return !m_state.isEmpty(); +} + +bool ApplicationAddonsModel::isEmpty() const +{ + return m_initial.isEmpty(); +} diff -Nru muon-1.9.60/libmuon/ApplicationAddonsModel.h muon-2.0.0/libmuon/ApplicationAddonsModel.h --- muon-1.9.60/libmuon/ApplicationAddonsModel.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationAddonsModel.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,63 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef APPLICATIONADDONSMODEL_H +#define APPLICATIONADDONSMODEL_H + +#include +#include + +#include "libmuonprivate_export.h" + +class AbstractResource; + +class MUONPRIVATE_EXPORT ApplicationAddonsModel : public QAbstractListModel +{ + Q_OBJECT + Q_PROPERTY(AbstractResource* application READ application WRITE setApplication) + Q_PROPERTY(bool hasChanges READ hasChanges NOTIFY stateChanged) + Q_PROPERTY(bool isEmpty READ isEmpty NOTIFY applicationChanged) + public: + explicit ApplicationAddonsModel(QObject* parent = 0); + + AbstractResource* application() const; + void setApplication(AbstractResource* app); + bool hasChanges() const; + + virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; + virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; + bool isEmpty() const; + + public slots: + void discardChanges(); + void applyChanges(); + void changeState(const QString& packageName, bool installed); + + signals: + void stateChanged(); + void applicationChanged(); + + private: + AbstractResource* m_app; + QList m_initial; + QHash m_state; +}; + +#endif // APPLICATIONADDONSMODEL_H diff -Nru muon-1.9.60/libmuon/ApplicationBackend/Application.cpp muon-2.0.0/libmuon/ApplicationBackend/Application.cpp --- muon-1.9.60/libmuon/ApplicationBackend/Application.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationBackend/Application.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,494 +0,0 @@ -/*************************************************************************** - * Copyright © 2010-2011 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "Application.h" -#include "resources/PackageState.h" -#include "ApplicationBackend.h" - -// Qt includes -#include -#include -#include -#include - -// KDE includes -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// QApt includes -#include -#include - -//QJSON includes -#include - -Application::Application(const QString& fileName, QApt::Backend* backend) - : AbstractResource(0) - , m_backend(backend) - , m_package(0) - , m_isValid(true) - , m_isTechnical(false) - , m_isExtrasApp(false) -{ - m_data = desktopContents(fileName); - m_isTechnical = getField("NoDisplay").toLower() == "true" || !hasField("Exec"); - m_packageName = getField("X-AppInstall-Package"); -} - -Application::Application(QApt::Package* package, QApt::Backend* backend) - : AbstractResource(0) - , m_backend(backend) - , m_package(package) - , m_isValid(true) - , m_isTechnical(true) - , m_isExtrasApp(false) -{ - m_packageName = m_package->name().latin1(); - - if (m_package->architecture() != m_backend->nativeArchitecture()) - m_packageName.append(QByteArray(":") + m_package->architecture().toLatin1()); - - if (m_package->origin() == QLatin1String("LP-PPA-app-review-board")) { - if (!m_package->controlField(QLatin1String("Appname")).isEmpty()) { - m_isExtrasApp = true; - m_isTechnical = false; - } - } -} - -QString Application::name() -{ - if (!m_isTechnical) - return i18n(untranslatedName().toUtf8()); - - // Technical packages use the package name, which is untranslatable - return untranslatedName(); -} - -QString Application::untranslatedName() -{ - QString name = QString::fromUtf8(getField("Name")).trimmed(); - if (name.isEmpty() && package()) { - // extras.ubuntu.com packages can have this - if (m_isExtrasApp) - name = m_package->controlField(QLatin1String("Appname")); - else - name = m_package->name(); - } - - return name; -} - -QString Application::comment() -{ - QString comment = getField("Comment"); - if (comment.isEmpty()) { - // Sometimes GenericName is used instead of Comment - comment = getField("GenericName"); - if (comment.isEmpty()) { - return package()->shortDescription(); - } - } - - return i18n(comment.toUtf8()); -} - -QString Application::packageName() const -{ - return m_packageName; -} - -QApt::Package *Application::package() -{ - if (!m_package && m_backend) { - m_package = m_backend->package(packageName()); - emit stateChanged(); - } - - // Packages removed from archive will remain in app-install-data until the - // next refresh, so we can have valid .desktops with no package - if (!m_package) { - m_isValid = false; - } - - return m_package; -} - -QString Application::icon() const -{ - return getField("Icon", "applications-other"); -} - -QString Application::mimetypes() const -{ - return getField("MimeType"); -} - -QString Application::menuPath() -{ - QString path; - QString arrow(QString::fromUtf8(" ➜ ")); - - // Take the file name and remove the .desktop ending - QVector execs = executables(); - if(execs.isEmpty()) - return path; - - KService::Ptr service = execs.first(); - QVector > ret; - - if (service) { - ret = locateApplication(QString(), service->menuId()); - } - - if (!ret.isEmpty()) { - path.append(QString("") - .arg(KIconLoader::global()->iconPath("kde", KIconLoader::Small))); - path.append(QString(" %1  %3") - .arg(arrow) - .arg(KIconLoader::global()->iconPath("applications-other", KIconLoader::Small)) - .arg(i18n("Applications"))); - for (int i = 0; i < ret.size(); i++) { - path.append(QString(" %1  %3") - .arg(arrow) - .arg(KIconLoader::global()->iconPath(ret.at(i).second, KIconLoader::Small)) - .arg(ret.at(i).first)); - } - } - - return path; -} - -QVector > Application::locateApplication(const QString &_relPath, const QString &menuId) const -{ - QVector > ret; - KServiceGroup::Ptr root = KServiceGroup::group(_relPath); - - if (!root || !root->isValid()) { - return ret; - } - - const KServiceGroup::List list = root->entries(false /* sorted */, - true /* exclude no display entries */, - false /* allow separators */); - - for (KServiceGroup::List::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) { - const KSycocaEntry::Ptr p = (*it); - - if (p->isType(KST_KService)) { - const KService::Ptr service = KService::Ptr::staticCast(p); - - if (service->noDisplay()) { - continue; - } - - if (service->menuId() == menuId) { - QPair pair; - pair.first = service->name(); - pair.second = service->icon(); - ret << pair; - return ret; - } - } else if (p->isType(KST_KServiceGroup)) { - const KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr::staticCast(p); - - if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { - continue; - } - - QVector > found; - found = locateApplication(serviceGroup->relPath(), menuId); - if (!found.isEmpty()) { - QPair pair; - pair.first = serviceGroup->caption(); - pair.second = serviceGroup->icon(); - ret << pair; - ret << found; - return ret; - } - } else { - continue; - } - } - - return ret; -} - -QString Application::categories() -{ - QString categories = getField("Categories"); - - if (categories.isEmpty()) { - // extras.ubuntu.com packages can have this field - if (m_isExtrasApp) - categories = package()->controlField(QLatin1String("Category")); - } - return categories; -} - -QUrl Application::screenshotUrl(QApt::ScreenshotType type) -{ - return package()->screenshotUrl(type); -} - -QString Application::license() -{ - if (package()->component() == "main" || - package()->component() == "universe") { - return i18nc("@info license", "Open Source"); - } else if (package()->component() == "restricted") { - return i18nc("@info license", "Proprietary"); - } else { - return i18nc("@info license", "Unknown"); - } -} - -QApt::PackageList Application::addons() -{ - QApt::PackageList addons; - - QApt::Package *pkg = package(); - if (!pkg) { - return addons; - } - - QStringList tempList; - // Only add recommends or suggests to the list if they aren't already going to be - // installed - if (!m_backend->config()->readEntry("APT::Install-Recommends", true)) { - tempList << m_package->recommendsList(); - } - if (!m_backend->config()->readEntry("APT::Install-Suggests", false)) { - tempList << m_package->suggestsList(); - } - tempList << m_package->enhancedByList(); - - QStringList languagePackages; - QFile l10nFilterFile("/usr/share/language-selector/data/pkg_depends"); - - if (l10nFilterFile.open(QFile::ReadOnly)) { - QString contents = l10nFilterFile.readAll(); - - foreach (const QString &line, contents.split('\n')) { - if (line.startsWith(QLatin1Char('#'))) { - continue; - } - languagePackages << line.split(':').last(); - } - - languagePackages.removeAll(""); - } - - foreach (const QString &addon, tempList) { - bool shouldShow = true; - QApt::Package *package = m_backend->package(addon); - - if (!package || QString(package->section()).contains("lib") || addons.contains(package)) { - continue; - } - - foreach (const QString &langpack, languagePackages) { - if (addon.contains(langpack)) { - shouldShow = false; - break; - } - } - - if (shouldShow) { - addons << package; - } - } - - return addons; -} - -QList Application::addonsInformation() -{ - QList ret; - QApt::PackageList pkgs = addons(); - foreach(QApt::Package* p, pkgs) { - ret += PackageState(p->name(), p->shortDescription(), p->isInstalled()); - } - return ret; -} - -bool Application::isValid() const -{ - return m_isValid; -} - -bool Application::isTechnical() const -{ - return m_isTechnical; -} - -QByteArray Application::getField(const char* field, const QByteArray& defaultvalue) const -{ - if(m_data) { - KConfigGroup group = m_data->group("Desktop Entry"); - return group.readEntry(field, defaultvalue); - } else - return defaultvalue; - -} - -bool Application::hasField(const char* field) const -{ - return m_data && m_data->group("Desktop Entry").hasKey(field); -} - -QUrl Application::homepage() const -{ - if(!m_package) return QString(); - return m_package->homepage(); -} - -QString Application::origin() const -{ - if(!m_package) return QString(); - return m_package->origin(); -} - -QString Application::longDescription() const -{ - if(!m_package) return QString(); - return m_package->longDescription(); -} - -QString Application::availableVersion() const -{ - if(!m_package) return QString(); - return m_package->availableVersion(); -} - -QString Application::installedVersion() const -{ - if(!m_package) return QString(); - return m_package->installedVersion(); -} - -QString Application::sizeDescription() -{ - if (!isInstalled()) { - return i18nc("@info app size", "%1 to download, %2 on disk", - KGlobal::locale()->formatByteSize(package()->downloadSize()), - KGlobal::locale()->formatByteSize(package()->availableInstalledSize())); - } else { - return i18nc("@info app size", "%1 on disk", - KGlobal::locale()->formatByteSize(package()->currentInstalledSize())); - } -} - -KSharedConfigPtr Application::desktopContents(const QString& filename) -{ - return KSharedConfig::openConfig(filename, KConfig::SimpleConfig); -} - -void Application::clearPackage() -{ - m_package = 0; -} - -QVector Application::executables() const -{ - QVector ret; - foreach (const QString &desktop, m_package->installedFilesList().filter(".desktop")) { - // we create a new KService because findByDestopPath - // might fail because the Sycoca database is not up to date yet. - KService::Ptr service = KService::serviceByStorageId(desktop); - if (service->isApplication() && - !service->noDisplay() && - !service->exec().isEmpty()) - { - ret << service; - } - } - return ret; -} - -void Application::emitStateChanged() -{ - emit stateChanged(); -} - -void Application::invokeApplication() const -{ - QVector< KService::Ptr > execs = executables(); - Q_ASSERT(!execs.isEmpty()); - KToolInvocation::startServiceByDesktopPath(execs.first()->desktopEntryPath()); -} - -bool Application::canExecute() const -{ - return !executables().isEmpty(); -} - -QString Application::section() -{ - return package()->section(); -} -AbstractResource::State Application::state() -{ - State ret = None; - int s = package()->state(); - if(s & QApt::Package::Upgradeable) ret = Upgradeable; - else if(s & QApt::Package::Installed) ret = Installed; - - return ret; -} - -void Application::fetchScreenshots() -{ - QString dest = KStandardDirs::locate("tmp", "screenshots."+m_packageName); - - //TODO: Make async - bool done = false; - bool ret = KIO::NetAccess::download(KUrl("http://screenshots.debian.net/json/package/"+m_packageName), dest, 0); - if(ret) { - QFile f(dest); - f.open(QIODevice::ReadOnly); - - QJson::Parser p; - bool ok; - QVariantMap values = p.parse(&f, &ok).toMap(); - if(!ok) { - QVariantList screenshots = values["screenshots"].toList(); - - QList thumbnailUrls, screenshotUrls; - foreach(const QVariant& screenshot, screenshots) { - QVariantMap s = screenshot.toMap(); - thumbnailUrls += s["small_image_url"].toUrl(); - screenshotUrls += s["large_image_url"].toUrl(); - } - emit screenshotsFetched(thumbnailUrls, screenshotUrls); - done = true; - } - } - if(!done) - emit screenshotsFetched(QList() << thumbnailUrl(), QList() << screenshotUrl()); -} diff -Nru muon-1.9.60/libmuon/ApplicationBackend/Application.h muon-2.0.0/libmuon/ApplicationBackend/Application.h --- muon-1.9.60/libmuon/ApplicationBackend/Application.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationBackend/Application.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,108 +0,0 @@ -/*************************************************************************** - * Copyright © 2010-2011 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef APPLICATION_H -#define APPLICATION_H - -#include -#include -#include - -#include -#include - -#include - -#include "libmuonprivate_export.h" -#include "resources/AbstractResource.h" - -class KJob; -namespace QApt { - class Backend; -} - -class MUONPRIVATE_EXPORT Application : public AbstractResource -{ -Q_OBJECT -// Q_PROPERTY(QString mimetypes READ mimetypes CONSTANT) -// Q_PROPERTY(QString menuPath READ menuPath CONSTANT) -public: - friend class TransactionListener; - - explicit Application(const QString &fileName, QApt::Backend *backend); - explicit Application(QApt::Package *package, QApt::Backend *backend); - - QString name(); - QString untranslatedName(); - QString comment(); - QApt::Package *package(); - QString icon() const; - QString mimetypes() const; - QString menuPath(); - QString categories(); - QString license(); - QUrl screenshotUrl() { return screenshotUrl(QApt::Screenshot); } - QUrl thumbnailUrl() { return screenshotUrl(QApt::Thumbnail); } - virtual QList< PackageState > addonsInformation(); - bool isValid() const; - bool isTechnical() const; - QString packageName() const; - - //QApt::Package forwarding - QUrl homepage() const; - QString longDescription() const; - QString installedVersion() const; - QString availableVersion() const; - QString sizeDescription(); - QString origin() const; - - void clearPackage(); - QVector executables() const; - - /** Used to trigger the stateChanged signal from the ApplicationBackend */ - void emitStateChanged(); - - void invokeApplication() const; - - bool canExecute() const; - QString section(); - - virtual State state(); - virtual void fetchScreenshots(); - -private: - KSharedConfigPtr m_data; - QApt::Backend *m_backend; - QApt::Package *m_package; - QByteArray m_packageName; - - bool m_isValid; - bool m_isTechnical; - bool m_isExtrasApp; - - QByteArray getField(const char* field, const QByteArray& defaultvalue = QByteArray()) const; - KSharedConfigPtr desktopContents(const QString& filename); - QUrl screenshotUrl(QApt::ScreenshotType type); - QApt::PackageList addons(); - QVector > locateApplication(const QString &_relPath, const QString &menuId) const; - bool hasField(const char* field) const; -}; - -#endif diff -Nru muon-1.9.60/libmuon/ApplicationBackend/ApplicationBackend.cpp muon-2.0.0/libmuon/ApplicationBackend/ApplicationBackend.cpp --- muon-1.9.60/libmuon/ApplicationBackend/ApplicationBackend.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationBackend/ApplicationBackend.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,639 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ApplicationBackend.h" - -// Qt includes -#include -#include -#include -#include -#include -#include - -// KDE includes -#include -#include -#include -#include -#include -#include - -// LibQApt/DebconfKDE includes -#include -#include -#include - -// Own includes -#include "MuonStrings.h" -#include "ChangesDialog.h" -#include "Application.h" -#include "ReviewsBackend/ReviewsBackend.h" -#include "Transaction/Transaction.h" -#include "ApplicationUpdates.h" -#include "QAptActions.h" -#include "MuonMainWindow.h" - -ApplicationBackend::ApplicationBackend(QObject *parent) - : AbstractResourcesBackend(parent) - , m_backend(nullptr) - , m_reviewsBackend(new ReviewsBackend(this)) - , m_isReloading(false) - , m_currentTransaction(nullptr) - , m_backendUpdater(new ApplicationUpdates(this)) - , m_aptify(nullptr) -{ - m_watcher = new QFutureWatcher >(this); - connect(m_watcher, SIGNAL(finished()), this, SLOT(setApplications())); - connect(this, SIGNAL(reloadFinished()), SIGNAL(updatesCountChanged())); - connect(this, SIGNAL(backendReady()), SIGNAL(updatesCountChanged())); - connect(m_reviewsBackend, SIGNAL(ratingsReady()), SIGNAL(allDataChanged())); -} - -ApplicationBackend::~ApplicationBackend() -{ - qDeleteAll(m_appList); -} - -QVector init(QApt::Backend *backend, QThread* thread) -{ - QVector appList; - QDir appDir("/usr/share/app-install/desktop/"); - QStringList fileList = appDir.entryList(QStringList("*.desktop"), QDir::Files); - - QStringList pkgBlacklist; - pkgBlacklist << "kde-runtime" << "kdepim-runtime" << "kdelibs5-plugins" << "kdelibs5-data"; - - QList tempList; - QSet packages; - foreach(const QString &fileName, fileList) { - Application *app = new Application(appDir.filePath(fileName), backend); - packages.insert(app->packageName()); - tempList << app; - } - - foreach (QApt::Package *package, backend->availablePackages()) { - //Don't create applications twice - if(packages.contains(package->name())) - continue; - - if (package->isMultiArchDuplicate()) - continue; - - Application *app = new Application(package, backend); - tempList << app; - } - - for (Application *app : tempList) { - bool added = false; - QApt::Package *pkg = app->package(); - if (app->isValid()) { - if ((pkg) && !pkgBlacklist.contains(pkg->name())) { - appList << app; - added = true; - } - } - - if(added) - app->moveToThread(thread); - else - delete app; - } - - return appList; -} - -void ApplicationBackend::setBackend(QApt::Backend *backend) -{ - m_backend = backend; - m_backend->setUndoRedoCacheSize(1); - m_reviewsBackend->setAptBackend(m_backend); - m_backendUpdater->setBackend(m_backend); - - QFuture > future = QtConcurrent::run(init, m_backend, QThread::currentThread()); - m_watcher->setFuture(future); - connect(m_backend, SIGNAL(transactionQueueChanged(QString,QStringList)), - this, SLOT(aptTransactionsChanged(QString))); - connect(m_backend, SIGNAL(xapianUpdateFinished()), - this, SIGNAL(searchInvalidated())); -} - -void ApplicationBackend::setApplications() -{ - m_appList = m_watcher->future().result(); - - // Populate origin lists - QApt::Package *pkg; - for (Application *app : m_appList) { - app->setParent(this); - pkg = app->package(); - if (pkg->isInstalled()) - m_instOriginList << pkg->origin(); - else - m_originList << pkg->origin(); - } - - m_originList.remove(QString()); - m_instOriginList.remove(QString()); - m_originList += m_instOriginList; - emit backendReady(); - - if (m_aptify) - m_aptify->setCanExit(true); -} - -void ApplicationBackend::reload() -{ - if (m_aptify) - m_aptify->setCanExit(false); - emit reloadStarted(); - m_isReloading = true; - foreach(Application* app, m_appList) - app->clearPackage(); - qDeleteAll(m_transQueue); - m_transQueue.clear(); - m_reviewsBackend->stopPendingJobs(); - - if (!m_backend->reloadCache()) - initError(); - - foreach(Application* app, m_appList) - app->package(); - - m_isReloading = false; - if (m_aptify) - m_aptify->setCanExit(true); - emit reloadFinished(); - emit searchInvalidated(); -} - -bool ApplicationBackend::isReloading() const -{ - return m_isReloading; -} - -void ApplicationBackend::aptTransactionsChanged(QString active) -{ - // Find the newly-active QApt transaction in our list - QApt::Transaction *trans = nullptr; - auto list = m_transQueue.values(); - - for (QApt::Transaction *t : list) { - if (t->transactionId() == active) { - trans = t; - break; - } - } - - if (!trans || m_transQueue.key(trans) == m_currentTransaction) - return; - - m_currentTransaction = m_transQueue.key(trans); - connect(trans, SIGNAL(statusChanged(QApt::TransactionStatus)), - this, SLOT(transactionEvent(QApt::TransactionStatus))); - connect(trans, SIGNAL(errorOccurred(QApt::ErrorCode)), - this, SLOT(errorOccurred(QApt::ErrorCode))); - connect(trans, SIGNAL(progressChanged(int)), - this, SLOT(updateProgress(int))); - // FIXME: untrusted packages, conf file prompt, media change -} - -void ApplicationBackend::transactionEvent(QApt::TransactionStatus status) -{ - auto iter = m_transQueue.find(m_currentTransaction); - if (iter == m_transQueue.end()) - return; - - switch (status) { - case QApt::SetupStatus: - case QApt::AuthenticationStatus: - case QApt::WaitingStatus: - case QApt::WaitingLockStatus: - case QApt::WaitingMediumStatus: - case QApt::WaitingConfigFilePromptStatus: - case QApt::LoadingCacheStatus: - break; - case QApt::RunningStatus: - m_currentTransaction->setState(RunningState); - break; - case QApt::DownloadingStatus: - transactionsEvent(StartedDownloading, m_currentTransaction); - break; - case QApt::CommittingStatus: - transactionsEvent(FinishedDownloading, m_currentTransaction); - transactionsEvent(StartedCommitting, m_currentTransaction); - - // Set up debconf - m_debconfGui = new DebconfKde::DebconfGui(iter.value()->debconfPipe()); - m_debconfGui->connect(m_debconfGui, SIGNAL(activated()), m_debconfGui, SLOT(show())); - m_debconfGui->connect(m_debconfGui, SIGNAL(deactivated()), m_debconfGui, SLOT(hide())); - break; - case QApt::FinishedStatus: - transactionsEvent(FinishedCommitting, m_currentTransaction); - m_currentTransaction->setState(DoneState); - - // Clean up manually created debconf pipe - QApt::Transaction *trans = iter.value(); - if (!trans->debconfPipe().isEmpty()) - QFile::remove(trans->debconfPipe()); - - // Cleanup - trans->deleteLater(); - emit transactionRemoved(m_currentTransaction); - m_transQueue.remove(iter.key()); - - qobject_cast(m_currentTransaction->resource())->emitStateChanged(); - delete m_currentTransaction; - m_currentTransaction = nullptr; - - if (m_transQueue.isEmpty()) - reload(); - break; - } -} - -void ApplicationBackend::errorOccurred(QApt::ErrorCode error) -{ - if (m_transQueue.isEmpty()) // Shouldn't happen - return; - - emit errorSignal(error, m_transQueue.value(m_currentTransaction)->errorDetails()); -} - -void ApplicationBackend::updateProgress(int percentage) -{ - emit transactionProgressed(m_currentTransaction, percentage); -} - -bool ApplicationBackend::confirmRemoval(QApt::StateChanges changes) -{ - if (changes[QApt::Package::ToRemove].isEmpty()) { - return true; - } - QHash removals; - removals[QApt::Package::ToRemove] = changes[QApt::Package::ToRemove]; - - ChangesDialog *dialog = new ChangesDialog(0, removals); - - return (dialog->exec() == QDialog::Accepted); -} - -void ApplicationBackend::markTransaction(Transaction *transaction) -{ - Application *app = qobject_cast(transaction->resource()); - - switch (transaction->action()) { - case InstallApp: - app->package()->setInstall(); - markLangpacks(transaction); - break; - case RemoveApp: - app->package()->setRemove(); - break; - default: - break; - } - - QHash< QString, bool > addons = transaction->addons(); - auto iter = addons.constBegin(); - - while (iter != addons.constEnd()) { - QApt::Package* package = m_backend->package(iter.key()); - bool state = iter.value(); - if(state) - package->setInstall(); - else - package->setRemove(); - ++iter; - } -} - -void ApplicationBackend::markLangpacks(Transaction *transaction) -{ - QString prog = KStandardDirs::findExe("check-language-support"); - if (prog.isEmpty()) - return; - - QString language = KGlobal::locale()->language(); - QString pkgName = transaction->resource()->packageName(); - - QStringList args; - args << prog << QLatin1String("-l") << language << QLatin1String("-p") << pkgName; - - KProcess proc; - proc.setOutputChannelMode(KProcess::OnlyStdoutChannel); - proc.setProgram(args); - proc.start(); - proc.waitForFinished(); - - QString res = proc.readAllStandardOutput(); - res.remove(QString()); - - QApt::Package *langPack = nullptr; - m_backend->setCompressEvents(true); - foreach(const QString &pkg, res.split(' ')) - { - langPack = m_backend->package(pkg.trimmed()); - - if (langPack) - langPack->setInstall(); - } - m_backend->setCompressEvents(false); -} - -void ApplicationBackend::addTransaction(Transaction *transaction) -{ - QApt::CacheState oldCacheState = m_backend->currentCacheState(); - m_backend->saveCacheState(); - - markTransaction(transaction); - - // Find changes due to markings - QApt::PackageList excluded; - excluded.append(qobject_cast(transaction->resource())->package()); - - // Exclude addons being marked - auto iter = transaction->addons().constBegin(); - while (iter != transaction->addons().constEnd()) { - QApt::Package *addon = m_backend->package(iter.key()); - if (addon) - excluded.append(addon); - ++iter; - } - - QApt::StateChanges changes = m_backend->stateChanges(oldCacheState, excluded); - - if (!confirmRemoval(changes)) { - m_backend->restoreCacheState(oldCacheState); - emit transactionCancelled(transaction); - delete transaction; - return; - } - - Application *app = qobject_cast(transaction->resource()); - - if (app->package()->wouldBreak()) { - m_backend->restoreCacheState(oldCacheState); - //TODO Notify of error - } - - QApt::Transaction *aptTrans = m_backend->commitChanges(); - setupTransaction(aptTrans); - m_transQueue.insert(transaction, aptTrans); - aptTrans->run(); - m_backend->restoreCacheState(oldCacheState); // Undo temporary simulation marking - emit transactionAdded(transaction); - - if (m_transQueue.count() == 1) { - aptTransactionsChanged(aptTrans->transactionId()); - m_currentTransaction = transaction; - emit startingFirstTransaction(); - } -} - -void ApplicationBackend::cancelTransaction(AbstractResource* app) -{ - for (auto iter = m_transQueue.begin(); iter != m_transQueue.end(); ++iter) { - Transaction* t = iter.key(); - QApt::Transaction *aptTrans = iter.value(); - - if (t->resource() == app) { - if (t->state() == RunningState) { - aptTrans->cancel(); - } - break; - } - } - // Emitting the cancellation occurs when the QApt trans is finished -} - -//void ApplicationBackend::runNextTransaction() -//{ -// m_currentTransaction = m_queue.head(); -// if (!m_currentTransaction) { -// return; -// } -// QApt::CacheState oldCacheState = m_backend->currentCacheState(); -// m_backend->saveCacheState(); - -// markTransaction(m_currentTransaction); - -// Application *app = qobject_cast(m_currentTransaction->resource()); - -// if (app->package()->wouldBreak()) { -// m_backend->restoreCacheState(oldCacheState); -// //TODO Notify of error -// } - -// m_backend->commitChanges(); -// m_backend->undo(); // Undo temporary simulation marking -//} - -QList ApplicationBackend::launchList() const -{ - return m_appLaunchList; -} - -QApt::Backend* ApplicationBackend::backend() const -{ - return m_backend; -} - -void ApplicationBackend::clearLaunchList() -{ - m_appLaunchList.clear(); -} - -AbstractReviewsBackend *ApplicationBackend::reviewsBackend() const -{ - return m_reviewsBackend; -} - -QVector ApplicationBackend::allResources() const -{ - QVector ret; - - for (Application* app : m_appList) { - ret += app; - } - return ret; -} - -QSet ApplicationBackend::appOrigins() const -{ - return m_originList; -} - -QSet ApplicationBackend::installedAppOrigins() const -{ - return m_instOriginList; -} - -QList ApplicationBackend::transactions() const -{ - return m_transQueue.keys(); -} - -void ApplicationBackend::installApplication(AbstractResource* res, const QHash< QString, bool >& addons) -{ - Application* app = qobject_cast(res); - TransactionAction action = app->package()->isInstalled() ? ChangeAddons : InstallApp; - - addTransaction(new Transaction(res, action, addons)); -} - -void ApplicationBackend::installApplication(AbstractResource* app) -{ - addTransaction(new Transaction(app, InstallApp)); -} - -void ApplicationBackend::removeApplication(AbstractResource* app) -{ - addTransaction(new Transaction(app, RemoveApp)); -} - -int ApplicationBackend::updatesCount() const -{ - if(m_isReloading) - return 0; - - int count = 0; - foreach(Application* app, m_appList) { - count += app->canUpgrade(); - } - return count; -} - -AbstractResource* ApplicationBackend::resourceByPackageName(const QString& name) const -{ - foreach(Application* app, m_appList) { - if(app->packageName()==name) - return app; - } - return 0; -} - -QStringList ApplicationBackend::searchPackageName(const QString& searchText) -{ - QApt::PackageList packages = m_backend->search(searchText); - QStringList names; - foreach(QApt::Package* package, packages) { - names += package->name(); - } - return names; -} - -QPair ApplicationBackend::currentTransactionState() const -{ - QPair ret; - ret.second = m_currentTransaction; - - QApt::Transaction *trans = m_transQueue.value(m_currentTransaction); - - if (!m_currentTransaction || !trans) - return ret; - - switch (trans->status()) { - case QApt::DownloadingStatus: - ret.first = StartedDownloading; - break; - case QApt::CommittingStatus: - ret.first = StartedCommitting; - break; - default: - break; - } - - return ret; -} - -bool ApplicationBackend::providesResouce(AbstractResource* res) const -{ - return qobject_cast(res); -} - -AbstractBackendUpdater* ApplicationBackend::backendUpdater() const -{ - return m_backendUpdater; -} - -void ApplicationBackend::integrateMainWindow(MuonMainWindow* w) -{ - m_backend = new QApt::Backend(this); - m_aptify = new QAptActions(w, m_backend); - QTimer::singleShot(10, this, SLOT(initBackend())); - - m_aptify->setupActions(); - connect(m_aptify, SIGNAL(sourcesEditorFinished()), SLOT(reload())); -} - -void ApplicationBackend::initBackend() -{ - if (m_aptify) { - m_aptify->setCanExit(false); - m_aptify->setReloadWhenEditorFinished(true); - } - - if (!m_backend->init()) - initError(); - if (m_backend->xapianIndexNeedsUpdate()) { - // FIXME: transaction - m_backend->updateXapianIndex(); - } - - setBackend(m_backend); -} - -void ApplicationBackend::initError() -{ - QString details = m_backend->initErrorMessage(); - - MuonStrings *muonStrings = MuonStrings::global(); - - QString title = muonStrings->errorTitle(QApt::InitError); - QString text = muonStrings->errorText(QApt::InitError, nullptr); - - KMessageBox::detailedError(nullptr, text, details, title); - exit(-1); -} - -void ApplicationBackend::setupTransaction(QApt::Transaction *trans) -{ - // Provide proxy/locale to the transaction - if (KProtocolManager::proxyType() == KProtocolManager::ManualProxy) { - trans->setProxy(KProtocolManager::proxyFor("http")); - } - - trans->setLocale(QLatin1String(setlocale(LC_MESSAGES, 0))); - - // Debconf - QString uuid = QUuid::createUuid().toString(); - uuid.remove('{').remove('}').remove('-'); - QFile pipe(QDir::tempPath() % QLatin1String("/qapt-sock-") % uuid); - pipe.open(QFile::ReadWrite); - pipe.close(); - trans->setDebconfPipe(pipe.fileName()); -} - -void ApplicationBackend::sourcesEditorClosed() -{ - reload(); - emit sourcesEditorFinished(); -} diff -Nru muon-1.9.60/libmuon/ApplicationBackend/ApplicationBackend.h muon-2.0.0/libmuon/ApplicationBackend/ApplicationBackend.h --- muon-1.9.60/libmuon/ApplicationBackend/ApplicationBackend.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationBackend/ApplicationBackend.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,130 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef APPLICATIONBACKEND_H -#define APPLICATIONBACKEND_H - -#include -#include -#include -#include -#include -#include - -#include - -#include "libmuonprivate_export.h" -#include "resources/AbstractResourcesBackend.h" - -namespace QApt { - class Backend; - class Transaction; -} -namespace DebconfKde -{ - class DebconfGui; -} - -class Application; -class ApplicationUpdates; -class ReviewsBackend; -class Transaction; -class MuonMainWindow; -class QAptActions; - -class MUONPRIVATE_EXPORT ApplicationBackend : public AbstractResourcesBackend -{ - Q_OBJECT -public: - explicit ApplicationBackend(QObject *parent=0); - ~ApplicationBackend(); - - AbstractReviewsBackend *reviewsBackend() const; - Q_SCRIPTABLE AbstractResource* resourceByPackageName(const QString& name) const; - QSet appOrigins() const; - QSet installedAppOrigins() const; - QPair currentTransactionState() const; - QList transactions() const; - QList launchList() const; - QApt::Backend* backend() const; - - int updatesCount() const; - - bool confirmRemoval(QApt::StateChanges changes); - Q_SCRIPTABLE bool isReloading() const; - void markTransaction(Transaction *transaction); - void markLangpacks(Transaction *transaction); - void addTransaction(Transaction *transaction); - - QVector< AbstractResource* > allResources() const; - QStringList searchPackageName(const QString& searchText); - bool providesResouce(AbstractResource* res) const; - - void installApplication(AbstractResource *app, const QHash &addons); - void installApplication(AbstractResource *app); - void removeApplication(AbstractResource *app); - void cancelTransaction(AbstractResource *app); - - AbstractBackendUpdater* backendUpdater() const; - void integrateMainWindow(MuonMainWindow *w); -private: - QApt::Backend *m_backend; - ReviewsBackend *m_reviewsBackend; - bool m_isReloading; - - QFutureWatcher >* m_watcher; - QVector m_appList; - QSet m_originList; - QSet m_instOriginList; - QList m_appLaunchList; - - // Transactions - QHash m_transQueue; - Transaction *m_currentTransaction; - - DebconfKde::DebconfGui *m_debconfGui; - ApplicationUpdates* m_backendUpdater; - QAptActions *m_aptify; -public Q_SLOTS: - void setBackend(QApt::Backend *backend); - void initError(); - void reload(); - - //helper functions - void clearLaunchList(); - -private Q_SLOTS: - void setApplications(); - void aptTransactionsChanged(QString active); - void transactionEvent(QApt::TransactionStatus status); - void errorOccurred(QApt::ErrorCode error); - void updateProgress(int percentage); - void initBackend(); - void setupTransaction(QApt::Transaction *trans); - void sourcesEditorClosed(); - -Q_SIGNALS: - void startingFirstTransaction(); - void errorSignal(QApt::ErrorCode code, const QString &details); - void launchListChanged(); - void sourcesEditorFinished(); -}; - -#endif diff -Nru muon-1.9.60/libmuon/ApplicationBackend/ApplicationUpdates.cpp muon-2.0.0/libmuon/ApplicationBackend/ApplicationUpdates.cpp --- muon-1.9.60/libmuon/ApplicationBackend/ApplicationUpdates.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationBackend/ApplicationUpdates.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,145 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ApplicationUpdates.h" - -// Qt includes -#include - -// KDE includes -#include - -// LibQApt includes -#include -#include - -// Own includes -#include "Application.h" -#include "ApplicationBackend.h" -#include "ChangesDialog.h" - -ApplicationUpdates::ApplicationUpdates(ApplicationBackend* parent) - : AbstractBackendUpdater(parent) - , m_aptBackend(nullptr) - , m_appBackend(parent) - , m_lastRealProgress(0) - , m_eta(0) -{ -} - -bool ApplicationUpdates::hasUpdates() const -{ - return m_appBackend->updatesCount()>0; -} - -qreal ApplicationUpdates::progress() const -{ - return m_lastRealProgress; -} - -long unsigned int ApplicationUpdates::remainingTime() const -{ - return m_eta; -} - -void ApplicationUpdates::setBackend(QApt::Backend* backend) -{ - Q_ASSERT(!m_aptBackend || m_aptBackend==backend); - m_aptBackend = backend; -} - -void ApplicationUpdates::start() -{ - m_aptBackend->saveCacheState(); - - // Take the current cache state to compare for changes later - QApt::CacheState cache = m_aptBackend->currentCacheState(); - m_aptBackend->markPackagesForDistUpgrade(); - auto changes = m_aptBackend->stateChanges(cache, QApt::PackageList()); - changes.remove(QApt::Package::ToUpgrade); - - // Confirm additional changes beyond upgrading the files - if(!changes.isEmpty()) { - ChangesDialog d(0, changes); - if(d.exec()==QDialog::Rejected) { - emit updatesFinnished(); - return; - } - } - - // Create and run the transaction - m_trans = m_aptBackend->commitChanges(); - setupTransaction(m_trans); - m_trans->run(); -} - -void ApplicationUpdates::progressChanged(int progress) -{ - if (progress > 100) - return; - - if (progress > m_lastRealProgress) { - m_lastRealProgress = progress; - emit progressChanged((qreal)progress); - } -} - -void ApplicationUpdates::etaChanged(quint64 eta) -{ - m_eta = eta; - emit remainingTimeChanged(); -} - -void ApplicationUpdates::installMessage(const QString& msg) -{ - emit message(QIcon(), msg); -} - -void ApplicationUpdates::transactionStatusChanged(QApt::TransactionStatus status) -{ - if (status == QApt::FinishedStatus) { - emit updatesFinnished(); - m_lastRealProgress = 0; - } -} - -void ApplicationUpdates::errorOccurred(QApt::ErrorCode error) -{ - emit errorSignal(error, m_trans->errorDetails()); -} - -void ApplicationUpdates::setupTransaction(QApt::Transaction *trans) -{ - // Provide proxy/locale to the transaction - if (KProtocolManager::proxyType() == KProtocolManager::ManualProxy) { - trans->setProxy(KProtocolManager::proxyFor("http")); - } - - trans->setLocale(QLatin1String(setlocale(LC_MESSAGES, 0))); - - connect(m_trans, SIGNAL(statusChanged(QApt::TransactionStatus)), - this, SLOT(transactionStatusChanged(QApt::TransactionStatus))); - connect(m_trans, SIGNAL(errorOccurred(QApt::ErrorCode)), - this, SLOT(errorOccurred(QApt::ErrorCode))); - connect(m_trans, SIGNAL(progressChanged(int)), - this, SLOT(progressChanged(int))); - connect(m_trans, SIGNAL(statusDetailsChanged(QString)), - this, SLOT(installMessage(QString))); -} diff -Nru muon-1.9.60/libmuon/ApplicationBackend/ApplicationUpdates.h muon-2.0.0/libmuon/ApplicationBackend/ApplicationUpdates.h --- muon-1.9.60/libmuon/ApplicationBackend/ApplicationUpdates.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationBackend/ApplicationUpdates.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef APPLICATIONUPDATES_H -#define APPLICATIONUPDATES_H - -// Qt includes -#include - -// LibQApt includes -#include - -// Own includes -#include "resources/AbstractBackendUpdater.h" - -namespace QApt { - class Backend; - class Transaction; -} - -class ApplicationBackend; - -class ApplicationUpdates : public AbstractBackendUpdater -{ - Q_OBJECT -public: - explicit ApplicationUpdates(ApplicationBackend* parent); - - bool hasUpdates() const; - qreal progress() const; - void start(); - void setBackend(QApt::Backend* b); - long unsigned int remainingTime() const; - -private: - QApt::Backend* m_aptBackend; - QApt::Transaction *m_trans; - ApplicationBackend* m_appBackend; - int m_lastRealProgress; - long unsigned int m_eta; - -private slots: - void transactionStatusChanged(QApt::TransactionStatus status); - void errorOccurred(QApt::ErrorCode error); - void progressChanged(int progress); - void etaChanged(quint64 eta); - void installMessage(const QString& message); - void setupTransaction(QApt::Transaction *trans); - -signals: - void errorSignal(QApt::ErrorCode error, QString details); -}; - -#endif // APPLICATIONUPDATES_H diff -Nru muon-1.9.60/libmuon/ApplicationBackend/LaunchListModel.cpp muon-2.0.0/libmuon/ApplicationBackend/LaunchListModel.cpp --- muon-1.9.60/libmuon/ApplicationBackend/LaunchListModel.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationBackend/LaunchListModel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,70 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "LaunchListModel.h" -#include "Application.h" -#include "ApplicationBackend.h" -#include -#include -#include -#include -#include - -LaunchListModel::LaunchListModel(QObject* parent) - : QStandardItemModel(parent) - , m_backend(0) -{} - -void LaunchListModel::setBackend(ApplicationBackend* backend) -{ - if(m_backend) - disconnect(m_backend, SIGNAL(launchListChanged()), this, SLOT(resetApplications())); - m_backend = backend; - if(m_backend) { - connect(m_backend, SIGNAL(launchListChanged()), this, SLOT(resetApplications())); - resetApplications(); - } -} - -void LaunchListModel::resetApplications() -{ - clear(); - QList items; - foreach (Application *app, m_backend->launchList()) { - QVector execs = app->executables(); - foreach (KService::Ptr service, execs) { - QString name = service->genericName().isEmpty() ? - service->property("Name").toString() : - service->property("Name").toString() % QLatin1Literal(" - ") % service->genericName(); - QStandardItem *item = new QStandardItem(name); - item->setIcon(KIcon(service->icon())); - item->setData(service->desktopEntryPath(), Qt::UserRole); - items += item; - } - } - if(!items.isEmpty()) - invisibleRootItem()->appendRows(items); -} - -void LaunchListModel::invokeApplication(int row) const -{ - KToolInvocation::startServiceByDesktopPath(index(row, 0).data(Qt::UserRole).toString()); -} diff -Nru muon-1.9.60/libmuon/ApplicationBackend/LaunchListModel.h muon-2.0.0/libmuon/ApplicationBackend/LaunchListModel.h --- muon-1.9.60/libmuon/ApplicationBackend/LaunchListModel.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ApplicationBackend/LaunchListModel.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,49 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef LAUNCHLISTMODEL_H -#define LAUNCHLISTMODEL_H - -#include "libmuonprivate_export.h" -#include - -class Application; -class ApplicationBackend; -class MUONPRIVATE_EXPORT LaunchListModel : public QStandardItemModel -{ - Q_OBJECT - Q_PROPERTY(ApplicationBackend* backend READ backend WRITE setBackend) - public: - explicit LaunchListModel(QObject* parent = 0); - void setBackend(ApplicationBackend* backend); - ApplicationBackend* backend() const { return m_backend; } - - public slots: - void invokeApplication(int row) const; - - private slots: - void resetApplications(); - - private: - ApplicationBackend* m_backend; -}; - -#endif // LAUNCHLISTMODEL_H - diff -Nru muon-1.9.60/libmuon/CMakeLists.txt muon-2.0.0/libmuon/CMakeLists.txt --- muon-1.9.60/libmuon/CMakeLists.txt 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -1,38 +1,15 @@ -# make the macro a bit more smart, making it possible to pass arguments to qdbusxml2cpp -MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _basename) - GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE) - SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) - SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) - SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc) - - # handling more arguments (as in FindQt4.cmake from KDE4) will come soon, then - # _params will be used for more than just -m - SET(_params -m) - - ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header} - COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile} ${ARGN} - DEPENDS ${_infile}) - - SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE) - - QT4_GENERATE_MOC(${_header} ${_moc}) - - SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc}) - MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc}) - -ENDMACRO(QT4_ADD_DBUS_INTERFACE) - -add_subdirectory(tests) +add_subdirectory(backends) +add_subdirectory(declarative) set(muon_LIB_SRCS Category/Category.cpp Category/CategoryModel.cpp MuonMainWindow.cpp - mobile/src/mousecursor.cpp ReviewsBackend/AbstractReviewsBackend.cpp ReviewsBackend/Rating.cpp ReviewsBackend/Review.cpp ReviewsBackend/AbstractLoginBackend.cpp + ReviewsBackend/ReviewsModel.cpp settings/SettingsPageBase.cpp settings/NotifySettingsPage.cpp Transaction/Transaction.cpp @@ -44,71 +21,32 @@ resources/PackageState.cpp resources/AbstractBackendUpdater.cpp resources/ResourcesUpdatesModel.cpp + MuonBackendsFactory.cpp + ScreenshotsModel.cpp + ApplicationAddonsModel.cpp ) -if(QAPT_FOUND) - set(muon_LIB_SRCS ${muon_LIB_SRCS} - ApplicationBackend/Application.cpp - ApplicationBackend/ApplicationBackend.cpp - ChangesDialog.cpp - MuonStrings.cpp - QAptActions.cpp - ApplicationBackend/LaunchListModel.cpp - ApplicationBackend/ApplicationUpdates.cpp - HistoryView/HistoryProxyModel.cpp - HistoryView/HistoryView.cpp - ReviewsBackend/ReviewsBackend.cpp #TODO: rename to AptReviewsBackend - ReviewsBackend/UbuntuLoginBackend.cpp - ) - add_definitions(-DQAPT_ENABLED) - qt4_add_dbus_interface(muon_LIB_SRCS ReviewsBackend/ubuntu_sso_dbus_interface.xml ubuntu_sso -i "ReviewsBackend/LoginMetaTypes.h") -endif(QAPT_FOUND) - -if(LIBATTICA_FOUND) - set(muon_LIB_SRCS ${muon_LIB_SRCS} - KNSBackend/KNSBackend.cpp - KNSBackend/KNSResource.cpp - KNSBackend/KNSReviews.cpp - KNSBackend/KNSUpdater.cpp - ) -endif(LIBATTICA_FOUND) - kde4_add_kcfg_files(muon_LIB_SRCS GENERATE_MOC MuonDataSources.kcfgc) kde4_add_library(muonprivate SHARED ${muon_LIB_SRCS}) set_target_properties(muonprivate PROPERTIES - VERSION 1.3.65 + VERSION 1.9.97 SOVERSION 1 ) -if(NOT qjson_LIBRARIES) #hack to compatibilize different qjson finder versions - set(qjson_LIBRARIES ${QJSON_LIBRARIES}) -endif() - target_link_libraries(muonprivate - ${DEBCONF_KDE_LIB} + ${QT_QTXML_LIBRARY} + ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} + ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} - ${KDE4_KIO_LIBS} ${KDE4_PHONON_LIBS} - ${KDE4_SOLID_LIBS} - ${QAPT_LIBRARY} - ${qjson_LIBRARIES} - ${QTOAUTH_LIBRARY} - ${KDE4_KNEWSTUFF3_LIBS} ) -if(LIBATTICA_FOUND) - target_link_libraries(muonprivate ${LIBATTICA_LIBRARIES}) -endif(LIBATTICA_FOUND) - -if(QAPT_FOUND) - target_link_libraries(muonprivate ${QAPT_LIBRARY}) -endif(QAPT_FOUND) - -file(GLOB muon_QMLS "${CMAKE_CURRENT_SOURCE_DIR}/mobile/qml/*.qml") - install(TARGETS muonprivate ${INSTALL_TARGETS_DEFAULT_ARGS}) install(FILES moo.ogg DESTINATION ${DATA_INSTALL_DIR}/libmuon) -install(FILES ${muon_QMLS} DESTINATION ${DATA_INSTALL_DIR}/libmuon) -install(FILES categories.xml DESTINATION ${DATA_INSTALL_DIR}/muon-installer) + +install(FILES + muonbackendplugin.desktop + DESTINATION ${SERVICETYPES_INSTALL_DIR} +) diff -Nru muon-1.9.60/libmuon/Category/Category.cpp muon-2.0.0/libmuon/Category/Category.cpp --- muon-1.9.60/libmuon/Category/Category.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/Category/Category.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -24,58 +24,42 @@ #include #include +#include #include -#include -Category::Category(const QDomNode &data, CategoryChildPolicy policy) - : m_iconString("applications-other") - , m_hasSubCategories(false) - , m_showTechnical(false) - , m_policy(policy) -{ - parseData(data); -} - -Category::Category(const QString& name, QObject* parent) +Category::Category(const QDomNode& data, bool canHaveChildren, QObject* parent) : QObject(parent) - , m_name(name) , m_iconString("applications-other") - , m_hasSubCategories(false) , m_showTechnical(false) - , m_policy(NoChildren) { - m_andFilters.append(qMakePair(CategoryFilter, name)); + parseData(data, canHaveChildren); } Category::~Category() {} -void Category::parseData(const QDomNode &data) +void Category::parseData(const QDomNode& data, bool canHaveChildren) { + if(!canHaveChildren) { + m_name = i18nc("@label The label used for viewing all members of this category", "All"); + } QDomNode node = data.firstChild(); while(!node.isNull()) { QDomElement tempElement = node.toElement(); - if (tempElement.tagName() == QLatin1String("Name")) { - if (m_policy == CanHaveChildren) { + if (canHaveChildren) { + if (tempElement.tagName() == QLatin1String("Name")) { m_name = i18nc("Category", tempElement.text().toUtf8()); - } else { - m_name = i18nc("@label The label used for viewing all members of this category", "All"); - } - } else if (tempElement.tagName() == QLatin1String("Icon")) { - if (!tempElement.text().isEmpty()) { - m_iconString = tempElement.text(); + } else if (tempElement.tagName() == QLatin1String("Menu")) { + m_subCategories << new Category(node, true, this); } + } + + if (tempElement.tagName() == QLatin1String("Icon") && tempElement.hasChildNodes()) { + m_iconString = tempElement.text(); } else if (tempElement.tagName() == QLatin1String("ShowTechnical")) { m_showTechnical = true; - } else if (tempElement.tagName() == QLatin1String("Menu")) { - if (m_policy == CanHaveChildren) { - Category *subCategory = new Category(node); - subCategory->setParent(this); - m_subCategories << subCategory; - m_hasSubCategories = true; - } } else if (tempElement.tagName() == QLatin1String("Include")) { parseIncludes(tempElement); } @@ -83,10 +67,8 @@ node = node.nextSibling(); } - if (m_hasSubCategories) { - Category *allSubCategory = new Category(data, NoChildren); - allSubCategory->setParent(this); - m_subCategories << allSubCategory; + if (!m_subCategories.isEmpty()) { + m_subCategories << new Category(data, false, this); } } @@ -159,7 +141,7 @@ bool Category::hasSubCategories() const { - return m_hasSubCategories; + return !m_subCategories.isEmpty(); } bool Category::shouldShowTechnical() const @@ -177,9 +159,9 @@ return (QString::localeAwareCompare(c1->name(), c2->name()) < 0); } -QList< Category* > Category::populateCategories() +QList< Category* > Category::loadCategoriesFile(const QString& path) { - QFile menuFile(KStandardDirs::locate("data", "muon-installer/categories.xml")); + QFile menuFile(path); QList ret; if (!menuFile.open(QIODevice::ReadOnly)) { @@ -190,19 +172,61 @@ QDomDocument menuDocument; QString error; int line; - menuDocument.setContent(&menuFile, &error, &line); + bool correct = menuDocument.setContent(&menuFile, &error, &line); + if(!correct) + kWarning() << "error while parsing the categories file:" << error << " at: " << path << ":" << line; QDomElement root = menuDocument.documentElement(); QDomNode node = root.firstChild(); while(!node.isNull()) { - ret << new Category(node); + ret << new Category(node, true, nullptr); node = node.nextSibling(); } + return ret; +} +QList Category::populateCategories() +{ + // FIXME: Should only populate categories for plugins that have successfully been loaded + QList ret; + QStringList files = KGlobal::dirs()->findAllResources("data", "libmuon/categories/*.xml"); + for(const QString& file : files) { + QList cats = loadCategoriesFile(file); + if(ret.isEmpty()) + ret += cats; + else { + for(Category* c : cats) + addSubcategory(ret, c); + } + } qSort(ret.begin(), ret.end(), categoryLessThan); - return ret; } + +//TODO: maybe it would be interesting to apply some rules to a said backend... +void Category::addSubcategory(QList< Category* >& list, Category* newcat) +{ + for(Category* c : list) { + if(c->name() == newcat->name()) { + if(c->icon() != newcat->icon() + || c->shouldShowTechnical() != newcat->shouldShowTechnical() + || c->m_andFilters != newcat->andFilters()) + { + kWarning() << "the following categories seem to be the same but they're not entirely" + << c->name() << newcat->name(); + break; + } else { + c->m_orFilters += newcat->orFilters(); + c->m_notFilters += newcat->notFilters(); + for(Category* nc : newcat->subCategories()) + addSubcategory(c->m_subCategories, nc); + delete newcat; + return; + } + } + } + list << newcat; +} diff -Nru muon-1.9.60/libmuon/Category/Category.h muon-2.0.0/libmuon/Category/Category.h --- muon-1.9.60/libmuon/Category/Category.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/Category/Category.h 2013-04-01 20:32:05.000000000 +0000 @@ -37,12 +37,6 @@ PkgNameFilter = 4 }; -enum CategoryChildPolicy { - InvalidPolicy = 0, - CanHaveChildren = 1, - NoChildren = 2 -}; - class MUONPRIVATE_EXPORT Category : public QObject { Q_OBJECT @@ -51,8 +45,6 @@ Q_PROPERTY(QString icon READ icon CONSTANT) Q_PROPERTY(bool hasSubCategories READ hasSubCategories CONSTANT) Q_PROPERTY(bool shouldShowTechnical READ shouldShowTechnical CONSTANT) - explicit Category(const QDomNode &node, CategoryChildPolicy type = CanHaveChildren); - explicit Category(const QString& name, QObject* parent = 0); ~Category(); QString name() const; @@ -67,17 +59,20 @@ static QList populateCategories(); private: + static void addSubcategory(QList& list, Category* cat); + static QList loadCategoriesFile(const QString& path); + + explicit Category(const QDomNode& data, bool canHaveChildren, QObject* parent = 0); + QString m_name; QString m_iconString; QList > m_andFilters; QList > m_orFilters; QList > m_notFilters; - bool m_hasSubCategories; bool m_showTechnical; QList m_subCategories; - CategoryChildPolicy m_policy; - void parseData(const QDomNode &data); + void parseData(const QDomNode &data, bool canHaveChildren); QList > parseIncludes(const QDomNode &data); }; diff -Nru muon-1.9.60/libmuon/Category/CategoryModel.cpp muon-2.0.0/libmuon/Category/CategoryModel.cpp --- muon-1.9.60/libmuon/Category/CategoryModel.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/Category/CategoryModel.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -37,15 +37,12 @@ setRoleNames(names); } -void CategoryModel::setCategories(const QList &categoryList, - const QString &rootName) +void CategoryModel::setCategories(const QList &categoryList, const QString &rootName) { invisibleRootItem()->removeRows(0, invisibleRootItem()->rowCount()); qDeleteAll(m_categoryList); m_categoryList = categoryList; foreach (Category *category, m_categoryList) { - if(!category->parent()) - category->setParent(this); QStandardItem *categoryItem = new QStandardItem; categoryItem->setText(category->name()); categoryItem->setIcon(KIcon(category->icon())); @@ -68,9 +65,12 @@ return m_categoryList.at(row); } -void CategoryModel::populateCategories(const QString& rootName) +QList CategoryModel::populateCategories() { - setCategories(Category::populateCategories(), rootName); + static QList cats; + if(cats.isEmpty()) + cats = Category::populateCategories(); + return cats; } void CategoryModel::setSubcategories(Category* c) @@ -79,10 +79,36 @@ if(c) setCategories(c->subCategories(), c->name()); else - populateCategories(QString()); + setCategories(populateCategories(), QString()); } Category* CategoryModel::displayedCategory() const { return m_currentCategory; } + +static Category* recFindCategory(Category* root, const QString& name) +{ + if(root->name()==name) + return root; + else if(root->hasSubCategories()) { + QList subs = root->subCategories(); + for(Category* c : subs) { + Category* ret = recFindCategory(c, name); + if(ret) + return ret; + } + } + return 0; +} + +Category* CategoryModel::findCategoryByName(const QString& name) +{ + QList cats = populateCategories(); + for(Category* cat : cats) { + Category* ret = recFindCategory(cat, name); + if(ret) + return ret; + } + return 0; +} diff -Nru muon-1.9.60/libmuon/Category/CategoryModel.h muon-2.0.0/libmuon/Category/CategoryModel.h --- muon-1.9.60/libmuon/Category/CategoryModel.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/Category/CategoryModel.h 2013-04-01 20:32:05.000000000 +0000 @@ -52,13 +52,15 @@ explicit CategoryModel(QObject* parent = 0); void setCategories(const QList &categoryList, const QString &rootName); - Q_SCRIPTABLE Category* categoryForIndex(int row); + Category* categoryForIndex(int row); - Q_SCRIPTABLE void populateCategories(const QString& rootName); void setSubcategories(Category* c); Category* displayedCategory() const; + Q_SCRIPTABLE static Category* findCategoryByName(const QString& name); private: + static QList populateCategories(); + QList m_categoryList; Category* m_currentCategory; }; diff -Nru muon-1.9.60/libmuon/ChangesDialog.cpp muon-2.0.0/libmuon/ChangesDialog.cpp --- muon-1.9.60/libmuon/ChangesDialog.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ChangesDialog.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,133 +0,0 @@ -/*************************************************************************** - * Copyright © 2011 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ChangesDialog.h" - -// Qt includes -#include -#include -#include -#include - -// KDE includes -#include -#include -#include - -// Own includes -#include "../libmuon/MuonStrings.h" - -ChangesDialog::ChangesDialog(QWidget *parent, const QApt::StateChanges &changes) - : QDialog(parent) -{ - setWindowTitle(i18nc("@title:window", "Confirm Additional Changes")); - QVBoxLayout *layout = new QVBoxLayout(this); - setLayout(layout); - - QLabel *headerLabel = new QLabel(this); - headerLabel->setText(i18nc("@info", "

Mark additional changes?

")); - - int count = countChanges(changes); - QLabel *label = new QLabel(this); - label->setText(i18np("This action requires a change to another package:", - "This action requires changes to other packages:", - count)); - - QTreeView *packageView = new QTreeView(this); - packageView->setHeaderHidden(true); - packageView->setRootIsDecorated(false); - - QWidget *bottomBox = new QWidget(this); - QHBoxLayout *bottomLayout = new QHBoxLayout(bottomBox); - bottomLayout->setSpacing(0); - bottomLayout->setMargin(0); - bottomBox->setLayout(bottomLayout); - - QWidget *bottomSpacer = new QWidget(bottomBox); - bottomSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); - - QPushButton *okButton = new QPushButton(bottomBox); - KGuiItem okItem = KStandardGuiItem::ok(); - okButton->setText(okItem.text()); - okButton->setIcon(okItem.icon()); - connect(okButton, SIGNAL(clicked()), this, SLOT(accept())); - - QPushButton *cancelButton = new QPushButton(bottomBox); - KGuiItem cancelItem = KStandardGuiItem::cancel(); - cancelButton->setText(cancelItem.text()); - cancelButton->setIcon(cancelItem.icon()); - connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject())); - - bottomLayout->addWidget(bottomSpacer); - bottomLayout->addWidget(okButton); - bottomLayout->addWidget(cancelButton); - - m_model = new QStandardItemModel(this); - packageView->setModel(m_model); - addPackages(changes); - packageView->expandAll(); - - layout->addWidget(headerLabel); - layout->addWidget(label); - layout->addWidget(packageView); - layout->addWidget(bottomBox); -} - -void ChangesDialog::addPackages(const QApt::StateChanges &changes) -{ - for (auto i = changes.constBegin(); i != changes.constEnd(); ++i) { - QStandardItem *root = new QStandardItem; - root->setText(MuonStrings::global()->packageStateName(i.key())); - root->setEditable(false); - - QFont font = root->font(); - font.setBold(true); - root->setFont(font); - - const QApt::PackageList packages = i.value(); - - QStandardItem *item = 0; - for (QApt::Package *package : packages) { - item = new QStandardItem; - item->setText(package->name()); - item->setEditable(false); - item->setIcon(KIcon("muon")); - - root->appendRow(item); - } - - m_model->appendRow(root); - } -} - -int ChangesDialog::countChanges(const QApt::StateChanges &changes) -{ - int count = 0; - auto iter = changes.constBegin(); - - while (iter != changes.constEnd()) { - const QApt::PackageList packages = iter.value(); - count += packages.size(); - - ++iter; - } - - return count; -} diff -Nru muon-1.9.60/libmuon/ChangesDialog.h muon-2.0.0/libmuon/ChangesDialog.h --- muon-1.9.60/libmuon/ChangesDialog.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ChangesDialog.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/*************************************************************************** - * Copyright © 2011 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef CHANGESDIALOG_H -#define CHANGESDIALOG_H - -// Qt includes -#include -#include - -// LibQApt includes -#include - -#include "libmuonprivate_export.h" - -class QStandardItemModel; - -class MUONPRIVATE_EXPORT ChangesDialog : public QDialog -{ -public: - ChangesDialog(QWidget *parent, const QApt::StateChanges &changes); - -private: - QStandardItemModel *m_model; - - void addPackages(const QApt::StateChanges &changes); - int countChanges(const QApt::StateChanges &changes); -}; - -#endif // CHANGESDIALOG_H diff -Nru muon-1.9.60/libmuon/HistoryView/HistoryProxyModel.cpp muon-2.0.0/libmuon/HistoryView/HistoryProxyModel.cpp --- muon-1.9.60/libmuon/HistoryView/HistoryProxyModel.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/HistoryView/HistoryProxyModel.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,88 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "HistoryProxyModel.h" - -#include -#include -#include - -HistoryProxyModel::HistoryProxyModel(QObject *parent) - : QSortFilterProxyModel(parent) - , m_stateFilter((QApt::Package::State)0) -{ -} - -HistoryProxyModel::~HistoryProxyModel() -{ -} - -void HistoryProxyModel::search(const QString &searchText) -{ - m_searchText = searchText; - invalidate(); -} - -void HistoryProxyModel::setStateFilter(QApt::Package::State state) -{ - m_stateFilter = state; - invalidate(); -} - -bool HistoryProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const -{ - QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent); - for(int i = 0 ; i < sourceModel()->rowCount(sourceIndex); i++) { - if (filterAcceptsRow(i, sourceIndex)) { - return true; - } - } - - //Our "main"-method - QStandardItem *item = static_cast(sourceModel())->itemFromIndex(sourceModel()->index(sourceRow, 0, sourceParent)); - - if (!item) { - return false; - } - - if (!m_stateFilter == 0) { - if ((bool)(item->data(HistoryActionRole).toInt() & m_stateFilter) == false) { - return false; - } - } - - if (!m_searchText.isEmpty()) { - if ((bool)(item->data(Qt::DisplayRole).toString().contains(m_searchText)) == false) { - return false; - } - } - - return true; -} - -bool HistoryProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const -{ - QStandardItemModel *parentModel = static_cast(sourceModel()); - - QStandardItem *leftItem = parentModel->itemFromIndex(left); - QStandardItem *rightItem = parentModel->itemFromIndex(right); - - return (leftItem->data(HistoryDateRole).toDateTime() > rightItem->data(HistoryDateRole).toDateTime()); -} diff -Nru muon-1.9.60/libmuon/HistoryView/HistoryProxyModel.h muon-2.0.0/libmuon/HistoryView/HistoryProxyModel.h --- muon-1.9.60/libmuon/HistoryView/HistoryProxyModel.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/HistoryView/HistoryProxyModel.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,52 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef HISTORYPROXYMODEL_H -#define HISTORYPROXYMODEL_H - -#include - -#include - -class HistoryProxyModel : public QSortFilterProxyModel -{ - Q_OBJECT -public: - enum { - HistoryDateRole = Qt::UserRole + 1, - HistoryActionRole = Qt::UserRole + 2 - }; - HistoryProxyModel(QObject *parent); - ~HistoryProxyModel(); - - void search(const QString &searchText); - void setStateFilter(QApt::Package::State state); - - bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; - -protected: - bool lessThan(const QModelIndex &left, const QModelIndex &right) const; - -private: - QString m_searchText; - QApt::Package::State m_stateFilter; -}; - -#endif diff -Nru muon-1.9.60/libmuon/HistoryView/HistoryView.cpp muon-2.0.0/libmuon/HistoryView/HistoryView.cpp --- muon-1.9.60/libmuon/HistoryView/HistoryView.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/HistoryView/HistoryView.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,238 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "HistoryView.h" - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -#include "HistoryProxyModel.h" - -HistoryView::HistoryView(QWidget *parent) - : KVBox(parent) -{ - m_history = new QApt::History(this); - - QWidget *headerWidget = new QWidget(this); - QHBoxLayout *headerLayout = new QHBoxLayout(headerWidget); - - QLabel *headerLabel = new QLabel(headerWidget); - headerLabel->setText(i18nc("@info", "History")); - - QWidget *headerSpacer = new QWidget(headerWidget); - headerSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); - - m_searchEdit = new KLineEdit(headerWidget); - m_searchEdit->setClickMessage(i18nc("@label Line edit click message", "Search")); - m_searchEdit->setClearButtonShown(true); - - m_searchTimer = new QTimer(this); - m_searchTimer->setInterval(300); - m_searchTimer->setSingleShot(true); - connect(m_searchTimer, SIGNAL(timeout()), this, SLOT(startSearch())); - connect(m_searchEdit, SIGNAL(textChanged(QString)), m_searchTimer, SLOT(start())); - - m_filterBox = new KComboBox(headerWidget); - m_filterBox->insertItem(AllChangesItem, KIcon("bookmark-new-list"), - i18nc("@item:inlistbox Filters all changes in the history view", - "All changes"), - 0); - m_filterBox->insertItem(InstallationsItem, KIcon("download"), - i18nc("@item:inlistbox Filters installations in the history view", - "Installations"), - QApt::Package::ToInstall); - m_filterBox->insertItem(UpdatesItem, KIcon("system-software-update"), - i18nc("@item:inlistbox Filters updates in the history view", - "Updates"), - QApt::Package::ToUpgrade); - m_filterBox->insertItem(RemovalsItem, KIcon("edit-delete"), - i18nc("@item:inlistbox Filters removals in the history view", - "Removals"), - (QApt::Package::State)(QApt::Package::ToRemove | QApt::Package::ToPurge)); - connect(m_filterBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setStateFilter(int))); - - headerLayout->addWidget(headerLabel); - headerLayout->addWidget(headerSpacer); - headerLayout->addWidget(m_searchEdit); - headerLayout->addWidget(m_filterBox); - - m_historyModel = new QStandardItemModel(this); - m_historyModel->setColumnCount(1); - m_historyModel->setHeaderData(0, Qt::Horizontal, i18nc("@title:column", "Date")); - m_historyView = new QTreeView(this); - - KIcon itemIcon("applications-other"); - - QHash categoryHash; - - QHash actionHash; - actionHash[InstalledAction] = i18nc("@info:status describes a past-tense action", "Installed"); - actionHash[UpgradedAction] = i18nc("@info:status describes a past-tense action", "Upgraded"); - actionHash[DowngradedAction] = i18nc("@status describes a past-tense action", "Downgraded"); - actionHash[RemovedAction] = i18nc("@status describes a past-tense action", "Removed"); - actionHash[PurgedAction] = i18nc("@status describes a past-tense action", "Purged"); - - for (const QApt::HistoryItem &item : m_history->historyItems()) { - QDateTime startDateTime = item.startDate(); - QString formattedTime = KGlobal::locale()->formatTime(startDateTime.time()); - QString category; - - QString date = startDateTime.date().toString(); - if (categoryHash.contains(date)) { - category = categoryHash.value(date); - } else { - category = KGlobal::locale()->formatDate(startDateTime.date(), KLocale::FancyShortDate); - categoryHash[date] = category; - } - - QStandardItem *parentItem = 0; - - if (!m_categoryHash.contains(category)) { - parentItem = new QStandardItem; - parentItem->setEditable(false); - parentItem->setText(category); - parentItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); - - m_historyModel->appendRow(parentItem); - m_categoryHash[category] = parentItem; - } else { - parentItem = m_categoryHash.value(category); - } - - foreach (const QString &package, item.installedPackages()) { - QStandardItem *historyItem = new QStandardItem; - historyItem->setEditable(false); - historyItem->setIcon(itemIcon); - - QString action = actionHash.value(InstalledAction); - QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", - package, action, formattedTime); - historyItem->setText(text); - historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); - historyItem->setData(QApt::Package::ToInstall, HistoryProxyModel::HistoryActionRole); - - parentItem->appendRow(historyItem); - } - - foreach (const QString &package, item.upgradedPackages()) { - QStandardItem *historyItem = new QStandardItem; - historyItem->setEditable(false); - historyItem->setIcon(itemIcon); - - QString action = actionHash.value(UpgradedAction); - QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", - package, action, formattedTime); - historyItem->setText(text); - historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); - historyItem->setData(QApt::Package::ToUpgrade, HistoryProxyModel::HistoryActionRole); - - parentItem->appendRow(historyItem); - } - - foreach (const QString &package, item.downgradedPackages()) { - QStandardItem *historyItem = new QStandardItem; - historyItem->setEditable(false); - historyItem->setIcon(itemIcon); - - QString action = actionHash.value(DowngradedAction); - QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", - package, action, formattedTime); - historyItem->setText(text); - historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); - historyItem->setData(QApt::Package::ToDowngrade, HistoryProxyModel::HistoryActionRole); - - parentItem->appendRow(historyItem); - } - - foreach (const QString &package, item.removedPackages()) { - QStandardItem *historyItem = new QStandardItem; - historyItem->setEditable(false); - historyItem->setIcon(itemIcon); - - QString action = actionHash.value(RemovedAction); - QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", - package, action, formattedTime); - historyItem->setText(text); - historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); - historyItem->setData(QApt::Package::ToRemove, HistoryProxyModel::HistoryActionRole); - - parentItem->appendRow(historyItem); - } - - foreach (const QString &package, item.purgedPackages()) { - QStandardItem *historyItem = new QStandardItem; - historyItem->setEditable(false); - historyItem->setIcon(itemIcon); - - QString action = actionHash.value(PurgedAction); - QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", - package, action, formattedTime); - historyItem->setText(text); - historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); - historyItem->setData(QApt::Package::ToPurge, HistoryProxyModel::HistoryActionRole); - - parentItem->appendRow(historyItem); - } - } - - m_historyView->setMouseTracking(true); - m_historyView->setVerticalScrollMode(QListView::ScrollPerPixel); - - m_proxyModel = new HistoryProxyModel(this); - m_proxyModel->setSourceModel(m_historyModel); - m_proxyModel->sort(0); - - m_historyView->setModel(m_proxyModel); - - setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); -} - -QSize HistoryView::sizeHint() const -{ - return QWidget::sizeHint().expandedTo(QSize(500, 500)); -} - -void HistoryView::setStateFilter(int index) -{ - QApt::Package::State state = (QApt::Package::State)m_filterBox->itemData(index).toInt(); - m_proxyModel->setStateFilter(state); -} - -void HistoryView::startSearch() -{ - m_proxyModel->search(m_searchEdit->text()); -} - -#include "HistoryView.moc" diff -Nru muon-1.9.60/libmuon/HistoryView/HistoryView.h muon-2.0.0/libmuon/HistoryView/HistoryView.h --- muon-1.9.60/libmuon/HistoryView/HistoryView.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/HistoryView/HistoryView.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef HISTORYVIEW_H -#define HISTORYVIEW_H - -#include - -#include - -#include "../libmuonprivate_export.h" - -class QStandardItem; -class QStandardItemModel; -class QTimer; -class QTreeView; - -class KComboBox; -class KLineEdit; - -namespace QApt { - class History; -} - -class HistoryProxyModel; - -class MUONPRIVATE_EXPORT HistoryView : public KVBox -{ - Q_OBJECT -public: - enum ComboItems { - AllChangesItem = 0, - InstallationsItem = 1, - UpdatesItem = 2, - RemovalsItem = 3 - }; - enum PastActions { - InvalidAction = 0, - InstalledAction = 1, - UpgradedAction = 2, - DowngradedAction = 3, - RemovedAction = 4, - PurgedAction = 5 - }; - HistoryView(QWidget *parent); - - QSize sizeHint() const; - -private: - QApt::History *m_history; - QStandardItemModel *m_historyModel; - HistoryProxyModel *m_proxyModel; - QHash m_categoryHash; - - KLineEdit *m_searchEdit; - QTimer *m_searchTimer; - KComboBox *m_filterBox; - QTreeView *m_historyView; - -private Q_SLOTS: - void setStateFilter(int index); - void startSearch(); -}; - -#endif diff -Nru muon-1.9.60/libmuon/KNSBackend/KNSBackend.cpp muon-2.0.0/libmuon/KNSBackend/KNSBackend.cpp --- muon-1.9.60/libmuon/KNSBackend/KNSBackend.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/KNSBackend/KNSBackend.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,254 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "KNSBackend.h" -#include "KNSResource.h" -#include "KNSReviews.h" -#include "KNSUpdater.h" -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -KNSBackend::KNSBackend(const QString& configName, const QString& iconName, QObject* parent) - : AbstractResourcesBackend(parent) - , m_reviews(new KNSReviews(this)) - , m_fetching(true) - , m_iconName(iconName) - , m_updater(new KNSUpdater(this)) -{ - m_name = KStandardDirs::locate("config", configName); - KConfig conf(m_name); - KConfigGroup group; - if (conf.hasGroup("KNewStuff3")) { - group = conf.group("KNewStuff3"); - } - QStringList cats = group.readEntry("Categories", QStringList()); - m_atticaManager = new Attica::ProviderManager; - m_atticaManager->addProviderFileToDefaultProviders(group.readEntry("ProvidersUrl", QString())); - m_atticaManager->loadDefaultProviders(); - connect(m_atticaManager, SIGNAL(defaultProvidersLoaded()), SLOT(startFetchingCategories())); - m_page = 0; - - foreach(const QString& c, cats) { - m_categories.insert(c, Attica::Category()); - } - - m_manager = new KNS3::DownloadManager(m_name, this); - connect(m_manager, SIGNAL(searchResult(KNS3::Entry::List)), SLOT(receivedEntries(KNS3::Entry::List))); - connect(m_manager, SIGNAL(entryStatusChanged(KNS3::Entry)), SLOT(statusChanged(KNS3::Entry))); -} - -KNSBackend::~KNSBackend() -{ - delete m_atticaManager; -} - -void KNSBackend::startFetchingCategories() -{ - if (m_atticaManager->providers().isEmpty()) - return; - - m_provider = m_atticaManager->providers().first(); - - Attica::ListJob* job = m_provider.requestCategories(); - connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(categoriesLoaded(Attica::BaseJob*))); - job->start(); -} - -void KNSBackend::categoriesLoaded(Attica::BaseJob* job) -{ - if(job->metadata().error() != Attica::Metadata::NoError) { - kDebug() << "Network error"; - return; - } - Attica::ListJob* j = static_cast*>(job); - Attica::Category::List categoryList = j->itemList(); - - foreach(const Attica::Category& category, categoryList) { - if (m_categories.contains(category.name())) { - kDebug() << "Adding category: " << category.name(); - m_categories[category.name()] = category; - } - } - - Attica::ListJob* jj = - m_provider.searchContents(m_categories.values(), QString(), Attica::Provider::Alphabetical, m_page, 100); - connect(jj, SIGNAL(finished(Attica::BaseJob*)), SLOT(receivedContents(Attica::BaseJob*))); - jj->start(); -} - -void KNSBackend::receivedContents(Attica::BaseJob* job) -{ - if(job->metadata().error() != Attica::Metadata::NoError) { - kDebug() << "Network error"; - return; - } - Attica::ListJob* listJob = static_cast*>(job); - Attica::Content::List contents = listJob->itemList(); - - if(contents.isEmpty()) { - m_fetching = false; - m_page = 0; - m_manager->search(); - return; - } - QString filename = QFileInfo(m_name).fileName(); - foreach(const Attica::Content& c, contents) { - m_resourcesByName.insert(c.id(), new KNSResource(c, filename, m_iconName, this)); - } - m_page++; - Attica::ListJob* jj = - m_provider.searchContents(m_categories.values(), QString(), Attica::Provider::Alphabetical, m_page, 100); - connect(jj, SIGNAL(finished(Attica::BaseJob*)), SLOT(receivedContents(Attica::BaseJob*))); - jj->start(); -} - -void KNSBackend::receivedEntries(const KNS3::Entry::List& entries) -{ - if(entries.isEmpty()) { - emit backendReady(); - return; - } - - foreach(const KNS3::Entry& entry, entries) { - KNSResource* r = qobject_cast(m_resourcesByName.value(entry.id())); - r->setEntry(entry); - } - ++m_page; - m_manager->search(m_page); -} - -void KNSBackend::statusChanged(const KNS3::Entry& entry) -{ - KNSResource* r = qobject_cast(m_resourcesByName.value(entry.id())); - if(r) - r->setEntry(entry); - else - kWarning() << "unknown entry changed" << entry.id() << entry.name(); -} - -void KNSBackend::cancelTransaction(AbstractResource* app) -{ - Q_UNUSED(app) - - qWarning("KNS transaction cancelling unsupported"); -} - -void KNSBackend::removeApplication(AbstractResource* app) -{ - Transaction* t = new Transaction(app, RemoveApp); - emit transactionAdded(t); - KNSResource* r = qobject_cast(app); - Q_ASSERT(r->entry()); - m_manager->uninstallEntry(*r->entry()); - emit transactionRemoved(t); -} - -void KNSBackend::installApplication(AbstractResource* app) -{ - Transaction* t = new Transaction(app, InstallApp); - emit transactionAdded(t); - KNSResource* r = qobject_cast(app); - Q_ASSERT(r->entry()); - m_manager->installEntry(*r->entry()); - emit transactionRemoved(t); -} - -void KNSBackend::installApplication(AbstractResource* app, const QHash< QString, bool >& addons) -{ - installApplication(app); -} - -AbstractResource* KNSBackend::resourceByPackageName(const QString& name) const -{ - return m_resourcesByName[name]; -} - -bool KNSBackend::providesResouce(AbstractResource* resource) const -{ - return qobject_cast(resource); -} - -QList KNSBackend::transactions() const -{ - return QList(); -} - -QPair KNSBackend::currentTransactionState() const -{ - return QPair(FinishedCommitting, 0); -} - -int KNSBackend::updatesCount() const -{ - int ret = 0; - foreach(AbstractResource* r, m_resourcesByName) { - if(r->state()==AbstractResource::Upgradeable) - ++ret; - } - return ret; -} - -QList KNSBackend::upgradeablePackages() -{ - QList ret; - foreach(AbstractResource* r, m_resourcesByName) { - if(r->state()==AbstractResource::Upgradeable) - ret+=r; - } - return ret; -} - -AbstractReviewsBackend* KNSBackend::reviewsBackend() const -{ - return m_reviews; -} - -QStringList KNSBackend::searchPackageName(const QString& searchText) -{ - QStringList ret; - foreach(AbstractResource* r, m_resourcesByName) { - if(r->name().contains(searchText) || r->comment().contains(searchText)) - ret += r->packageName(); - } - return ret; -} - -QVector< AbstractResource* > KNSBackend::allResources() const -{ - return m_resourcesByName.values().toVector(); -} - -bool KNSBackend::isFetching() const -{ - return m_fetching; -} - -AbstractBackendUpdater* KNSBackend::backendUpdater() const -{ - return m_updater; -} diff -Nru muon-1.9.60/libmuon/KNSBackend/KNSBackend.h muon-2.0.0/libmuon/KNSBackend/KNSBackend.h --- muon-1.9.60/libmuon/KNSBackend/KNSBackend.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/KNSBackend/KNSBackend.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef KNSBACKEND_H -#define KNSBACKEND_H - -#include -#include -#include -#include - -#include "libmuonprivate_export.h" - -class KNSUpdater; -class KNSReviews; -namespace KNS3 { class DownloadManager; } -namespace Attica { - class ProviderManager; - class BaseJob; -} - -class MUONPRIVATE_EXPORT KNSBackend : public AbstractResourcesBackend -{ -Q_OBJECT -public: - explicit KNSBackend(const QString& configName, const QString& iconName, QObject* parent = 0); - virtual ~KNSBackend(); - - virtual void cancelTransaction(AbstractResource* app); - virtual void removeApplication(AbstractResource* app); - virtual void installApplication(AbstractResource* app); - virtual void installApplication(AbstractResource* app, const QHash< QString, bool >& addons); - virtual AbstractResource* resourceByPackageName(const QString& name) const; - virtual bool providesResouce(AbstractResource* resource) const; - virtual QList< Transaction* > transactions() const; - virtual QPair< TransactionStateTransition, Transaction* > currentTransactionState() const; - virtual int updatesCount() const; - virtual AbstractReviewsBackend* reviewsBackend() const; - virtual QStringList searchPackageName(const QString& searchText); - virtual QVector< AbstractResource* > allResources() const; - virtual AbstractBackendUpdater* backendUpdater() const; - - bool isFetching() const; - Attica::Provider* provider() { return &m_provider; } - QList upgradeablePackages(); - -public slots: - void receivedEntries(const KNS3::Entry::List& entry); - void startFetchingCategories(); - void categoriesLoaded(Attica::BaseJob*); - void receivedContents(Attica::BaseJob*); - void statusChanged(const KNS3::Entry& entry); - -private: - KNS3::DownloadManager* m_manager; - Attica::ProviderManager* m_atticaManager; - QHash m_resourcesByName; - int m_page; - KNSReviews* m_reviews; - Attica::Provider m_provider; - QMap m_categories; - QString m_name; - bool m_fetching; - QString m_iconName; - KNSUpdater* m_updater; -}; - -#endif // KNSBACKEND_H diff -Nru muon-1.9.60/libmuon/KNSBackend/KNSResource.cpp muon-2.0.0/libmuon/KNSBackend/KNSResource.cpp --- muon-1.9.60/libmuon/KNSBackend/KNSResource.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/KNSBackend/KNSResource.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,173 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "KNSResource.h" -#include "KNSBackend.h" -#include -#include -#include - -KNSResource::KNSResource(const Attica::Content& c, const QString& category, const QString& icon, KNSBackend* parent) - : AbstractResource(parent) - , m_status(KNS3::Entry::Downloadable) - , m_content(c) - , m_category(category) - , m_icon(icon) - , m_entry(0) -{} - -KNSResource::~KNSResource() -{ - delete m_entry; -} - -AbstractResource::State KNSResource::state() -{ - switch(m_status) { - case KNS3::Entry::Invalid: - return Broken; - case KNS3::Entry::Downloadable: - return None; - case KNS3::Entry::Installed: - return Installed; - case KNS3::Entry::Updateable: - return Upgradeable; - case KNS3::Entry::Deleted: - case KNS3::Entry::Installing: - case KNS3::Entry::Updating: - return None; - } - return None; -} - -void KNSResource::setStatus(KNS3::Entry::Status status) -{ - if(status!=m_status) { - m_status = status; - emit stateChanged(); - } -} - -QString KNSResource::icon() const -{ - return m_icon; -} - -QString KNSResource::comment() -{ - return m_content.summary(); -} - -QString KNSResource::name() -{ - return m_content.name(); -} - -QString KNSResource::packageName() const -{ - return m_content.id(); -} - -QString KNSResource::categories() -{ - return m_category; -} - -QUrl KNSResource::homepage() const -{ - return m_content.detailpage(); -} - -QUrl KNSResource::thumbnailUrl() -{ - return m_content.smallPreviewPicture(); -} - -QUrl KNSResource::screenshotUrl() -{ - return m_content.previewPicture(); -} - -Attica::Content& KNSResource::content() -{ - return m_content; -} - -QString KNSResource::longDescription() const -{ - //TODO: Translate the weird tags this uses to html or something - return m_content.description(); -} - -void KNSResource::setEntry(const KNS3::Entry& entry) -{ - setStatus(entry.status()); - delete m_entry; - m_entry = new KNS3::Entry(entry); -} - -KNS3::Entry* KNSResource::entry() const -{ - return m_entry; -} - -QString KNSResource::license() -{ - return m_content.licenseName(); -} - -QString KNSResource::sizeDescription() -{ - return KGlobal::locale()->formatByteSize(m_content.downloadUrlDescription(0).size()); -} - -QString KNSResource::installedVersion() const -{ - return m_entry->version(); -} - -QString KNSResource::availableVersion() const -{ - return m_content.version(); -} - -QString KNSResource::origin() const -{ - return m_entry->providerId(); -} - -QString KNSResource::section() -{ - return m_content.downloadUrlDescription(0).category(); -} - -void KNSResource::fetchScreenshots() -{ - QList thumbnails, screenshots; - for(int i=0; i<=3; i++) { - QString number = QString::number(i); - QString last = m_content.previewPicture(number); - if(!last.isEmpty()) { - thumbnails += QUrl(m_content.smallPreviewPicture(number)); - screenshots += QUrl(last); - } - } - emit screenshotsFetched(thumbnails, screenshots); -} diff -Nru muon-1.9.60/libmuon/KNSBackend/KNSResource.h muon-2.0.0/libmuon/KNSBackend/KNSResource.h --- muon-1.9.60/libmuon/KNSBackend/KNSResource.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/KNSBackend/KNSResource.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,71 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef KNSRESOURCE_H -#define KNSRESOURCE_H - -#include -#include -#include - -#include "libmuonprivate_export.h" - -class KNSBackend; -class MUONPRIVATE_EXPORT KNSResource : public AbstractResource -{ -Q_OBJECT -public: - explicit KNSResource(const Attica::Content& c, const QString& category, const QString& icon, KNSBackend* parent); - virtual ~KNSResource(); - - void setStatus(KNS3::Entry::Status status); - - virtual AbstractResource::State state(); - virtual QString icon() const; - virtual QString comment(); - virtual QString name(); - virtual QString packageName() const; - virtual QString categories(); - virtual QUrl homepage() const; - virtual QUrl thumbnailUrl(); - virtual QUrl screenshotUrl(); - virtual QString license(); - virtual QString longDescription() const; - virtual QList addonsInformation() { return QList(); } - virtual QString sizeDescription(); - virtual QString availableVersion() const; - virtual QString installedVersion() const; - virtual QString origin() const; - virtual QString section(); - virtual void fetchScreenshots(); - - Attica::Content& content(); - void setEntry(const KNS3::Entry& entry); - KNS3::Entry* entry() const; - -private: - KNS3::Entry::Status m_status; - Attica::Content m_content; - QString m_category; - QString m_icon; - KNS3::Entry* m_entry; -}; - -#endif // KNSRESOURCE_H diff -Nru muon-1.9.60/libmuon/KNSBackend/KNSReviews.cpp muon-2.0.0/libmuon/KNSBackend/KNSReviews.cpp --- muon-1.9.60/libmuon/KNSBackend/KNSReviews.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/KNSBackend/KNSReviews.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,144 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "KNSReviews.h" -#include "KNSBackend.h" -#include "KNSResource.h" -#include -#include -#include -#include -#include -#include -#include - -Q_DECLARE_METATYPE(AbstractResource*) - -KNSReviews::KNSReviews(KNSBackend* backend) - : AbstractReviewsBackend(backend) - , m_backend(backend) - , m_fetching(0) -{ - if(!m_backend->isFetching()) - connect(m_backend, SIGNAL(backendReady()), SIGNAL(ratingsReady())); - else - QMetaObject::invokeMethod(this, "ratingsReady", Qt::QueuedConnection); -} - -Rating* KNSReviews::ratingForApplication(AbstractResource* app) const -{ - KNSResource *resource = qobject_cast(m_backend->resourceByPackageName(app->packageName())); - if (!resource) - { - qDebug() << app->packageName() << "<= couldn't find resource"; - return nullptr; - } - - Attica::Content c = resource->content(); - Q_ASSERT(c.rating()<=100); - QVariantMap data; - data["package_name"] = app->packageName(); - data["app_name"] = app->name(); - data["ratings_total"] = c.numberOfComments(); - data["ratings_average"] = c.rating()/20; - data["histogram"] = ""; - return new Rating(data); -} - -void KNSReviews::fetchReviews(AbstractResource* app, int page) -{ - if(!m_backend->provider()->hasCommentService()) { - emit reviewsReady(app, QList()); - return; - } - - Attica::ListJob< Attica::Comment >* job = - m_backend->provider()->requestComments(Attica::Comment::ContentComment, app->packageName(), "0", page, 10); - job->setProperty("app", qVariantFromValue(app)); - connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(commentsReceived(Attica::BaseJob*))); - job->start(); -} - -void KNSReviews::commentsReceived(Attica::BaseJob* j) -{ - Attica::ListJob* job = static_cast*>(j); - Attica::Comment::List comments = job->itemList(); - - QList reviews; - AbstractResource* app = job->property("app").value(); - foreach(const Attica::Comment& comment, comments) { - //TODO: language lookup? - Review* r = new Review(app->name(), app->packageName(), "en", comment.subject(), comment.text(), comment.user(), - comment.date(), true, comment.id().toInt(), comment.score()/10, 0, 0, QString() - ); - reviews += r; - } - - emit reviewsReady(app, reviews); -} - -bool KNSReviews::isFetching() const -{ - return m_backend->isFetching(); -} - -void KNSReviews::flagReview(Review* r, const QString& reason, const QString& text) -{ - -} - -void KNSReviews::deleteReview(Review* r) -{ - -} - -void KNSReviews::submitReview(AbstractResource* app, const QString& summary, const QString& review_text, const QString& rating) -{ - -} - -void KNSReviews::submitUsefulness(Review* r, bool useful) -{ - -} - -void KNSReviews::logout() -{ - -} - -void KNSReviews::registerAndLogin() -{ - -} - -void KNSReviews::login() -{ -} - -bool KNSReviews::hasCredentials() const -{ - return m_backend->provider()->hasCredentials(); -} - -QString KNSReviews::userName() const -{ - return "little joe"; -} diff -Nru muon-1.9.60/libmuon/KNSBackend/KNSReviews.h muon-2.0.0/libmuon/KNSBackend/KNSReviews.h --- muon-1.9.60/libmuon/KNSBackend/KNSReviews.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/KNSBackend/KNSReviews.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,64 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef KNSREVIEWS_H -#define KNSREVIEWS_H - -#include -#include -#include - -class KNSBackend; -class QUrl; -namespace Attica { -class Provider; -class ProviderManager; -class BaseJob; -} - -class KNSReviews : public AbstractReviewsBackend -{ - Q_OBJECT - public: - explicit KNSReviews(KNSBackend* backend); - - virtual void fetchReviews(AbstractResource* app, int page = 1); - virtual bool isFetching() const; - virtual void flagReview(Review* r, const QString& reason, const QString& text); - virtual void deleteReview(Review* r); - virtual void submitReview(AbstractResource* app, const QString& summary, const QString& review_text, const QString& rating); - virtual void submitUsefulness(Review* r, bool useful); - virtual void logout(); - virtual void registerAndLogin(); - virtual void login(); - virtual Rating* ratingForApplication(AbstractResource* app) const; - virtual bool hasCredentials() const; - virtual QString userName() const; - - public slots: - void commentsReceived(Attica::BaseJob* job); - - private: - KNSBackend* m_backend; - - int m_fetching; -}; - -#endif // KNSREVIEWS_H diff -Nru muon-1.9.60/libmuon/KNSBackend/KNSUpdater.cpp muon-2.0.0/libmuon/KNSBackend/KNSUpdater.cpp --- muon-1.9.60/libmuon/KNSBackend/KNSUpdater.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/KNSBackend/KNSUpdater.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/* - * Copyright (C) 2012 Aleix Pol Gonzalez - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library/Lesser General Public License - * version 2, or (at your option) any later version, as published by the - * Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library/Lesser General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include "KNSUpdater.h" -#include "KNSBackend.h" -#include - -KNSUpdater::KNSUpdater(KNSBackend* parent) - : AbstractBackendUpdater(parent) - , m_backend(parent) -{} - -bool KNSUpdater::hasUpdates() const -{ - return m_backend->updatesCount() > 0; -} - -void KNSUpdater::start() -{ - QList< AbstractResource* > resources = m_backend->upgradeablePackages(); - foreach(AbstractResource* res, resources) { - m_backend->installApplication(res); - } - emit updatesFinnished(); -} - -qreal KNSUpdater::progress() const -{ - return hasUpdates() ? 0 : 1; -} - -long unsigned int KNSUpdater::remainingTime() const -{ - return 0; -} diff -Nru muon-1.9.60/libmuon/KNSBackend/KNSUpdater.h muon-2.0.0/libmuon/KNSBackend/KNSUpdater.h --- muon-1.9.60/libmuon/KNSBackend/KNSUpdater.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/KNSBackend/KNSUpdater.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,43 +0,0 @@ -/* - * Copyright (C) 2012 Aleix Pol Gonzalez - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU Library/Lesser General Public License - * version 2, or (at your option) any later version, as published by the - * Free Software Foundation - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details - * - * You should have received a copy of the GNU Library/Lesser General Public - * License along with this program; if not, write to the - * Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef KNSUPDATER_H -#define KNSUPDATER_H - -#include - -class KNSBackend; - -class KNSUpdater : public AbstractBackendUpdater -{ - Q_OBJECT - public: - explicit KNSUpdater(KNSBackend* parent = 0); - - virtual bool hasUpdates() const; - virtual qreal progress() const; - virtual void start(); - virtual long unsigned int remainingTime() const; - - private: - KNSBackend* m_backend; -}; - -#endif // KNSUPDATER_H - diff -Nru muon-1.9.60/libmuon/MuonBackendsFactory.cpp muon-2.0.0/libmuon/MuonBackendsFactory.cpp --- muon-1.9.60/libmuon/MuonBackendsFactory.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/MuonBackendsFactory.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,92 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "MuonBackendsFactory.h" +#include "resources/AbstractResourcesBackend.h" +#include "resources/ResourcesModel.h" +#include +#include +#include +#include + +MuonBackendsFactory::MuonBackendsFactory() +{} + +AbstractResourcesBackend* MuonBackendsFactory::backend(const QString& pluginname) +{ + QString query = QString("[X-KDE-PluginInfo-Name]=='%1'").arg( pluginname ); + KService::List serviceList = KServiceTypeTrader::self()->query( "Muon/Backend", query ); + if(!serviceList.isEmpty()) { + return backendForPlugin(KPluginInfo(serviceList.first())); + } else { + qWarning() << "Couldn't find the backend: " << pluginname; + } + return 0; +} + +QList MuonBackendsFactory::allBackends() +{ + KService::List serviceList = KServiceTypeTrader::self() ->query("Muon/Backend"); + + QList ret; + foreach(const KService::Ptr& plugin, serviceList) { + KPluginInfo info(plugin); + if(info.pluginName()=="muon-dummybackend") + continue; + + AbstractResourcesBackend* b = backendForPlugin(info); + if(b) { + ret += b; + } else { + qDebug() << "couldn't load " << info.name(); + } + } + + if(ret.isEmpty()) + qWarning() << "Didn't find any muon backend!"; + return ret; +} + + +AbstractResourcesBackend* MuonBackendsFactory::backendForPlugin(const KPluginInfo& info) +{ + QVariantMap args; + foreach(const QString& prop, info.service()->propertyNames()) { + args[prop] = info.property(prop); + } + + QString str_error; + AbstractResourcesBackend* obj = KServiceTypeTrader::createInstanceFromQuery( + QLatin1String( "Muon/Backend" ), QString::fromLatin1( "[X-KDE-PluginInfo-Name]=='%1'" ).arg( info.pluginName() ), + ResourcesModel::global(), QVariantList() << args, &str_error ); + + if(!obj) { + qDebug() << "error when loading the plugin" << info.name() << "because" << str_error; + } else if (!obj->isValid()) { + qDebug() << "Error initializing Muon Backend."; + + // Clean up invalid plugin as we will not load it + delete obj; + obj = nullptr; + } + + return obj; +} + diff -Nru muon-1.9.60/libmuon/MuonBackendsFactory.h muon-2.0.0/libmuon/MuonBackendsFactory.h --- muon-1.9.60/libmuon/MuonBackendsFactory.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/MuonBackendsFactory.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,41 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef MUONBACKENDSFACTORY_H +#define MUONBACKENDSFACTORY_H +#include +#include "libmuonprivate_export.h" + +class KPluginInfo; +class AbstractResourcesBackend; +class MUONPRIVATE_EXPORT MuonBackendsFactory +{ +public: + MuonBackendsFactory(); + + AbstractResourcesBackend* backend(const QString& name); + QList allBackends(); + +private: + AbstractResourcesBackend* backendForPlugin(const KPluginInfo& info); + AbstractResourcesBackend* backendForName(const KPluginInfo& info); +}; + +#endif // MUONBACKENDSFACTORY_H diff -Nru muon-1.9.60/libmuon/MuonMainWindow.cpp muon-2.0.0/libmuon/MuonMainWindow.cpp --- muon-1.9.60/libmuon/MuonMainWindow.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/MuonMainWindow.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -35,9 +35,8 @@ MuonMainWindow::MuonMainWindow() : KXmlGuiWindow(0) - , m_canExit(false) -{ -} + , m_canExit(true) +{} bool MuonMainWindow::queryExit() { diff -Nru muon-1.9.60/libmuon/MuonMainWindow.h muon-2.0.0/libmuon/MuonMainWindow.h --- muon-1.9.60/libmuon/MuonMainWindow.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/MuonMainWindow.h 2013-04-01 20:32:05.000000000 +0000 @@ -32,10 +32,6 @@ class KAction; -#ifdef QAPT_ENABLED -class QAptActions; -#endif - /** * This class serves as a shared Main Window implementation that connects * all the various backend bits so that they don't have to be reimplemented @@ -52,24 +48,20 @@ MuonMainWindow(); QSize sizeHint() const; - void setupActions(); bool isConnected(); - void setActionsEnabled(bool enabled = true); Q_SIGNALS: void shouldConnect(bool isConnected); protected slots: bool queryExit(); + void setupActions(); public slots: void easterEggTriggered(); void setCanExit(bool canExit); -protected: -#ifdef QAPT_ENABLED - QAptActions *m_actions; -#endif +private: bool m_canExit; }; diff -Nru muon-1.9.60/libmuon/MuonStrings.cpp muon-2.0.0/libmuon/MuonStrings.cpp --- muon-1.9.60/libmuon/MuonStrings.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/MuonStrings.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,315 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "MuonStrings.h" - -#include -#include - -#include - -K_GLOBAL_STATIC_WITH_ARGS(MuonStrings, globalMuonStrings, (0)) - -MuonStrings *MuonStrings::global() -{ - return globalMuonStrings; -} - -MuonStrings::MuonStrings(QObject *parent) - : QObject(parent) - , m_groupHash(groupHash()) - , m_stateHash(stateHash()) - , m_archHash(archHash()) -{ -} - -QHash MuonStrings::groupHash() -{ - QHash hash; - hash["admin"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"admin\"", - "System Administration"); - hash["base"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"base\"", - "Base System"); - hash["cli-mono"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"cli-mono\"", - "Mono/CLI Infrastructure"); - hash["comm"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"comm\"", - "Communication"); - hash["database"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"database\"", - "Databases"); - hash["devel"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"devel\"", - "Development"); - hash["doc"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"doc\"", - "Documentation"); - hash["debug"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"debug\"", - "Debug"); - hash["editors"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"editors\"", - "Editors"); - hash["electronics"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"electronics\"", - "Electronics"); - hash["embedded"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"embedded\"", - "Embedded Devices"); - hash["fonts"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"fonts\"", - "Fonts"); - hash["games"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"games\"", - "Games and Amusement"); - hash["gnome"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"gnome\"", - "GNOME Desktop Environment"); - hash["graphics"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"graphics\"", - "Graphics"); - hash["gnu-r"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"", - "GNU R Statistical System"); - hash["gnustep"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"gnustep\"", - "Gnustep Desktop Environment"); - hash["hamradio"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"hamradio\"", - "Amateur Radio"); - hash["haskell"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"haskell\"", - "Haskell Programming Language"); - hash["httpd"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"httpd\"", - "Web Servers"); - hash["interpreters"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"interpreters\"", - "Interpreted Computer Languages"); - hash["java"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"java\"", - "Java Programming Language"); - hash["kde"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"kde\"", - "KDE Software Compilation"); - hash["kernel"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"kernel\"", - "Kernel and Modules"); - hash["libdevel"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"libdevel\"", - "Libraries - Development"); - hash["libs"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"libs\"", - "Libraries"); - hash["lisp"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"lisp\"", - "Lisp Programming Language"); - hash["localization"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"localization\"", - "Localization"); - hash["mail"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"mail\"", - "Email"); - hash["math"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"math\"", - "Mathematics"); - hash["misc"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"misc\"", - "Miscellaneous - Text-based"); - hash["net"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"net\"", - "Networking"); - hash["news"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"news\"", - "Newsgroups"); - hash["ocaml"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"ocaml\"", - "OCaml Programming Language"); - hash["oldlibs"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"oldlibs\"", - "Libraries - Old"); - hash["otherosfs"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"otherosfs\"", - "Cross Platform"); - hash["perl"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"perl\"", - "Perl Programming Language"); - hash["php"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"php\"", - "PHP Programming Language"); - hash["python"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"python\"", - "Python Programming Language"); - hash["ruby"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"ruby\"", - "Ruby Programming Language"); - hash["science"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"science\"", - "Science"); - hash["shells"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"shells\"", - "Shells"); - hash["sound"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"sound\"", - "Multimedia"); - hash["tex"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"tex\"", - "TeX Authoring"); - hash["text"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"text\"", - "Word Processing"); - hash["utils"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"utils\"", - "Utilities"); - hash["vcs"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"vcs\"", - "Version Control Systems"); - hash["video"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"video\"", - "Video Software"); - hash["web"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"web\"", - "Internet"); - hash["x11"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"x11\"", - "Miscellaneous - Graphical"); - hash["xfce"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"xfce\"", - "Xfce Desktop Environment"); - hash["zope"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"zope\"", - "Zope/Plone Environment"); - hash["unknown"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"unknown\"", - "Unknown"); - hash["alien"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"alien\"", - "Converted from RPM by Alien"); - hash["translations"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"translations\"", - "Internationalization and Localization"); - hash["metapackages"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"metapackages\"", - "Meta Packages"); - hash["non-us"] = i18nc("@item:inlistbox Debian package section \"non-US\", for packages that cannot be shipped in the US", - "Restricted On Export"); - hash["non-free"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"non-free\"", - "Non-free"); - hash["contrib"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"contrib\"", - "Contrib"); - hash["education"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"education\"", - "Education"); - hash["introspection"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"introspection\"", - "GObject Introspection Data"); - return hash; -} - -QString MuonStrings::groupName(const QString &name) const -{ - QString suffix; - - if (name.contains('/')) { - QStringList split = name.split('/'); - suffix = split.at(1); - - return m_groupHash.value(suffix); - } else { - return m_groupHash.value(name); - } -} - -QString MuonStrings::groupKey(const QString &text) const -{ - return m_groupHash.key(text); -} - -QHash MuonStrings::stateHash() -{ - QHash hash; - hash[QApt::Package::NotInstalled] = i18nc("@info:status Package state" , "Not Installed"); - hash[QApt::Package::Installed] = i18nc("@info:status Package state", "Installed"); - hash[QApt::Package::Upgradeable] = i18nc("@info:status Package state", "Upgradeable"); - hash[QApt::Package::NowBroken] = i18nc("@info:status Package state", "Broken"); - hash[QApt::Package::ResidualConfig] = i18nc("@info:status Package state", "Residual Configuration"); - hash[QApt::Package::IsGarbage] = i18nc("@info:status Package state", "Installed (auto-removable)"); - hash[QApt::Package::ToKeep] = i18nc("@info:status Package state", "No Change"); - hash[QApt::Package::ToInstall] = i18nc("@info:status Requested action", "Install"); - hash[QApt::Package::NewInstall] = i18nc("@info:status Requested action", "Install"); - hash[QApt::Package::ToUpgrade] = i18nc("@info:status Requested action", "Upgrade"); - hash[QApt::Package::ToRemove] = i18nc("@info:status Requested action", "Remove"); - hash[QApt::Package::ToPurge] = i18nc("@info:status Requested action", "Purge"); - hash[QApt::Package::ToReInstall] = i18nc("@info:status Requested action", "Reinstall"); - hash[QApt::Package::ToDowngrade] = i18nc("@info:status Requested action", "Downgrade"); - hash[QApt::Package::IsPinned] = i18nc("@info:status Package locked at a certain version", - "Locked"); - - return hash; -} - -QString MuonStrings::packageStateName(QApt::Package::State state) const -{ - return m_stateHash.value(state); -} - -QHash MuonStrings::archHash() -{ - QHash hash; - hash["all"] = i18nc("@item:inlistbox", "Common"); - hash["i386"] = i18nc("@item:inlistbox CPU architecture", "32-bit"); - hash["amd64"] = i18nc("@item:inlistbox CPU architecture", "64-bit"); - hash["powerpc"] = i18nc("@item:inlistbox PU architecture", "Power PC"); - - return hash; -} - -QString MuonStrings::archString(const QString &arch) const -{ - QString str = m_archHash.value(arch); - - if (str.isEmpty()) - str = arch; - - return str; -} - -QString MuonStrings::errorTitle(QApt::ErrorCode error) const -{ - switch (error) { - case QApt::InitError: - return i18nc("@title:window", "Initialization Error"); - case QApt::LockError: - return i18nc("@title:window", "Unable to Obtain Package System Lock"); - case QApt::DiskSpaceError: - return i18nc("@title:window", "Low Disk Space"); - case QApt::FetchError: - case QApt::CommitError: - return i18nc("@title:window", "Failed to Apply Changes"); - case QApt::AuthError: - return i18nc("@title:window", "Authentication error"); - case QApt::WorkerDisappeared: - return i18nc("@title:window", "Unexpected Error"); - case QApt::UntrustedError: - return i18nc("@title:window", "Untrusted Packages"); - case QApt::UnknownError: - default: - return i18nc("@title:window", "Unknown Error"); - } -} - -QString MuonStrings::errorText(QApt::ErrorCode error, QApt::Transaction *trans) const -{ - QString text; - - switch (error) { - case QApt::InitError: - text = i18nc("@label", "The package system could not be initialized, your " - "configuration may be broken."); - break; - case QApt::LockError: - text = i18nc("@label", - "Another application seems to be using the package " - "system at this time. You must close all other package " - "managers before you will be able to install or remove " - "any packages."); - break; - case QApt::DiskSpaceError: - text = i18nc("@label", - "You do not have enough disk space in the directory " - "at %1 to continue with this operation.", trans->errorDetails()); - break; - case QApt::FetchError: - text = i18nc("@label", "Could not download packages"); - break; - case QApt::CommitError: - text = i18nc("@label", "An error occurred while applying changes:"); - break; - case QApt::AuthError: - text = i18nc("@label", - "This operation cannot continue since proper " - "authorization was not provided"); - break; - case QApt::WorkerDisappeared: - text = i18nc("@label", "It appears that the QApt worker has either crashed " - "or disappeared. Please report a bug to the QApt maintainers"); - break; - case QApt::UntrustedError: - text = i18ncp("@label", - "The following package has not been verified by its author. " - "Downloading untrusted packages has been disallowed " - "by your current configuration.", - "The following packages have not been verified by " - "their authors. " - "Downloading untrusted packages has " - "been disallowed by your current configuration.", - trans->untrustedPackages().size()); - break; - default: - break; - } - - return text; -} diff -Nru muon-1.9.60/libmuon/MuonStrings.h muon-2.0.0/libmuon/MuonStrings.h --- muon-1.9.60/libmuon/MuonStrings.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/MuonStrings.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,59 +0,0 @@ -/*************************************************************************** - * Copyright © 2010 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef MUONSTRINGS_H -#define MUONSTRINGS_H - -#include - -#include - -#include "libmuonprivate_export.h" - -namespace QApt { - class Transaction; -} - -class MUONPRIVATE_EXPORT MuonStrings : public QObject -{ - Q_OBJECT -public: - explicit MuonStrings(QObject *parent); - - static MuonStrings* global(); - - QString groupName(const QString &name) const; - QString groupKey(const QString &text) const; - QString packageStateName(QApt::Package::State state) const; - QString archString(const QString &arch) const; - QString errorTitle(QApt::ErrorCode error) const; - QString errorText(QApt::ErrorCode error, QApt::Transaction *trans) const; - -private: - const QHash m_groupHash; - const QHash m_stateHash; - const QHash m_archHash; - - QHash groupHash(); - QHash stateHash(); - QHash archHash(); -}; - -#endif diff -Nru muon-1.9.60/libmuon/QAptActions.cpp muon-2.0.0/libmuon/QAptActions.cpp --- muon-1.9.60/libmuon/QAptActions.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/QAptActions.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,341 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "QAptActions.h" - -// Qt includes -#include -#include - -// KDE includes -#include -#include -#include -#include -#include -#include -#include -#include -#include - -// LibQApt includes -#include -#include -#include - -// Own includes -#include "MuonMainWindow.h" - -QAptActions::QAptActions(MuonMainWindow *parent, QApt::Backend *backend) - : QObject(parent) - , m_backend(backend) - , m_actionsDisabled(false) - , m_mainWindow(parent) - , m_reloadWhenEditorFinished(false) -{ - connect(m_backend, SIGNAL(packageChanged()), this, SLOT(setActionsEnabled())); - connect(Solid::Networking::notifier(), SIGNAL(statusChanged(Solid::Networking::Status)), - this, SLOT(networkChanged())); -} - -void QAptActions::setupActions() -{ - KAction* updateAction = m_mainWindow->actionCollection()->addAction("update"); - updateAction->setIcon(KIcon("system-software-update")); - updateAction->setText(i18nc("@action Checks the Internet for updates", "Check for Updates")); - updateAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); - connect(updateAction, SIGNAL(triggered()), SIGNAL(checkForUpdates())); - if (!isConnected()) { - updateAction->setDisabled(true); - } - connect(this, SIGNAL(shouldConnect(bool)), updateAction, SLOT(setEnabled(bool))); - - - KAction* undoAction = KStandardAction::undo(this, SLOT(undo()), actionCollection()); - actionCollection()->addAction("undo", undoAction); - - KAction* redoAction = KStandardAction::redo(this, SLOT(redo()), actionCollection()); - actionCollection()->addAction("redo", redoAction); - - KAction* revertAction = actionCollection()->addAction("revert"); - revertAction->setIcon(KIcon("document-revert")); - revertAction->setText(i18nc("@action Reverts all potential changes to the cache", "Unmark All")); - connect(revertAction, SIGNAL(triggered()), this, SLOT(revertChanges())); - - KAction* softwarePropertiesAction = actionCollection()->addAction("software_properties"); - softwarePropertiesAction->setIcon(KIcon("configure")); - softwarePropertiesAction->setText(i18nc("@action Opens the software sources configuration dialog", "Configure Software Sources")); - connect(softwarePropertiesAction, SIGNAL(triggered()), this, SLOT(runSourcesEditor())); -} - -void QAptActions::setActionsEnabled(bool enabled) -{ - m_actionsDisabled = !enabled; - for (int i = 0; i < actionCollection()->count(); ++i) { - actionCollection()->action(i)->setEnabled(enabled); - } - actionCollection()->action("update")->setEnabled(isConnected() && enabled); - - if(enabled) { - actionCollection()->action("undo")->setEnabled(!m_backend->isUndoStackEmpty()); - actionCollection()->action("redo")->setEnabled(!m_backend->isRedoStackEmpty()); - actionCollection()->action("revert")->setEnabled(!m_backend->isUndoStackEmpty()); - } -} - -bool QAptActions::isConnected() const { - int status = Solid::Networking::status(); - bool connected = ((status == Solid::Networking::Connected) || - (status == Solid::Networking::Unknown)); - return connected; -} - - -void QAptActions::networkChanged() -{ - if (m_actionsDisabled) - return; - - emit shouldConnect(isConnected()); -} - -bool QAptActions::saveSelections() -{ - QString filename; - - filename = KFileDialog::getSaveFileName(QString(), QString(), m_mainWindow, - i18nc("@title:window", "Save Markings As")); - - if (filename.isEmpty()) { - return false; - } - - if (!m_backend->saveSelections(filename)) { - QString text = i18nc("@label", "The document could not be saved, as it " - "was not possible to write to " - "%1\n\nCheck " - "that you have write access to this file " - "or that enough disk space is available.", - filename); - KMessageBox::error(m_mainWindow, text, QString()); - return false; - } - - return true; -} - -bool QAptActions::saveInstalledPackagesList() -{ - QString filename; - - filename = KFileDialog::getSaveFileName(QString(), QString(), m_mainWindow, - i18nc("@title:window", "Save Installed Packages List As")); - - if (filename.isEmpty()) { - return false; - } - - if (!m_backend->saveInstalledPackagesList(filename)) { - QString text = i18nc("@label", "The document could not be saved, as it " - "was not possible to write to " - "%1\n\nCheck " - "that you have write access to this file " - "or that enough disk space is available.", - filename); - KMessageBox::error(m_mainWindow, text, QString()); - return false; - } - - return true; -} - -bool QAptActions::createDownloadList() -{ - QString filename; - filename = KFileDialog::getSaveFileName(QString(), QString(), m_mainWindow, - i18nc("@title:window", "Save Download List As")); - - if (filename.isEmpty()) { - return false; - } - - if (!m_backend->saveDownloadList(filename)) { - QString text = i18nc("@label", "The document could not be saved, as it " - "was not possible to write to " - "%1\n\nCheck " - "that you have write access to this file " - "or that enough disk space is available.", - filename); - KMessageBox::error(m_mainWindow, text, QString()); - return false; - } - - return true; -} - -void QAptActions::downloadPackagesFromList() -{ - QString filename = KFileDialog::getOpenFileName(QString(), QString(), - m_mainWindow, i18nc("@title:window", "Open File")); - - if (filename.isEmpty()) { - return; - } - - QString dirName = filename.left(filename.lastIndexOf('/')); - - setActionsEnabled(false); - QApt::Transaction *trans = m_backend->downloadArchives(filename, dirName % QLatin1String("/packages")); - - if (trans) - emit downloadArchives(trans); -} - -void QAptActions::loadSelections() -{ - QString filename = KFileDialog::getOpenFileName(QString(), QString(), - m_mainWindow, i18nc("@title:window", "Open File")); - - if (filename.isEmpty()) { - return; - } - - m_backend->saveCacheState(); - if (!m_backend->loadSelections(filename)) { - QString text = i18nc("@label", "Could not mark changes. Please make sure " - "that the file is a markings file created by " - "either the Muon Package Manager or the " - "Synaptic Package Manager."); - KMessageBox::error(m_mainWindow, text, QString()); - } -} - -void QAptActions::loadArchives() -{ - QString dirName; - - dirName = KFileDialog::getExistingDirectory(KUrl(), m_mainWindow, - i18nc("@title:window", - "Choose a Directory")); - - if (dirName.isEmpty()) { - // User cancelled - return; - } - - QDir dir(dirName); - QStringList archiveFiles = dir.entryList(QDir::Files, QDir::Name); - - int successCount = 0; - foreach (const QString &archiveFile, archiveFiles) { - const QApt::DebFile debFile(dirName % '/' % archiveFile); - - if (debFile.isValid()) { - if (m_backend->addArchiveToCache(debFile)) { - successCount++; - } - } - } - - if (successCount) { - QString message = i18ncp("@label", - "%1 package was successfully added to the cache", - "%1 packages were successfully added to the cache", - successCount); - KMessageBox::information(m_mainWindow, message, QString()); - } else { - QString message = i18nc("@label", - "No valid packages could be found in this directory. " - "Please make sure the packages are compatible with your " - "computer and are at the latest version."); - KMessageBox::error(m_mainWindow, message, i18nc("@title:window", - "Packages Could Not be Found")); - } -} - -void QAptActions::undo() -{ - m_backend->undo(); -} - -void QAptActions::redo() -{ - m_backend->redo(); -} - -void QAptActions::revertChanges() -{ - m_backend->restoreCacheState(m_originalState); - emit changesReverted(); -} - -void QAptActions::runSourcesEditor() -{ - KProcess *proc = new KProcess(this); - QStringList arguments; - int winID = m_mainWindow->effectiveWinId(); - - QString editor = "software-properties-kde"; - - if (m_reloadWhenEditorFinished) { - editor.append(QLatin1String(" --dont-update --attach ") % QString::number(winID)); //krazy:exclude=spelling; - } else { - editor.append(QLatin1String(" --attach ") % QString::number(winID)); - } - - arguments << "/usr/bin/kdesudo" << editor; - - proc->setProgram(arguments); - m_mainWindow->find(winID)->setEnabled(false); - proc->start(); - connect(proc, SIGNAL(finished(int,QProcess::ExitStatus)), - this, SLOT(sourcesEditorFinished(int))); -} - -void QAptActions::sourcesEditorFinished(int exitStatus) -{ - bool reload = (exitStatus == 0); - m_mainWindow->find(m_mainWindow->effectiveWinId())->setEnabled(true); - if (m_reloadWhenEditorFinished && reload) { - emit checkForUpdates(); - } - - emit sourcesEditorClosed(reload); -} - -KActionCollection* QAptActions::actionCollection() -{ - return m_mainWindow->actionCollection(); -} - -void QAptActions::setOriginalState(QApt::CacheState state) -{ - m_originalState = state; -} - -void QAptActions::setCanExit(bool canExit) -{ - m_mainWindow->setCanExit(canExit); -} - -void QAptActions::setReloadWhenEditorFinished(bool reload) -{ - m_reloadWhenEditorFinished = reload; -} diff -Nru muon-1.9.60/libmuon/QAptActions.h muon-2.0.0/libmuon/QAptActions.h --- muon-1.9.60/libmuon/QAptActions.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/QAptActions.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,85 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef QAPTACTIONS_H -#define QAPTACTIONS_H - -#include - -#include - -#include "libmuonprivate_export.h" - -class KActionCollection; - -namespace QApt { - class Backend; - class Transaction; -} - -class MuonMainWindow; - -class MUONPRIVATE_EXPORT QAptActions : public QObject -{ - Q_OBJECT -public: - QAptActions(MuonMainWindow *parent, QApt::Backend *backend); - - bool isConnected() const; - void setOriginalState(QApt::CacheState state); - void setCanExit(bool canExit); - void setReloadWhenEditorFinished(bool reload); - -signals: - void checkForUpdates(); - void shouldConnect(bool isConnected); - void changesReverted(); - void sourcesEditorClosed(bool reload); - void downloadArchives(QApt::Transaction *trans); - -public slots: - void setupActions(); - void setActionsEnabled(bool enabled = true); - void networkChanged(); - - // KAction slots - bool saveSelections(); - bool saveInstalledPackagesList(); - void loadSelections(); - bool createDownloadList(); - void downloadPackagesFromList(); - void loadArchives(); - void undo(); - void redo(); - void revertChanges(); - void runSourcesEditor(); - void sourcesEditorFinished(int exitStatus); - -private: - QApt::Backend *m_backend; - QApt::CacheState m_originalState; - bool m_actionsDisabled; - MuonMainWindow* m_mainWindow; - bool m_reloadWhenEditorFinished; - - KActionCollection* actionCollection(); -}; - -#endif // QAPTACTIONS_H diff -Nru muon-1.9.60/libmuon/ReviewsBackend/AbstractLoginBackend.h muon-2.0.0/libmuon/ReviewsBackend/AbstractLoginBackend.h --- muon-1.9.60/libmuon/ReviewsBackend/AbstractLoginBackend.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/AbstractLoginBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -22,8 +22,9 @@ #define ABSTRACTLOGINBACKEND_H #include +#include "libmuonprivate_export.h" -class AbstractLoginBackend : public QObject +class MUONPRIVATE_EXPORT AbstractLoginBackend : public QObject { Q_OBJECT public: diff -Nru muon-1.9.60/libmuon/ReviewsBackend/LoginMetaTypes.h muon-2.0.0/libmuon/ReviewsBackend/LoginMetaTypes.h --- muon-1.9.60/libmuon/ReviewsBackend/LoginMetaTypes.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/LoginMetaTypes.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,30 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef LOGINMETATYPES_H -#define LOGINMETATYPES_H - -#include -#include - -typedef QMap MapString; -Q_DECLARE_METATYPE(MapString) - -#endif diff -Nru muon-1.9.60/libmuon/ReviewsBackend/Rating.cpp muon-2.0.0/libmuon/ReviewsBackend/Rating.cpp --- muon-1.9.60/libmuon/ReviewsBackend/Rating.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/Rating.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -96,17 +96,21 @@ return sum_scores + 3; } -///TODO: improve API Rating::Rating(const QVariantMap &data) + : Rating(data.value("package_name").toString(), data.value("app_name").toString(), + data.value("ratings_total").toULongLong(), data.value("ratings_average").toDouble() * 2, data.value("histogram").toString()) +{ +} + +Rating::Rating(const QString& packageName, const QString& appName, int ratingCount, int rating, const QString& histogram) + : QObject() + , m_packageName(packageName) + , m_appName(appName) + , m_ratingCount(ratingCount) + , m_rating(rating) + , m_ratingPoints(0) + , m_sortableRating(0) { - m_packageName = data.value("package_name").toString(); - m_appName = data.value("app_name").toString(); - m_ratingCount = data.value("ratings_total").toULongLong(); - m_rating = data.value("ratings_average").toDouble() * 2; - - m_sortableRating = 0; - m_ratingPoints = 0; - QString histogram = data.value("histogram").toString(); QStringList histo = histogram.mid(1,histogram.size()-2).split(", "); QVector spread = QVector(); diff -Nru muon-1.9.60/libmuon/ReviewsBackend/Rating.h muon-2.0.0/libmuon/ReviewsBackend/Rating.h --- muon-1.9.60/libmuon/ReviewsBackend/Rating.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/Rating.h 2013-04-01 20:32:05.000000000 +0000 @@ -34,6 +34,7 @@ Q_PROPERTY(int ratingPoints READ ratingPoints CONSTANT) public: explicit Rating(const QVariantMap &data); + explicit Rating(const QString& packageName, const QString& appName, int ratingCount, int rating, const QString& histogram); ~Rating(); QString packageName() const; diff -Nru muon-1.9.60/libmuon/ReviewsBackend/Review.cpp muon-2.0.0/libmuon/ReviewsBackend/Review.cpp --- muon-1.9.60/libmuon/ReviewsBackend/Review.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/Review.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -19,8 +19,10 @@ ***************************************************************************/ #include "Review.h" +#include Review::Review(const QVariantMap &data) + : m_package(nullptr) { m_appName = data.value("app_name").toString(); m_packageName = data.value("package_name").toString(); @@ -144,12 +146,10 @@ return m_usefulnessFavorable; } -QApt::Package *Review::package() const +AbstractResource *Review::package() { + if(!m_package) { + m_package = ResourcesModel::global()->resourceByPackageName(m_packageName); + } return m_package; } - -void Review::setPackage(QApt::Package *package) -{ - m_package = package; -} diff -Nru muon-1.9.60/libmuon/ReviewsBackend/Review.h muon-2.0.0/libmuon/ReviewsBackend/Review.h --- muon-1.9.60/libmuon/ReviewsBackend/Review.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/Review.h 2013-04-01 20:32:05.000000000 +0000 @@ -26,9 +26,7 @@ #include "libmuonprivate_export.h" -namespace QApt { - class Package; -} +class AbstractResource; class MUONPRIVATE_EXPORT Review { @@ -56,9 +54,7 @@ int rating() const; int usefulnessTotal() const; int usefulnessFavorable() const; - QApt::Package *package() const; - - void setPackage(QApt::Package *package); + AbstractResource *package(); private: QString m_appName; @@ -75,7 +71,7 @@ QString m_summary; QString m_packageVersion; - QApt::Package *m_package; + AbstractResource *m_package; }; #endif diff -Nru muon-1.9.60/libmuon/ReviewsBackend/ReviewsBackend.cpp muon-2.0.0/libmuon/ReviewsBackend/ReviewsBackend.cpp --- muon-1.9.60/libmuon/ReviewsBackend/ReviewsBackend.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/ReviewsBackend.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,408 +0,0 @@ - /*************************************************************************** - * Copyright © 2011 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ReviewsBackend.h" - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include - -#include -#include - -#include - -#include -#include "Rating.h" -#include "Review.h" -#include "AbstractLoginBackend.h" -#include "UbuntuLoginBackend.h" -#include "MuonDataSources.h" - -static QString getCodename(const QString& value) -{ - QString ret; - QFile f("/etc/lsb-release"); - if(f.open(QIODevice::ReadOnly|QIODevice::Text)) { - QRegExp rx(QString("%1=(.+)\n").arg(value)); - while(!f.atEnd()) { - QByteArray line = f.readLine(); - if(rx.exactMatch(line)) { - ret = rx.cap(1); - break; - } - } - } - return ret; -} - -ReviewsBackend::ReviewsBackend(QObject *parent) - : AbstractReviewsBackend(parent) - , m_aptBackend(0) - , m_serverBase(MuonDataSources::rnRSource()) - , m_ratingsFile(0) - , m_reviewsFile(0) -{ - m_loginBackend = new UbuntuLoginBackend(this); - connect(m_loginBackend, SIGNAL(connectionStateChanged()), SIGNAL(loginStateChanged())); - connect(m_loginBackend, SIGNAL(connectionStateChanged()), SLOT(refreshConsumerKeys())); - m_oauthInterface = new QOAuth::Interface(this); - refreshConsumerKeys(); - fetchRatings(); -} - -ReviewsBackend::~ReviewsBackend() -{ - delete m_ratingsFile; - qDeleteAll(m_ratings); -} - -void ReviewsBackend::refreshConsumerKeys() -{ - if(m_loginBackend->hasCredentials()) { - m_oauthInterface->setConsumerKey(m_loginBackend->consumerKey()); - m_oauthInterface->setConsumerSecret(m_loginBackend->consumerSecret()); - - QList >::const_iterator it, itEnd; - for(it=m_pendingRequests.constBegin(), itEnd=m_pendingRequests.constEnd(); it!=itEnd; ++it) { - postInformation(it->first, it->second); - } - m_pendingRequests.clear(); - } -} - -void ReviewsBackend::setAptBackend(QApt::Backend *aptBackend) -{ - m_aptBackend = aptBackend; -} - -// void ReviewsBackend::clearReviewCache() -// { -// foreach (QList reviewList, m_reviewsCache) { -// qDeleteAll(reviewList); -// } -// -// m_reviewsCache.clear(); -// } - -void ReviewsBackend::fetchRatings() -{ - // First, load our old ratings cache in case we don't have net connectivity - loadRatingsFromFile(KStandardDirs::locateLocal("data", "libmuon/ratings.txt")); - - // Try to fetch the latest ratings from the internet - KUrl ratingsUrl(m_serverBase, "review-stats/"); - - if (m_ratingsFile) { - m_ratingsFile->deleteLater(); - m_ratingsFile = 0; - } - - m_ratingsFile = new KTemporaryFile(); - m_ratingsFile->open(); - - KIO::FileCopyJob *getJob = KIO::file_copy(ratingsUrl, - m_ratingsFile->fileName(), -1, - KIO::Overwrite | KIO::HideProgressInfo); - connect(getJob, SIGNAL(result(KJob*)), - this, SLOT(ratingsFetched(KJob*))); -} - -void ReviewsBackend::ratingsFetched(KJob *job) -{ - if (job->error()) { - return; - } - - loadRatingsFromFile(m_ratingsFile->fileName()); -} - -void ReviewsBackend::loadRatingsFromFile(const QString &fileName) -{ - QIODevice* dev = KFilterDev::deviceForFile(fileName, "application/x-gzip"); - - QJson::Parser parser; - bool ok = false; - QVariant ratings = parser.parse(dev, &ok); - - if (!ok) { - qDebug() << "error while parsing ratings: " << fileName; - return; - } - - // Replace old ratings cache - QString ratingsCache = KStandardDirs::locateLocal("data", "libmuon/ratings.txt", true); - if (fileName != ratingsCache) { - QFile::remove(ratingsCache); - QFile::copy(fileName, ratingsCache); - } - - qDeleteAll(m_ratings); - m_ratings.clear(); - foreach (const QVariant &data, ratings.toList()) { - Rating *rating = new Rating(data.toMap()); - if (!rating->ratingCount()) { - delete rating; - continue; - } - m_ratings[rating->packageName()] = rating; - } - emit ratingsReady(); -} - -Rating *ReviewsBackend::ratingForApplication(AbstractResource* app) const -{ - return m_ratings.value(app->packageName()); -} - -void ReviewsBackend::stopPendingJobs() -{ - auto iter = m_jobHash.constBegin(); - while (iter != m_jobHash.constEnd()) { - KJob *getJob = iter.key(); - disconnect(getJob, SIGNAL(result(KJob*)), - this, SLOT(changelogFetched(KJob*))); - iter++; - } - - m_jobHash.clear(); -} - -void ReviewsBackend::fetchReviews(AbstractResource* res, int page) -{ - Application* app = qobject_cast(res); - // Check our cache before fetching from the 'net - QString hashName = app->package()->name() + app->untranslatedName(); - - QList revs = m_reviewsCache.value(hashName); - if (revs.size()>(page*10)) { //there are 10 reviews per page - emit reviewsReady(app, revs.mid(page*10, 10)); - return; - } - - QString lang = getLanguage(); - QString origin = app->package()->origin().toLower(); - - QString version = QLatin1String("any"); - QString packageName = app->package()->name(); - QString appName = app->name(); - // Replace spaces with %2B for the url - appName.replace(' ', QLatin1String("%2B")); - - // Figuring out how this damn Django url was put together took more - // time than figuring out QJson... - // But that could be because the Ubuntu Software Center (which I used to - // figure it out) is written in python, so you have to go hunting to where - // a variable was initially initialized with a primitive to figure out its type. - KUrl reviewsUrl(m_serverBase, QLatin1String("reviews/filter/") % lang % '/' - % origin % '/' % QLatin1String("any") % '/' % version % '/' % packageName - % ';' % appName % '/' % QLatin1String("page") % '/' % QString::number(page)); - - if (m_reviewsFile) { - m_reviewsFile->deleteLater(); - m_reviewsFile = 0; - } - - m_reviewsFile = new KTemporaryFile(); - m_reviewsFile->open(); - - KIO::FileCopyJob *getJob = KIO::file_copy(reviewsUrl, - m_reviewsFile->fileName(), -1, - KIO::Overwrite | KIO::HideProgressInfo); - m_jobHash[getJob] = app; - connect(getJob, SIGNAL(result(KJob*)), - this, SLOT(reviewsFetched(KJob*))); -} - -void ReviewsBackend::reviewsFetched(KJob *job) -{ - if (job->error()) { - m_jobHash.remove(job); - return; - } - - QFile file(m_reviewsFile->fileName()); - file.open(QIODevice::ReadOnly | QIODevice::Text); - - QJson::Parser parser; - QByteArray json = file.readAll(); - - bool ok = false; - QVariant reviews = parser.parse(json, &ok); - - if (!ok) { - m_jobHash.remove(job); - return; - } - - QList reviewsList; - foreach (const QVariant &data, reviews.toList()) { - Review *review = new Review(data.toMap()); - QApt::Package *package = m_aptBackend->package(review->packageName()); - - if (package) { - review->setPackage(package); - reviewsList << review; - } - } - - Application *app = m_jobHash.value(job); - m_jobHash.remove(job); - - if (!app) - return; - - m_reviewsCache[app->package()->name() + app->name()].append(reviewsList); - - emit reviewsReady(app, reviewsList); -} - -QString ReviewsBackend::getLanguage() -{ - QStringList fullLangs; - // The reviews API abbreviates all langs past the _ char except these - fullLangs << "pt_BR" << "zh_CN" << "zh_TW"; - - QString language = KGlobal::locale()->language(); - - if (fullLangs.contains(language)) { - return language; - } - - return language.split('_').first(); -} - -void ReviewsBackend::submitUsefulness(Review* r, bool useful) -{ - QVariantMap data; - data["useful"] = useful; - - postInformation(QString("reviews/%1/recommendations/").arg(r->id()), data); -} - -void ReviewsBackend::submitReview(AbstractResource* application, const QString& summary, - const QString& review_text, const QString& rating) -{ - Application* app = qobject_cast(application); - - QVariantMap data; - data["app_name"] = app->name(); - data["package_name"] = app->packageName(); - data["summary"] = summary; - data["version"] = app->package()->version(); - data["review_text"] = review_text; - data["rating"] = rating; - data["language"] = getLanguage(); - data["origin"] = app->package()->origin(); - data["distroseries"] = getCodename("DISTRIB_CODENAME"); - data["arch_tag"] = app->package()->architecture(); - - postInformation("reviews/", data); -} - -void ReviewsBackend::deleteReview(Review* r) -{ - postInformation(QString("reviews/delete/%1/").arg(r->id()), QVariantMap()); -} - -void ReviewsBackend::flagReview(Review* r, const QString& reason, const QString& text) -{ - QVariantMap data; - data["reason"] = reason; - data["text"] = text; - - postInformation(QString("reviews/%1/flags/").arg(r->id()), data); -} - -QByteArray authorization(QOAuth::Interface* oauth, const KUrl& url, AbstractLoginBackend* login) -{ - return oauth->createParametersString(url.url(), QOAuth::POST, login->token(), login->tokenSecret(), - QOAuth::HMAC_SHA1, QOAuth::ParamMap(), QOAuth::ParseForHeaderArguments); -} - -void ReviewsBackend::postInformation(const QString& path, const QVariantMap& data) -{ - if(!hasCredentials()) { - m_pendingRequests += qMakePair(path, data); - login(); - return; - } - - KUrl url(m_serverBase, path); - url.setScheme("https"); - - KIO::StoredTransferJob* job = KIO::storedHttpPost(QJson::Serializer().serialize(data), url, KIO::Overwrite | KIO::HideProgressInfo); - job->addMetaData("content-type", "Content-Type: application/json" ); - job->addMetaData("customHTTPHeader", "Authorization: " + authorization(m_oauthInterface, url, m_loginBackend)); - connect(job, SIGNAL(result(KJob*)), this, SLOT(informationPosted(KJob*))); - job->start(); -} - -void ReviewsBackend::informationPosted(KJob* j) -{ - KIO::StoredTransferJob* job = qobject_cast(j); - if(job->error()==0) { - qDebug() << "success" << job->data(); - } else { - qDebug() << "error..." << job->error() << job->errorString() << job->errorText(); - } -} - -bool ReviewsBackend::isFetching() const -{ - return !m_jobHash.isEmpty(); -} - -bool ReviewsBackend::hasCredentials() const -{ - return m_loginBackend->hasCredentials(); -} - -QString ReviewsBackend::userName() const -{ - Q_ASSERT(m_loginBackend->hasCredentials()); - return m_loginBackend->displayName(); -} - -void ReviewsBackend::login() -{ - Q_ASSERT(!m_loginBackend->hasCredentials()); - m_loginBackend->login(); -} - -void ReviewsBackend::registerAndLogin() -{ - Q_ASSERT(!m_loginBackend->hasCredentials()); - m_loginBackend->registerAndLogin(); -} - -void ReviewsBackend::logout() -{ - Q_ASSERT(m_loginBackend->hasCredentials()); - m_loginBackend->logout(); -} diff -Nru muon-1.9.60/libmuon/ReviewsBackend/ReviewsBackend.h muon-2.0.0/libmuon/ReviewsBackend/ReviewsBackend.h --- muon-1.9.60/libmuon/ReviewsBackend/ReviewsBackend.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/ReviewsBackend.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,101 +0,0 @@ -/*************************************************************************** - * Copyright © 2011 Jonathan Thomas * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef REVIEWSBACKEND_H -#define REVIEWSBACKEND_H - -#include -#include -#include - -#include "libmuonprivate_export.h" -#include "AbstractReviewsBackend.h" - -namespace QOAuth { - class Interface; -} - -class KJob; -class KTemporaryFile; - -namespace QApt { - class Backend; -} - -class AbstractLoginBackend; -class Application; -class Rating; -class Review; - -class MUONPRIVATE_EXPORT ReviewsBackend : public AbstractReviewsBackend -{ - Q_OBJECT -public: - ReviewsBackend(QObject *parent); - ~ReviewsBackend(); - - Rating *ratingForApplication(AbstractResource *app) const; - - void setAptBackend(QApt::Backend *aptBackend); - void fetchReviews(AbstractResource* app, int page=1); -// void clearReviewCache(); - void stopPendingJobs(); - bool isFetching() const; - - QString userName() const; - bool hasCredentials() const; - -private: - QApt::Backend *m_aptBackend; - - const KUrl m_serverBase; - KTemporaryFile *m_ratingsFile; - KTemporaryFile *m_reviewsFile; - QHash m_ratings; - // cache key is package name + app name, since both by their own may not be unique - QHash > m_reviewsCache; - QHash m_jobHash; - - void fetchRatings(); - void loadRatingsFromFile(const QString &fileName); - QString getLanguage(); - AbstractLoginBackend* m_loginBackend; - QOAuth::Interface* m_oauthInterface; - QList > m_pendingRequests; - -private Q_SLOTS: - void ratingsFetched(KJob *job); - void reviewsFetched(KJob *job); - void informationPosted(KJob* job); - void postInformation(const QString& path, const QVariantMap& data); - -public slots: - void login(); - void registerAndLogin(); - void logout(); - void submitUsefulness(Review* r, bool useful); - void submitReview(AbstractResource* app, const QString& summary, - const QString& review_text, const QString& rating); - void deleteReview(Review* r); - void flagReview(Review* r, const QString& reason, const QString &text); - void refreshConsumerKeys(); -}; - -#endif diff -Nru muon-1.9.60/libmuon/ReviewsBackend/ReviewsModel.cpp muon-2.0.0/libmuon/ReviewsBackend/ReviewsModel.cpp --- muon-1.9.60/libmuon/ReviewsBackend/ReviewsModel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/ReviewsModel.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,167 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ReviewsModel.h" +#include +#include +#include +#include +#include +#include + +ReviewsModel::ReviewsModel(QObject* parent) + : QAbstractListModel(parent) + , m_app(0) + , m_backend(0) + , m_lastPage(0) + , m_canFetchMore(true) +{ + QHash roles = roleNames(); + roles.insert(ShouldShow, "shouldShow"); + roles.insert(Reviewer, "reviewer"); + roles.insert(CreationDate, "date"); + roles.insert(UsefulnessTotal, "usefulnessTotal"); + roles.insert(UsefulnessFavorable, "usefulnessFavorable"); + roles.insert(Rating, "rating"); + roles.insert(Summary, "summary"); + setRoleNames(roles); +} + +QVariant ReviewsModel::data(const QModelIndex& index, int role) const +{ + if(!index.isValid()) + return QVariant(); + switch(role) { + case Qt::DisplayRole: + return m_reviews.at(index.row())->reviewText(); + case ShouldShow: + return m_reviews.at(index.row())->shouldShow(); + case Reviewer: + return m_reviews.at(index.row())->reviewer(); + case CreationDate: + return m_reviews.at(index.row())->creationDate(); + case UsefulnessTotal: + return m_reviews.at(index.row())->usefulnessTotal(); + case UsefulnessFavorable: + return m_reviews.at(index.row())->usefulnessFavorable(); + case Rating: + return m_reviews.at(index.row())->rating(); + case Summary: + return m_reviews.at(index.row())->summary(); + } + return QVariant(); +} + +int ReviewsModel::rowCount(const QModelIndex& parent) const +{ + if(parent.isValid()) + return 0; + return m_reviews.count(); +} + +AbstractResource* ReviewsModel::resource() const +{ + return m_app; +} + +AbstractReviewsBackend* ReviewsModel::backend() const +{ + return m_backend; +} + +void ReviewsModel::setResource(AbstractResource* app) +{ + if(m_app!=app) { + reset(); + m_reviews.clear(); + + m_app = app; + if(m_backend) { + disconnect(m_backend, SIGNAL(reviewsReady(AbstractResource*,QList)), + this, SLOT(addReviews(AbstractResource*,QList))); + } + m_backend = app->backend()->reviewsBackend(); + if(m_backend) { + connect(m_backend, SIGNAL(reviewsReady(AbstractResource*,QList)), + this, SLOT(addReviews(AbstractResource*,QList))); + + QMetaObject::invokeMethod(this, "restartFetching", Qt::QueuedConnection); + } + } +} + +void ReviewsModel::restartFetching() +{ + if(!m_app || !m_backend) + return; + + m_canFetchMore=true; + m_lastPage = 0; + fetchMore(); +} + +void ReviewsModel::fetchMore(const QModelIndex& parent) +{ + if(!m_backend || !m_app || m_backend->isFetching() || parent.isValid() || !m_canFetchMore) + return; + + m_lastPage++; + m_backend->fetchReviews(m_app, m_lastPage); + qDebug() << "fetching reviews... " << m_lastPage; +} + +void ReviewsModel::addReviews(AbstractResource* app, const QList& reviews) +{ + if(app!=m_app) + return; + + m_canFetchMore=!reviews.isEmpty(); + qDebug() << "reviews arrived..." << m_lastPage << reviews.size(); + + if(!reviews.isEmpty()) { + beginInsertRows(QModelIndex(), rowCount(), rowCount()+reviews.size()-1); + m_reviews += reviews; + endInsertRows(); + } +} + +bool ReviewsModel::canFetchMore(const QModelIndex&) const +{ + return m_canFetchMore; +} + +void ReviewsModel::markUseful(int row, bool useful) +{ + Review* r = m_reviews[row]; + qDebug() << "submitting usefulness" << r->applicationName() << r->id() << useful; + m_backend->submitUsefulness(r, useful); +} + +void ReviewsModel::deleteReview(int row) +{ + Review* r = m_reviews[row]; + m_backend->deleteReview(r); +} + +void ReviewsModel::flagReview(int row, const QString& reason, const QString& text) +{ + Review* r = m_reviews[row]; + m_backend->flagReview(r, reason, text); +} diff -Nru muon-1.9.60/libmuon/ReviewsBackend/ReviewsModel.h muon-2.0.0/libmuon/ReviewsBackend/ReviewsModel.h --- muon-1.9.60/libmuon/ReviewsBackend/ReviewsModel.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/ReviewsModel.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,73 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef REVIEWSMODEL_H +#define REVIEWSMODEL_H + +#include +#include "libmuonprivate_export.h" + +class Review; +class AbstractResource; +class AbstractReviewsBackend; +class MUONPRIVATE_EXPORT ReviewsModel : public QAbstractListModel +{ + Q_OBJECT + Q_PROPERTY(AbstractReviewsBackend* backend READ backend) + Q_PROPERTY(AbstractResource* resource READ resource WRITE setResource) + public: + enum Roles { + ShouldShow=Qt::UserRole+1, + Reviewer, + CreationDate, + UsefulnessTotal, + UsefulnessFavorable, + Rating, + Summary + }; + explicit ReviewsModel(QObject* parent = 0); + virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; + virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; + + AbstractReviewsBackend* backend() const; + void setResource(AbstractResource* app); + AbstractResource* resource() const; + virtual void fetchMore(const QModelIndex& parent=QModelIndex()); + virtual bool canFetchMore(const QModelIndex&) const; + + public slots: + void deleteReview(int row); + void flagReview(int row, const QString& reason, const QString& text); + void markUseful(int row, bool useful); + + private slots: + void addReviews(AbstractResource* app, const QList& reviews); + void restartFetching(); + + private: + AbstractResource* m_app; + AbstractReviewsBackend* m_backend; + QList m_reviews; + int m_lastPage; + bool m_canFetchMore; +}; + +#endif // REVIEWSMODEL_H + diff -Nru muon-1.9.60/libmuon/ReviewsBackend/UbuntuLoginBackend.cpp muon-2.0.0/libmuon/ReviewsBackend/UbuntuLoginBackend.cpp --- muon-1.9.60/libmuon/ReviewsBackend/UbuntuLoginBackend.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/UbuntuLoginBackend.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,148 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "UbuntuLoginBackend.h" -#include -#include -#include -#include -#include -#include "ubuntu_sso.h" -#include "LoginMetaTypes.h" - -//NOTE: this is needed because the method is called register. see the xml file for more info -struct HackedComUbuntuSsoCredentialsManagementInterface : public ComUbuntuSsoCredentialsManagementInterface -{ - HackedComUbuntuSsoCredentialsManagementInterface(const QString& service, const QString& path, const QDBusConnection& connection, QObject* parent = 0) - : ComUbuntuSsoCredentialsManagementInterface(service, path, connection, parent) - {} - - inline QDBusPendingReply<> register_hack(const QString &app_name, MapString args) - { - QList argumentList; - argumentList << QVariant::fromValue(app_name) << QVariant::fromValue(args); - return asyncCallWithArgumentList(QLatin1String("register"), argumentList); - } -}; - -UbuntuLoginBackend::UbuntuLoginBackend(QObject* parent) - : AbstractLoginBackend(parent) -{ - qDBusRegisterMetaType(); - m_interface = new HackedComUbuntuSsoCredentialsManagementInterface( "com.ubuntu.sso", "/com/ubuntu/sso/credentials", QDBusConnection::sessionBus(), this); - connect(m_interface, SIGNAL(CredentialsError(QString,MapString)), SLOT(credentialsError(QString,MapString))); - connect(m_interface, SIGNAL(AuthorizationDenied(QString)), SLOT(authorizationDenied(QString))); - connect(m_interface, SIGNAL(CredentialsFound(QString,MapString)), this, SLOT(successfulLogin(QString,MapString))); - - m_interface->find_credentials(appname(), MapString()); -} - -void UbuntuLoginBackend::login() -{ - MapString data; - data["help_text"] = i18n("Log in to the Ubuntu SSO service"); - data["window_id"] = winId(); - QDBusPendingReply< void > ret = m_interface->login(appname(), data); -} - -void UbuntuLoginBackend::registerAndLogin() -{ - MapString data; - data["help_text"] = i18n("Log in to the Ubuntu SSO service"); - data["window_id"] = winId(); - m_interface->register_hack(appname(), data); -} - -QString UbuntuLoginBackend::displayName() const -{ - return m_credentials["name"]; -} - -bool UbuntuLoginBackend::hasCredentials() const -{ - return !m_credentials.isEmpty(); -} - -void UbuntuLoginBackend::successfulLogin(const QString& app, const QMap& credentials) -{ - qDebug() << "logged in" << appname() << app << credentials; - if(app==appname()) { - m_credentials = credentials; - emit connectionStateChanged(); - } -} - -QString UbuntuLoginBackend::appname() const -{ - return QCoreApplication::instance()->applicationName(); -} - -QString UbuntuLoginBackend::winId() const -{ - QString windowId; - QApplication *app = qobject_cast(qApp); - - if (app->activeWindow()) - windowId = QString::number(app->activeWindow()->winId()); - - return windowId; -} - -void UbuntuLoginBackend::authorizationDenied(const QString& app) -{ - qDebug() << "denied" << app; - if(app==appname()) - emit connectionStateChanged(); -} - -void UbuntuLoginBackend::credentialsError(const QString& app, const MapString& a) -{ - //TODO: provide error message? - qDebug() << "error" << app << a; - if(app==appname()) - emit connectionStateChanged(); -} - -void UbuntuLoginBackend::logout() -{ - m_interface->clear_credentials(appname(), MapString()); - m_credentials.clear(); - emit connectionStateChanged(); -} - -QByteArray UbuntuLoginBackend::token() const -{ - return m_credentials["token"].toLatin1(); -} - -QByteArray UbuntuLoginBackend::tokenSecret() const -{ - return m_credentials["token_secret"].toLatin1(); -} - -QByteArray UbuntuLoginBackend::consumerKey() const -{ - return m_credentials["consumer_key"].toLatin1(); -} - -QByteArray UbuntuLoginBackend::consumerSecret() const -{ - return m_credentials["consumer_secret"].toLatin1(); -} diff -Nru muon-1.9.60/libmuon/ReviewsBackend/UbuntuLoginBackend.h muon-2.0.0/libmuon/ReviewsBackend/UbuntuLoginBackend.h --- muon-1.9.60/libmuon/ReviewsBackend/UbuntuLoginBackend.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/UbuntuLoginBackend.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef UBUNTULOGINBACKEND_H -#define UBUNTULOGINBACKEND_H - -#include -#include -#include "LoginMetaTypes.h" - -class HackedComUbuntuSsoCredentialsManagementInterface; -class UbuntuLoginBackend : public AbstractLoginBackend -{ - Q_OBJECT - public: - UbuntuLoginBackend(QObject* parent=0); - - void login(); - void registerAndLogin(); - void logout(); - QString displayName() const; - bool hasCredentials() const; - - QByteArray token() const; - QByteArray tokenSecret() const; - QByteArray consumerKey() const; - QByteArray consumerSecret() const; - - private slots: - void credentialsError(const QString& app, const MapString& a); - void authorizationDenied(const QString& app); - void successfulLogin(const QString& app, const MapString& credentials); - - private: - QString appname() const; - QString winId() const; - HackedComUbuntuSsoCredentialsManagementInterface* m_interface; - MapString m_credentials; -}; - -#endif // UBUNTULOGINBACKEND_H diff -Nru muon-1.9.60/libmuon/ReviewsBackend/ubuntu_sso_dbus_interface.xml muon-2.0.0/libmuon/ReviewsBackend/ubuntu_sso_dbus_interface.xml --- muon-1.9.60/libmuon/ReviewsBackend/ubuntu_sso_dbus_interface.xml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/ReviewsBackend/ubuntu_sso_dbus_interface.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,73 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -Nru muon-1.9.60/libmuon/ScreenshotsModel.cpp muon-2.0.0/libmuon/ScreenshotsModel.cpp --- muon-1.9.60/libmuon/ScreenshotsModel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/ScreenshotsModel.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,94 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ScreenshotsModel.h" +#include +// #include +#include + +ScreenshotsModel::ScreenshotsModel(QObject* parent) + : QAbstractListModel(parent) + , m_resource(0) +{ + QHash roles = roleNames(); + roles.insert(ThumbnailUrl, "small_image_url"); + roles.insert(ScreenshotUrl, "large_image_url"); + setRoleNames(roles); +} + +void ScreenshotsModel::setResource(AbstractResource* res) +{ + if(m_resource) { + disconnect(m_resource, SIGNAL(screenshotsFetched(QList,QList)), this, + SLOT(screenshotsFetched(QList,QList))); + } + m_resource = res; + + if(res) { + connect(m_resource, SIGNAL(screenshotsFetched(QList,QList)), + SLOT(screenshotsFetched(QList,QList))); + res->fetchScreenshots(); + } else + kDebug() << "empty resource!"; +} + +AbstractResource* ScreenshotsModel::resource() const +{ + return m_resource; +} + +void ScreenshotsModel::screenshotsFetched(const QList< QUrl >& thumbnails, const QList< QUrl >& screenshots) +{ + Q_ASSERT(thumbnails.count()==screenshots.count()); + + beginInsertRows(QModelIndex(), m_thumbnails.size(), m_thumbnails.size()+thumbnails.size()-1); + m_thumbnails += thumbnails; + m_screenshots += screenshots; + endInsertRows(); + emit countChanged(); +} + +QVariant ScreenshotsModel::data(const QModelIndex& index, int role) const +{ + if(!index.isValid() || index.parent().isValid()) + return QVariant(); + + switch(role) { + case ThumbnailUrl: return m_thumbnails[index.row()]; + case ScreenshotUrl: return m_screenshots[index.row()]; + } + + return QVariant(); +} + +int ScreenshotsModel::rowCount(const QModelIndex& parent) const +{ + return !parent.isValid() ? m_screenshots.count() : 0; +} + +QUrl ScreenshotsModel::screenshotAt(int row) const +{ + return m_screenshots[row]; +} + +int ScreenshotsModel::count() const +{ + return m_screenshots.count(); +} diff -Nru muon-1.9.60/libmuon/ScreenshotsModel.h muon-2.0.0/libmuon/ScreenshotsModel.h --- muon-1.9.60/libmuon/ScreenshotsModel.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/ScreenshotsModel.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,61 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef SCREENSHOTSMODEL_H +#define SCREENSHOTSMODEL_H + +#include +#include +#include "libmuonprivate_export.h" + +class AbstractResource; + +class MUONPRIVATE_EXPORT ScreenshotsModel : public QAbstractListModel +{ + Q_OBJECT + Q_PROPERTY(AbstractResource* application READ resource WRITE setResource) + Q_PROPERTY(int count READ count NOTIFY countChanged) + public: + enum Roles { ThumbnailUrl=Qt::UserRole+1, ScreenshotUrl }; + + ScreenshotsModel(QObject* parent = 0); + + AbstractResource* resource() const; + void setResource(AbstractResource* res); + + virtual QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const; + virtual int rowCount(const QModelIndex& parent = QModelIndex()) const; + Q_SCRIPTABLE QUrl screenshotAt(int row) const; + int count() const; + + private slots: + void screenshotsFetched(const QList& thumbnails, const QList& screenshots); + + signals: + void countChanged(); + + private: + AbstractResource* m_resource; + QList m_thumbnails; + QList m_screenshots; + +}; + +#endif // SCREENSHOTSMODEL_H diff -Nru muon-1.9.60/libmuon/Transaction/TransactionListener.cpp muon-2.0.0/libmuon/Transaction/TransactionListener.cpp --- muon-1.9.60/libmuon/Transaction/TransactionListener.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/Transaction/TransactionListener.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -121,6 +121,7 @@ setDownloading(false); break; case StartedCommitting: + emit running(true); setStateComment(transaction); connect(m_backend, SIGNAL(transactionProgressed(Transaction*,int)), this, SLOT(updateProgress(Transaction*,int))); @@ -173,7 +174,6 @@ case InstallApp: m_comment = i18nc("@info:status", "Installing"); emit commentChanged(); - emit running(true); break; case ChangeAddons: m_comment = i18nc("@info:status", "Changing Addons"); @@ -209,9 +209,11 @@ void TransactionListener::setResource(AbstractResource* app) { - m_resource = app; - init(); - emit resourceChanged(); + if(m_resource!=app) { + m_resource = app; + init(); + emit resourceChanged(); + } } AbstractResource* TransactionListener::resource() const diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/Application.cpp muon-2.0.0/libmuon/backends/ApplicationBackend/Application.cpp --- muon-1.9.60/libmuon/backends/ApplicationBackend/Application.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/Application.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,538 @@ +/*************************************************************************** + * Copyright © 2010-2011 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "Application.h" +#include "resources/PackageState.h" +#include "ApplicationBackend.h" +#include + +// Qt includes +#include +#include +#include +#include + +// KDE includes +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// QApt includes +#include +#include + +//QJSON includes +#include + +Application::Application(const QString& fileName, QApt::Backend* backend) + : AbstractResource(0) + , m_backend(backend) + , m_package(0) + , m_isValid(true) + , m_isTechnical(false) + , m_isExtrasApp(false) + , m_sourceHasScreenshot(true) +{ + m_data = desktopContents(fileName); + m_isTechnical = getField("NoDisplay").toLower() == "true" || !hasField("Exec"); + m_packageName = getField("X-AppInstall-Package"); +} + +Application::Application(QApt::Package* package, QApt::Backend* backend) + : AbstractResource(0) + , m_backend(backend) + , m_package(package) + , m_isValid(true) + , m_isTechnical(true) + , m_isExtrasApp(false) +{ + m_packageName = m_package->name().latin1(); + + if (m_package->architecture() != m_backend->nativeArchitecture()) + m_packageName.append(QByteArray(":") + m_package->architecture().toLatin1()); + + if (m_package->origin() == QLatin1String("LP-PPA-app-review-board")) { + if (!m_package->controlField(QLatin1String("Appname")).isEmpty()) { + m_isExtrasApp = true; + m_isTechnical = false; + } + } +} + +QString Application::name() +{ + if (!m_isTechnical) + return i18n(untranslatedName().toUtf8()); + + // Technical packages use the package name, which is untranslatable + return untranslatedName(); +} + +QString Application::untranslatedName() +{ + QString name = QString::fromUtf8(getField("Name")).trimmed(); + if (name.isEmpty() && package()) { + // extras.ubuntu.com packages can have this + if (m_isExtrasApp) + name = m_package->controlField(QLatin1String("Appname")); + else + name = m_package->name(); + } + + return name; +} + +QString Application::comment() +{ + QString comment = getField("Comment"); + if (comment.isEmpty()) { + // Sometimes GenericName is used instead of Comment + comment = getField("GenericName"); + if (comment.isEmpty()) { + return package()->shortDescription(); + } + } + + return i18n(comment.toUtf8()); +} + +QString Application::packageName() const +{ + return m_packageName; +} + +QApt::Package *Application::package() +{ + if (!m_package && m_backend) { + m_package = m_backend->package(packageName()); + emit stateChanged(); + } + + // Packages removed from archive will remain in app-install-data until the + // next refresh, so we can have valid .desktops with no package + if (!m_package) { + m_isValid = false; + } + + return m_package; +} + +QString Application::icon() const +{ + return getField("Icon", "applications-other"); +} + +QString Application::mimetypes() const +{ + return getField("MimeType"); +} + +QString Application::menuPath() +{ + QString path; + QString arrow(QString::fromUtf8(" ➜ ")); + + // Take the file name and remove the .desktop ending + QVector execs = findExecutables(); + if(execs.isEmpty()) + return path; + + KService::Ptr service = execs.first(); + QVector > ret; + + if (service) { + ret = locateApplication(QString(), service->menuId()); + } + + if (!ret.isEmpty()) { + path.append(QString("") + .arg(KIconLoader::global()->iconPath("kde", KIconLoader::Small))); + path.append(QString(" %1  %3") + .arg(arrow) + .arg(KIconLoader::global()->iconPath("applications-other", KIconLoader::Small)) + .arg(i18n("Applications"))); + for (int i = 0; i < ret.size(); i++) { + path.append(QString(" %1  %3") + .arg(arrow) + .arg(KIconLoader::global()->iconPath(ret.at(i).second, KIconLoader::Small)) + .arg(ret.at(i).first)); + } + } + + return path; +} + +QVector > Application::locateApplication(const QString &_relPath, const QString &menuId) const +{ + QVector > ret; + KServiceGroup::Ptr root = KServiceGroup::group(_relPath); + + if (!root || !root->isValid()) { + return ret; + } + + const KServiceGroup::List list = root->entries(false /* sorted */, + true /* exclude no display entries */, + false /* allow separators */); + + for (KServiceGroup::List::ConstIterator it = list.constBegin(); it != list.constEnd(); ++it) { + const KSycocaEntry::Ptr p = (*it); + + if (p->isType(KST_KService)) { + const KService::Ptr service = KService::Ptr::staticCast(p); + + if (service->noDisplay()) { + continue; + } + + if (service->menuId() == menuId) { + QPair pair; + pair.first = service->name(); + pair.second = service->icon(); + ret << pair; + return ret; + } + } else if (p->isType(KST_KServiceGroup)) { + const KServiceGroup::Ptr serviceGroup = KServiceGroup::Ptr::staticCast(p); + + if (serviceGroup->noDisplay() || serviceGroup->childCount() == 0) { + continue; + } + + QVector > found; + found = locateApplication(serviceGroup->relPath(), menuId); + if (!found.isEmpty()) { + QPair pair; + pair.first = serviceGroup->caption(); + pair.second = serviceGroup->icon(); + ret << pair; + ret << found; + return ret; + } + } else { + continue; + } + } + + return ret; +} + +QString Application::categories() +{ + QString categories = getField("Categories"); + + if (categories.isEmpty()) { + // extras.ubuntu.com packages can have this field + if (m_isExtrasApp) + categories = package()->controlField(QLatin1String("Category")); + } + return categories; +} + +QUrl Application::thumbnailUrl() +{ + QUrl url(package()->controlField(QLatin1String("Thumbnail-Url"))); + if(m_sourceHasScreenshot) { + url = KUrl(MuonDataSources::screenshotsSource(), "thumbnail/"+packageName()); + } + return url; +} + +QUrl Application::screenshotUrl() +{ + QUrl url(package()->controlField(QLatin1String("Screenshot-Url"))); + if(m_sourceHasScreenshot) { + url = KUrl(MuonDataSources::screenshotsSource(), "screenshot/"+packageName()); + } + return url; +} + +QString Application::license() +{ + QString component = package()->component(); + if (component == "main" || component == "universe") { + return i18nc("@info license", "Open Source"); + } else if (component == "restricted") { + return i18nc("@info license", "Proprietary"); + } else { + return i18nc("@info license", "Unknown"); + } +} + +QApt::PackageList Application::addons() +{ + QApt::PackageList addons; + + QApt::Package *pkg = package(); + if (!pkg) { + return addons; + } + + QStringList tempList; + // Only add recommends or suggests to the list if they aren't already going to be + // installed + if (!m_backend->config()->readEntry("APT::Install-Recommends", true)) { + tempList << m_package->recommendsList(); + } + if (!m_backend->config()->readEntry("APT::Install-Suggests", false)) { + tempList << m_package->suggestsList(); + } + tempList << m_package->enhancedByList(); + + QStringList languagePackages; + QFile l10nFilterFile("/usr/share/language-selector/data/pkg_depends"); + + if (l10nFilterFile.open(QFile::ReadOnly)) { + QString contents = l10nFilterFile.readAll(); + + foreach (const QString &line, contents.split('\n')) { + if (line.startsWith(QLatin1Char('#'))) { + continue; + } + languagePackages << line.split(':').last(); + } + + languagePackages.removeAll(""); + } + + foreach (const QString &addon, tempList) { + bool shouldShow = true; + QApt::Package *package = m_backend->package(addon); + + if (!package || QString(package->section()).contains("lib") || addons.contains(package)) { + continue; + } + + foreach (const QString &langpack, languagePackages) { + if (addon.contains(langpack)) { + shouldShow = false; + break; + } + } + + if (shouldShow) { + addons << package; + } + } + + return addons; +} + +QList Application::addonsInformation() +{ + QList ret; + QApt::PackageList pkgs = addons(); + foreach(QApt::Package* p, pkgs) { + ret += PackageState(p->name(), p->shortDescription(), p->isInstalled()); + } + return ret; +} + +bool Application::isValid() const +{ + return m_isValid; +} + +bool Application::isTechnical() const +{ + return m_isTechnical; +} + +QByteArray Application::getField(const char* field, const QByteArray& defaultvalue) const +{ + if(m_data) { + KConfigGroup group = m_data->group("Desktop Entry"); + return group.readEntry(field, defaultvalue); + } else + return defaultvalue; + +} + +bool Application::hasField(const char* field) const +{ + return m_data && m_data->group("Desktop Entry").hasKey(field); +} + +QUrl Application::homepage() const +{ + if(!m_package) return QString(); + return m_package->homepage(); +} + +QString Application::origin() const +{ + if(!m_package) return QString(); + return m_package->origin(); +} + +QString Application::longDescription() const +{ + if(!m_package) return QString(); + return m_package->longDescription(); +} + +QString Application::availableVersion() const +{ + if(!m_package) return QString(); + return m_package->availableVersion(); +} + +QString Application::installedVersion() const +{ + if(!m_package) return QString(); + return m_package->installedVersion(); +} + +QString Application::sizeDescription() +{ + if (!isInstalled()) { + return i18nc("@info app size", "%1 to download, %2 on disk", + KGlobal::locale()->formatByteSize(package()->downloadSize()), + KGlobal::locale()->formatByteSize(package()->availableInstalledSize())); + } else { + return i18nc("@info app size", "%1 on disk", + KGlobal::locale()->formatByteSize(package()->currentInstalledSize())); + } +} + +KSharedConfigPtr Application::desktopContents(const QString& filename) +{ + return KSharedConfig::openConfig(filename, KConfig::SimpleConfig); +} + +void Application::clearPackage() +{ + m_package = 0; +} + +QVector Application::findExecutables() const +{ + QVector ret; + foreach (const QString &desktop, m_package->installedFilesList().filter(QRegExp(".+\\.desktop$", Qt::CaseSensitive))) { + // Important to use serviceByStorageId to ensure we get a service even + // if the KSycoca database doesn't have our .desktop file yet. + KService::Ptr service = KService::serviceByStorageId(desktop); + if (service && + service->isApplication() && + !service->noDisplay() && + !service->exec().isEmpty()) + { + ret << service; + } + } + return ret; +} + +void Application::emitStateChanged() +{ + emit stateChanged(); +} + +void Application::invokeApplication() const +{ + QVector< KService::Ptr > execs = findExecutables(); + Q_ASSERT(!execs.isEmpty()); + KToolInvocation::startServiceByDesktopPath(execs.first()->desktopEntryPath()); +} + +bool Application::canExecute() const +{ + return !findExecutables().isEmpty(); +} + +QString Application::section() +{ + return package()->section(); +} + +AbstractResource::State Application::state() +{ + if (!package()) + return Broken; + + State ret = None; + + int s = package()->state(); + if(s & QApt::Package::Upgradeable) ret = Upgradeable; + else if(s & QApt::Package::Installed) ret = Installed; + + return ret; +} + +void Application::fetchScreenshots() +{ + bool done = false; + + QString dest = KStandardDirs::locate("tmp", "screenshots."+m_packageName); + //TODO: Make async + KUrl packageUrl(MuonDataSources::screenshotsSource(), "/json/package/"+m_packageName); + bool downloadDescriptor = m_sourceHasScreenshot && KIO::NetAccess::download(packageUrl, dest, 0); + if(downloadDescriptor) { + QFile f(dest); + bool b = f.open(QIODevice::ReadOnly); + Q_ASSERT(b); + + QJson::Parser p; + bool ok; + QVariantMap values = p.parse(&f, &ok).toMap(); + if(ok) { + QVariantList screenshots = values["screenshots"].toList(); + + QList thumbnailUrls, screenshotUrls; + foreach(const QVariant& screenshot, screenshots) { + QVariantMap s = screenshot.toMap(); + thumbnailUrls += s["small_image_url"].toUrl(); + screenshotUrls += s["large_image_url"].toUrl(); + } + emit screenshotsFetched(thumbnailUrls, screenshotUrls); + done = true; + } + } + if(!done) { + QList thumbnails, screenshots; + if(!thumbnailUrl().isEmpty()) { + thumbnails += thumbnailUrl(); + screenshots += screenshotUrl(); + } + emit screenshotsFetched(thumbnails, screenshots); + } +} + +void Application::setHasScreenshot(bool has) +{ + m_sourceHasScreenshot = has; +} + +QStringList Application::executables() const +{ + QStringList ret; + QVector exes = findExecutables(); + foreach(KService::Ptr exe, exes) { + ret += exe->desktopEntryPath(); + } + return ret; +} diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/Application.h muon-2.0.0/libmuon/backends/ApplicationBackend/Application.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/Application.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/Application.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,112 @@ +/*************************************************************************** + * Copyright © 2010-2011 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef APPLICATION_H +#define APPLICATION_H + +#include +#include +#include + +#include +#include + +#include + +#include "libmuonprivate_export.h" +#include "resources/AbstractResource.h" + +class KJob; +namespace QApt { + class Backend; +} + +class MUONPRIVATE_EXPORT Application : public AbstractResource +{ +Q_OBJECT +// Q_PROPERTY(QString mimetypes READ mimetypes CONSTANT) +Q_PROPERTY(QString menuPath READ menuPath CONSTANT) +public: + friend class TransactionListener; + + explicit Application(const QString &fileName, QApt::Backend *backend); + explicit Application(QApt::Package *package, QApt::Backend *backend); + + QString name(); + QString untranslatedName(); + QString comment(); + QApt::Package *package(); + QString icon() const; + QString mimetypes() const; + QString menuPath(); + QString categories(); + QString license(); + QUrl screenshotUrl(); + QUrl thumbnailUrl(); + virtual QList< PackageState > addonsInformation(); + bool isValid() const; + bool isTechnical() const; + QString packageName() const; + + //QApt::Package forwarding + QUrl homepage() const; + QString longDescription() const; + QString installedVersion() const; + QString availableVersion() const; + QString sizeDescription(); + QString origin() const; + + bool hasScreenshot() const { return m_sourceHasScreenshot; } + void setHasScreenshot(bool has); + + void clearPackage(); + QVector findExecutables() const; + virtual QStringList executables() const; + + /** Used to trigger the stateChanged signal from the ApplicationBackend */ + void emitStateChanged(); + + void invokeApplication() const; + + bool canExecute() const; + QString section(); + + virtual State state(); + virtual void fetchScreenshots(); + +private: + KSharedConfigPtr m_data; + QApt::Backend *m_backend; + QApt::Package *m_package; + QByteArray m_packageName; + + bool m_isValid; + bool m_isTechnical; + bool m_isExtrasApp; + bool m_sourceHasScreenshot; + + QByteArray getField(const char* field, const QByteArray& defaultvalue = QByteArray()) const; + KSharedConfigPtr desktopContents(const QString& filename); + QApt::PackageList addons(); + QVector > locateApplication(const QString &_relPath, const QString &menuId) const; + bool hasField(const char* field) const; +}; + +#endif diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/ApplicationBackend.cpp muon-2.0.0/libmuon/backends/ApplicationBackend/ApplicationBackend.cpp --- muon-1.9.60/libmuon/backends/ApplicationBackend/ApplicationBackend.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/ApplicationBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,641 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ApplicationBackend.h" + +// Qt includes +#include +#include +#include +#include +#include +#include + +// KDE includes +#include +#include +#include +#include +#include +#include +#include +#include + +// LibQApt/DebconfKDE includes +#include +#include +#include +#include + +//libmuonapt includes +#include "MuonStrings.h" +#include "ChangesDialog.h" +#include "QAptActions.h" + +// Own includes +#include "Application.h" +#include "ReviewsBackend.h" +#include "Transaction/Transaction.h" +#include "ApplicationUpdates.h" +#include "MuonMainWindow.h" +#include + +static const KCatalogLoader loader("app-install-data"); + +K_PLUGIN_FACTORY(MuonAppsBackendFactory, registerPlugin(); ) +K_EXPORT_PLUGIN(MuonAppsBackendFactory(KAboutData("muon-appsbackend","muon-appsbackend",ki18n("Applications Backend"),"0.1",ki18n("Applications in your system"), KAboutData::License_GPL))) + +ApplicationBackend::ApplicationBackend(QObject* parent, const QVariantList& ) + : AbstractResourcesBackend(parent) + , m_backend(new QApt::Backend(this)) + , m_reviewsBackend(new ReviewsBackend(this)) + , m_isReloading(false) + , m_currentTransaction(nullptr) + , m_backendUpdater(new ApplicationUpdates(this)) + , m_aptify(nullptr) + , m_aptBackendInitialized(false) +{ + KGlobal::dirs()->addResourceDir("appicon", "/usr/share/app-install/icons/"); + + m_watcher = new QFutureWatcher >(this); + connect(m_watcher, SIGNAL(finished()), this, SLOT(setApplications())); + connect(this, SIGNAL(reloadFinished()), SIGNAL(updatesCountChanged())); + connect(this, SIGNAL(backendReady()), SIGNAL(updatesCountChanged())); + connect(m_reviewsBackend, SIGNAL(ratingsReady()), SIGNAL(allDataChanged())); + connect(m_backendUpdater, SIGNAL(updatesFinnished()), SLOT(reload())); + + QTimer::singleShot(10, this, SLOT(initBackend())); +} + +ApplicationBackend::~ApplicationBackend() +{ + qDeleteAll(m_appList); +} + +QVector init(QApt::Backend *backend, QThread* thread) +{ + QVector appList; + QDir appDir("/usr/share/app-install/desktop/"); + QStringList fileList = appDir.entryList(QStringList("*.desktop"), QDir::Files); + + QStringList pkgBlacklist; + pkgBlacklist << "kde-runtime" << "kdepim-runtime" << "kdelibs5-plugins" << "kdelibs5-data"; + + QList tempList; + QSet packages; + foreach(const QString &fileName, fileList) { + Application *app = new Application(appDir.filePath(fileName), backend); + packages.insert(app->packageName()); + tempList << app; + } + + foreach (QApt::Package *package, backend->availablePackages()) { + //Don't create applications twice + if(packages.contains(package->name())) + continue; + + if (package->isMultiArchDuplicate()) + continue; + + Application *app = new Application(package, backend); + tempList << app; + } + + // To be added an Application must have a package that: + // a) exists + // b) is not on the blacklist + // c) if not downloadable, then it must already be installed + for (Application *app : tempList) { + bool added = false; + QApt::Package *pkg = app->package(); + if (app->isValid()) { + if ((pkg) && !pkgBlacklist.contains(pkg->name())) { + appList << app; + app->moveToThread(thread); + added = true; + } + } + + if(!added) + delete app; + } + + return appList; +} + +void ApplicationBackend::setApplications() +{ + m_appList = m_watcher->future().result(); + for (Application* app : m_appList) + app->setParent(this); + + emit backendReady(); + + KIO::StoredTransferJob* job = KIO::storedGet(KUrl(MuonDataSources::screenshotsSource(), "/json/packages"),KIO::NoReload, KIO::DefaultFlags|KIO::HideProgressInfo); + connect(job, SIGNAL(finished(KJob*)), SLOT(initAvailablePackages(KJob*))); + + if (m_aptify) + m_aptify->setCanExit(true); +} + +void ApplicationBackend::reload() +{ + if (m_aptify) + m_aptify->setCanExit(false); + emit reloadStarted(); + m_isReloading = true; + foreach(Application* app, m_appList) + app->clearPackage(); + qDeleteAll(m_transQueue); + m_transQueue.clear(); + m_reviewsBackend->stopPendingJobs(); + + if (!m_backend->reloadCache()) + QAptActions::self()->initError(); + + foreach(Application* app, m_appList) + app->package(); + + m_isReloading = false; + if (m_aptify) + m_aptify->setCanExit(true); + emit reloadFinished(); + emit searchInvalidated(); +} + +bool ApplicationBackend::isReloading() const +{ + return m_isReloading; +} + +bool ApplicationBackend::isValid() const +{ + // ApplicationBackend will force an application quit if it is invalid, so + // if it has not done that, the backend is valid. + return true; +} + +void ApplicationBackend::aptTransactionsChanged(QString active) +{ + // Find the newly-active QApt transaction in our list + QApt::Transaction *trans = nullptr; + auto list = m_transQueue.values(); + + for (QApt::Transaction *t : list) { + if (t->transactionId() == active) { + trans = t; + break; + } + } + + if (!trans || m_transQueue.key(trans) == m_currentTransaction) + return; + + m_currentTransaction = m_transQueue.key(trans); + connect(trans, SIGNAL(statusChanged(QApt::TransactionStatus)), + this, SLOT(transactionEvent(QApt::TransactionStatus))); + connect(trans, SIGNAL(errorOccurred(QApt::ErrorCode)), + this, SLOT(errorOccurred(QApt::ErrorCode))); + connect(trans, SIGNAL(progressChanged(int)), + this, SLOT(updateProgress(int))); + // FIXME: untrusted packages, conf file prompt, media change +} + +void ApplicationBackend::transactionEvent(QApt::TransactionStatus status) +{ + auto iter = m_transQueue.find(m_currentTransaction); + if (iter == m_transQueue.end()) + return; + + switch (status) { + case QApt::SetupStatus: + case QApt::AuthenticationStatus: + case QApt::WaitingStatus: + case QApt::WaitingLockStatus: + case QApt::WaitingMediumStatus: + case QApt::WaitingConfigFilePromptStatus: + case QApt::LoadingCacheStatus: + break; + case QApt::RunningStatus: + m_currentTransaction->setState(RunningState); + break; + case QApt::DownloadingStatus: + transactionsEvent(StartedDownloading, m_currentTransaction); + break; + case QApt::CommittingStatus: + transactionsEvent(FinishedDownloading, m_currentTransaction); + transactionsEvent(StartedCommitting, m_currentTransaction); + + // Set up debconf + m_debconfGui = new DebconfKde::DebconfGui(iter.value()->debconfPipe()); + m_debconfGui->connect(m_debconfGui, SIGNAL(activated()), m_debconfGui, SLOT(show())); + m_debconfGui->connect(m_debconfGui, SIGNAL(deactivated()), m_debconfGui, SLOT(hide())); + break; + case QApt::FinishedStatus: + transactionsEvent(FinishedCommitting, m_currentTransaction); + m_currentTransaction->setState(DoneState); + + // Clean up manually created debconf pipe + QApt::Transaction *trans = iter.value(); + if (!trans->debconfPipe().isEmpty()) + QFile::remove(trans->debconfPipe()); + + // Cleanup + trans->deleteLater(); + emit transactionRemoved(m_currentTransaction); + m_transQueue.remove(iter.key()); + + qobject_cast(m_currentTransaction->resource())->emitStateChanged(); + delete m_currentTransaction; + m_currentTransaction = nullptr; + + if (m_transQueue.isEmpty()) + reload(); + break; + } +} + +void ApplicationBackend::errorOccurred(QApt::ErrorCode error) +{ + if (m_transQueue.isEmpty()) // Shouldn't happen + return; + + emit errorSignal(error, m_transQueue.value(m_currentTransaction)->errorDetails()); +} + +void ApplicationBackend::updateProgress(int percentage) +{ + emit transactionProgressed(m_currentTransaction, percentage); +} + +bool ApplicationBackend::confirmRemoval(QApt::StateChanges changes) +{ + const QApt::PackageList removeList = changes.value(QApt::Package::ToRemove); + if (removeList.isEmpty()) + return true; + + QApt::StateChanges removals; + removals[QApt::Package::ToRemove] = removeList; + + ChangesDialog *dialog = new ChangesDialog(0, removals); + + return (dialog->exec() == QDialog::Accepted); +} + +void ApplicationBackend::markTransaction(Transaction *transaction) +{ + Application *app = qobject_cast(transaction->resource()); + + switch (transaction->action()) { + case InstallApp: + app->package()->setInstall(); + markLangpacks(transaction); + break; + case RemoveApp: + app->package()->setRemove(); + break; + default: + break; + } + + QHash< QString, bool > addons = transaction->addons(); + auto iter = addons.constBegin(); + + while (iter != addons.constEnd()) { + QApt::Package* package = m_backend->package(iter.key()); + bool state = iter.value(); + if(state) + package->setInstall(); + else + package->setRemove(); + ++iter; + } +} + +void ApplicationBackend::markLangpacks(Transaction *transaction) +{ + QString prog = KStandardDirs::findExe("check-language-support"); + if (prog.isEmpty()) + return; + + QString language = KGlobal::locale()->language(); + QString pkgName = transaction->resource()->packageName(); + + QStringList args; + args << prog << QLatin1String("-l") << language << QLatin1String("-p") << pkgName; + + KProcess proc; + proc.setOutputChannelMode(KProcess::OnlyStdoutChannel); + proc.setProgram(args); + proc.start(); + proc.waitForFinished(); + + QString res = proc.readAllStandardOutput(); + res.remove(QString()); + + QApt::Package *langPack = nullptr; + m_backend->setCompressEvents(true); + foreach(const QString &pkg, res.split(' ')) + { + langPack = m_backend->package(pkg.trimmed()); + + if (langPack) + langPack->setInstall(); + } + m_backend->setCompressEvents(false); +} + +void ApplicationBackend::addTransaction(Transaction *transaction) +{ + QApt::CacheState oldCacheState = m_backend->currentCacheState(); + m_backend->saveCacheState(); + + markTransaction(transaction); + + // Find changes due to markings + QApt::PackageList excluded; + excluded.append(qobject_cast(transaction->resource())->package()); + + // Exclude addons being marked + auto iter = transaction->addons().constBegin(); + while (iter != transaction->addons().constEnd()) { + QApt::Package *addon = m_backend->package(iter.key()); + if (addon) + excluded.append(addon); + ++iter; + } + + QApt::StateChanges changes = m_backend->stateChanges(oldCacheState, excluded); + + if (!confirmRemoval(changes)) { + m_backend->restoreCacheState(oldCacheState); + emit transactionCancelled(transaction); + delete transaction; + return; + } + + Application *app = qobject_cast(transaction->resource()); + + if (app->package()->wouldBreak()) { + m_backend->restoreCacheState(oldCacheState); + //TODO Notify of error + } + + QApt::Transaction *aptTrans = m_backend->commitChanges(); + setupTransaction(aptTrans); + m_transQueue.insert(transaction, aptTrans); + aptTrans->run(); + m_backend->restoreCacheState(oldCacheState); // Undo temporary simulation marking + emit transactionAdded(transaction); + + if (m_transQueue.count() == 1) { + aptTransactionsChanged(aptTrans->transactionId()); + m_currentTransaction = transaction; + emit startingFirstTransaction(); + } +} + +void ApplicationBackend::cancelTransaction(AbstractResource* app) +{ + for (auto iter = m_transQueue.begin(); iter != m_transQueue.end(); ++iter) { + Transaction* t = iter.key(); + QApt::Transaction *aptTrans = iter.value(); + + if (t->resource() == app) { + if (t->state() == RunningState) { + aptTrans->cancel(); + } + break; + } + } + // Emitting the cancellation occurs when the QApt trans is finished +} + +//void ApplicationBackend::runNextTransaction() +//{ +// m_currentTransaction = m_queue.head(); +// if (!m_currentTransaction) { +// return; +// } +// QApt::CacheState oldCacheState = m_backend->currentCacheState(); +// m_backend->saveCacheState(); + +// markTransaction(m_currentTransaction); + +// Application *app = qobject_cast(m_currentTransaction->resource()); + +// if (app->package()->wouldBreak()) { +// m_backend->restoreCacheState(oldCacheState); +// //TODO Notify of error +// } + +// m_backend->commitChanges(); +// m_backend->undo(); // Undo temporary simulation marking +//} + +QApt::Backend* ApplicationBackend::backend() const +{ + return m_backend; +} + +AbstractReviewsBackend *ApplicationBackend::reviewsBackend() const +{ + return m_reviewsBackend; +} + +QVector ApplicationBackend::allResources() const +{ + QVector ret; + + for (Application* app : m_appList) { + ret += app; + } + return ret; +} + +QList ApplicationBackend::transactions() const +{ + return m_transQueue.keys(); +} + +void ApplicationBackend::installApplication(AbstractResource* res, const QHash< QString, bool >& addons) +{ + Application* app = qobject_cast(res); + TransactionAction action = app->package()->isInstalled() ? ChangeAddons : InstallApp; + + addTransaction(new Transaction(res, action, addons)); +} + +void ApplicationBackend::installApplication(AbstractResource* app) +{ + addTransaction(new Transaction(app, InstallApp)); +} + +void ApplicationBackend::removeApplication(AbstractResource* app) +{ + addTransaction(new Transaction(app, RemoveApp)); +} + +int ApplicationBackend::updatesCount() const +{ + if(m_isReloading) + return 0; + + int count = 0; + foreach(Application* app, m_appList) { + count += app->canUpgrade(); + } + return count; +} + +AbstractResource* ApplicationBackend::resourceByPackageName(const QString& name) const +{ + foreach(Application* app, m_appList) { + if(app->packageName()==name) + return app; + } + return 0; +} + +QStringList ApplicationBackend::searchPackageName(const QString& searchText) +{ + QApt::PackageList packages = m_backend->search(searchText); + QStringList names; + foreach(QApt::Package* package, packages) { + names += package->name(); + } + return names; +} + +QPair ApplicationBackend::currentTransactionState() const +{ + QPair ret; + ret.second = m_currentTransaction; + + QApt::Transaction *trans = m_transQueue.value(m_currentTransaction); + + if (!m_currentTransaction || !trans) + return ret; + + switch (trans->status()) { + case QApt::DownloadingStatus: + ret.first = StartedDownloading; + break; + case QApt::CommittingStatus: + ret.first = StartedCommitting; + break; + default: + break; + } + + return ret; +} + +AbstractBackendUpdater* ApplicationBackend::backendUpdater() const +{ + return m_backendUpdater; +} + +void ApplicationBackend::integrateMainWindow(MuonMainWindow* w) +{ + m_aptify = w; + QAptActions* apt = QAptActions::self(); + apt->setMainWindow(w); + if(m_aptBackendInitialized) + apt->setBackend(m_backend); + else + connect(this, SIGNAL(aptBackendInitialized(QApt::Backend*)), apt, SLOT(setBackend(QApt::Backend*))); + connect(apt, SIGNAL(sourcesEditorClosed(bool)), SLOT(reload())); +} + +void ApplicationBackend::initBackend() +{ + if (m_aptify) { + m_aptify->setCanExit(false); + QAptActions::self()->setReloadWhenEditorFinished(true); + } + + if (!m_backend->init()) + QAptActions::self()->initError(); + if (m_backend->xapianIndexNeedsUpdate()) { + // FIXME: transaction + m_backend->updateXapianIndex(); + } + m_aptBackendInitialized = true; + emit aptBackendInitialized(m_backend); + + m_backend->setUndoRedoCacheSize(1); + m_reviewsBackend->setAptBackend(m_backend); + m_backendUpdater->setBackend(m_backend); + + QFuture > future = QtConcurrent::run(init, m_backend, QThread::currentThread()); + m_watcher->setFuture(future); + connect(m_backend, SIGNAL(transactionQueueChanged(QString,QStringList)), + this, SLOT(aptTransactionsChanged(QString))); + connect(m_backend, SIGNAL(xapianUpdateFinished()), + this, SIGNAL(searchInvalidated())); +} + +void ApplicationBackend::setupTransaction(QApt::Transaction *trans) +{ + // Provide proxy/locale to the transaction + if (KProtocolManager::proxyType() == KProtocolManager::ManualProxy) { + trans->setProxy(KProtocolManager::proxyFor("http")); + } + + trans->setLocale(QLatin1String(setlocale(LC_MESSAGES, 0))); + + // Debconf + QString uuid = QUuid::createUuid().toString(); + uuid.remove('{').remove('}').remove('-'); + QFile pipe(QDir::tempPath() % QLatin1String("/qapt-sock-") % uuid); + pipe.open(QFile::ReadWrite); + pipe.close(); + trans->setDebconfPipe(pipe.fileName()); +} + +void ApplicationBackend::sourcesEditorClosed() +{ + reload(); + emit sourcesEditorFinished(); +} + +void ApplicationBackend::initAvailablePackages(KJob* j) +{ + KIO::StoredTransferJob* job = qobject_cast(j); + Q_ASSERT(job); + + bool ok=false; + QJson::Parser p; + QVariantList data = p.parse(job->data(), &ok).toMap().value("packages").toList(); + if(!ok) + kWarning() << "errors!" << p.errorString(); + else { + Q_ASSERT(!m_appList.isEmpty()); + QSet packages; + foreach(const QVariant& v, data) { + packages += v.toMap().value("name").toString(); + } + Q_ASSERT(packages.count()==data.count()); + for(Application* a : m_appList) { + a->setHasScreenshot(packages.contains(a->packageName())); + } + } +} diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/ApplicationBackend.h muon-2.0.0/libmuon/backends/ApplicationBackend/ApplicationBackend.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/ApplicationBackend.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/ApplicationBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,127 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef APPLICATIONBACKEND_H +#define APPLICATIONBACKEND_H + +#include +#include +#include +#include +#include +#include + +#include +#include + +#include +#include "resources/AbstractResourcesBackend.h" + +namespace QApt { + class Backend; + class Transaction; +} +namespace DebconfKde { + class DebconfGui; +} + +class Application; +class ApplicationUpdates; +class ReviewsBackend; +class Transaction; +class QAptActions; +class KJob; + +class MUONPRIVATE_EXPORT ApplicationBackend : public AbstractResourcesBackend +{ + Q_OBJECT + Q_INTERFACES(AbstractResourcesBackend) + Q_PROPERTY(QObject* backend READ backend) +public: + explicit ApplicationBackend(QObject *parent, const QVariantList& args); + ~ApplicationBackend(); + + bool isValid() const; + AbstractReviewsBackend *reviewsBackend() const; + Q_SCRIPTABLE AbstractResource* resourceByPackageName(const QString& name) const; + QPair currentTransactionState() const; + QList transactions() const; + QApt::Backend* backend() const; + + int updatesCount() const; + + bool confirmRemoval(QApt::StateChanges changes); + Q_SCRIPTABLE bool isReloading() const; + void markTransaction(Transaction *transaction); + void markLangpacks(Transaction *transaction); + void addTransaction(Transaction *transaction); + + QVector< AbstractResource* > allResources() const; + QStringList searchPackageName(const QString& searchText); + + void installApplication(AbstractResource *app, const QHash &addons); + void installApplication(AbstractResource *app); + void removeApplication(AbstractResource *app); + void cancelTransaction(AbstractResource *app); + + AbstractBackendUpdater* backendUpdater() const; + void integrateMainWindow(MuonMainWindow* w); + +private: + QApt::Backend *m_backend; + ReviewsBackend *m_reviewsBackend; + bool m_isReloading; + + QFutureWatcher >* m_watcher; + QVector m_appList; + + // Transactions + QHash m_transQueue; + Transaction *m_currentTransaction; + + DebconfKde::DebconfGui *m_debconfGui; + ApplicationUpdates* m_backendUpdater; + MuonMainWindow *m_aptify; + bool m_aptBackendInitialized; + +public Q_SLOTS: + void reload(); + + //helper functions + void initAvailablePackages(KJob*); + +private Q_SLOTS: + void setApplications(); + void aptTransactionsChanged(QString active); + void transactionEvent(QApt::TransactionStatus status); + void errorOccurred(QApt::ErrorCode error); + void updateProgress(int percentage); + void initBackend(); + void setupTransaction(QApt::Transaction *trans); + void sourcesEditorClosed(); + +Q_SIGNALS: + void startingFirstTransaction(); + void errorSignal(QApt::ErrorCode code, const QString &details); + void sourcesEditorFinished(); + void aptBackendInitialized(QApt::Backend* backend); +}; + +#endif diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/ApplicationUpdates.cpp muon-2.0.0/libmuon/backends/ApplicationBackend/ApplicationUpdates.cpp --- muon-1.9.60/libmuon/backends/ApplicationBackend/ApplicationUpdates.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/ApplicationUpdates.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,145 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ApplicationUpdates.h" + +// Qt includes +#include + +// KDE includes +#include + +// LibQApt includes +#include +#include + +// Own includes +#include "Application.h" +#include "ApplicationBackend.h" +#include "ChangesDialog.h" + +ApplicationUpdates::ApplicationUpdates(ApplicationBackend* parent) + : AbstractBackendUpdater(parent) + , m_aptBackend(nullptr) + , m_appBackend(parent) + , m_lastRealProgress(0) + , m_eta(0) +{ +} + +bool ApplicationUpdates::hasUpdates() const +{ + return m_appBackend->updatesCount()>0; +} + +qreal ApplicationUpdates::progress() const +{ + return m_lastRealProgress; +} + +long unsigned int ApplicationUpdates::remainingTime() const +{ + return m_eta; +} + +void ApplicationUpdates::setBackend(QApt::Backend* backend) +{ + Q_ASSERT(!m_aptBackend || m_aptBackend==backend); + m_aptBackend = backend; +} + +void ApplicationUpdates::start() +{ + m_aptBackend->saveCacheState(); + + // Take the current cache state to compare for changes later + QApt::CacheState cache = m_aptBackend->currentCacheState(); + m_aptBackend->markPackagesForDistUpgrade(); + auto changes = m_aptBackend->stateChanges(cache, QApt::PackageList()); + changes.remove(QApt::Package::ToUpgrade); + + // Confirm additional changes beyond upgrading the files + if(!changes.isEmpty()) { + ChangesDialog d(0, changes); + if(d.exec()==QDialog::Rejected) { + emit updatesFinnished(); + return; + } + } + + // Create and run the transaction + m_trans = m_aptBackend->commitChanges(); + setupTransaction(m_trans); + m_trans->run(); +} + +void ApplicationUpdates::progressChanged(int progress) +{ + if (progress > 100) + return; + + if (progress > m_lastRealProgress) { + m_lastRealProgress = progress; + emit progressChanged((qreal)progress); + } +} + +void ApplicationUpdates::etaChanged(quint64 eta) +{ + m_eta = eta; + emit remainingTimeChanged(); +} + +void ApplicationUpdates::installMessage(const QString& msg) +{ + emit message(QIcon(), msg); +} + +void ApplicationUpdates::transactionStatusChanged(QApt::TransactionStatus status) +{ + if (status == QApt::FinishedStatus) { + emit updatesFinnished(); + m_lastRealProgress = 0; + } +} + +void ApplicationUpdates::errorOccurred(QApt::ErrorCode error) +{ + emit errorSignal(error, m_trans->errorDetails()); +} + +void ApplicationUpdates::setupTransaction(QApt::Transaction *trans) +{ + // Provide proxy/locale to the transaction + if (KProtocolManager::proxyType() == KProtocolManager::ManualProxy) { + trans->setProxy(KProtocolManager::proxyFor("http")); + } + + trans->setLocale(QLatin1String(setlocale(LC_MESSAGES, 0))); + + connect(m_trans, SIGNAL(statusChanged(QApt::TransactionStatus)), + this, SLOT(transactionStatusChanged(QApt::TransactionStatus))); + connect(m_trans, SIGNAL(errorOccurred(QApt::ErrorCode)), + this, SLOT(errorOccurred(QApt::ErrorCode))); + connect(m_trans, SIGNAL(progressChanged(int)), + this, SLOT(progressChanged(int))); + connect(m_trans, SIGNAL(statusDetailsChanged(QString)), + this, SLOT(installMessage(QString))); +} diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/ApplicationUpdates.h muon-2.0.0/libmuon/backends/ApplicationBackend/ApplicationUpdates.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/ApplicationUpdates.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/ApplicationUpdates.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,71 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef APPLICATIONUPDATES_H +#define APPLICATIONUPDATES_H + +// Qt includes +#include + +// LibQApt includes +#include + +// Own includes +#include "resources/AbstractBackendUpdater.h" + +namespace QApt { + class Backend; + class Transaction; +} + +class ApplicationBackend; + +class ApplicationUpdates : public AbstractBackendUpdater +{ + Q_OBJECT +public: + explicit ApplicationUpdates(ApplicationBackend* parent); + + bool hasUpdates() const; + qreal progress() const; + void start(); + void setBackend(QApt::Backend* b); + long unsigned int remainingTime() const; + +private: + QApt::Backend* m_aptBackend; + QApt::Transaction *m_trans; + ApplicationBackend* m_appBackend; + int m_lastRealProgress; + long unsigned int m_eta; + +private slots: + void transactionStatusChanged(QApt::TransactionStatus status); + void errorOccurred(QApt::ErrorCode error); + void progressChanged(int progress); + void etaChanged(quint64 eta); + void installMessage(const QString& message); + void setupTransaction(QApt::Transaction *trans); + +signals: + void errorSignal(QApt::ErrorCode error, QString details); +}; + +#endif // APPLICATIONUPDATES_H diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/CMakeLists.txt muon-2.0.0/libmuon/backends/ApplicationBackend/CMakeLists.txt --- muon-1.9.60/libmuon/backends/ApplicationBackend/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,46 @@ +# make the macro a bit more smart, making it possible to pass arguments to qdbusxml2cpp +MACRO(QT4_ADD_DBUS_INTERFACE _sources _interface _basename) + GET_FILENAME_COMPONENT(_infile ${_interface} ABSOLUTE) + SET(_header ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.h) + SET(_impl ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.cpp) + SET(_moc ${CMAKE_CURRENT_BINARY_DIR}/${_basename}.moc) + + # handling more arguments (as in FindQt4.cmake from KDE4) will come soon, then + # _params will be used for more than just -m + SET(_params -m) + + ADD_CUSTOM_COMMAND(OUTPUT ${_impl} ${_header} + COMMAND ${QT_DBUSXML2CPP_EXECUTABLE} ${_params} -p ${_basename} ${_infile} ${ARGN} + DEPENDS ${_infile}) + + SET_SOURCE_FILES_PROPERTIES(${_impl} PROPERTIES SKIP_AUTOMOC TRUE) + + QT4_GENERATE_MOC(${_header} ${_moc}) + + SET(${_sources} ${${_sources}} ${_impl} ${_header} ${_moc}) + MACRO_ADD_FILE_DEPENDENCIES(${_impl} ${_moc}) + +ENDMACRO(QT4_ADD_DBUS_INTERFACE) + +include_directories(. ${CMAKE_SOURCE_DIR}/libmuonapt) + +add_subdirectory(tests) + +set(appsbackend_SRCS + ApplicationBackend.cpp + Application.cpp + ApplicationUpdates.cpp + ReviewsBackend.cpp #TODO: rename to AptReviewsBackend + UbuntuLoginBackend.cpp +) + +qt4_add_dbus_interface(appsbackend_SRCS ubuntu_sso_dbus_interface.xml ubuntu_sso -i "LoginMetaTypes.h") + +kde4_add_plugin(muon-appsbackend SHARED ${appsbackend_SRCS}) +target_link_libraries(muon-appsbackend ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDBUS_LIBRARY} + ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_KIO_LIBS} ${DEBCONF_KDE_LIB} + ${qjson_LIBRARIES} ${QTOAUTH_LIBRARY} ${QAPT_LIBRARY} muonprivate muonapt +) +install(TARGETS muon-appsbackend DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES muon-applications-backend.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES apps-categories.xml DESTINATION ${DATA_INSTALL_DIR}/libmuon/categories) diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/LoginMetaTypes.h muon-2.0.0/libmuon/backends/ApplicationBackend/LoginMetaTypes.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/LoginMetaTypes.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/LoginMetaTypes.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,30 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef LOGINMETATYPES_H +#define LOGINMETATYPES_H + +#include +#include + +typedef QMap MapString; +Q_DECLARE_METATYPE(MapString) + +#endif diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/ReviewsBackend.cpp muon-2.0.0/libmuon/backends/ApplicationBackend/ReviewsBackend.cpp --- muon-1.9.60/libmuon/backends/ApplicationBackend/ReviewsBackend.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/ReviewsBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,404 @@ +/*************************************************************************** + * Copyright © 2011 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ReviewsBackend.h" + +#include +#include + +#include +#include +#include +#include +#include +#include + +#include + +#include +#include + +#include + +#include +#include +#include +#include +#include "UbuntuLoginBackend.h" +#include + +static QString getCodename(const QString& value) +{ + QString ret; + QFile f("/etc/lsb-release"); + if(f.open(QIODevice::ReadOnly|QIODevice::Text)) { + QRegExp rx(QString("%1=(.+)\n").arg(value)); + while(!f.atEnd()) { + QByteArray line = f.readLine(); + if(rx.exactMatch(line)) { + ret = rx.cap(1); + break; + } + } + } + return ret; +} + +ReviewsBackend::ReviewsBackend(QObject *parent) + : AbstractReviewsBackend(parent) + , m_aptBackend(0) + , m_serverBase(MuonDataSources::rnRSource()) + , m_ratingsFile(0) + , m_reviewsFile(0) +{ + m_loginBackend = new UbuntuLoginBackend(this); + connect(m_loginBackend, SIGNAL(connectionStateChanged()), SIGNAL(loginStateChanged())); + connect(m_loginBackend, SIGNAL(connectionStateChanged()), SLOT(refreshConsumerKeys())); + m_oauthInterface = new QOAuth::Interface(this); + + QMetaObject::invokeMethod(this, "fetchRatings", Qt::QueuedConnection); +} + +ReviewsBackend::~ReviewsBackend() +{ + delete m_ratingsFile; +} + +void ReviewsBackend::refreshConsumerKeys() +{ + if(m_loginBackend->hasCredentials()) { + m_oauthInterface->setConsumerKey(m_loginBackend->consumerKey()); + m_oauthInterface->setConsumerSecret(m_loginBackend->consumerSecret()); + + QList >::const_iterator it, itEnd; + for(it=m_pendingRequests.constBegin(), itEnd=m_pendingRequests.constEnd(); it!=itEnd; ++it) { + postInformation(it->first, it->second); + } + m_pendingRequests.clear(); + } +} + +void ReviewsBackend::setAptBackend(QApt::Backend *aptBackend) +{ + m_aptBackend = aptBackend; +} + +// void ReviewsBackend::clearReviewCache() +// { +// foreach (QList reviewList, m_reviewsCache) { +// qDeleteAll(reviewList); +// } +// +// m_reviewsCache.clear(); +// } + +void ReviewsBackend::fetchRatings() +{ + refreshConsumerKeys(); + // First, load our old ratings cache in case we don't have net connectivity + loadRatingsFromFile(KStandardDirs::locateLocal("data", "libmuon/ratings.txt")); + + + if (m_ratingsFile) { + m_ratingsFile->deleteLater(); + m_ratingsFile = 0; + } + + m_ratingsFile = new KTemporaryFile(); + m_ratingsFile->open(); + + // Try to fetch the latest ratings from the internet + KUrl ratingsUrl(m_serverBase, "review-stats/"); + KIO::FileCopyJob *getJob = KIO::file_copy(ratingsUrl, + m_ratingsFile->fileName(), -1, + KIO::Overwrite | KIO::HideProgressInfo); + connect(getJob, SIGNAL(result(KJob*)), + this, SLOT(ratingsFetched(KJob*))); +} + +void ReviewsBackend::ratingsFetched(KJob *job) +{ + if (job->error()) { + return; + } + + loadRatingsFromFile(m_ratingsFile->fileName()); +} + +void ReviewsBackend::loadRatingsFromFile(const QString &fileName) +{ + QIODevice* dev = KFilterDev::deviceForFile(fileName, "application/x-gzip"); + + QJson::Parser parser; + bool ok = false; + QVariant ratings = parser.parse(dev, &ok); + + if (!ok) { + qDebug() << "error while parsing ratings: " << fileName; + return; + } + + // Replace old ratings cache + QString ratingsCache = KStandardDirs::locateLocal("data", "libmuon/ratings.txt", true); + if (fileName != ratingsCache) { + QFile::remove(ratingsCache); + QFile::copy(fileName, ratingsCache); + } + + qDeleteAll(m_ratings); + m_ratings.clear(); + foreach (const QVariant &data, ratings.toList()) { + Rating *rating = new Rating(data.toMap()); + if (!rating->ratingCount()) { + delete rating; + continue; + } + rating->setParent(this); + m_ratings[rating->packageName()] = rating; + } + emit ratingsReady(); +} + +Rating *ReviewsBackend::ratingForApplication(AbstractResource* app) const +{ + return m_ratings.value(app->packageName()); +} + +void ReviewsBackend::stopPendingJobs() +{ + auto iter = m_jobHash.constBegin(); + while (iter != m_jobHash.constEnd()) { + KJob *getJob = iter.key(); + disconnect(getJob, SIGNAL(result(KJob*)), + this, SLOT(changelogFetched(KJob*))); + iter++; + } + + m_jobHash.clear(); +} + +void ReviewsBackend::fetchReviews(AbstractResource* res, int page) +{ + Application* app = qobject_cast(res); + // Check our cache before fetching from the 'net + QString hashName = app->package()->name() + app->untranslatedName(); + + QList revs = m_reviewsCache.value(hashName); + if (revs.size()>(page*10)) { //there are 10 reviews per page + emit reviewsReady(app, revs.mid(page*10, 10)); + return; + } + + QString lang = getLanguage(); + QString origin = app->package()->origin().toLower(); + + QString version = QLatin1String("any"); + QString packageName = app->package()->name(); + QString appName = app->name(); + // Replace spaces with %2B for the url + appName.replace(' ', QLatin1String("%2B")); + + // Figuring out how this damn Django url was put together took more + // time than figuring out QJson... + // But that could be because the Ubuntu Software Center (which I used to + // figure it out) is written in python, so you have to go hunting to where + // a variable was initially initialized with a primitive to figure out its type. + KUrl reviewsUrl(m_serverBase, QLatin1String("reviews/filter/") % lang % '/' + % origin % '/' % QLatin1String("any") % '/' % version % '/' % packageName + % ';' % appName % '/' % QLatin1String("page") % '/' % QString::number(page)); + + if (m_reviewsFile) { + m_reviewsFile->deleteLater(); + m_reviewsFile = 0; + } + + m_reviewsFile = new KTemporaryFile(); + m_reviewsFile->open(); + + KIO::FileCopyJob *getJob = KIO::file_copy(reviewsUrl, + m_reviewsFile->fileName(), -1, + KIO::Overwrite | KIO::HideProgressInfo); + m_jobHash[getJob] = app; + connect(getJob, SIGNAL(result(KJob*)), + this, SLOT(reviewsFetched(KJob*))); +} + +void ReviewsBackend::reviewsFetched(KJob *job) +{ + if (job->error()) { + m_jobHash.remove(job); + return; + } + + QFile file(m_reviewsFile->fileName()); + file.open(QIODevice::ReadOnly | QIODevice::Text); + + QJson::Parser parser; + QByteArray json = file.readAll(); + + bool ok = false; + QVariant reviews = parser.parse(json, &ok); + + if (!ok) { + m_jobHash.remove(job); + return; + } + + QList reviewsList; + foreach (const QVariant &data, reviews.toList()) { + Review *review = new Review(data.toMap()); + reviewsList << review; + } + + Application *app = m_jobHash.value(job); + m_jobHash.remove(job); + + if (!app) + return; + + m_reviewsCache[app->package()->name() + app->name()].append(reviewsList); + + emit reviewsReady(app, reviewsList); +} + +QString ReviewsBackend::getLanguage() +{ + QStringList fullLangs; + // The reviews API abbreviates all langs past the _ char except these + fullLangs << "pt_BR" << "zh_CN" << "zh_TW"; + + QString language = KGlobal::locale()->language(); + + if (fullLangs.contains(language)) { + return language; + } + + return language.split('_').first(); +} + +void ReviewsBackend::submitUsefulness(Review* r, bool useful) +{ + QVariantMap data; + data["useful"] = useful; + + postInformation(QString("reviews/%1/recommendations/").arg(r->id()), data); +} + +void ReviewsBackend::submitReview(AbstractResource* application, const QString& summary, + const QString& review_text, const QString& rating) +{ + Application* app = qobject_cast(application); + + QVariantMap data; + data["app_name"] = app->name(); + data["package_name"] = app->packageName(); + data["summary"] = summary; + data["version"] = app->package()->version(); + data["review_text"] = review_text; + data["rating"] = rating; + data["language"] = getLanguage(); + data["origin"] = app->package()->origin(); + data["distroseries"] = getCodename("DISTRIB_CODENAME"); + data["arch_tag"] = app->package()->architecture(); + + postInformation("reviews/", data); +} + +void ReviewsBackend::deleteReview(Review* r) +{ + postInformation(QString("reviews/delete/%1/").arg(r->id()), QVariantMap()); +} + +void ReviewsBackend::flagReview(Review* r, const QString& reason, const QString& text) +{ + QVariantMap data; + data["reason"] = reason; + data["text"] = text; + + postInformation(QString("reviews/%1/flags/").arg(r->id()), data); +} + +QByteArray authorization(QOAuth::Interface* oauth, const KUrl& url, AbstractLoginBackend* login) +{ + return oauth->createParametersString(url.url(), QOAuth::POST, login->token(), login->tokenSecret(), + QOAuth::HMAC_SHA1, QOAuth::ParamMap(), QOAuth::ParseForHeaderArguments); +} + +void ReviewsBackend::postInformation(const QString& path, const QVariantMap& data) +{ + if(!hasCredentials()) { + m_pendingRequests += qMakePair(path, data); + login(); + return; + } + + KUrl url(m_serverBase, path); + url.setScheme("https"); + + KIO::StoredTransferJob* job = KIO::storedHttpPost(QJson::Serializer().serialize(data), url, KIO::Overwrite | KIO::HideProgressInfo); + job->addMetaData("content-type", "Content-Type: application/json" ); + job->addMetaData("customHTTPHeader", "Authorization: " + authorization(m_oauthInterface, url, m_loginBackend)); + connect(job, SIGNAL(result(KJob*)), this, SLOT(informationPosted(KJob*))); + job->start(); +} + +void ReviewsBackend::informationPosted(KJob* j) +{ + KIO::StoredTransferJob* job = qobject_cast(j); + if(job->error()==0) { + qDebug() << "success" << job->data(); + } else { + qDebug() << "error..." << job->error() << job->errorString() << job->errorText(); + } +} + +bool ReviewsBackend::isFetching() const +{ + return !m_jobHash.isEmpty(); +} + +bool ReviewsBackend::hasCredentials() const +{ + return m_loginBackend->hasCredentials(); +} + +QString ReviewsBackend::userName() const +{ + Q_ASSERT(m_loginBackend->hasCredentials()); + return m_loginBackend->displayName(); +} + +void ReviewsBackend::login() +{ + Q_ASSERT(!m_loginBackend->hasCredentials()); + m_loginBackend->login(); +} + +void ReviewsBackend::registerAndLogin() +{ + Q_ASSERT(!m_loginBackend->hasCredentials()); + m_loginBackend->registerAndLogin(); +} + +void ReviewsBackend::logout() +{ + Q_ASSERT(m_loginBackend->hasCredentials()); + m_loginBackend->logout(); +} diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/ReviewsBackend.h muon-2.0.0/libmuon/backends/ApplicationBackend/ReviewsBackend.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/ReviewsBackend.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/ReviewsBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,101 @@ +/*************************************************************************** + * Copyright © 2011 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef REVIEWSBACKEND_H +#define REVIEWSBACKEND_H + +#include +#include +#include + +#include "libmuonprivate_export.h" +#include + +namespace QOAuth { + class Interface; +} + +class KJob; +class KTemporaryFile; + +namespace QApt { + class Backend; +} + +class AbstractLoginBackend; +class Application; +class Rating; +class Review; + +class MUONPRIVATE_EXPORT ReviewsBackend : public AbstractReviewsBackend +{ + Q_OBJECT +public: + ReviewsBackend(QObject *parent); + ~ReviewsBackend(); + + Rating *ratingForApplication(AbstractResource *app) const; + + void setAptBackend(QApt::Backend *aptBackend); + void fetchReviews(AbstractResource* app, int page=1); +// void clearReviewCache(); + void stopPendingJobs(); + bool isFetching() const; + + QString userName() const; + bool hasCredentials() const; + +private: + QApt::Backend *m_aptBackend; + + const KUrl m_serverBase; + KTemporaryFile *m_ratingsFile; + KTemporaryFile *m_reviewsFile; + QHash m_ratings; + // cache key is package name + app name, since both by their own may not be unique + QHash > m_reviewsCache; + QHash m_jobHash; + + void loadRatingsFromFile(const QString &fileName); + QString getLanguage(); + AbstractLoginBackend* m_loginBackend; + QOAuth::Interface* m_oauthInterface; + QList > m_pendingRequests; + +private Q_SLOTS: + void ratingsFetched(KJob *job); + void reviewsFetched(KJob *job); + void informationPosted(KJob* job); + void postInformation(const QString& path, const QVariantMap& data); + void fetchRatings(); + +public slots: + void login(); + void registerAndLogin(); + void logout(); + void submitUsefulness(Review* r, bool useful); + void submitReview(AbstractResource* app, const QString& summary, + const QString& review_text, const QString& rating); + void deleteReview(Review* r); + void flagReview(Review* r, const QString& reason, const QString &text); + void refreshConsumerKeys(); +}; + +#endif diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp muon-2.0.0/libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp --- muon-1.9.60/libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,148 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "UbuntuLoginBackend.h" +#include +#include +#include +#include +#include +#include "ubuntu_sso.h" +#include "LoginMetaTypes.h" + +//NOTE: this is needed because the method is called register. see the xml file for more info +struct HackedComUbuntuSsoCredentialsManagementInterface : public ComUbuntuSsoCredentialsManagementInterface +{ + HackedComUbuntuSsoCredentialsManagementInterface(const QString& service, const QString& path, const QDBusConnection& connection, QObject* parent = 0) + : ComUbuntuSsoCredentialsManagementInterface(service, path, connection, parent) + {} + + inline QDBusPendingReply<> register_hack(const QString &app_name, MapString args) + { + QList argumentList; + argumentList << QVariant::fromValue(app_name) << QVariant::fromValue(args); + return asyncCallWithArgumentList(QLatin1String("register"), argumentList); + } +}; + +UbuntuLoginBackend::UbuntuLoginBackend(QObject* parent) + : AbstractLoginBackend(parent) +{ + qDBusRegisterMetaType(); + m_interface = new HackedComUbuntuSsoCredentialsManagementInterface( "com.ubuntu.sso", "/com/ubuntu/sso/credentials", QDBusConnection::sessionBus(), this); + connect(m_interface, SIGNAL(CredentialsError(QString,MapString)), SLOT(credentialsError(QString,MapString))); + connect(m_interface, SIGNAL(AuthorizationDenied(QString)), SLOT(authorizationDenied(QString))); + connect(m_interface, SIGNAL(CredentialsFound(QString,MapString)), this, SLOT(successfulLogin(QString,MapString))); + + m_interface->find_credentials(appname(), MapString()); +} + +void UbuntuLoginBackend::login() +{ + MapString data; + data["help_text"] = i18n("Log in to the Ubuntu SSO service"); + data["window_id"] = winId(); + QDBusPendingReply< void > ret = m_interface->login(appname(), data); +} + +void UbuntuLoginBackend::registerAndLogin() +{ + MapString data; + data["help_text"] = i18n("Log in to the Ubuntu SSO service"); + data["window_id"] = winId(); + m_interface->register_hack(appname(), data); +} + +QString UbuntuLoginBackend::displayName() const +{ + return m_credentials["name"]; +} + +bool UbuntuLoginBackend::hasCredentials() const +{ + return !m_credentials.isEmpty(); +} + +void UbuntuLoginBackend::successfulLogin(const QString& app, const QMap& credentials) +{ +// qDebug() << "logged in" << appname() << app << credentials; + if(app==appname()) { + m_credentials = credentials; + emit connectionStateChanged(); + } +} + +QString UbuntuLoginBackend::appname() const +{ + return QCoreApplication::instance()->applicationName(); +} + +QString UbuntuLoginBackend::winId() const +{ + QString windowId; + QApplication *app = qobject_cast(qApp); + + if (app->activeWindow()) + windowId = QString::number(app->activeWindow()->winId()); + + return windowId; +} + +void UbuntuLoginBackend::authorizationDenied(const QString& app) +{ + qDebug() << "denied" << app; + if(app==appname()) + emit connectionStateChanged(); +} + +void UbuntuLoginBackend::credentialsError(const QString& app, const MapString& a) +{ + //TODO: provide error message? + qDebug() << "error" << app << a; + if(app==appname()) + emit connectionStateChanged(); +} + +void UbuntuLoginBackend::logout() +{ + m_interface->clear_credentials(appname(), MapString()); + m_credentials.clear(); + emit connectionStateChanged(); +} + +QByteArray UbuntuLoginBackend::token() const +{ + return m_credentials["token"].toLatin1(); +} + +QByteArray UbuntuLoginBackend::tokenSecret() const +{ + return m_credentials["token_secret"].toLatin1(); +} + +QByteArray UbuntuLoginBackend::consumerKey() const +{ + return m_credentials["consumer_key"].toLatin1(); +} + +QByteArray UbuntuLoginBackend::consumerSecret() const +{ + return m_credentials["consumer_secret"].toLatin1(); +} diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/UbuntuLoginBackend.h muon-2.0.0/libmuon/backends/ApplicationBackend/UbuntuLoginBackend.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/UbuntuLoginBackend.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/UbuntuLoginBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,58 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef UBUNTULOGINBACKEND_H +#define UBUNTULOGINBACKEND_H + +#include +#include +#include "LoginMetaTypes.h" + +class HackedComUbuntuSsoCredentialsManagementInterface; +class UbuntuLoginBackend : public AbstractLoginBackend +{ + Q_OBJECT + public: + UbuntuLoginBackend(QObject* parent=0); + + void login(); + void registerAndLogin(); + void logout(); + QString displayName() const; + bool hasCredentials() const; + + QByteArray token() const; + QByteArray tokenSecret() const; + QByteArray consumerKey() const; + QByteArray consumerSecret() const; + + private slots: + void credentialsError(const QString& app, const MapString& a); + void authorizationDenied(const QString& app); + void successfulLogin(const QString& app, const MapString& credentials); + + private: + QString appname() const; + QString winId() const; + HackedComUbuntuSsoCredentialsManagementInterface* m_interface; + MapString m_credentials; +}; + +#endif // UBUNTULOGINBACKEND_H diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/apps-categories.xml muon-2.0.0/libmuon/backends/ApplicationBackend/apps-categories.xml --- muon-1.9.60/libmuon/backends/ApplicationBackend/apps-categories.xml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/apps-categories.xml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,553 @@ + + + + + Accessories + applications-utilities + + + Utility + Accessibility + + + + + + Accessibility + preferences-desktop-accessibility + + + Accessibility + Settings + + + + + + Developer Tools + applications-development + + + Development + devel + restricted/devel + universe/devel + multiverse/devel + + emacs.desktop + + + + + Debugging + tools-report-bug + + + Debugger + + + + + + Graphic Interface Design + + + GUIDesigner + + + + + + Haskell + text-x-haskell + + + haskell + restricted/haskell + universe/haskell + multiverse/haskell + + + + + + IDEs + + + IDE + + + + + + Java + application-x-java + + + java + restricted/java + universe/java + multiverse/java + + + + + + Localization + preferences-desktop-locale + + + Translation + + + + + + Perl + + + perl + restricted/perl + universe/perl + multiverse/perl + + + + + + Profiling + + + Profiling + + + + + + Python + text-x-python + + + python + restricted/python + universe/python + multiverse/python + + + + + + Version Control + text-x-patch + + + vcs + restricted/vcs + universe/vcs + multiverse/vcs + RevisionControl + + + + + + Web Development + + + WebDevelopment + + + applications-internet + + + + + + + Education + applications-education + + + Education + + Science + + + + + + + + Science & Engineering + applications-science + + + Science + Engineering + + + + Astronomy + + + Astronomy + + + + + Biology + + + Biology + + + + + Chemistry + applications-science + + + Chemistry + + + + + Computer Science & Robotics + computer + + + ArtificialIntelligence + ComputerScience + Robotics + + + + + Electronics + audio-card + + + Electronics + + + + + Engineering + applications-engineering + + + Engineering + + + + + Geography + + + Geography + + + + + Geology + + + Geology + Geoscience + + + + + Mathematics + applications-education-mathematics + + + DataVisualization + Math + NumericalAnalysis + math + restricted/math + universe/math + multiverse/math + gnu-r + restricted/gnu-r + universe/gnu-r + multiverse/gnu-r + + + + + Physics + step + + + Physics + + + + + + + Fonts + preferences-desktop-font + true + + + ttf-* + otf-* + fonts + restricted/fonts + universe/fonts + multiverse/fonts + + + + + + Games + applications-games + + + Game + + + + + Arcade + applications-games-arcade + + + ArcadeGame + + + + + Board Games + applications-games-board + + + BoardGame + + + + + Card Games + applications-games-card + + + CardGame + + + + + Puzzles + applications-games + + + LogicGame + + + + + Role Playing + applications-games + + + RolePlaying + + + + + Simulation + applications-games-strategy + + + Simulation + + + + + Sports + applications-games + + + SportsGame + + + + + + + + + Graphics + applications-graphics + + + Graphics + + + + 3D + + + 3DGraphics + + + + + Drawing + draw-freehand + + + VectorGraphics + + Viewer + + + + + + Painting & Editing + draw-brush + + + RasterGraphics + + Viewer + Scanning + + + + + + Photography + image-x-generic + + + Photography + + + + + Publishing + document-export + + + Publishing + + + + + Scanning & OCR + scanner + + + Scanning + OCR + + + + + Viewers + graphics-viewer-document + + + Viewer + + + + + + + + Internet + applications-internet + + + Network + + + + Chat + kopete + + + InstantMessaging + IRCClient + + + + + File Sharing + ktorrent + + + FileTransfer + + + + + Mail + internet-mail + + + Email + + + + + Web Browsers + internet-web-browser + + + WebBrowser + + + + + + + + Multimedia + applications-multimedia + + + AudioVideo + + + + + + + Office + applications-office + + + Office + + + + + + System & Settings + preferences-system + + + Settings + System + + + + + + Plasma Desktop Widgets + plasma + + + plasma-widget-* + + + + + diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/muon-applications-backend.desktop muon-2.0.0/libmuon/backends/ApplicationBackend/muon-applications-backend.desktop --- muon-1.9.60/libmuon/backends/ApplicationBackend/muon-applications-backend.desktop 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/muon-applications-backend.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,89 @@ +[Desktop Entry] +Type=Service +ServiceTypes=Muon/Backend +Exec=blubb +Icon=applications-other +Comment=Install and browse applications in APT +Comment[bs]=Instaliraj i pregledaj aplikacije u APT +Comment[ca]=Instal·la i mostra aplicacions en l'APT +Comment[cs]=Instalujte a prohlížejte aplikace v APT +Comment[da]=Installér og gennemse programmer i APT +Comment[de]=Anwendungen in APT Installieren und durchsuchen +Comment[es]=Instalar y explorar aplicaciones en APT +Comment[fi]=Asenna ja selaa APT:n kautta tarjolla olevia sovelluksia +Comment[fr]=Installer et parcourir des applications dans APT +Comment[it]=Installa e sfoglia le applicazioni in APT +Comment[kk]=APT-де бағдарламаларды орнату мен шолу +Comment[nb]=Installer og bla til programmet i APT +Comment[nl]=Installeer en blader door toepassingen in APT +Comment[pt]=Instalar e navegar pelas aplicações no APT +Comment[pt_BR]=Instalar e navegar pelos aplicativos no APT +Comment[ru]=Установка и обзор приложений в APT +Comment[sk]=Inštalácia a prehliadanie aplikácií v APT +Comment[sl]=Namesti in brskaj po programih v APT +Comment[sr]=Инсталирајте и прегледајте програме из АПТ‑а +Comment[sr@ijekavian]=Инсталирајте и прегледајте програме из АПТ‑а +Comment[sr@ijekavianlatin]=Instalirajte i pregledajte programe iz APT‑a +Comment[sr@latin]=Instalirajte i pregledajte programe iz APT‑a +Comment[sv]=Installera och bläddra bland program med APT +Comment[tr]=Uygulamalara APT içerisinde gözat ve yükle +Comment[uk]=Встановіть і перегляньте встановлені програми у APT +Comment[x-test]=xxInstall and browse applications in APTxx +Comment[zh_TW]=在 APT 中安裝並瀏覽應用程式 +Name=Applications Backend +Name[bs]=Pozadina aplikacija +Name[ca]=Dorsal d'aplicacions +Name[cs]=Podpůrná vrstva aplikace +Name[da]=Programmotor +Name[de]=Dienstprogramm für Anwendungen +Name[es]=Motor de aplicaciones +Name[fi]=Sovellukset-taustaosa +Name[fr]=Moteur des applications +Name[it]=Motore applicazioni +Name[kk]=Қолданбалар тетігі +Name[nb]=Program-bakgrunnsmotor +Name[nl]=Backend van toepassingen +Name[pt]=Infra-Estrutura de Aplicações +Name[pt_BR]=Infraestrutura de aplicativos +Name[ru]=Модуль приложений +Name[sk]=Backend aplikácií +Name[sl]=Zaledje programov +Name[sr]=Позадина за програме +Name[sr@ijekavian]=Позадина за програме +Name[sr@ijekavianlatin]=Pozadina za programe +Name[sr@latin]=Pozadina za programe +Name[sv]=Programgränssnitt +Name[tr]=Uygulama Arkauçları +Name[uk]=Модуль програм +Name[x-test]=xxApplications Backendxx +Name[zh_TW]=應用程式後端介面 +GenericName=APT Support +GenericName[bs]=APT podrška +GenericName[ca]=Implementació de l'APT +GenericName[cs]=Podpora APT +GenericName[da]=APT-understøttelse +GenericName[de]=Unterstützung für APT +GenericName[es]=Implementación de APT +GenericName[fi]=APT-tuki +GenericName[fr]=Prise en charge de APT +GenericName[it]=Supporto APT +GenericName[kk]=APT қолдауы +GenericName[nb]=APT-støtte +GenericName[nl]=APT-ondersteuning +GenericName[pt]=Suporte para o APT +GenericName[pt_BR]=Suporte ao APT +GenericName[ru]=Поддержка APT +GenericName[sk]=Podpora APT +GenericName[sl]=Podpora APT +GenericName[sr]=Подршка за АПТ +GenericName[sr@ijekavian]=Подршка за АПТ +GenericName[sr@ijekavianlatin]=Podrška za APT +GenericName[sr@latin]=Podrška za APT +GenericName[sv]=APT-stöd +GenericName[tr]=APT Desteği +GenericName[uk]=Підтримка APT +GenericName[x-test]=xxAPT Supportxx +GenericName[zh_TW]=APT 支援 +X-KDE-Library=muon-appsbackend +X-KDE-PluginInfo-Name=muon-appsbackend +X-KDE-PluginInfo-License=GPL diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/tests/ApplicationBackendTest.cpp muon-2.0.0/libmuon/backends/ApplicationBackend/tests/ApplicationBackendTest.cpp --- muon-1.9.60/libmuon/backends/ApplicationBackend/tests/ApplicationBackendTest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/tests/ApplicationBackendTest.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,87 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ApplicationBackendTest.h" +#include +#include +#include + +#include "modeltest.h" +#include +#include +#include +#include +#include + +QTEST_KDEMAIN_CORE( ApplicationBackendTest ) + +ApplicationBackendTest::ApplicationBackendTest() +{ + ResourcesModel* m = ResourcesModel::global(); + new ModelTest(m,m); + + MuonBackendsFactory f; + m_appBackend = f.backend("muon-appsbackend"); + m->addResourcesBackend(m_appBackend); + QVERIFY(m_appBackend); //TODO: test all backends + QTest::kWaitForSignal(m_appBackend, SIGNAL(backendReady())); +} + +ApplicationBackendTest::~ApplicationBackendTest() +{} + +void ApplicationBackendTest::testReload() +{ + ResourcesModel* model = ResourcesModel::global(); + QVector apps = m_appBackend->allResources(); + QCOMPARE(apps.count(), model->rowCount()); + + QVector appNames(apps.size()); + for(int i=0; irowCount(); ++i) { + AbstractResource* app = apps[i]; + appNames[i]=app->property("packageName"); + } + + bool b = QMetaObject::invokeMethod(m_appBackend, "reload"); + Q_ASSERT(b); + m_appBackend->updatesCount(); + QCOMPARE(apps, m_appBackend->allResources() ); + + QVERIFY(!apps.isEmpty()); + QCOMPARE(apps.count(), model->rowCount()); + + for(int i=0; irowCount(); ++i) { + AbstractResource* app = apps[i]; + QCOMPARE(appNames[i], app->property("packageName")); +// QCOMPARE(m_model->data(m_model->index(i), ResourcesModel::NameRole).toString(), app->name()); + } +} + +void ApplicationBackendTest::testCategories() +{ + ResourcesModel* m = ResourcesModel::global(); + ResourcesProxyModel* proxy = new ResourcesProxyModel(m); + proxy->setSourceModel(m); + QList categories = Category::populateCategories(); + foreach(Category* cat, categories) { + proxy->setFiltersFromCategory(cat); + qDebug() << "fuuuuuu" << proxy->rowCount() << cat->name(); + } +} diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/tests/ApplicationBackendTest.h muon-2.0.0/libmuon/backends/ApplicationBackend/tests/ApplicationBackendTest.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/tests/ApplicationBackendTest.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/tests/ApplicationBackendTest.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,42 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef RESOURCESMODELTEST_H +#define RESOURCESMODELTEST_H + +#include + +class AbstractResourcesBackend; +class ApplicationBackendTest : public QObject +{ + Q_OBJECT + public: + ApplicationBackendTest(); + virtual ~ApplicationBackendTest(); + + private slots: + void testReload(); + void testCategories(); + + private: + AbstractResourcesBackend* m_appBackend; +}; + +#endif diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/tests/CMakeLists.txt muon-2.0.0/libmuon/backends/ApplicationBackend/tests/CMakeLists.txt --- muon-1.9.60/libmuon/backends/ApplicationBackend/tests/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/tests/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,13 @@ +include_directories(..) + +macro(libmuon_add_unit_test name) + kde4_add_unit_test(${name} modeltest.cpp ${ARGN}) + target_link_libraries(${name} + muonprivate + + ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} + ${KDE4_KIO_LIBS} ${QAPT_LIBRARY}) +endmacro(libmuon_add_unit_test) + +libmuon_add_unit_test(applicationbackendtest ApplicationBackendTest.cpp) +libmuon_add_unit_test(reviewstest ReviewsTest.cpp) diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/tests/ReviewsTest.cpp muon-2.0.0/libmuon/backends/ApplicationBackend/tests/ReviewsTest.cpp --- muon-1.9.60/libmuon/backends/ApplicationBackend/tests/ReviewsTest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/tests/ReviewsTest.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,74 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ReviewsTest.h" +#include "modeltest.h" +#include +#include +#include +#include +#include +#include +#include + +QTEST_KDEMAIN_CORE( ReviewsTest ) + +ReviewsTest::ReviewsTest(QObject* parent): QObject(parent) +{ + MuonBackendsFactory f; + m_appBackend = f.backend("muon-appsbackend"); + QTest::kWaitForSignal(m_appBackend, SIGNAL(backendReady())); + m_revBackend = m_appBackend->reviewsBackend(); +} + +void ReviewsTest::testReviewsFetch() +{ + if(m_revBackend->isFetching()) + QTest::kWaitForSignal(m_revBackend, SIGNAL(ratingsReady())); + QVERIFY(!m_revBackend->isFetching()); +} + +void ReviewsTest::testReviewsModel_data() +{ + QTest::addColumn( "application" ); + QTest::newRow( "kate" ) << "kate"; + QTest::newRow( "gedit" ) << "gedit"; +} + +void ReviewsTest::testReviewsModel() +{ + QFETCH(QString, application); + ReviewsModel* model = new ReviewsModel(this); + new ModelTest(model, model); + + AbstractResource* app = m_appBackend->resourceByPackageName(application); + QVERIFY(app); + model->setResource(app); + QTest::kWaitForSignal(model, SIGNAL(rowsInserted(QModelIndex,int,int))); + + QModelIndex root; + while(model->canFetchMore(root)) { + model->fetchMore(root); + bool arrived = QTest::kWaitForSignal(model, SIGNAL(rowsInserted(QModelIndex,int,int)), 2000); + QCOMPARE(arrived, model->canFetchMore(root)); + } + + delete model; +} diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/tests/ReviewsTest.h muon-2.0.0/libmuon/backends/ApplicationBackend/tests/ReviewsTest.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/tests/ReviewsTest.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/tests/ReviewsTest.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,50 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef REVIEWSTEST_H +#define REVIEWSTEST_H + +#include + +class AbstractResourcesBackend; +class AbstractReviewsBackend; +namespace QApt { +class Backend; +} + +class ReviewsTest : public QObject +{ + Q_OBJECT + public: + explicit ReviewsTest(QObject* parent = 0); + + private slots: + void testReviewsFetch(); + + void testReviewsModel_data(); + void testReviewsModel(); + + private: + AbstractReviewsBackend* m_revBackend; + AbstractResourcesBackend* m_appBackend; + +}; + +#endif // REVIEWSTEST_H diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/tests/modeltest.cpp muon-2.0.0/libmuon/backends/ApplicationBackend/tests/modeltest.cpp --- muon-1.9.60/libmuon/backends/ApplicationBackend/tests/modeltest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/tests/modeltest.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,566 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#include + +#include "modeltest.h" + +#include +#undef Q_ASSERT +#define Q_ASSERT QVERIFY + +Q_DECLARE_METATYPE ( QModelIndex ) + +/*! + Connect to all of the models signals. Whenever anything happens recheck everything. +*/ +ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false ) +{ + Q_ASSERT ( model ); + + connect ( model, SIGNAL (columnsAboutToBeInserted(QModelIndex,int,int)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (columnsAboutToBeRemoved(QModelIndex,int,int)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (columnsInserted(QModelIndex,int,int)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (columnsRemoved(QModelIndex,int,int)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (dataChanged(QModelIndex,QModelIndex)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (headerDataChanged(Qt::Orientation,int,int)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (layoutAboutToBeChanged()), this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (layoutChanged()), this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (modelReset()), this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (rowsAboutToBeInserted(QModelIndex,int,int)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (rowsAboutToBeRemoved(QModelIndex,int,int)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (rowsInserted(QModelIndex,int,int)), + this, SLOT (runAllTests()) ); + connect ( model, SIGNAL (rowsRemoved(QModelIndex,int,int)), + this, SLOT (runAllTests()) ); + + // Special checks for inserting/removing + connect ( model, SIGNAL (layoutAboutToBeChanged()), + this, SLOT (layoutAboutToBeChanged()) ); + connect ( model, SIGNAL (layoutChanged()), + this, SLOT (layoutChanged()) ); + + connect ( model, SIGNAL (rowsAboutToBeInserted(QModelIndex,int,int)), + this, SLOT (rowsAboutToBeInserted(QModelIndex,int,int)) ); + connect ( model, SIGNAL (rowsAboutToBeRemoved(QModelIndex,int,int)), + this, SLOT (rowsAboutToBeRemoved(QModelIndex,int,int)) ); + connect ( model, SIGNAL (rowsInserted(QModelIndex,int,int)), + this, SLOT (rowsInserted(QModelIndex,int,int)) ); + connect ( model, SIGNAL (rowsRemoved(QModelIndex,int,int)), + this, SLOT (rowsRemoved(QModelIndex,int,int)) ); + + runAllTests(); +} + +void ModelTest::runAllTests() +{ + if ( fetchingMore ) + return; + nonDestructiveBasicTest(); + rowCount(); + columnCount(); + hasIndex(); + index(); + parent(); + data(); +} + +/*! + nonDestructiveBasicTest tries to call a number of the basic functions (not all) + to make sure the model doesn't outright segfault, testing the functions that makes sense. +*/ +void ModelTest::nonDestructiveBasicTest() +{ + Q_ASSERT ( model->buddy ( QModelIndex() ) == QModelIndex() ); + model->canFetchMore ( QModelIndex() ); + Q_ASSERT ( model->columnCount ( QModelIndex() ) >= 0 ); + Q_ASSERT ( model->data ( QModelIndex() ) == QVariant() ); + fetchingMore = true; + model->fetchMore ( QModelIndex() ); + fetchingMore = false; + Qt::ItemFlags flags = model->flags ( QModelIndex() ); + Q_ASSERT ( flags == Qt::ItemIsDropEnabled || flags == 0 ); + model->hasChildren ( QModelIndex() ); + model->hasIndex ( 0, 0 ); + model->headerData ( 0, Qt::Horizontal ); + model->index ( 0, 0 ); + model->itemData ( QModelIndex() ); + QVariant cache; + model->match ( QModelIndex(), -1, cache ); + model->mimeTypes(); + Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); + Q_ASSERT ( model->rowCount() >= 0 ); + QVariant variant; + model->setData ( QModelIndex(), variant, -1 ); + model->setHeaderData ( -1, Qt::Horizontal, QVariant() ); + model->setHeaderData ( 999999, Qt::Horizontal, QVariant() ); + QMap roles; + model->sibling ( 0, 0, QModelIndex() ); + model->span ( QModelIndex() ); + model->supportedDropActions(); +} + +/*! + Tests model's implementation of QAbstractItemModel::rowCount() and hasChildren() + + Models that are dynamically populated are not as fully tested here. + */ +void ModelTest::rowCount() +{ +// qDebug() << "rc"; + // check top row + QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); + int rows = model->rowCount ( topIndex ); + Q_ASSERT ( rows >= 0 ); + if ( rows > 0 ) + Q_ASSERT ( model->hasChildren ( topIndex ) == true ); + + QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex ); + if ( secondLevelIndex.isValid() ) { // not the top level + // check a row count where parent is valid + rows = model->rowCount ( secondLevelIndex ); + Q_ASSERT ( rows >= 0 ); + if ( rows > 0 ) + Q_ASSERT ( model->hasChildren ( secondLevelIndex ) == true ); + } + + // The models rowCount() is tested more extensively in checkChildren(), + // but this catches the big mistakes +} + +/*! + Tests model's implementation of QAbstractItemModel::columnCount() and hasChildren() + */ +void ModelTest::columnCount() +{ + // check top row + QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); + Q_ASSERT ( model->columnCount ( topIndex ) >= 0 ); + + // check a column count where parent is valid + QModelIndex childIndex = model->index ( 0, 0, topIndex ); + if ( childIndex.isValid() ) + Q_ASSERT ( model->columnCount ( childIndex ) >= 0 ); + + // columnCount() is tested more extensively in checkChildren(), + // but this catches the big mistakes +} + +/*! + Tests model's implementation of QAbstractItemModel::hasIndex() + */ +void ModelTest::hasIndex() +{ +// qDebug() << "hi"; + // Make sure that invalid values returns an invalid index + Q_ASSERT ( model->hasIndex ( -2, -2 ) == false ); + Q_ASSERT ( model->hasIndex ( -2, 0 ) == false ); + Q_ASSERT ( model->hasIndex ( 0, -2 ) == false ); + + int rows = model->rowCount(); + int columns = model->columnCount(); + + // check out of bounds + Q_ASSERT ( model->hasIndex ( rows, columns ) == false ); + Q_ASSERT ( model->hasIndex ( rows + 1, columns + 1 ) == false ); + + if ( rows > 0 ) + Q_ASSERT ( model->hasIndex ( 0, 0 ) == true ); + + // hasIndex() is tested more extensively in checkChildren(), + // but this catches the big mistakes +} + +/*! + Tests model's implementation of QAbstractItemModel::index() + */ +void ModelTest::index() +{ +// qDebug() << "i"; + // Make sure that invalid values returns an invalid index + Q_ASSERT ( model->index ( -2, -2 ) == QModelIndex() ); + Q_ASSERT ( model->index ( -2, 0 ) == QModelIndex() ); + Q_ASSERT ( model->index ( 0, -2 ) == QModelIndex() ); + + int rows = model->rowCount(); + int columns = model->columnCount(); + + if ( rows == 0 ) + return; + + // Catch off by one errors + Q_ASSERT ( model->index ( rows, columns ) == QModelIndex() ); + Q_ASSERT ( model->index ( 0, 0 ).isValid() == true ); + + // Make sure that the same index is *always* returned + QModelIndex a = model->index ( 0, 0 ); + QModelIndex b = model->index ( 0, 0 ); + Q_ASSERT ( a == b ); + + // index() is tested more extensively in checkChildren(), + // but this catches the big mistakes +} + +/*! + Tests model's implementation of QAbstractItemModel::parent() + */ +void ModelTest::parent() +{ +// qDebug() << "p"; + // Make sure the model wont crash and will return an invalid QModelIndex + // when asked for the parent of an invalid index. + Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); + + if ( model->rowCount() == 0 ) + return; + + // Column 0 | Column 1 | + // QModelIndex() | | + // \- topIndex | topIndex1 | + // \- childIndex | childIndex1 | + + // Common error test #1, make sure that a top level index has a parent + // that is a invalid QModelIndex. + QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); + Q_ASSERT ( model->parent ( topIndex ) == QModelIndex() ); + + // Common error test #2, make sure that a second level index has a parent + // that is the first level index. + if ( model->rowCount ( topIndex ) > 0 ) { + QModelIndex childIndex = model->index ( 0, 0, topIndex ); + Q_ASSERT ( model->parent ( childIndex ) == topIndex ); + } + + // Common error test #3, the second column should NOT have the same children + // as the first column in a row. + // Usually the second column shouldn't have children. + QModelIndex topIndex1 = model->index ( 0, 1, QModelIndex() ); + if ( model->rowCount ( topIndex1 ) > 0 ) { + QModelIndex childIndex = model->index ( 0, 0, topIndex ); + QModelIndex childIndex1 = model->index ( 0, 0, topIndex1 ); + Q_ASSERT ( childIndex != childIndex1 ); + } + + // Full test, walk n levels deep through the model making sure that all + // parent's children correctly specify their parent. + checkChildren ( QModelIndex() ); +} + +/*! + Called from the parent() test. + + A model that returns an index of parent X should also return X when asking + for the parent of the index. + + This recursive function does pretty extensive testing on the whole model in an + effort to catch edge cases. + + This function assumes that rowCount(), columnCount() and index() already work. + If they have a bug it will point it out, but the above tests should have already + found the basic bugs because it is easier to figure out the problem in + those tests then this one. + */ +void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) +{ + // First just try walking back up the tree. + QModelIndex p = parent; + while ( p.isValid() ) + p = p.parent(); + + // For models that are dynamically populated + if ( model->canFetchMore ( parent ) ) { + fetchingMore = true; + model->fetchMore ( parent ); + fetchingMore = false; + } + + int rows = model->rowCount ( parent ); + int columns = model->columnCount ( parent ); + + if ( rows > 0 ) + Q_ASSERT ( model->hasChildren ( parent ) ); + + // Some further testing against rows(), columns(), and hasChildren() + Q_ASSERT ( rows >= 0 ); + Q_ASSERT ( columns >= 0 ); + if ( rows > 0 ) + Q_ASSERT ( model->hasChildren ( parent ) == true ); + + //qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows + // << "columns:" << columns << "parent column:" << parent.column(); + + Q_ASSERT ( model->hasIndex ( rows + 1, 0, parent ) == false ); + for ( int r = 0; r < rows; ++r ) { + if ( model->canFetchMore ( parent ) ) { + fetchingMore = true; + model->fetchMore ( parent ); + fetchingMore = false; + } + Q_ASSERT ( model->hasIndex ( r, columns + 1, parent ) == false ); + for ( int c = 0; c < columns; ++c ) { + Q_ASSERT ( model->hasIndex ( r, c, parent ) == true ); + QModelIndex index = model->index ( r, c, parent ); + // rowCount() and columnCount() said that it existed... + Q_ASSERT ( index.isValid() == true ); + + // index() should always return the same index when called twice in a row + QModelIndex modifiedIndex = model->index ( r, c, parent ); + Q_ASSERT ( index == modifiedIndex ); + + // Make sure we get the same index if we request it twice in a row + QModelIndex a = model->index ( r, c, parent ); + QModelIndex b = model->index ( r, c, parent ); + Q_ASSERT ( a == b ); + + // Some basic checking on the index that is returned + Q_ASSERT ( index.model() == model ); + Q_ASSERT ( index.row() == r ); + Q_ASSERT ( index.column() == c ); + // While you can technically return a QVariant usually this is a sign + // of an bug in data() Disable if this really is ok in your model. +// Q_ASSERT ( model->data ( index, Qt::DisplayRole ).isValid() == true ); + + // If the next test fails here is some somewhat useful debug you play with. + + if (model->parent(index) != parent) { + qDebug() << r << c << currentDepth << model->data(index).toString() + << model->data(parent).toString(); + qDebug() << index << parent << model->parent(index); +// And a view that you can even use to show the model. +// QTreeView view; +// view.setModel(model); +// view.show(); + } + + // Check that we can get back our real parent. +// qDebug() << model->parent ( index ) << parent ; + Q_ASSERT ( model->parent ( index ) == parent ); + + // recursively go down the children + if ( model->hasChildren ( index ) && currentDepth < 10 ) { + //qDebug() << r << c << "has children" << model->rowCount(index); + checkChildren ( index, ++currentDepth ); + }/* else { if (currentDepth >= 10) qDebug() << "checked 10 deep"; };*/ + + // make sure that after testing the children that the index doesn't change. + QModelIndex newerIndex = model->index ( r, c, parent ); + Q_ASSERT ( index == newerIndex ); + } + } +} + +/*! + Tests model's implementation of QAbstractItemModel::data() + */ +void ModelTest::data() +{ + // Invalid index should return an invalid qvariant + Q_ASSERT ( !model->data ( QModelIndex() ).isValid() ); + + if ( model->rowCount() == 0 ) + return; + + // A valid index should have a valid QVariant data + Q_ASSERT ( model->index ( 0, 0 ).isValid() ); + + // shouldn't be able to set data on an invalid index + Q_ASSERT ( model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) == false ); + + // General Purpose roles that should return a QString + QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole ); + if ( variant.isValid() ) { + Q_ASSERT ( qVariantCanConvert ( variant ) ); + } + variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole ); + if ( variant.isValid() ) { + Q_ASSERT ( qVariantCanConvert ( variant ) ); + } + variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole ); + if ( variant.isValid() ) { + Q_ASSERT ( qVariantCanConvert ( variant ) ); + } + + // General Purpose roles that should return a QSize + variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole ); + if ( variant.isValid() ) { + Q_ASSERT ( qVariantCanConvert ( variant ) ); + } + + // General Purpose roles that should return a QFont + QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole ); + if ( fontVariant.isValid() ) { + Q_ASSERT ( qVariantCanConvert ( fontVariant ) ); + } + + // Check that the alignment is one we know about + QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); + if ( textAlignmentVariant.isValid() ) { + int alignment = textAlignmentVariant.toInt(); + Q_ASSERT ( alignment == ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); + } + + // General Purpose roles that should return a QColor + QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); + if ( colorVariant.isValid() ) { + Q_ASSERT ( qVariantCanConvert ( colorVariant ) ); + } + + colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); + if ( colorVariant.isValid() ) { + Q_ASSERT ( qVariantCanConvert ( colorVariant ) ); + } + + // Check that the "check state" is one we know about. + QVariant checkStateVariant = model->data ( model->index ( 0, 0 ), Qt::CheckStateRole ); + if ( checkStateVariant.isValid() ) { + int state = checkStateVariant.toInt(); + Q_ASSERT ( state == Qt::Unchecked || + state == Qt::PartiallyChecked || + state == Qt::Checked ); + } +} + +/*! + Store what is about to be inserted to make sure it actually happens + + \sa rowsInserted() + */ +void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int end ) +{ +// Q_UNUSED(end); +// qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString() +// << "current count of parent=" << model->rowCount ( parent ); // << "display of last=" << model->data( model->index(start-1, 0, parent) ); +// qDebug() << model->index(start-1, 0, parent) << model->data( model->index(start-1, 0, parent) ); + Changing c; + c.parent = parent; + c.oldSize = model->rowCount ( parent ); + c.last = model->data ( model->index ( start - 1, 0, parent ) ); + c.next = model->data ( model->index ( start, 0, parent ) ); + insert.push ( c ); +} + +/*! + Confirm that what was said was going to happen actually did + + \sa rowsAboutToBeInserted() + */ +void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) +{ + Changing c = insert.pop(); + Q_ASSERT ( c.parent == parent ); +// qDebug() << "rowsInserted" << "start=" << start << "end=" << end << "oldsize=" << c.oldSize +// << "parent=" << model->data ( parent ).toString() << "current rowcount of parent=" << model->rowCount ( parent ); + +// for (int ii=start; ii <= end; ii++) +// { +// qDebug() << "itemWasInserted:" << ii << model->data ( model->index ( ii, 0, parent )); +// } +// qDebug(); + + Q_ASSERT ( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) ); + Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); + + if (c.next != model->data(model->index(end + 1, 0, c.parent))) { + qDebug() << start << end; + for (int i=0; i < model->rowCount(); ++i) + qDebug() << model->index(i, 0).data().toString(); + qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent)); + } + + Q_ASSERT ( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) ); +} + +void ModelTest::layoutAboutToBeChanged() +{ + for ( int i = 0; i < qBound ( 0, model->rowCount(), 100 ); ++i ) + changing.append ( QPersistentModelIndex ( model->index ( i, 0 ) ) ); +} + +void ModelTest::layoutChanged() +{ + for ( int i = 0; i < changing.count(); ++i ) { + QPersistentModelIndex p = changing[i]; + Q_ASSERT ( p == model->index ( p.row(), p.column(), p.parent() ) ); + } + changing.clear(); +} + +/*! + Store what is about to be inserted to make sure it actually happens + + \sa rowsRemoved() + */ +void ModelTest::rowsAboutToBeRemoved ( const QModelIndex &parent, int start, int end ) +{ +qDebug() << "ratbr" << parent << start << end; + Changing c; + c.parent = parent; + c.oldSize = model->rowCount ( parent ); + c.last = model->data ( model->index ( start - 1, 0, parent ) ); + c.next = model->data ( model->index ( end + 1, 0, parent ) ); + remove.push ( c ); +} + +/*! + Confirm that what was said was going to happen actually did + + \sa rowsAboutToBeRemoved() + */ +void ModelTest::rowsRemoved ( const QModelIndex & parent, int start, int end ) +{ + qDebug() << "rr" << parent << start << end; + Changing c = remove.pop(); + Q_ASSERT ( c.parent == parent ); + Q_ASSERT ( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) ); + Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); + Q_ASSERT ( c.next == model->data ( model->index ( start, 0, c.parent ) ) ); +} + + diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/tests/modeltest.h muon-2.0.0/libmuon/backends/ApplicationBackend/tests/modeltest.h --- muon-1.9.60/libmuon/backends/ApplicationBackend/tests/modeltest.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/tests/modeltest.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,94 @@ +/**************************************************************************** +** +** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). +** All rights reserved. +** Contact: Nokia Corporation (qt-info@nokia.com) +** +** This file is part of the test suite of the Qt Toolkit. +** +** $QT_BEGIN_LICENSE:LGPL$ +** GNU Lesser General Public License Usage +** This file may be used under the terms of the GNU Lesser General Public +** License version 2.1 as published by the Free Software Foundation and +** appearing in the file LICENSE.LGPL included in the packaging of this +** file. Please review the following information to ensure the GNU Lesser +** General Public License version 2.1 requirements will be met: +** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. +** +** In addition, as a special exception, Nokia gives you certain additional +** rights. These rights are described in the Nokia Qt LGPL Exception +** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. +** +** GNU General Public License Usage +** Alternatively, this file may be used under the terms of the GNU General +** Public License version 3.0 as published by the Free Software Foundation +** and appearing in the file LICENSE.GPL included in the packaging of this +** file. Please review the following information to ensure the GNU General +** Public License version 3.0 requirements will be met: +** http://www.gnu.org/copyleft/gpl.html. +** +** Other Usage +** Alternatively, this file may be used in accordance with the terms and +** conditions contained in a signed written agreement between you and Nokia. +** +** +** +** +** +** $QT_END_LICENSE$ +** +****************************************************************************/ + + +#ifndef MODELTEST_H +#define MODELTEST_H + +#include +#include +#include + +class ModelTest : public QObject +{ + Q_OBJECT + +public: + ModelTest( QAbstractItemModel *model, QObject *parent = 0 ); + +private Q_SLOTS: + void nonDestructiveBasicTest(); + void rowCount(); + void columnCount(); + void hasIndex(); + void index(); + void parent(); + void data(); + +protected Q_SLOTS: + void runAllTests(); + void layoutAboutToBeChanged(); + void layoutChanged(); + void rowsAboutToBeInserted( const QModelIndex &parent, int start, int end ); + void rowsInserted( const QModelIndex & parent, int start, int end ); + void rowsAboutToBeRemoved( const QModelIndex &parent, int start, int end ); + void rowsRemoved( const QModelIndex & parent, int start, int end ); + +private: + void checkChildren( const QModelIndex &parent, int currentDepth = 0 ); + + QAbstractItemModel *model; + + struct Changing { + QModelIndex parent; + int oldSize; + QVariant last; + QVariant next; + }; + QStack insert; + QStack remove; + + bool fetchingMore; + + QList changing; +}; + +#endif diff -Nru muon-1.9.60/libmuon/backends/ApplicationBackend/ubuntu_sso_dbus_interface.xml muon-2.0.0/libmuon/backends/ApplicationBackend/ubuntu_sso_dbus_interface.xml --- muon-1.9.60/libmuon/backends/ApplicationBackend/ubuntu_sso_dbus_interface.xml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/ApplicationBackend/ubuntu_sso_dbus_interface.xml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru muon-1.9.60/libmuon/backends/BodegaBackend/BodegaBackend.cpp muon-2.0.0/libmuon/backends/BodegaBackend/BodegaBackend.cpp --- muon-1.9.60/libmuon/backends/BodegaBackend/BodegaBackend.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/BodegaBackend/BodegaBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,244 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "BodegaBackend.h" +#include "BodegaResource.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +K_PLUGIN_FACTORY(MuonBodegaBackendFactory, registerPlugin(); ) +K_EXPORT_PLUGIN(MuonBodegaBackendFactory(KAboutData("muon-bodegabackend","muon-bodegabackend",ki18n("Bodega Backend"),"0.1",ki18n("Install Bodega data in your system"), KAboutData::License_GPL))) + +QMap retrieveCredentials() +{ + QMap ret; + KWallet::Wallet *wallet = KWallet::Wallet::openWallet(KWallet::Wallet::NetworkWallet(), 0, KWallet::Wallet::Synchronous); + if (wallet && wallet->isOpen()) { + bool folderExists = wallet->setFolder("MakePlayLive"); + if (folderExists) { + QMap map; + + if (wallet->readMap("credentials", map) == 0 && map.contains("username") && map.contains("password")) { + ret["username"] = map.value("username"); + ret["password"] = map.value("password"); + } else { + kWarning() << "Unable to read credentials from wallet"; + } + } + + if (ret.isEmpty()) { + QPointer dialog(new KPasswordDialog(0, KPasswordDialog::ShowKeepPassword|KPasswordDialog::ShowUsernameLine)); + dialog->setPrompt(i18n("Enter MakePlayLive credentials")); + dialog->exec(); + ret["username"] = dialog->username(); + ret["password"] = dialog->password(); + if(dialog->keepPassword()) { + folderExists = (folderExists || wallet->createFolder("MakePlayLive")) && + wallet->setFolder("MakePlayLive") && + wallet->writeMap("credentials", ret)==0; + } + delete dialog; + } + } else { + kWarning() << "Unable to open wallet"; + } + + return ret; +} + +BodegaBackend::BodegaBackend(QObject* parent, const QVariantList& args) +// BodegaBackend::BodegaBackend(const QString& channel, const QString& iconName, QObject* parent) + : AbstractResourcesBackend(parent) +{ + const QVariantMap info = args.first().toMap(); + + m_icon = info.value("Icon").toString(); + m_channel = info.value("X-Muon-Arguments").toString(); + + m_session = new Bodega::Session(this); + QMap credentials = retrieveCredentials(); + m_session->setUserName(credentials["username"]); + m_session->setPassword(credentials["password"]); + m_session->setBaseUrl(QUrl("http://addons.makeplaylive.com:3000")); + m_session->setStoreId("VIVALDI-1"); + connect(m_session, SIGNAL(authenticated(bool)), SLOT(resetResources())); + m_session->signOn(); +} + +BodegaBackend::~BodegaBackend() +{} + +void BodegaBackend::resetResources() +{ + if(!m_session->isAuthenticated()) { + qDebug() << "not authenticated!" << m_session->userName(); + return; + } + + Bodega::ChannelsJob* job = m_session->channels(); + connect(job, SIGNAL(jobFinished(Bodega::NetworkJob*)), SLOT(channelsRetrieved(Bodega::NetworkJob*))); +} + +void BodegaBackend::channelsRetrieved(Bodega::NetworkJob* job) +{ + qDebug() << "channels received"; + Bodega::ChannelsJob* ballotsJob = qobject_cast(job); + QList channels = ballotsJob->channels(); + + foreach(const Bodega::ChannelInfo& c, channels) { + if(c.name == m_channel) { + Bodega::ChannelsJob* wallpapersChannel = m_session->channels(c.id); + connect(wallpapersChannel, SIGNAL(jobFinished(Bodega::NetworkJob*)), SLOT(dataReceived(Bodega::NetworkJob*))); + } + } +} + +void BodegaBackend::dataReceived(Bodega::NetworkJob* job) +{ + Bodega::ChannelsJob* cjob = qobject_cast(job); + QList assets = cjob->assets(); + + foreach(const Bodega::AssetInfo& a, assets) { + m_resourcesByName.insert(a.name, new BodegaResource(a, this)); + } + emit backendReady(); +} + +QVector BodegaBackend::allResources() const +{ + return m_resourcesByName.values().toVector(); +} + +QStringList BodegaBackend::searchPackageName(const QString& searchText){ + QStringList ret; + foreach(AbstractResource* r, m_resourcesByName) { + if(r->name().contains(searchText) || r->comment().contains(searchText)) + ret += r->packageName(); + } + return ret; +} + +AbstractResource* BodegaBackend::resourceByPackageName(const QString& name) const +{ + return m_resourcesByName.value(name); +} + +AbstractBackendUpdater* BodegaBackend::backendUpdater() const +{ return 0; } + +void BodegaBackend::installApplication(AbstractResource* app, const QHash< QString, bool >& addons) +{ + Q_ASSERT(m_transactions.count()==0); + Q_ASSERT(addons.isEmpty()); + BodegaResource* res = qobject_cast(app); + Transaction* t = new Transaction(res, InstallApp); + emit transactionAdded(t); + m_transactions.append(t); + emit transactionsEvent(StartedCommitting, t); + + Bodega::InstallJob* job = m_session->install(res->assetOperations()); + t->setProperty("job", qVariantFromValue(job)); + connect(job, SIGNAL(jobFinished(Bodega::NetworkJob*)), SLOT(removeTransaction(Bodega::NetworkJob*))); +} + +void BodegaBackend::removeApplication(AbstractResource* app) +{ + Q_ASSERT(m_transactions.count()==0); + BodegaResource* res = qobject_cast(app); + Transaction* t = new Transaction(res, RemoveApp); + emit transactionAdded(t); + m_transactions.append(t); + emit transactionsEvent(StartedCommitting, t); + + Bodega::UninstallJob* job = m_session->uninstall(res->assetOperations()); + t->setProperty("job", qVariantFromValue(job)); + connect(job, SIGNAL(jobFinished(Bodega::UninstallJob*)), SLOT(removeTransaction(Bodega::UninstallJob*))); +} + +void BodegaBackend::removeTransaction(Bodega::NetworkJob* job) { removeTransactionGeneric(job); } +void BodegaBackend::removeTransaction(Bodega::UninstallJob* job) { removeTransactionGeneric(job); } + +void BodegaBackend::removeTransactionGeneric(QObject* job) +{ + Q_ASSERT(m_transactions.count()==1); + if(job->property("failed").toBool()) { + qDebug() << "job failed" << job->metaObject()->className() << job->property("error").value().title(); + } + + qDebug() << "finished" << job; + foreach(Transaction* t, m_transactions) { + if(t->property("job").value() == job) { + t->setState(DoneState); + emit transactionRemoved(t); + m_transactions.removeAll(t); + emit transactionsEvent(FinishedCommitting, t); + delete t; + break; + } + } +} + +void BodegaBackend::cancelTransaction(AbstractResource* app) +{ + foreach(Transaction* t, m_transactions) { + if(t->resource() == app) { + Bodega::NetworkJob* job = qobject_cast(t->property("job").value()); + job->reply()->abort(); + m_transactions.removeAll(t); + emit transactionCancelled(t); + delete t; + break; + } + } +} + +QPair< TransactionStateTransition, Transaction* > BodegaBackend::currentTransactionState() const { + Transaction* t = 0; + if(!m_transactions.isEmpty()) + t = m_transactions.first(); + return qMakePair(StartedCommitting, t); +} + +QList< Transaction* > BodegaBackend::transactions() const { return m_transactions; } + +AbstractReviewsBackend* BodegaBackend::reviewsBackend() const { return 0; } + +int BodegaBackend::updatesCount() const { return upgradeablePackages().count(); } + +QList BodegaBackend::upgradeablePackages() const +{ + QList ret; + foreach(AbstractResource* res, m_resourcesByName.values()) { + if(res->state()==AbstractResource::Upgradeable) + ret += res; + } + return ret; +} diff -Nru muon-1.9.60/libmuon/backends/BodegaBackend/BodegaBackend.h muon-2.0.0/libmuon/backends/BodegaBackend/BodegaBackend.h --- muon-1.9.60/libmuon/backends/BodegaBackend/BodegaBackend.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/BodegaBackend/BodegaBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,80 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef BODEGABACKEND_H +#define BODEGABACKEND_H + +#include +#include "libmuonprivate_export.h" +#include +#include +#include + +class BodegaResource; +namespace Bodega { + class Session; + class NetworkJob; + class UninstallJob; +} + +class MUONPRIVATE_EXPORT BodegaBackend : public AbstractResourcesBackend +{ +Q_OBJECT +Q_INTERFACES(AbstractResourcesBackend) +public: + explicit BodegaBackend(QObject* parent, const QVariantList& args); + virtual ~BodegaBackend(); + + virtual void cancelTransaction(AbstractResource* app); + virtual void removeApplication(AbstractResource* app); + virtual void installApplication(AbstractResource* app, const QHash< QString, bool >& addons); + virtual void installApplication(AbstractResource* app) { installApplication(app, QHash()); } + virtual AbstractResource* resourceByPackageName(const QString& name) const; + virtual QList< Transaction* > transactions() const; + virtual QPair< TransactionStateTransition, Transaction* > currentTransactionState() const; + virtual int updatesCount() const; + virtual AbstractReviewsBackend* reviewsBackend() const; + virtual QStringList searchPackageName(const QString& searchText); + virtual QVector< AbstractResource* > allResources() const; + virtual AbstractBackendUpdater* backendUpdater() const; + virtual bool isValid() const { return true; } // No external file dependencies that could cause runtime errors + + QList upgradeablePackages() const; + + Bodega::Session* session() const { return m_session; } + QString icon() const { return m_icon; } + +public slots: + void channelsRetrieved(Bodega::NetworkJob*); + void resetResources(); + void dataReceived(Bodega::NetworkJob*); + void removeTransaction(Bodega::NetworkJob* job); + void removeTransaction(Bodega::UninstallJob* job); + void removeTransactionGeneric(QObject* job); + +private: + Bodega::Session* m_session; + QHash m_resourcesByName; + QList m_transactions; + QString m_channel; + QString m_icon; +}; + +#endif // BODEGABACKEND_H diff -Nru muon-1.9.60/libmuon/backends/BodegaBackend/BodegaResource.cpp muon-2.0.0/libmuon/backends/BodegaBackend/BodegaResource.cpp --- muon-1.9.60/libmuon/backends/BodegaBackend/BodegaResource.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/BodegaBackend/BodegaResource.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,76 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "BodegaResource.h" +#include "BodegaBackend.h" +#include +#include +#include + +BodegaResource::BodegaResource(const Bodega::AssetInfo& info, AbstractResourcesBackend* parent) + : AbstractResource(parent) + , m_info(info) + , m_assetOperations(0) +{} + +BodegaBackend* BodegaResource::backend() const +{ + return qobject_cast(parent()); +} + +QUrl BodegaResource::screenshotUrl() +{ + return m_info.images.value(Bodega::ImageLarge, + m_info.images.value(Bodega::ImageHuge, + m_info.images.value(Bodega::ImageMedium))); +} + +QUrl BodegaResource::thumbnailUrl() +{ + return m_info.images.value(Bodega::ImageMedium); +} + +AbstractResource::State BodegaResource::state() +{ + Bodega::AssetOperations* ops = assetOperations(); + if(!ops->isReady()) + return AbstractResource::Broken; + return ops->isInstalled() ? AbstractResource::Installed : AbstractResource::None; +} + +QString BodegaResource::icon() const +{ + return backend()->icon(); +} + +Bodega::AssetOperations* BodegaResource::assetOperations() +{ + if(!m_assetOperations) { + Bodega::Session* session = backend()->session(); + m_assetOperations = session->assetOperations(m_info.id); + connect(m_assetOperations, SIGNAL(installedChanged()), SIGNAL(stateChanged())); + } + return m_assetOperations; +} + +QString BodegaResource::categories() +{ + return assetOperations()->assetTags().value("mimetype"); +} diff -Nru muon-1.9.60/libmuon/backends/BodegaBackend/BodegaResource.h muon-2.0.0/libmuon/backends/BodegaBackend/BodegaResource.h --- muon-1.9.60/libmuon/backends/BodegaBackend/BodegaResource.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/BodegaBackend/BodegaResource.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,67 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef BODEGARESOURCE_H +#define BODEGARESOURCE_H + +#include +#include + +class BodegaBackend; +namespace Bodega { + class AssetInfo; + class AssetOperations; +} + +class BodegaResource : public AbstractResource +{ + Q_OBJECT + public: + explicit BodegaResource(const Bodega::AssetInfo& info, AbstractResourcesBackend* parent); + + virtual QUrl homepage() const { return QUrl(); } + virtual QString section() { return "123"; } + virtual QString installedVersion() const { return "only"; } + virtual QString sizeDescription() { return "33GiB"; } + virtual QString origin() const { return "fuuu"; } + + virtual QString categories(); + virtual QList addonsInformation() { return QList(); } + virtual QString name() { return m_info.name; } + virtual QString availableVersion() const { return m_info.version; } + virtual QString comment() { return m_info.description; } //TODO: figure out difference. add author + virtual QString longDescription() const { return m_info.description; } + virtual QString packageName() const { return m_info.id; } + virtual QString license() { return m_info.license; } + virtual QUrl screenshotUrl(); + virtual QUrl thumbnailUrl(); + virtual State state(); + virtual QString icon() const; + + QString assetId() const { return m_info.id; } + Bodega::AssetOperations* assetOperations(); + + private: + BodegaBackend* backend() const; + Bodega::AssetInfo m_info; + Bodega::AssetOperations* m_assetOperations; +}; + +#endif // BODEGARESOURCE_H diff -Nru muon-1.9.60/libmuon/backends/BodegaBackend/CMakeLists.txt muon-2.0.0/libmuon/backends/BodegaBackend/CMakeLists.txt --- muon-1.9.60/libmuon/backends/BodegaBackend/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/BodegaBackend/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,12 @@ +set(bodegabackend_SRCS + BodegaBackend.cpp + BodegaResource.cpp +) + +kde4_add_plugin(muon-bodegabackend SHARED ${bodegabackend_SRCS}) +target_link_libraries(muon-bodegabackend muonprivate ${QT_QTCORE_LIBRARY} ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${BODEGA_LIBRARIES}) + +install(TARGETS muon-bodegabackend DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES muon-bodegawallpapers-backend.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + +install(FILES bodegawallpapers-categories.xml DESTINATION ${DATA_INSTALL_DIR}/libmuon/categories) \ No newline at end of file diff -Nru muon-1.9.60/libmuon/backends/BodegaBackend/bodegawallpapers-categories.xml muon-2.0.0/libmuon/backends/BodegaBackend/bodegawallpapers-categories.xml --- muon-1.9.60/libmuon/backends/BodegaBackend/bodegawallpapers-categories.xml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/BodegaBackend/bodegawallpapers-categories.xml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,14 @@ + + + + + Wallpapers + plasma + + + application/x-desktop-wallpaper + + + + + \ No newline at end of file diff -Nru muon-1.9.60/libmuon/backends/BodegaBackend/muon-bodegawallpapers-backend.desktop muon-2.0.0/libmuon/backends/BodegaBackend/muon-bodegawallpapers-backend.desktop --- muon-1.9.60/libmuon/backends/BodegaBackend/muon-bodegawallpapers-backend.desktop 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/BodegaBackend/muon-bodegawallpapers-backend.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,92 @@ +[Desktop Entry] +Type=Service +ServiceTypes=Muon/Backend +Exec=blubb +Icon=preferences-desktop-wallpaper +Name=Bodega Wallpapers +Name[bs]=Bodega pozadinske slike +Name[ca]=Fons d'escriptori del Bodega +Name[cs]=Tapety Bodega +Name[da]=Bodega-baggrundsbilleder +Name[de]=Bodega-Hintergrundbilder +Name[es]=Fondos de escritorio de Bodega +Name[fi]=Bodega-taustakuvat +Name[fr]=Papiers peints de Bodega +Name[it]=Sfondi Bodega +Name[kk]=Bodega тұсқағаздары +Name[nb]=Bodega tapeter +Name[nl]=Bodega achtergrondafbeeldingen +Name[pt]=Papéis de Parede do Bodega +Name[pt_BR]=Papéis de parede do Bodega +Name[ru]=Обои Bodega +Name[sk]=Tapety Bodega +Name[sl]=Ozadja Bodega +Name[sr]=Бодегини тапети +Name[sr@ijekavian]=Бодегини тапети +Name[sr@ijekavianlatin]=Bodegini tapeti +Name[sr@latin]=Bodegini tapeti +Name[sv]=Bodega skrivbordsunderlägg +Name[tr]=Bodega Duvar Kağıtları +Name[uk]=Шпалери Bodega +Name[x-test]=xxBodega Wallpapersxx +Name[zh_TW]=Bodega 桌布 +GenericName=Wallpapers +GenericName[bs]=Pozadinske slike +GenericName[ca]=Fons d'escriptori +GenericName[cs]=Tapety +GenericName[da]=Baggrundsbilleder +GenericName[de]=Hintergrundbilder +GenericName[es]=Fondos de escritorio +GenericName[fi]=Taustakuvat +GenericName[fr]=Papiers peints +GenericName[it]=Sfondi +GenericName[kk]=Тұсқағаздар +GenericName[nb]=Tapeter +GenericName[nl]=Achtergrondafbeeldingen +GenericName[pt]=Papéis de Parede +GenericName[pt_BR]=Papéis de parede +GenericName[ru]=Обои +GenericName[sk]=Tapety +GenericName[sl]=Ozadja namizja +GenericName[sr]=Тапети +GenericName[sr@ijekavian]=Тапети +GenericName[sr@ijekavianlatin]=Tapeti +GenericName[sr@latin]=Tapeti +GenericName[sv]=Skrivbordsunderlägg +GenericName[tr]=Duvar Kağıtları +GenericName[uk]=Шпалери +GenericName[x-test]=xxWallpapersxx +GenericName[zh_TW]=桌布 +Comment=Install new, awesome wallpapers for your KDE! +Comment[bs]=Instalirajte nove, lijepe pozadinske slike za vaš KDE +Comment[ca]=Instal·leu fons d'escriptori nous i fantàstics pel vostre KDE! +Comment[cs]=Nainstalovat nové skvělé tapety pro vaše KDE! +Comment[da]=Installér nye lækre baggrundsbilleder til din KDE! +Comment[de]=Installiert neue fantastische Hintergrundbilder für Ihr KDE-System. +Comment[es]=¡Instale nuevos y geniales fondos de escritorio en su KDE! +Comment[fi]=Asenna uusia ja mahtavia taustakuvia KDE:hesi! +Comment[fr]=Installez de nouveaux et magnifiques papiers peints ! +Comment[it]=Installa nuovi, strabilianti sfondi per il tuo KDE! +Comment[kk]=kDE-ге жаңа, ғажайып тұсқағаздарды орнатыңыз! +Comment[nb]=Installer nye, praktfulle tapeter for din KDE! +Comment[nl]=Installeer nieuwe, geweldige achtergrondafbeeldingen voor uw KDE! +Comment[pt]=Instalar papéis de parede novos e espectaculares para o seu KDE! +Comment[pt_BR]=Instalar papéis de parede novos e incríveis para o seu KDE! +Comment[ru]=Новые замечательные обои для KDE! +Comment[sk]=Nainštalujte nové, úžasné tapety pre vaše KDE! +Comment[sl]=Namestite nova, čudovita ozadja namizja za vaš KDE! +Comment[sr]=Инсталирајте нове, фантастичне тапете +Comment[sr@ijekavian]=Инсталирајте нове, фантастичне тапете +Comment[sr@ijekavianlatin]=Instalirajte nove, fantastične tapete +Comment[sr@latin]=Instalirajte nove, fantastične tapete +Comment[sv]=Installera nya fantastiska skrivbordsunderlägg för KDE. +Comment[tr]=KDE'niz için yeni harika duvar kağıtları yükleyin! +Comment[uk]=Встановіть нові чудові шпалери для вашого KDE! +Comment[x-test]=xxInstall new, awesome wallpapers for your KDE!xx +Comment[zh_TW]=為您的 KDE 安裝新的，好看的桌布。 +X-KDE-Library=muon-bodegabackend +X-KDE-PluginInfo-Name=muon-bodegabackend-wallpapers +X-KDE-PluginInfo-License=GPL + +#channel name +X-Muon-Arguments=Wallpapers diff -Nru muon-1.9.60/libmuon/backends/CMakeLists.txt muon-2.0.0/libmuon/backends/CMakeLists.txt --- muon-1.9.60/libmuon/backends/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,16 @@ +if(LIBATTICA_FOUND) + add_subdirectory(KNSBackend) +endif(LIBATTICA_FOUND) + +if(QAPT_FOUND) + add_subdirectory(ApplicationBackend) +endif(QAPT_FOUND) + +if(BODEGA_FOUND) + add_subdirectory(BodegaBackend) +endif(BODEGA_FOUND) + +OPTION(BUILD_DummyBackend "Build the DummyBackend" "OFF") +if(BUILD_DummyBackend) + add_subdirectory(DummyBackend) +endif(BUILD_DummyBackend) diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/CMakeLists.txt muon-2.0.0/libmuon/backends/DummyBackend/CMakeLists.txt --- muon-1.9.60/libmuon/backends/DummyBackend/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,12 @@ +set(dummybackend_SRCS + DummyResource.cpp + DummyBackend.cpp + DummyReviewsBackend.cpp +) + +kde4_add_plugin(muon-dummybackend SHARED ${dummybackend_SRCS}) +target_link_libraries(muon-dummybackend ${QT_QTCORE_LIBRARY} ${KDE4_KDECORE_LIBRARY} muonprivate) + +install(TARGETS muon-dummybackend DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES muon-dummy-backend.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES dummy-categories.xml DESTINATION ${DATA_INSTALL_DIR}/libmuon/categories) diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/DummyBackend.cpp muon-2.0.0/libmuon/backends/DummyBackend/DummyBackend.cpp --- muon-1.9.60/libmuon/backends/DummyBackend/DummyBackend.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/DummyBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,133 @@ +/*************************************************************************** + * Copyright © 2013 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "DummyBackend.h" +#include "DummyResource.h" +#include "DummyReviewsBackend.h" +#include + +#include +#include +#include +#include + +K_PLUGIN_FACTORY(MuonDummyBackendFactory, registerPlugin(); ) +K_EXPORT_PLUGIN(MuonDummyBackendFactory(KAboutData("muon-dummybackend","muon-dummybackend",ki18n("Dummy Backend"),"0.1",ki18n("Dummy backend to test muon frontends"), KAboutData::License_GPL))) + +DummyBackend::DummyBackend(QObject* parent, const QVariantList&) + : AbstractResourcesBackend(parent) + , m_updater(0) +{ + for(int i=0; i<32; i++) { + QString name = "alalala"+QString::number(i); + DummyResource* res = new DummyResource(name, this); + res->setState(AbstractResource::State(1+(i%3))); + m_resources.insert(name, res); + } + + QMetaObject::invokeMethod(this, "backendReady", Qt::QueuedConnection); + m_reviews = new DummyReviewsBackend(this); +} + +QVector DummyBackend::allResources() const +{ + QVector ret; + ret.reserve(m_resources.size()); + foreach(AbstractResource* res, m_resources) { + ret += res; + } + return ret; +} + +int DummyBackend::updatesCount() const +{ + return upgradeablePackages().count(); +} + +QList DummyBackend::upgradeablePackages() const +{ + QList updates; + foreach(AbstractResource* res, m_resources) { + if(res->state()==AbstractResource::Upgradeable) + updates += res; + } + return updates; +} + +AbstractResource* DummyBackend::resourceByPackageName(const QString& name) const +{ + return m_resources.value(name); +} + +QStringList DummyBackend::searchPackageName(const QString& searchText) +{ + QStringList ret; + foreach(AbstractResource* r, m_resources) { + if(r->name().contains(searchText) || r->comment().contains(searchText)) + ret += r->packageName(); + } + return ret; +} + +AbstractBackendUpdater* DummyBackend::backendUpdater() const +{ + return m_updater; +} + +AbstractReviewsBackend* DummyBackend::reviewsBackend() const +{ + return m_reviews; +} + +QPair DummyBackend::currentTransactionState() const +{ + return QPair(FinishedCommitting, 0); +} + +QList DummyBackend::transactions() const +{ + return QList(); +} + +void DummyBackend::installApplication(AbstractResource* app, const QHash< QString, bool >&) +{ + installApplication(app); +} + +void DummyBackend::installApplication(AbstractResource* app) +{ + Transaction* t = new Transaction(app, InstallApp); + emit transactionAdded(t); + qobject_cast(app)->setState(AbstractResource::Installed); + emit transactionRemoved(t); + t->deleteLater(); +} + +void DummyBackend::removeApplication(AbstractResource* app) +{ + Transaction* t = new Transaction(app, RemoveApp); + emit transactionAdded(t); + qobject_cast(app)->setState(AbstractResource::None); + emit transactionRemoved(t); + t->deleteLater(); +} + +void DummyBackend::cancelTransaction(AbstractResource*) +{} diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/DummyBackend.h muon-2.0.0/libmuon/backends/DummyBackend/DummyBackend.h --- muon-1.9.60/libmuon/backends/DummyBackend/DummyBackend.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/DummyBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,57 @@ +/*************************************************************************** + * Copyright © 2013 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef DUMMYBACKEND_H +#define DUMMYBACKEND_H + +#include +#include + +class DummyResource; +class DummyBackend : public AbstractResourcesBackend +{ +Q_OBJECT +Q_INTERFACES(AbstractResourcesBackend) +public: + explicit DummyBackend(QObject* parent, const QVariantList& args); + + virtual QList upgradeablePackages() const; + virtual AbstractResource* resourceByPackageName(const QString& name) const; + virtual QList transactions() const; + virtual QPair< TransactionStateTransition, Transaction* > currentTransactionState() const; + virtual int updatesCount() const; + virtual AbstractBackendUpdater* backendUpdater() const; + virtual AbstractReviewsBackend* reviewsBackend() const; + virtual QStringList searchPackageName(const QString& searchText); + virtual QVector allResources() const; + virtual bool isValid() const { return true; } // No external file dependencies that could cause runtime errors + + virtual void cancelTransaction(AbstractResource* app); + virtual void installApplication(AbstractResource* app); + virtual void installApplication(AbstractResource* app, const QHash< QString, bool >& addons); + virtual void removeApplication(AbstractResource* app); + +private: + QHash m_resources; + AbstractBackendUpdater* m_updater; + AbstractReviewsBackend* m_reviews; +}; + +#endif // DUMMYBACKEND_H diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/DummyResource.cpp muon-2.0.0/libmuon/backends/DummyBackend/DummyResource.cpp --- muon-1.9.60/libmuon/backends/DummyBackend/DummyResource.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/DummyResource.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,123 @@ +/*************************************************************************** + * Copyright © 2013 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "DummyResource.h" + +DummyResource::DummyResource(const QString& name, AbstractResourcesBackend* parent) + : AbstractResource(parent) + , m_name(name) +{ +} + +QList DummyResource::addonsInformation() +{ + return QList(); +} + +QString DummyResource::availableVersion() const +{ + return "3.0"; +} + +QString DummyResource::categories() +{ + return "dummy"; +} + +QString DummyResource::comment() +{ + return "comment "+name()+"..."; +} + +int DummyResource::downloadSize() +{ + return 123; +} + +QUrl DummyResource::homepage() const +{ + return QUrl("http://kde.org"); +} + +QString DummyResource::icon() const +{ + return "kalarm"; +} + +QString DummyResource::installedVersion() const +{ + return "2.3"; +} + +QString DummyResource::license() +{ + return "GPL"; +} + +QString DummyResource::longDescription() const +{ + return "aaaaaaaaaaaaaa aaaaaaaaa aaaaaaaaaa"; +} + +QString DummyResource::name() +{ + return m_name; +} + +QString DummyResource::origin() const +{ + return "dummy"; +} + +QString DummyResource::packageName() const +{ + return m_name; +} + +QUrl DummyResource::screenshotUrl() +{ + return QUrl(); +} + +QUrl DummyResource::thumbnailUrl() +{ + return QUrl(); +} + +QString DummyResource::section() +{ + return QString(); +} + +AbstractResource::State DummyResource::state() +{ + return m_state; +} + +QString DummyResource::sizeDescription() +{ + return QString::number(downloadSize()); +} + +void DummyResource::setState(AbstractResource::State state) +{ + m_state = state; + emit stateChanged(); +} diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/DummyResource.h muon-2.0.0/libmuon/backends/DummyBackend/DummyResource.h --- muon-1.9.60/libmuon/backends/DummyBackend/DummyResource.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/DummyResource.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,58 @@ +/*************************************************************************** + * Copyright © 2013 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef DUMMYRESOURCE_H +#define DUMMYRESOURCE_H + +#include + +class DummyResource : public AbstractResource +{ +Q_OBJECT +public: + explicit DummyResource(const QString& name, AbstractResourcesBackend* parent); + + virtual QList addonsInformation(); + virtual QString section(); + virtual QString origin() const; + virtual QString longDescription() const; + virtual QString availableVersion() const; + virtual QString installedVersion() const; + virtual QString license(); + virtual int downloadSize(); + virtual QUrl screenshotUrl(); + virtual QUrl thumbnailUrl(); + virtual QUrl homepage() const; + virtual QString categories(); + virtual AbstractResource::State state(); + virtual QString icon() const; + virtual QString comment(); + virtual QString name(); + virtual QString packageName() const; + QString sizeDescription(); + virtual bool isTechnical() const { return false; } + void setState(State state); + +public: + QString m_name; + AbstractResource::State m_state; +}; + +#endif // DUMMYRESOURCE_H diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/DummyReviewsBackend.cpp muon-2.0.0/libmuon/backends/DummyBackend/DummyReviewsBackend.cpp --- muon-1.9.60/libmuon/backends/DummyBackend/DummyReviewsBackend.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/DummyReviewsBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,50 @@ +/*************************************************************************** + * Copyright © 2013 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "DummyReviewsBackend.h" +#include "DummyBackend.h" +#include +#include +#include + +DummyReviewsBackend::DummyReviewsBackend(DummyBackend* parent) + : AbstractReviewsBackend(parent) +{ + foreach(AbstractResource* app, parent->allResources()) { + Rating* rating = new Rating(app->packageName(), app->name(), 3, 4, "1,2,3,4,5"); + m_ratings.insert(app, rating); + } + emit ratingsReady(); +} + +void DummyReviewsBackend::fetchReviews(AbstractResource* app, int page) +{ + QList review; + for(int i=0; i<33; i++) { + review += new Review(app->name(), app->packageName(), "en_US", "good morning", "the morning is very good", "dummy", + QDateTime(), true, page+i, i%5, 1, 1, app->packageName()); + } + emit reviewsReady(app, review); +} + +Rating* DummyReviewsBackend::ratingForApplication(AbstractResource* app) const +{ + return m_ratings[app]; +} diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/DummyReviewsBackend.h muon-2.0.0/libmuon/backends/DummyBackend/DummyReviewsBackend.h --- muon-1.9.60/libmuon/backends/DummyBackend/DummyReviewsBackend.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/DummyReviewsBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,52 @@ +/*************************************************************************** + * Copyright © 2013 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef DUMMYREVIEWSBACKEND_H +#define DUMMYREVIEWSBACKEND_H + +#include +#include + +class DummyBackend; +class DummyReviewsBackend : public AbstractReviewsBackend +{ +Q_OBJECT +public: + explicit DummyReviewsBackend(DummyBackend* parent = 0); + + virtual QString userName() const { return "dummy"; } + virtual void login() {} + virtual void logout() {} + virtual void registerAndLogin() {} + + virtual Rating* ratingForApplication(AbstractResource* app) const; + virtual bool hasCredentials() const { return false; } + virtual void deleteReview(Review*) {} + virtual void fetchReviews(AbstractResource* app, int page = 1); + virtual bool isFetching() const { return false; } + virtual void submitReview(AbstractResource*, const QString&, const QString&, const QString&) {} + virtual void flagReview(Review*, const QString&, const QString&) {} + virtual void submitUsefulness(Review*, bool) {} + +private: + QMap m_ratings; +}; + +#endif // DUMMYREVIEWSBACKEND_H diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/dummy-categories.xml muon-2.0.0/libmuon/backends/DummyBackend/dummy-categories.xml --- muon-1.9.60/libmuon/backends/DummyBackend/dummy-categories.xml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/dummy-categories.xml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,6 @@ + + + dummy + kalarm + + \ No newline at end of file diff -Nru muon-1.9.60/libmuon/backends/DummyBackend/muon-dummy-backend.desktop muon-2.0.0/libmuon/backends/DummyBackend/muon-dummy-backend.desktop --- muon-1.9.60/libmuon/backends/DummyBackend/muon-dummy-backend.desktop 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/DummyBackend/muon-dummy-backend.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,88 @@ +[Desktop Entry] +Type=Service +ServiceTypes=Muon/Backend +Exec=blubb +Icon=kalarm +Name=Dummy +Name[bs]=Bezvezna +Name[ca]=Prova +Name[cs]=Falešný +Name[da]=Attrap +Name[de]=Dummy +Name[es]=Simulado +Name[fi]=Tyhjä +Name[fr]=Factice +Name[hu]=Névtelen +Name[it]=Fittizio +Name[kk]=Қалып +Name[nl]=Dummy +Name[pt]=Testes +Name[pt_BR]=Teste +Name[ru]=Тестовый модуль +Name[sk]=Prázdne +Name[sl]=Poskusno +Name[sr]=Лажна +Name[sr@ijekavian]=Лажна +Name[sr@ijekavianlatin]=Lažna +Name[sr@latin]=Lažna +Name[sv]=Test +Name[tr]=Dummy +Name[uk]=Тест +Name[x-test]=xxDummyxx +Name[zh_TW]=Dummy +GenericName=Dummy +GenericName[bs]=Bezvezna +GenericName[ca]=Prova +GenericName[cs]=Falešný +GenericName[da]=Attrap +GenericName[de]=Dummy +GenericName[es]=Simulado +GenericName[fi]=Tyhjä +GenericName[fr]=Factice +GenericName[hu]=Névtelen +GenericName[it]=Fittizio +GenericName[kk]=Қалып +GenericName[nl]=Dummy +GenericName[pt]=Testes +GenericName[pt_BR]=Teste +GenericName[ru]=Тестовый модуль +GenericName[sk]=Prázdne +GenericName[sl]=Poskusno +GenericName[sr]=Лажна +GenericName[sr@ijekavian]=Лажна +GenericName[sr@ijekavianlatin]=Lažna +GenericName[sr@latin]=Lažna +GenericName[sv]=Test +GenericName[tr]=Dummy +GenericName[uk]=Тест +GenericName[x-test]=xxDummyxx +GenericName[zh_TW]=Dummy +Comment=It's some dummy backend for testing purposes +Comment[bs]=Bezvezna pozadina za potrebe testiranja +Comment[ca]=Són alguns dorsals falsos amb la finalitat de fer proves +Comment[cs]=Falešná podpůrná vrstva pro testovací účely +Comment[da]=Det er en attrap-backend til testformål +Comment[de]=Ein Dummy-Backend zu Testzwecken +Comment[es]=Se trata de un motor simulado pensado para hacer pruebas +Comment[fi]=Joku tyhjä taustaosa testaustarkoituksiin +Comment[fr]=Il s'agit d'un tableau de bord factice à des fins de tests +Comment[it]=È un motore fittizio creato a scopo di prova +Comment[kk]=Сынаққа арналған қалып тетігі +Comment[nl]=Het is een soort dummybackend voor testdoeleinden +Comment[pt]=É uma infra-estrutura de exemplo para testes +Comment[pt_BR]=Exemplo de infraestrutura para testes +Comment[ru]=Тестовый модуль +Comment[sk]=Je to nejaký prázdny backend na testovacie účely +Comment[sl]=To je poskusno zaledje za namene preizkušanja +Comment[sr]=Лажна позадина за потребе испробавања +Comment[sr@ijekavian]=Лажна позадина за потребе испробавања +Comment[sr@ijekavianlatin]=Lažna pozadina za potrebe isprobavanja +Comment[sr@latin]=Lažna pozadina za potrebe isprobavanja +Comment[sv]=Ett bakgrundsprogram för KDE:s partitionshanterare i testsyfte +Comment[tr]=Test amaçları için bazı sahte arkauçları +Comment[uk]=Тестовий модуль +Comment[x-test]=xxIt's some dummy backend for testing purposesxx +Comment[zh_TW]=測試用的 dummy 後端介面 +X-KDE-Library=muon-dummybackend +X-KDE-PluginInfo-Name=muon-dummybackend +X-KDE-PluginInfo-License=GPL diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/CMakeLists.txt muon-2.0.0/libmuon/backends/KNSBackend/CMakeLists.txt --- muon-1.9.60/libmuon/backends/KNSBackend/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,19 @@ +add_subdirectory(tests) + +set(knsbackend_SRCS + KNSBackend.cpp + KNSResource.cpp + KNSReviews.cpp + KNSUpdater.cpp +) + +kde4_add_plugin(muon-knsbackend SHARED ${knsbackend_SRCS}) +target_link_libraries(muon-knsbackend muonprivate + ${LIBATTICA_LIBRARIES} ${KDE4_KNEWSTUFF3_LIBS}) + +install(TARGETS muon-knsbackend DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES muon-knscomics-backend.desktop DESTINATION ${SERVICES_INSTALL_DIR}) +install(FILES muon-knsplasmoids-backend.desktop DESTINATION ${SERVICES_INSTALL_DIR}) + +install(FILES knsplasmoids-categories.xml DESTINATION ${DATA_INSTALL_DIR}/libmuon/categories) +install(FILES knscomics-categories.xml DESTINATION ${DATA_INSTALL_DIR}/libmuon/categories) \ No newline at end of file diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/KNSBackend.cpp muon-2.0.0/libmuon/backends/KNSBackend/KNSBackend.cpp --- muon-1.9.60/libmuon/backends/KNSBackend/KNSBackend.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/KNSBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,286 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "KNSBackend.h" +#include "KNSResource.h" +#include "KNSReviews.h" +#include "KNSUpdater.h" +#include + +#include +#include + +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +K_PLUGIN_FACTORY(MuonKNSBackendFactory, registerPlugin(); ) +K_EXPORT_PLUGIN(MuonKNSBackendFactory(KAboutData("muon-knsbackend","muon-knsbackend",ki18n("KNewStuff Backend"),"0.1",ki18n("Install KNewStuff data in your system"), KAboutData::License_GPL))) + +QSharedPointer KNSBackend::m_atticaManager; + +void KNSBackend::initManager(KConfigGroup& group) +{ + if(!m_atticaManager) { + m_atticaManager = QSharedPointer(new Attica::ProviderManager); + QString entry = group.readEntry("ProvidersUrl", QString()); + if(!m_atticaManager->defaultProviderFiles().contains(entry)) + m_atticaManager->addProviderFileToDefaultProviders(entry); + m_atticaManager->loadDefaultProviders(); + } +} + +KNSBackend::KNSBackend(QObject* parent, const QVariantList& args) + : AbstractResourcesBackend(parent) + , m_isValid(true) + , m_page(0) + , m_reviews(new KNSReviews(this)) + , m_fetching(true) + , m_updater(new KNSUpdater(this)) +{ + const QVariantMap info = args.first().toMap(); + + m_iconName = info.value("Icon").toString(); + m_name = KStandardDirs::locate("config", info.value("X-Muon-Arguments").toString()); + Q_ASSERT(!m_name.isEmpty()); + KConfig conf(m_name); + KConfigGroup group; + + if (conf.hasGroup("KNewStuff3")) + group = conf.group("KNewStuff3"); + + if (!group.isValid()) { + m_isValid = false; + kWarning() << "Config group not found! Check your KNS3 installation."; + return; + } + + QStringList cats = group.readEntry("Categories", QStringList()); + initManager(group); + connect(m_atticaManager.data(), SIGNAL(defaultProvidersLoaded()), SLOT(startFetchingCategories())); + + foreach(const QString& c, cats) { + m_categories.insert(c, Attica::Category()); + } + + m_manager = new KNS3::DownloadManager(m_name, this); + connect(m_manager, SIGNAL(searchResult(KNS3::Entry::List)), SLOT(receivedEntries(KNS3::Entry::List))); + connect(m_manager, SIGNAL(entryStatusChanged(KNS3::Entry)), SLOT(statusChanged(KNS3::Entry))); + + startFetchingCategories(); +} + +KNSBackend::~KNSBackend() +{ +} + +bool KNSBackend::isValid() const +{ + return m_isValid; +} + +void KNSBackend::startFetchingCategories() +{ + if (m_atticaManager->providers().isEmpty()) + return; + + m_provider = m_atticaManager->providers().first(); + + Attica::ListJob* job = m_provider.requestCategories(); + connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(categoriesLoaded(Attica::BaseJob*))); + job->start(); +} + +void KNSBackend::categoriesLoaded(Attica::BaseJob* job) +{ + if(job->metadata().error() != Attica::Metadata::NoError) { + kDebug() << "Network error"; + return; + } + Attica::ListJob* j = static_cast*>(job); + Attica::Category::List categoryList = j->itemList(); + + foreach(const Attica::Category& category, categoryList) { + if (m_categories.contains(category.name())) { + kDebug() << "Adding category: " << category.name(); + m_categories[category.name()] = category; + } + } + + Attica::ListJob* jj = + m_provider.searchContents(m_categories.values(), QString(), Attica::Provider::Alphabetical, m_page, 100); + connect(jj, SIGNAL(finished(Attica::BaseJob*)), SLOT(receivedContents(Attica::BaseJob*))); + jj->start(); +} + +void KNSBackend::receivedContents(Attica::BaseJob* job) +{ + if(job->metadata().error() != Attica::Metadata::NoError) { + kDebug() << "Network error"; + return; + } + Attica::ListJob* listJob = static_cast*>(job); + Attica::Content::List contents = listJob->itemList(); + + if(contents.isEmpty()) { + m_fetching = false; + m_page = 0; + m_manager->search(); + return; + } + QString filename = QFileInfo(m_name).fileName(); + foreach(const Attica::Content& c, contents) { + m_resourcesByName.insert(c.id(), new KNSResource(c, filename, m_iconName, this)); + } + m_page++; + Attica::ListJob* jj = + m_provider.searchContents(m_categories.values(), QString(), Attica::Provider::Alphabetical, m_page, 100); + connect(jj, SIGNAL(finished(Attica::BaseJob*)), SLOT(receivedContents(Attica::BaseJob*))); + jj->start(); +} + +void KNSBackend::receivedEntries(const KNS3::Entry::List& entries) +{ + if(entries.isEmpty()) { + emit backendReady(); + return; + } + + foreach(const KNS3::Entry& entry, entries) { + KNSResource* r = qobject_cast(m_resourcesByName.value(entry.id())); + r->setEntry(entry); + } + ++m_page; + m_manager->search(m_page); +} + +void KNSBackend::statusChanged(const KNS3::Entry& entry) +{ + KNSResource* r = qobject_cast(m_resourcesByName.value(entry.id())); + if(r) + r->setEntry(entry); + else + kWarning() << "unknown entry changed" << entry.id() << entry.name(); +} + +void KNSBackend::cancelTransaction(AbstractResource* app) +{ + Q_UNUSED(app) + + qWarning("KNS transaction cancelling unsupported"); +} + +void KNSBackend::removeApplication(AbstractResource* app) +{ + Transaction* t = new Transaction(app, RemoveApp); + emit transactionAdded(t); + KNSResource* r = qobject_cast(app); + Q_ASSERT(r->entry()); + m_manager->uninstallEntry(*r->entry()); + emit transactionRemoved(t); +} + +void KNSBackend::installApplication(AbstractResource* app) +{ + Transaction* t = new Transaction(app, InstallApp); + emit transactionAdded(t); + KNSResource* r = qobject_cast(app); + Q_ASSERT(r->entry()); + m_manager->installEntry(*r->entry()); + emit transactionRemoved(t); +} + +void KNSBackend::installApplication(AbstractResource* app, const QHash< QString, bool >&) +{ + installApplication(app); +} + +AbstractResource* KNSBackend::resourceByPackageName(const QString& name) const +{ + return m_resourcesByName[name]; +} + +QList KNSBackend::transactions() const +{ + return QList(); +} + +QPair KNSBackend::currentTransactionState() const +{ + return QPair(FinishedCommitting, 0); +} + +int KNSBackend::updatesCount() const +{ + int ret = 0; + foreach(AbstractResource* r, m_resourcesByName) { + if(r->state()==AbstractResource::Upgradeable) + ++ret; + } + return ret; +} + +QList KNSBackend::upgradeablePackages() +{ + QList ret; + foreach(AbstractResource* r, m_resourcesByName) { + if(r->state()==AbstractResource::Upgradeable) + ret+=r; + } + return ret; +} + +AbstractReviewsBackend* KNSBackend::reviewsBackend() const +{ + return m_reviews; +} + +QStringList KNSBackend::searchPackageName(const QString& searchText) +{ + QStringList ret; + foreach(AbstractResource* r, m_resourcesByName) { + if(r->name().contains(searchText) || r->comment().contains(searchText)) + ret += r->packageName(); + } + return ret; +} + +QVector< AbstractResource* > KNSBackend::allResources() const +{ + return m_resourcesByName.values().toVector(); +} + +bool KNSBackend::isFetching() const +{ + return m_fetching; +} + +AbstractBackendUpdater* KNSBackend::backendUpdater() const +{ + return m_updater; +} diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/KNSBackend.h muon-2.0.0/libmuon/backends/KNSBackend/KNSBackend.h --- muon-1.9.60/libmuon/backends/KNSBackend/KNSBackend.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/KNSBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,90 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef KNSBACKEND_H +#define KNSBACKEND_H + +#include +#include +#include +#include + +#include "libmuonprivate_export.h" + +class KConfigGroup; +class KNSUpdater; +class KNSReviews; +namespace KNS3 { class DownloadManager; } +namespace Attica { + class ProviderManager; + class BaseJob; +} + +class MUONPRIVATE_EXPORT KNSBackend : public AbstractResourcesBackend +{ +Q_OBJECT +Q_INTERFACES(AbstractResourcesBackend) +public: + explicit KNSBackend(QObject* parent, const QVariantList& args); + virtual ~KNSBackend(); + + virtual void cancelTransaction(AbstractResource* app); + virtual void removeApplication(AbstractResource* app); + virtual void installApplication(AbstractResource* app); + virtual void installApplication(AbstractResource* app, const QHash< QString, bool >& addons); + virtual AbstractResource* resourceByPackageName(const QString& name) const; + virtual QList< Transaction* > transactions() const; + virtual QPair< TransactionStateTransition, Transaction* > currentTransactionState() const; + virtual int updatesCount() const; + virtual AbstractReviewsBackend* reviewsBackend() const; + virtual QStringList searchPackageName(const QString& searchText); + virtual QVector< AbstractResource* > allResources() const; + virtual AbstractBackendUpdater* backendUpdater() const; + + bool isValid() const; + bool isFetching() const; + Attica::Provider* provider() { return &m_provider; } + QList upgradeablePackages(); + +public slots: + void receivedEntries(const KNS3::Entry::List& entry); + void startFetchingCategories(); + void categoriesLoaded(Attica::BaseJob*); + void receivedContents(Attica::BaseJob*); + void statusChanged(const KNS3::Entry& entry); + +private: + static void initManager(KConfigGroup& group); + static QSharedPointer m_atticaManager; + + bool m_isValid; + KNS3::DownloadManager* m_manager; + QHash m_resourcesByName; + int m_page; + KNSReviews* m_reviews; + Attica::Provider m_provider; + QMap m_categories; + QString m_name; + bool m_fetching; + QString m_iconName; + KNSUpdater* m_updater; +}; + +#endif // KNSBACKEND_H diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/KNSResource.cpp muon-2.0.0/libmuon/backends/KNSBackend/KNSResource.cpp --- muon-1.9.60/libmuon/backends/KNSBackend/KNSResource.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/KNSResource.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,174 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "KNSResource.h" +#include "KNSBackend.h" +#include +#include +#include + +KNSResource::KNSResource(const Attica::Content& c, const QString& category, const QString& icon, KNSBackend* parent) + : AbstractResource(parent) + , m_status(KNS3::Entry::Downloadable) + , m_content(c) + , m_category(category) + , m_icon(icon) + , m_entry(0) +{} + +KNSResource::~KNSResource() +{ + delete m_entry; +} + +AbstractResource::State KNSResource::state() +{ + switch(m_status) { + case KNS3::Entry::Invalid: + return Broken; + case KNS3::Entry::Downloadable: + return None; + case KNS3::Entry::Installed: + return Installed; + case KNS3::Entry::Updateable: + return Upgradeable; + case KNS3::Entry::Deleted: + case KNS3::Entry::Installing: + case KNS3::Entry::Updating: + return None; + } + return None; +} + +void KNSResource::setStatus(KNS3::Entry::Status status) +{ + if(status!=m_status) { + m_status = status; + emit stateChanged(); + } +} + +QString KNSResource::icon() const +{ + return m_icon; +} + +QString KNSResource::comment() +{ + return m_content.summary(); +} + +QString KNSResource::name() +{ + return m_content.name(); +} + +QString KNSResource::packageName() const +{ + return m_content.id(); +} + +QString KNSResource::categories() +{ + return m_category; +} + +QUrl KNSResource::homepage() const +{ + return m_content.detailpage(); +} + +QUrl KNSResource::thumbnailUrl() +{ + return m_content.smallPreviewPicture(); +} + +QUrl KNSResource::screenshotUrl() +{ + return m_content.previewPicture(); +} + +Attica::Content& KNSResource::content() +{ + return m_content; +} + +QString KNSResource::longDescription() const +{ + QString ret = m_content.description(); + ret = ret.replace('\r', QString()); + return ret; +} + +void KNSResource::setEntry(const KNS3::Entry& entry) +{ + setStatus(entry.status()); + delete m_entry; + m_entry = new KNS3::Entry(entry); +} + +KNS3::Entry* KNSResource::entry() const +{ + return m_entry; +} + +QString KNSResource::license() +{ + return m_content.licenseName(); +} + +QString KNSResource::sizeDescription() +{ + return KGlobal::locale()->formatByteSize(m_content.downloadUrlDescription(0).size()); +} + +QString KNSResource::installedVersion() const +{ + return m_entry->version(); +} + +QString KNSResource::availableVersion() const +{ + return m_content.version(); +} + +QString KNSResource::origin() const +{ + return m_entry->providerId(); +} + +QString KNSResource::section() +{ + return m_content.downloadUrlDescription(0).category(); +} + +void KNSResource::fetchScreenshots() +{ + QList thumbnails, screenshots; + for(int i=0; i<=3; i++) { + QString number = QString::number(i); + QString last = m_content.previewPicture(number); + if(!last.isEmpty()) { + thumbnails += QUrl(m_content.smallPreviewPicture(number)); + screenshots += QUrl(last); + } + } + emit screenshotsFetched(thumbnails, screenshots); +} diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/KNSResource.h muon-2.0.0/libmuon/backends/KNSBackend/KNSResource.h --- muon-1.9.60/libmuon/backends/KNSBackend/KNSResource.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/KNSResource.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,71 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef KNSRESOURCE_H +#define KNSRESOURCE_H + +#include +#include +#include + +#include "libmuonprivate_export.h" + +class KNSBackend; +class MUONPRIVATE_EXPORT KNSResource : public AbstractResource +{ +Q_OBJECT +public: + explicit KNSResource(const Attica::Content& c, const QString& category, const QString& icon, KNSBackend* parent); + virtual ~KNSResource(); + + void setStatus(KNS3::Entry::Status status); + + virtual AbstractResource::State state(); + virtual QString icon() const; + virtual QString comment(); + virtual QString name(); + virtual QString packageName() const; + virtual QString categories(); + virtual QUrl homepage() const; + virtual QUrl thumbnailUrl(); + virtual QUrl screenshotUrl(); + virtual QString license(); + virtual QString longDescription() const; + virtual QList addonsInformation() { return QList(); } + virtual QString sizeDescription(); + virtual QString availableVersion() const; + virtual QString installedVersion() const; + virtual QString origin() const; + virtual QString section(); + virtual void fetchScreenshots(); + + Attica::Content& content(); + void setEntry(const KNS3::Entry& entry); + KNS3::Entry* entry() const; + +private: + KNS3::Entry::Status m_status; + Attica::Content m_content; + QString m_category; + QString m_icon; + KNS3::Entry* m_entry; +}; + +#endif // KNSRESOURCE_H diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/KNSReviews.cpp muon-2.0.0/libmuon/backends/KNSBackend/KNSReviews.cpp --- muon-1.9.60/libmuon/backends/KNSBackend/KNSReviews.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/KNSReviews.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,144 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "KNSReviews.h" +#include "KNSBackend.h" +#include "KNSResource.h" +#include +#include +#include +#include +#include +#include +#include + +Q_DECLARE_METATYPE(AbstractResource*) + +KNSReviews::KNSReviews(KNSBackend* backend) + : AbstractReviewsBackend(backend) + , m_backend(backend) + , m_fetching(0) +{ + if(!m_backend->isFetching()) + connect(m_backend, SIGNAL(backendReady()), SIGNAL(ratingsReady())); + else + QMetaObject::invokeMethod(this, "ratingsReady", Qt::QueuedConnection); +} + +Rating* KNSReviews::ratingForApplication(AbstractResource* app) const +{ + KNSResource *resource = qobject_cast(m_backend->resourceByPackageName(app->packageName())); + if (!resource) + { + qDebug() << app->packageName() << "<= couldn't find resource"; + return nullptr; + } + + Attica::Content c = resource->content(); + Q_ASSERT(c.rating()<=100); + QVariantMap data; + data["package_name"] = app->packageName(); + data["app_name"] = app->name(); + data["ratings_total"] = c.numberOfComments(); + data["ratings_average"] = c.rating()/20; + data["histogram"] = ""; + return new Rating(data); +} + +void KNSReviews::fetchReviews(AbstractResource* app, int page) +{ + if(!m_backend->provider()->hasCommentService()) { + emit reviewsReady(app, QList()); + return; + } + + Attica::ListJob< Attica::Comment >* job = + m_backend->provider()->requestComments(Attica::Comment::ContentComment, app->packageName(), "0", page, 10); + job->setProperty("app", qVariantFromValue(app)); + connect(job, SIGNAL(finished(Attica::BaseJob*)), SLOT(commentsReceived(Attica::BaseJob*))); + job->start(); +} + +void KNSReviews::commentsReceived(Attica::BaseJob* j) +{ + Attica::ListJob* job = static_cast*>(j); + Attica::Comment::List comments = job->itemList(); + + QList reviews; + AbstractResource* app = job->property("app").value(); + foreach(const Attica::Comment& comment, comments) { + //TODO: language lookup? + Review* r = new Review(app->name(), app->packageName(), "en", comment.subject(), comment.text(), comment.user(), + comment.date(), true, comment.id().toInt(), comment.score()/10, 0, 0, QString() + ); + reviews += r; + } + + emit reviewsReady(app, reviews); +} + +bool KNSReviews::isFetching() const +{ + return m_backend->isFetching(); +} + +void KNSReviews::flagReview(Review* r, const QString& reason, const QString& text) +{ + +} + +void KNSReviews::deleteReview(Review* r) +{ + +} + +void KNSReviews::submitReview(AbstractResource* app, const QString& summary, const QString& review_text, const QString& rating) +{ + +} + +void KNSReviews::submitUsefulness(Review* r, bool useful) +{ + +} + +void KNSReviews::logout() +{ + +} + +void KNSReviews::registerAndLogin() +{ + +} + +void KNSReviews::login() +{ +} + +bool KNSReviews::hasCredentials() const +{ + return m_backend->provider()->hasCredentials(); +} + +QString KNSReviews::userName() const +{ + return "little joe"; +} diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/KNSReviews.h muon-2.0.0/libmuon/backends/KNSBackend/KNSReviews.h --- muon-1.9.60/libmuon/backends/KNSBackend/KNSReviews.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/KNSReviews.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,64 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef KNSREVIEWS_H +#define KNSREVIEWS_H + +#include +#include +#include + +class KNSBackend; +class QUrl; +namespace Attica { +class Provider; +class ProviderManager; +class BaseJob; +} + +class KNSReviews : public AbstractReviewsBackend +{ + Q_OBJECT + public: + explicit KNSReviews(KNSBackend* backend); + + virtual void fetchReviews(AbstractResource* app, int page = 1); + virtual bool isFetching() const; + virtual void flagReview(Review* r, const QString& reason, const QString& text); + virtual void deleteReview(Review* r); + virtual void submitReview(AbstractResource* app, const QString& summary, const QString& review_text, const QString& rating); + virtual void submitUsefulness(Review* r, bool useful); + virtual void logout(); + virtual void registerAndLogin(); + virtual void login(); + virtual Rating* ratingForApplication(AbstractResource* app) const; + virtual bool hasCredentials() const; + virtual QString userName() const; + + public slots: + void commentsReceived(Attica::BaseJob* job); + + private: + KNSBackend* m_backend; + + int m_fetching; +}; + +#endif // KNSREVIEWS_H diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/KNSUpdater.cpp muon-2.0.0/libmuon/backends/KNSBackend/KNSUpdater.cpp --- muon-1.9.60/libmuon/backends/KNSBackend/KNSUpdater.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/KNSUpdater.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,51 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "KNSUpdater.h" +#include "KNSBackend.h" +#include + +KNSUpdater::KNSUpdater(KNSBackend* parent) + : AbstractBackendUpdater(parent) + , m_backend(parent) +{} + +bool KNSUpdater::hasUpdates() const +{ + return m_backend->updatesCount() > 0; +} + +void KNSUpdater::start() +{ + QList< AbstractResource* > resources = m_backend->upgradeablePackages(); + foreach(AbstractResource* res, resources) { + m_backend->installApplication(res); + } + emit updatesFinnished(); +} + +qreal KNSUpdater::progress() const +{ + return hasUpdates() ? 0 : 1; +} + +long unsigned int KNSUpdater::remainingTime() const +{ + return 0; +} diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/KNSUpdater.h muon-2.0.0/libmuon/backends/KNSBackend/KNSUpdater.h --- muon-1.9.60/libmuon/backends/KNSBackend/KNSUpdater.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/KNSUpdater.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,43 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef KNSUPDATER_H +#define KNSUPDATER_H + +#include + +class KNSBackend; + +class KNSUpdater : public AbstractBackendUpdater +{ + Q_OBJECT + public: + explicit KNSUpdater(KNSBackend* parent = 0); + + virtual bool hasUpdates() const; + virtual qreal progress() const; + virtual void start(); + virtual long unsigned int remainingTime() const; + + private: + KNSBackend* m_backend; +}; + +#endif // KNSUPDATER_H + diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/knscomics-categories.xml muon-2.0.0/libmuon/backends/KNSBackend/knscomics-categories.xml --- muon-1.9.60/libmuon/backends/KNSBackend/knscomics-categories.xml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/knscomics-categories.xml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,11 @@ + + + Plasma Desktop Widgets + plasma + + + plasmoids.knsrc + + + + \ No newline at end of file diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/knsplasmoids-categories.xml muon-2.0.0/libmuon/backends/KNSBackend/knsplasmoids-categories.xml --- muon-1.9.60/libmuon/backends/KNSBackend/knsplasmoids-categories.xml 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/knsplasmoids-categories.xml 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,11 @@ + + + Comics + face-smile-big + + + comic.knsrc + + + + \ No newline at end of file diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/muon-knscomics-backend.desktop muon-2.0.0/libmuon/backends/KNSBackend/muon-knscomics-backend.desktop --- muon-1.9.60/libmuon/backends/KNSBackend/muon-knscomics-backend.desktop 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/muon-knscomics-backend.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,89 @@ +[Desktop Entry] +Type=Service +ServiceTypes=Muon/Backend +Exec=blubb +Icon=face-smile-big +Name=Comics +Name[bs]=Strip +Name[ca]=Còmics +Name[cs]=Komiksy +Name[da]=Tegneserier +Name[de]=Comics +Name[es]=Cómics +Name[fi]=Sarjakuvat +Name[fr]=Bandes dessinées +Name[it]=Fumetti +Name[kk]=Комикс +Name[nb]=Tegneserier +Name[nl]=Stripverhalen +Name[pt]=Banda Desenhada +Name[pt_BR]=Tirinhas +Name[ru]=Комиксы +Name[sk]=Komikx +Name[sl]=Stripi +Name[sr]=Стрипови +Name[sr@ijekavian]=Стрипови +Name[sr@ijekavianlatin]=Stripovi +Name[sr@latin]=Stripovi +Name[sv]=Serier +Name[tr]=Çizgi Romanlar +Name[uk]=Комікси +Name[x-test]=xxComicsxx +Name[zh_TW]=漫畫 +GenericName=Comics +GenericName[bs]=Strip +GenericName[ca]=Còmics +GenericName[cs]=Komiksy +GenericName[da]=Tegneserier +GenericName[de]=Comics +GenericName[es]=Cómics +GenericName[fi]=Sarjakuvat +GenericName[fr]=Bandes dessinées +GenericName[it]=Fumetti +GenericName[kk]=Комикс +GenericName[nb]=Tegneserier +GenericName[nl]=Stripverhalen +GenericName[pt]=Banda Desenhada +GenericName[pt_BR]=Tirinhas +GenericName[ru]=Комиксы +GenericName[sk]=Komikx +GenericName[sl]=Stripi +GenericName[sr]=Стрипови +GenericName[sr@ijekavian]=Стрипови +GenericName[sr@ijekavianlatin]=Stripovi +GenericName[sr@latin]=Stripovi +GenericName[sv]=Serier +GenericName[tr]=Çizgi Romanlar +GenericName[uk]=Комікси +GenericName[x-test]=xxComicsxx +GenericName[zh_TW]=漫畫 +Comment=Install comic stripes to be used from the comics plasmoid +Comment[bs]=Intaliranje stripa za plazmoid s strip pričama +Comment[ca]=Instal·la tires còmiques per utilitzar des del plasmoide de còmics +Comment[da]=Installér tegneseriestriber til brug fra tegneserie-plasmoiden +Comment[de]=Installation von Comics, die vom gleichnamigen Plasmoid benutzt werden +Comment[es]=Instalar tiras de cómic para usar en el plasmoide de cómics +Comment[fi]=Asenna sarjakuvaplasmoidin käyttämiä sarjakuvastrippejä +Comment[fr]=Installez des bandes dessinées à utiliser depuis le composant graphique « Bandes dessinées » +Comment[it]=Installa strisce di fumetti da usare col plasmoide dei fumetti +Comment[kk]=Комикс плазмоидтер қолданатын комикстерді орнату +Comment[nb]=Installer tegneserier som skal brukes fra comics-plasmoiden +Comment[nl]=Installeer stripverhalen om te worden gebruikt vanaf de plasmoid voor stripverhalen +Comment[pt]=Instalar as bandas desenhadas a usar no plasmóide de bandas desenhadas +Comment[pt_BR]=Instalar as tirinhas para serem usadas no plasmoide de tirinhas +Comment[ru]=Комиксы, которые будут использованы в виджете «Комиксы» +Comment[sk]=Nainštalujte komiksové pruhy na použitie pre komiksový plazmoid +Comment[sl]=Namestite stripe, ki jih lahko uporabite z vašim plasmoidom za stripe +Comment[sr]=Инсталирајте стрипове за читање кроз плазмоид стрипова +Comment[sr@ijekavian]=Инсталирајте стрипове за читање кроз плазмоид стрипова +Comment[sr@ijekavianlatin]=Instalirajte stripove za čitanje kroz plazmoid stripova +Comment[sr@latin]=Instalirajte stripove za čitanje kroz plazmoid stripova +Comment[sv]=Installera serier att använda med serie-plasmoiden +Comment[tr]=Çizgi Romanları plasmoid'inde kullanılmak üzere çizgi roman şeritleri indirin +Comment[uk]=Встановіть стрічки коміксів, які буде використано у плазмоїді коміксів +Comment[x-test]=xxInstall comic stripes to be used from the comics plasmoidxx +Comment[zh_TW]=安裝讓漫畫元件使用的漫畫 +X-KDE-Library=muon-knsbackend +X-KDE-PluginInfo-Name=muon-knsbackend-comics +X-KDE-PluginInfo-License=GPL +X-Muon-Arguments=comic.knsrc diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop muon-2.0.0/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop --- muon-1.9.60/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/muon-knsplasmoids-backend.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,88 @@ +[Desktop Entry] +Type=Service +ServiceTypes=Muon/Backend +Exec=blubb +Icon=plasma +Name=Plasmoids +Name[bs]=Plazmoidi +Name[ca]=Plasmoides +Name[cs]=Plasmoidy +Name[da]=Plasmoids +Name[de]=Plasmoide +Name[es]=Plasmoides +Name[fi]=Plasmoidit +Name[fr]=Composants graphiques +Name[it]=Plasmoidi +Name[kk]=Плазмоидтер +Name[nb]=Plasmoider +Name[nl]=Plasmoids +Name[pt]=Plasmóides +Name[pt_BR]=Plasmoides +Name[ru]=Виджеты Plasma +Name[sk]=Plazmoidy +Name[sl]=Plasmoidi +Name[sr]=Плазмоиди +Name[sr@ijekavian]=Плазмоиди +Name[sr@ijekavianlatin]=Plazmoidi +Name[sr@latin]=Plazmoidi +Name[sv]=Plasmoider +Name[tr]=Plasmoid'ler +Name[uk]=Плазмоїди +Name[x-test]=xxPlasmoidsxx +Name[zh_TW]=小元件 +GenericName=Plasmoids +GenericName[bs]=Plazmoidi +GenericName[ca]=Plasmoides +GenericName[cs]=Plasmoidy +GenericName[da]=Plasmoids +GenericName[de]=Plasmoide +GenericName[es]=Plasmoides +GenericName[fi]=Plasmoidit +GenericName[fr]=Composants graphiques +GenericName[it]=Plasmoidi +GenericName[kk]=Плазмоидтер +GenericName[nb]=Plasmoider +GenericName[nl]=Plasmoids +GenericName[pt]=Plasmóides +GenericName[pt_BR]=Plasmoides +GenericName[ru]=Виджеты Plasma +GenericName[sk]=Plazmoidy +GenericName[sl]=Plasmoidi +GenericName[sr]=Плазмоиди +GenericName[sr@ijekavian]=Плазмоиди +GenericName[sr@ijekavianlatin]=Plazmoidi +GenericName[sr@latin]=Plazmoidi +GenericName[sv]=Plasmoider +GenericName[tr]=Plasmoid'ler +GenericName[uk]=Плазмоїди +GenericName[x-test]=xxPlasmoidsxx +GenericName[zh_TW]=小元件 +Comment=Install plasmoids and raise the power of your workspace! +Comment[bs]=Instalirajte plazmoide i pojačajte radni prostor! +Comment[ca]=Instal·leu plasmoides i augmenteu la potència de l'espai de treball! +Comment[da]=Installér plasmoids og gør dit skrivebord endnu stærkere! +Comment[es]=¡Instale plasmoides y aumente la potencia de su espacio de trabajo! +Comment[fi]=Asenna plasmoideja ja lisää työtilasi tehoa! +Comment[fr]=Installez des composants graphiques et mettez au premier plan la puissance de votre espace de travail ! +Comment[it]=Installa plasmoidi e aumenta la potenza del tuo spazio di lavoro! +Comment[kk]=Плазмоидтерді орнатып жұмыс орынның қуаттылығын жетілдір! +Comment[nb]=Installer plasmoider og øk kraften i din arbeidsflate! +Comment[nl]=Installeer plasmoids en verhoog de kracht van uw werkruimte! +Comment[pt]=Instalar plasmóides e elevar as potencialidades da sua área de trabalho! +Comment[pt_BR]=Instale plasmoides e aumente o poder do seu espaço de trabalho! +Comment[ru]=Сделайте удобнее рабочий стол с виджетами Plasma! +Comment[sk]=Nainštalujte plazmoidy a zvýšte silu vašej pracovnej plochy! +Comment[sl]=Namestite plasmoide in povečajte moč vašega delovnega prostora! +Comment[sr]=Инсталирајте плазмоиде за обогаћивање радног простора +Comment[sr@ijekavian]=Инсталирајте плазмоиде за обогаћивање радног простора +Comment[sr@ijekavianlatin]=Instalirajte plazmoide za obogaćivanje radnog prostora +Comment[sr@latin]=Instalirajte plazmoide za obogaćivanje radnog prostora +Comment[sv]=Installera Plasmoider och öka arbetsytans möjligheter. +Comment[tr]=Plasmoid'ler yükleyerek çalışma alanınızın gücünü arttırın! +Comment[uk]=Встановіть плазмоїди і зробіть ваш робочий простір потужнішим! +Comment[x-test]=xxInstall plasmoids and raise the power of your workspace!xx +Comment[zh_TW]=安裝小元件，增加您的工作空間的能力！ +X-KDE-Library=muon-knsbackend +X-KDE-PluginInfo-Name=muon-knsbackend-plasmoids +X-KDE-PluginInfo-License=GPL +X-Muon-Arguments=plasmoids.knsrc diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/tests/CMakeLists.txt muon-2.0.0/libmuon/backends/KNSBackend/tests/CMakeLists.txt --- muon-1.9.60/libmuon/backends/KNSBackend/tests/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/tests/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,9 @@ +include_directories(..) + +kde4_add_unit_test(knsbackendtest KNSBackendTest.cpp) +target_link_libraries(knsbackendtest + muonprivate + + ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} + ${KDE4_KNEWSTUFF3_LIBS} ${KDE4_KIO_LIBS} attica +) diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/tests/KNSBackendTest.cpp muon-2.0.0/libmuon/backends/KNSBackend/tests/KNSBackendTest.cpp --- muon-1.9.60/libmuon/backends/KNSBackend/tests/KNSBackendTest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/tests/KNSBackendTest.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,78 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "KNSBackendTest.h" +#include +#include +#include +#include +#include +#include + +#include + +QTEST_KDEMAIN_CORE( KNSBackendTest ) + +KNSBackendTest::KNSBackendTest(QObject* parent) + : QObject(parent) + , m_r(0) +{ + ResourcesModel* model = ResourcesModel::global(); + + MuonBackendsFactory f; + m_backend = f.backend("muon-knsbackend-plasmoids"); + model->addResourcesBackend(m_backend); + QTest::kWaitForSignal(m_backend, SIGNAL(backendReady())); + connect(m_backend->reviewsBackend(), SIGNAL(reviewsReady(AbstractResource*,QList)), + SLOT(reviewsArrived(AbstractResource*,QList))); +} + +void KNSBackendTest::testRetrieval() +{ + ResourcesModel* model = ResourcesModel::global(); + QVector resources = m_backend->allResources(); + QVERIFY(!resources.isEmpty()); + QCOMPARE(resources.count(), model->rowCount()); + + foreach(AbstractResource* res, resources) { + QVERIFY(!res->name().isEmpty()); + QVERIFY(!res->categories().isEmpty()); + } +} + +void KNSBackendTest::testReviews() +{ + QVector resources = m_backend->allResources(); + AbstractReviewsBackend* rev = m_backend->reviewsBackend(); + foreach(AbstractResource* res, resources) { + Rating* r = rev->ratingForApplication(res); + QVERIFY(r); + QCOMPARE(r->packageName(), res->packageName()); + QVERIFY(r->rating()>0 && r->rating()<=10); +// rev->fetchReviews(res); +// QTest::kWaitForSignal(rev, SIGNAL(reviewsReady(AbstractResource*,QList))); + } +} + +void KNSBackendTest::reviewsArrived(AbstractResource* r, const QList< Review* >& revs) +{ + m_r = r; + m_revs = revs; +} diff -Nru muon-1.9.60/libmuon/backends/KNSBackend/tests/KNSBackendTest.h muon-2.0.0/libmuon/backends/KNSBackend/tests/KNSBackendTest.h --- muon-1.9.60/libmuon/backends/KNSBackend/tests/KNSBackendTest.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/backends/KNSBackend/tests/KNSBackendTest.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,49 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef KNSBACKENDTEST_H +#define KNSBACKENDTEST_H + +#include + +class AbstractResourcesBackend; +class AbstractResource; +class Review; + +class KNSBackendTest : public QObject +{ + Q_OBJECT + public: + explicit KNSBackendTest(QObject* parent = 0); + + private slots: + void testRetrieval(); + void testReviews(); + + public slots: + void reviewsArrived(AbstractResource *r, const QList& revs); + + private: + AbstractResourcesBackend* m_backend; + AbstractResource* m_r; + QList m_revs; +}; + +#endif // KNSBACKENDTEST_H diff -Nru muon-1.9.60/libmuon/categories.xml muon-2.0.0/libmuon/categories.xml --- muon-1.9.60/libmuon/categories.xml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/categories.xml 1970-01-01 00:00:00.000000000 +0000 @@ -1,573 +0,0 @@ - - - - - Accessories - applications-utilities - - - Utility - Accessibility - - - - - - Accessibility - preferences-desktop-accessibilitys - - - Accessibility - Settings - - - - - - Developer Tools - applications-development - - - Development - devel - restricted/devel - universe/devel - multiverse/devel - - emacs.desktop - - - - - Debugging - tools-report-bug - - - Debugger - - - - - - Graphic Interface Design - - - - GUIDesigner - - - - - - Haskell - text-x-haskell - - - haskell - restricted/haskell - universe/haskell - multiverse/haskell - - - - - - IDEs - - - - IDE - - - - - - Java - application-x-java - - - java - restricted/java - universe/java - multiverse/java - - - - - - Localization - preferences-desktop-locale - - - Translation - - - - - - Perl - - - - perl - restricted/perl - universe/perl - multiverse/perl - - - - - - Profiling - - - - Profiling - - - - - - Python - text-x-python - - - python - restricted/python - universe/python - multiverse/python - - - - - - Version Control - text-x-patch - - - vcs - restricted/vcs - universe/vcs - multiverse/vcs - RevisionControl - - - - - - Web Development - - - WebDevelopment - - - applications-internet - - - - - - - Education - applications-education - - - Education - - Science - - - - - - - - Science & Engineering - applications-science - - - Science - Engineering - - - - Astronomy - - - - Astronomy - - - - - Biology - - - - Biology - - - - - Chemistry - applications-science - - - Chemistry - - - - - Computer Science & Robotics - computer - - - ArtificialIntelligence - ComputerScience - Robotics - - - - - Electronics - audio-card - - - Electronics - - - - - Engineering - applications-engineering - - - Engineering - - - - - Geography - - - - Geography - - - - - Geology - - - - Geology - Geoscience - - - - - Mathematics - applications-education-mathematics - - - DataVisualization - Math - NumericalAnalysis - math - restricted/math - universe/math - multiverse/math - gnu-r - restricted/gnu-r - universe/gnu-r - multiverse/gnu-r - - - - - Physics - step - - - Physics - - - - - - - Fonts - preferences-desktop-font - true - - - ttf-* - otf-* - fonts - restricted/fonts - universe/fonts - multiverse/fonts - - - - - - Games - applications-games - - - Game - - - - - Arcade - applications-games-arcade - - - ArcadeGame - - - - - Board Games - applications-games-board - - - BoardGame - - - - - Card Games - applications-games-card - - - CardGame - - - - - Puzzles - applications-games - - - LogicGame - - - - - Role Playing - applications-games - - - RolePlaying - - - - - Simulation - applications-games-strategy - - - Simulation - - - - - Sports - applications-games - - - SportsGame - - - - - - - - - Graphics - applications-graphics - - - Graphics - - - - 3D - - - - 3DGraphics - - - - - Drawing - draw-freehand - - - VectorGraphics - - Viewer - - - - - - Painting & Editing - draw-brush - - - RasterGraphics - - Viewer - Scanning - - - - - - Photography - image-x-generic - - - Photography - - - - - Publishing - document-export - - - Publishing - - - - - Scanning & OCR - scanner - - - Scanning - OCR - - - - - Viewers - graphics-viewer-document - - - Viewer - - - - - - - - Internet - applications-internet - - - Network - - - - Chat - kopete - - - InstantMessaging - IRCClient - - - - - File Sharing - ktorrent - - - FileTransfer - - - - - Mail - internet-mail - - - Email - - - - - Web Browsers - internet-web-browser - - - WebBrowser - - - - - - - - Multimedia - applications-multimedia - - - AudioVideo - - - - - - - Office - applications-office - - - Office - - - - - - System & Settings - preferences-system - - - Settings - System - - - - - - Comics - face-smile-big - - - comic.knsrc - - - - - - Plasma Desktop Widgets - plasma - - - plasmoids.knsrc - plasma-widget-* - - - - - diff -Nru muon-1.9.60/libmuon/declarative/ApplicationProxyModelHelper.cpp muon-2.0.0/libmuon/declarative/ApplicationProxyModelHelper.cpp --- muon-1.9.60/libmuon/declarative/ApplicationProxyModelHelper.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/declarative/ApplicationProxyModelHelper.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,79 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "ApplicationProxyModelHelper.h" +#include +#include + +ApplicationProxyModelHelper::ApplicationProxyModelHelper(QObject* parent) + : ResourcesProxyModel(parent) +{ + setDynamicSortFilter(true); + init(); +} + +void ApplicationProxyModelHelper::init() +{ + setSourceModel(ResourcesModel::global()); + + if(!m_sortRoleString.isEmpty()) + setStringSortRole_hack(m_sortRoleString); + + connect(ResourcesModel::global(), SIGNAL(modelReset()), + SLOT(sortModel())); + sortModel(); +} + +void ApplicationProxyModelHelper::sortModel() +{ + QSortFilterProxyModel::sort(sortColumn(), sortOrder()); +} + +int ApplicationProxyModelHelper::stringToRole(const QByteArray& strRole) const +{ + return roleNames().key(strRole); +} + +QByteArray ApplicationProxyModelHelper::roleToString(int role) const +{ + return roleNames().value(role); +} + +void ApplicationProxyModelHelper::setSortRole_hack(int role) +{ + setSortRole(role); + emit sortRoleChanged(); +} + +void ApplicationProxyModelHelper::setSortOrder_hack(Qt::SortOrder order) +{ + sort(0, order); + emit sortOrderChanged(); +} + +void ApplicationProxyModelHelper::setStringSortRole_hack(const QString& role) +{ + setSortRole_hack(stringToRole(role.toUtf8())); + m_sortRoleString = role; +} + +QString ApplicationProxyModelHelper::stringSortRole() const +{ + return roleToString(sortRole()); +} diff -Nru muon-1.9.60/libmuon/declarative/ApplicationProxyModelHelper.h muon-2.0.0/libmuon/declarative/ApplicationProxyModelHelper.h --- muon-1.9.60/libmuon/declarative/ApplicationProxyModelHelper.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/declarative/ApplicationProxyModelHelper.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,56 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef APPLICATIONPROXYMODELHELPER_H +#define APPLICATIONPROXYMODELHELPER_H + +#include + + +class ApplicationProxyModelHelper : public ResourcesProxyModel +{ + Q_OBJECT + Q_PROPERTY(int sortRole READ sortRole WRITE setSortRole_hack NOTIFY sortRoleChanged) + Q_PROPERTY(QString stringSortRole READ stringSortRole WRITE setStringSortRole_hack NOTIFY sortRoleChanged) + Q_PROPERTY(Qt::SortOrder sortOrder READ sortOrder WRITE setSortOrder_hack NOTIFY sortOrderChanged) + public: + void setStateFilter_hack(int state); + explicit ApplicationProxyModelHelper(QObject* parent = 0); + + void setSortRole_hack(int role); + void setSortOrder_hack(Qt::SortOrder order); + void setStringSortRole_hack(const QString& role); + QString stringSortRole() const; + + public slots: + void init(); + void sortModel(); + + signals: + void sortRoleChanged(); + void sortOrderChanged(); + + private: + int stringToRole(const QByteArray& strRole) const; + QByteArray roleToString(int role) const; + + QString m_sortRoleString; +}; + +#endif // APPLICATIONPROXYMODELHELPER_H diff -Nru muon-1.9.60/libmuon/declarative/CMakeLists.txt muon-2.0.0/libmuon/declarative/CMakeLists.txt --- muon-1.9.60/libmuon/declarative/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/declarative/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,10 @@ +project(muon-declarative) + +include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ..) + +kde4_add_library(muondeclarativeplugin SHARED MuonDeclarativePlugin.cpp ApplicationProxyModelHelper.cpp) + +target_link_libraries(muondeclarativeplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} muonprivate) + +install(TARGETS muondeclarativeplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/muon) +install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/muon) diff -Nru muon-1.9.60/libmuon/declarative/MuonDeclarativePlugin.cpp muon-2.0.0/libmuon/declarative/MuonDeclarativePlugin.cpp --- muon-1.9.60/libmuon/declarative/MuonDeclarativePlugin.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/declarative/MuonDeclarativePlugin.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,57 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "MuonDeclarativePlugin.h" +#include "ApplicationProxyModelHelper.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +QML_DECLARE_TYPE(ResourcesModel) +QML_DECLARE_TYPE(AbstractResourcesBackend) + +void MuonDeclarativePlugin::registerTypes(const char*) +{ + qmlRegisterType("org.kde.muon", 1, 0, "CategoryModel"); + qmlRegisterType("org.kde.muon", 1, 0, "TransactionListener"); + qmlRegisterType("org.kde.muon", 1, 0, "ResourcesUpdatesModel"); + + qmlRegisterType("org.kde.muon", 1, 0, "ReviewsModel"); + qmlRegisterType("org.kde.muon", 1, 0, "ApplicationAddonsModel"); + qmlRegisterType("org.kde.muon", 1, 0, "ScreenshotsModel"); + qmlRegisterType("org.kde.muon", 1, 0, "ApplicationProxyModel"); + + qmlRegisterType(); + qmlRegisterType(); + qmlRegisterType(); + qmlRegisterType(); + qmlRegisterType(); + qmlRegisterType(); + qmlRegisterType(); +} diff -Nru muon-1.9.60/libmuon/declarative/MuonDeclarativePlugin.h muon-2.0.0/libmuon/declarative/MuonDeclarativePlugin.h --- muon-1.9.60/libmuon/declarative/MuonDeclarativePlugin.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/declarative/MuonDeclarativePlugin.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef MUONDECLARATIVEPLUGIN_H +#define MUONDECLARATIVEPLUGIN_H + +#include + +class MuonDeclarativePlugin : public QDeclarativeExtensionPlugin +{ + public: + virtual void registerTypes(const char*); +}; + +Q_EXPORT_PLUGIN2(muondeclarativeplugin, MuonDeclarativePlugin); + +#endif diff -Nru muon-1.9.60/libmuon/declarative/qmldir muon-2.0.0/libmuon/declarative/qmldir --- muon-1.9.60/libmuon/declarative/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/declarative/qmldir 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1 @@ +plugin muondeclarativeplugin diff -Nru muon-1.9.60/libmuon/mobile/qml/ClickableImage.qml muon-2.0.0/libmuon/mobile/qml/ClickableImage.qml --- muon-1.9.60/libmuon/mobile/qml/ClickableImage.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/mobile/qml/ClickableImage.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,58 +0,0 @@ -/* - Copyright (C) 2011 Jonathan Thomas - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), Nokia Corporation - (or its successors, if any) and the KDE Free Qt Foundation, which shall - act as a proxy defined in Section 6 of version 3 of the license. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . -*/ - -import QtQuick 1.0 -import MuonMobile 1.0 - -Image { - id: image - fillMode: Image.PreserveAspectFit - asynchronous: true - opacity: 0.0 - visible: true - - signal buttonClicked - - MouseArea { - anchors.fill: parent - acceptedButtons: Qt.LeftButton - Component.onCompleted: clicked.connect(parent.buttonClicked) - } - - MouseCursor { - anchors.fill: parent - shape: Qt.PointingHandCursor - } - - transitions: Transition { - from: "*" - to: "loaded" - PropertyAnimation { target: image; property: "opacity"; duration: 500 } - } - - states: [ - State { - name: 'loaded' - when: image.status == Image.Ready - PropertyChanges { target: image; opacity: 1.0 } - } - ] -} diff -Nru muon-1.9.60/libmuon/mobile/qml/ThumbnailView.qml muon-2.0.0/libmuon/mobile/qml/ThumbnailView.qml --- muon-1.9.60/libmuon/mobile/qml/ThumbnailView.qml 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/mobile/qml/ThumbnailView.qml 1970-01-01 00:00:00.000000000 +0000 @@ -1,51 +0,0 @@ -/* - Copyright (C) 2011 Jonathan Thomas - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), Nokia Corporation - (or its successors, if any) and the KDE Free Qt Foundation, which shall - act as a proxy defined in Section 6 of version 3 of the license. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . -*/ - -import QtQuick 1.0 -import Effects 1.0 - -Rectangle { - id: rectangle1 - width: 170 - height: 130 - - property alias source: image.source - signal thumbnailClicked() - signal thumbnailLoaded() - - ClickableImage { - id: image - width: 160 - height: 120 - - effect: DropShadow { - blurRadius: 10 - } - - onStatusChanged: { - if (image.status == Image.Error) - view.hide() - else if (image.status == Image.Ready) - parent.thumbnailLoaded() - } - onButtonClicked: parent.thumbnailClicked() - } -} diff -Nru muon-1.9.60/libmuon/mobile/src/mousecursor.cpp muon-2.0.0/libmuon/mobile/src/mousecursor.cpp --- muon-1.9.60/libmuon/mobile/src/mousecursor.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/mobile/src/mousecursor.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,42 +0,0 @@ -/* - Copyright (C) 2011 Harald Sitter - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), Nokia Corporation - (or its successors, if any) and the KDE Free Qt Foundation, which shall - act as a proxy defined in Section 6 of version 3 of the license. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . -*/ - -#include "mousecursor.h" - -MouseCursor::MouseCursor() -{ -} - -Qt::CursorShape MouseCursor::cursorShape() const -{ - return cursor().shape(); -} - -void MouseCursor::setCursorShape(Qt::CursorShape shape) -{ - setCursor(QCursor(shape)); - emit cursorShapeChanged(); -} - -void MouseCursor::reset() -{ - setCursor(QCursor()); -} diff -Nru muon-1.9.60/libmuon/mobile/src/mousecursor.h muon-2.0.0/libmuon/mobile/src/mousecursor.h --- muon-1.9.60/libmuon/mobile/src/mousecursor.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/mobile/src/mousecursor.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,45 +0,0 @@ -/* - Copyright (C) 2011 Harald Sitter - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) version 3, or any - later version accepted by the membership of KDE e.V. (or its - successor approved by the membership of KDE e.V.), Nokia Corporation - (or its successors, if any) and the KDE Free Qt Foundation, which shall - act as a proxy defined in Section 6 of version 3 of the license. - - This library is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this library. If not, see . -*/ - -#ifndef MOUSECURSOR_H -#define MOUSECURSOR_H - -#include - -#include "../../libmuonprivate_export.h" - -class MUONPRIVATE_EXPORT MouseCursor : public QDeclarativeItem -{ - Q_OBJECT - Q_PROPERTY(Qt::CursorShape shape READ cursorShape WRITE setCursorShape NOTIFY cursorShapeChanged) -public: - MouseCursor(); - - Qt::CursorShape cursorShape() const; - void setCursorShape(Qt::CursorShape shape); - - Q_INVOKABLE void reset(); - -signals: - void cursorShapeChanged(); -}; - -#endif // MOUSECURSOR_H diff -Nru muon-1.9.60/libmuon/muonbackendplugin.desktop muon-2.0.0/libmuon/muonbackendplugin.desktop --- muon-1.9.60/libmuon/muonbackendplugin.desktop 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuon/muonbackendplugin.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,34 @@ +[Desktop Entry] +Type=ServiceType +X-KDE-ServiceType=Muon/Backend +X-KDE-Derived=KPluginInfo +Name=Muon Backend +Name[bs]=Muon pozadina +Name[ca]=Dorsal del Muon +Name[cs]=Podpůrná vrstva Muon +Name[da]=Muon-motor +Name[de]=Muon-Backend +Name[es]=Motor de Muon +Name[fi]=Muon-taustaosa +Name[fr]=Moteur de Muon +Name[it]=Motore di Muon +Name[kk]=Muon тетігі +Name[nb]=Bakgrunnsmotor for Muon +Name[nl]=Backend van Muon +Name[pt]=Infra-Estrutura do Muon +Name[pt_BR]=Infraestrutura do Muon +Name[ru]=Модуль Muon +Name[sk]=Muon Backend +Name[sl]=Zaledje za Muon +Name[sr]=Позадина Муона +Name[sr@ijekavian]=Позадина Муона +Name[sr@ijekavianlatin]=Pozadina Muona +Name[sr@latin]=Pozadina Muona +Name[sv]=Muon-gränssnitt +Name[tr]=Muon Arkaucu +Name[uk]=Модуль Muon +Name[x-test]=xxMuon Backendxx +Name[zh_TW]=Muon 後端介面 + +[PropertyDef::X-Muon-Arguments] +Type=QStringList diff -Nru muon-1.9.60/libmuon/resources/AbstractResource.cpp muon-2.0.0/libmuon/resources/AbstractResource.cpp --- muon-1.9.60/libmuon/resources/AbstractResource.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/resources/AbstractResource.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -20,6 +20,7 @@ #include "AbstractResource.h" #include "AbstractResourcesBackend.h" +#include AbstractResource::AbstractResource(AbstractResourcesBackend* parent) : QObject(parent) @@ -50,7 +51,13 @@ void AbstractResource::fetchScreenshots() { - emit screenshotsFetched(QList() << thumbnailUrl(), QList() << screenshotUrl()); + QList thumbs, screens; + QUrl thumbnail = thumbnailUrl(); + if(!thumbnail.isEmpty()) { + thumbs << thumbnail; + screens << screenshotUrl(); + } + emit screenshotsFetched(thumbs, screens); } QString AbstractResource::mimetypes() const @@ -58,7 +65,23 @@ return QString(); } +QStringList AbstractResource::executables() const +{ + return QStringList(); +} + AbstractResourcesBackend* AbstractResource::backend() const { return static_cast(parent()); } + +QString AbstractResource::status() +{ + switch(state()) { + case Broken: return i18n("Broken"); + case None: return i18n("Available"); + case Installed: return i18n("Installed"); + case Upgradeable: return i18n("Upgradeable"); + } + return QString(); +} diff -Nru muon-1.9.60/libmuon/resources/AbstractResource.h muon-2.0.0/libmuon/resources/AbstractResource.h --- muon-1.9.60/libmuon/resources/AbstractResource.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/resources/AbstractResource.h 2013-04-01 20:32:05.000000000 +0000 @@ -37,6 +37,7 @@ Q_PROPERTY(QString icon READ icon CONSTANT) Q_PROPERTY(bool canExecute READ canExecute CONSTANT) Q_PROPERTY(State state READ state NOTIFY stateChanged) + Q_PROPERTY(QString status READ status NOTIFY stateChanged) Q_PROPERTY(QString category READ categories CONSTANT) Q_PROPERTY(bool isTechnical READ isTechnical CONSTANT) Q_PROPERTY(QUrl homepage READ homepage CONSTANT) @@ -109,9 +110,15 @@ virtual QString mimetypes() const; virtual QList addonsInformation() = 0; + + virtual QStringList executables() const; bool canUpgrade(); bool isInstalled(); + + ///@returns a user-readable explaination of the resource status + ///by default, it will specify what state() is returning + virtual QString status(); AbstractResourcesBackend* backend() const; public slots: diff -Nru muon-1.9.60/libmuon/resources/AbstractResourcesBackend.cpp muon-2.0.0/libmuon/resources/AbstractResourcesBackend.cpp --- muon-1.9.60/libmuon/resources/AbstractResourcesBackend.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/resources/AbstractResourcesBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -19,7 +19,16 @@ ***************************************************************************/ #include "AbstractResourcesBackend.h" +#include AbstractResourcesBackend::AbstractResourcesBackend(QObject* parent) : QObject(parent) {} + +void AbstractResourcesBackend::installApplication(AbstractResource* app) +{ + installApplication(app, QHash()); +} + +void AbstractResourcesBackend::integrateMainWindow(MuonMainWindow*) +{} diff -Nru muon-1.9.60/libmuon/resources/AbstractResourcesBackend.h muon-2.0.0/libmuon/resources/AbstractResourcesBackend.h --- muon-1.9.60/libmuon/resources/AbstractResourcesBackend.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/resources/AbstractResourcesBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -38,6 +38,7 @@ class AbstractReviewsBackend; class AbstractResource; class AbstractBackendUpdater; +class MuonMainWindow; class MUONPRIVATE_EXPORT AbstractResourcesBackend : public QObject { @@ -46,6 +47,7 @@ Q_PROPERTY(int updatesCount READ updatesCount NOTIFY updatesCountChanged) public: explicit AbstractResourcesBackend(QObject* parent = 0); + virtual bool isValid() const = 0; virtual QVector allResources() const = 0; virtual QStringList searchPackageName(const QString &searchText) = 0; virtual AbstractReviewsBackend* reviewsBackend() const = 0; @@ -53,12 +55,12 @@ virtual int updatesCount() const = 0; virtual QPair currentTransactionState() const = 0; virtual QList transactions() const = 0; - virtual bool providesResouce(AbstractResource* resource) const = 0; virtual AbstractResource* resourceByPackageName(const QString& name) const = 0; + virtual void integrateMainWindow(MuonMainWindow* w); public slots: virtual void installApplication(AbstractResource *app, const QHash &addons) = 0; - virtual void installApplication(AbstractResource *app) = 0; + virtual void installApplication(AbstractResource *app); virtual void removeApplication(AbstractResource *app) = 0; virtual void cancelTransaction(AbstractResource *app) = 0; @@ -77,4 +79,6 @@ void transactionsEvent(TransactionStateTransition transition, Transaction* transaction); }; +Q_DECLARE_INTERFACE( AbstractResourcesBackend, "org.kde.muon.AbstractResourcesBackend" ) + #endif // ABSTRACTRESOURCESBACKEND_H diff -Nru muon-1.9.60/libmuon/resources/ResourcesModel.cpp muon-2.0.0/libmuon/resources/ResourcesModel.cpp --- muon-1.9.60/libmuon/resources/ResourcesModel.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/resources/ResourcesModel.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -29,38 +29,41 @@ #include #include -K_GLOBAL_STATIC_WITH_ARGS(ResourcesModel, globalResourcesModel, (0)) +static const KCatalogLoader loader("libmuon"); + +ResourcesModel *ResourcesModel::s_self = nullptr; ResourcesModel *ResourcesModel::global() { - return globalResourcesModel; + return s_self; } ResourcesModel::ResourcesModel(QObject* parent) : QAbstractListModel(parent) { + if (!s_self) + s_self = this; + QHash< int, QByteArray > roles = roleNames(); roles[NameRole] = "name"; roles[IconRole] = "icon"; roles[CommentRole] = "comment"; - roles[ActionRole] = "action"; roles[StateRole] = "state"; roles[RatingRole] = "rating"; roles[RatingPointsRole] = "ratingPoints"; roles[SortableRatingRole] = "sortableRating"; roles[ActiveRole] = "active"; - roles[ProgressRole] = "progress"; - roles[ProgressTextRole] = "progressText"; roles[InstalledRole] = "isInstalled"; roles[ApplicationRole] = "application"; roles[OriginRole] = "origin"; - roles[UntranslatedNameRole] = "untranslatedName"; roles[CanUpgrade] = "canUpgrade"; roles[PackageNameRole] = "packageName"; roles[IsTechnicalRole] = "isTechnical"; roles[CategoryRole] = "category"; roles[SectionRole] = "section"; roles[MimeTypes] = "mimetypes"; + roles.remove(Qt::EditRole); + roles.remove(Qt::WhatsThisRole); setRoleNames(roles); } @@ -68,11 +71,16 @@ { Q_ASSERT(!m_backends.contains(resources)); QVector newResources = resources->allResources(); - int current = rowCount(); - beginInsertRows(QModelIndex(), current, current+newResources.size()); - m_backends += resources; - m_resources.append(newResources); - endInsertRows(); + if(!newResources.isEmpty()) { + int current = rowCount(); + beginInsertRows(QModelIndex(), current, current+newResources.size()); + m_backends += resources; + m_resources.append(newResources); + endInsertRows(); + } else { + m_backends += resources; + m_resources.append(newResources); + } connect(resources, SIGNAL(backendReady()), SLOT(resetCaller())); connect(resources, SIGNAL(reloadStarted()), SLOT(cleanCaller())); @@ -132,16 +140,24 @@ AbstractResource* resource = resourceAt(index.row()); switch(role) { case ActiveRole: { - //TODO: Maybe move to AbstractResource? - Transaction* t = resource->backend()->currentTransactionState().second; - return t && t->resource() == resource; + Transaction* t = nullptr; + + for (Transaction *trans : resource->backend()->transactions()) { + if (trans->resource() == resource) { + t = trans; + break; + } + } + + return (t != nullptr); } case ApplicationRole: return qVariantFromValue(resource); case RatingPointsRole: case RatingRole: - case SortableRatingRole:{ - Rating* rating = resource->backend()->reviewsBackend()->ratingForApplication(resource); + case SortableRatingRole: { + AbstractReviewsBackend* ratings = resource->backend()->reviewsBackend(); + Rating* rating = ratings ? ratings->ratingForApplication(resource) : nullptr; return rating ? rating->property(roleNames().value(role)) : -1; } case Qt::DecorationRole: @@ -157,18 +173,21 @@ qDebug() << "unknown role:" << role << roleText; return QVariant(); } else - return resource->property(roleNames().value(role)); + return resource->property(roleText); } } } int ResourcesModel::rowCount(const QModelIndex& parent) const { - if(parent.isValid()) return 0; + if(parent.isValid()) + return 0; // Not the root element, and children don't have subchildren + + // The root element parents all resources from all backends int ret = 0; - foreach(const QVector& resources, m_resources) { + for (const QVector& resources : m_resources) ret += resources.size(); - } + return ret; } @@ -224,7 +243,7 @@ int pos = m_backends.indexOf(backend); QVector* backendsResources = &m_resources[pos]; int before = 0; - for(QVector >::const_iterator it=m_resources.constBegin(); + for(auto it=m_resources.constBegin(); it!=m_resources.constEnd() && it!=backendsResources; ++it) { @@ -287,3 +306,13 @@ QModelIndex idx = resourceIndex(t->resource()); dataChanged(idx, idx); } + +QMap ResourcesModel::itemData(const QModelIndex& index) const +{ + QMap ret; + QHash names = roleNames(); + for (auto it = names.constBegin(); it != names.constEnd(); ++it) { + ret.insert(it.key(), data(index, it.key())); + } + return ret; +} diff -Nru muon-1.9.60/libmuon/resources/ResourcesModel.h muon-2.0.0/libmuon/resources/ResourcesModel.h --- muon-1.9.60/libmuon/resources/ResourcesModel.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/resources/ResourcesModel.h 2013-04-01 20:32:05.000000000 +0000 @@ -39,17 +39,13 @@ NameRole = Qt::UserRole, IconRole, CommentRole, - ActionRole, StateRole, RatingRole, RatingPointsRole, SortableRatingRole, ActiveRole, - ProgressRole, - ProgressTextRole, InstalledRole, ApplicationRole, - UntranslatedNameRole, OriginRole, CanUpgrade, PackageNameRole, @@ -70,6 +66,7 @@ QModelIndex resourceIndex(AbstractResource* res) const; QVector< AbstractResourcesBackend* > backends() const; int updatesCount() const; + virtual QMap< int, QVariant > itemData(const QModelIndex& index) const; Q_SCRIPTABLE AbstractResource* resourceByPackageName(const QString& name); @@ -100,6 +97,8 @@ private: QVector< AbstractResourcesBackend* > m_backends; QVector< QVector > m_resources; + + static ResourcesModel* s_self; }; #endif // RESOURCESMODEL_H diff -Nru muon-1.9.60/libmuon/resources/ResourcesProxyModel.cpp muon-2.0.0/libmuon/resources/ResourcesProxyModel.cpp --- muon-1.9.60/libmuon/resources/ResourcesProxyModel.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/resources/ResourcesProxyModel.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -30,7 +30,6 @@ ResourcesProxyModel::ResourcesProxyModel(QObject *parent) : QSortFilterProxyModel(parent) , m_sortByRelevancy(false) - , m_filterActive(false) , m_filterBySearch(false) , m_filteredCategory(0) , m_stateFilter(AbstractResource::Broken) @@ -82,6 +81,9 @@ void ResourcesProxyModel::setFiltersFromCategory(Category *category) { + if(category==m_filteredCategory) + return; + if(category) { m_andFilters = category->andFilters(); m_orFilters = category->orFilters(); @@ -141,9 +143,6 @@ if(!idx.isValid()) return false; - if (m_filterActive && !idx.data(ResourcesModel::ActiveRole).toBool()) - return false; - for(QHash::const_iterator it=m_roleFilters.constBegin(), itEnd=m_roleFilters.constEnd(); it!=itEnd; ++it) { if(idx.data(it.key())!=it.value()) { return false; @@ -220,8 +219,11 @@ if(leftValue.type()==QVariant::String && rightValue.type()==QVariant::String) { int comp = QString::localeAwareCompare(leftValue.toString(), rightValue.toString()); return (comp < 0) ^ invert; - } else + } else if(sortRole() == ResourcesModel::CanUpgrade) { + return leftValue.toBool(); + } else { return QSortFilterProxyModel::lessThan(left, right); + } } Category* ResourcesProxyModel::filteredCategory() const @@ -267,5 +269,8 @@ void ResourcesProxyModel::setFilterActive(bool filter) { - m_filterActive = filter; + if(filter) + m_roleFilters.insert(ResourcesModel::ActiveRole, true); + else + m_roleFilters.remove(ResourcesModel::ActiveRole); } diff -Nru muon-1.9.60/libmuon/resources/ResourcesProxyModel.h muon-2.0.0/libmuon/resources/ResourcesProxyModel.h --- muon-1.9.60/libmuon/resources/ResourcesProxyModel.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/resources/ResourcesProxyModel.h 2013-04-01 20:32:05.000000000 +0000 @@ -82,7 +82,6 @@ QHash m_roleFilters; bool m_sortByRelevancy; - bool m_filterActive; bool m_filterBySearch; Category* m_filteredCategory; AbstractResource::State m_stateFilter; diff -Nru muon-1.9.60/libmuon/tests/CMakeLists.txt muon-2.0.0/libmuon/tests/CMakeLists.txt --- muon-1.9.60/libmuon/tests/CMakeLists.txt 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/tests/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1,15 +0,0 @@ -include_directories(..) - -macro(libmuon_add_unit_test name) - kde4_add_unit_test(${name} ${ARGN}) - target_link_libraries(${name} - muonprivate - - ${QT_QTTEST_LIBRARY} ${QT_QTCORE_LIBRARY} - ${KDE4_KIO_LIBS} ${QAPT_LIBRARY} - ) -endmacro(libmuon_add_unit_test) - -if(QAPT_ENABLED) - libmuon_add_unit_test(resourcesmodeltest ResourcesModelTest.cpp modeltest.cpp) -endif(QAPT_ENABLED) diff -Nru muon-1.9.60/libmuon/tests/ResourcesModelTest.cpp muon-2.0.0/libmuon/tests/ResourcesModelTest.cpp --- muon-1.9.60/libmuon/tests/ResourcesModelTest.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/tests/ResourcesModelTest.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,96 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#include "ResourcesModelTest.h" -#include -#include -#include -#include -#include - -#include "modeltest.h" -#include -#include -#include -#include - -QTEST_KDEMAIN_CORE( ResourcesModelTest ) - -ResourcesModelTest::ResourcesModelTest() -{ - m_backend = new QApt::Backend; - - if (KProtocolManager::proxyType() == KProtocolManager::ManualProxy) { - m_backend->setWorkerProxy(KProtocolManager::proxyFor("http")); - } - m_backend->init(); - if (m_backend->xapianIndexNeedsUpdate()) { - m_backend->updateXapianIndex(); - } - - m_appBackend = new ApplicationBackend(this); - m_appBackend->setBackend(m_backend); - QTest::kWaitForSignal(m_appBackend, SIGNAL(backendReady())); - - m_model = new ResourcesModel(this); - m_model->addResourcesBackend(m_appBackend); - new ModelTest(m_model, m_model); -} - -ResourcesModelTest::~ResourcesModelTest() -{ - delete m_backend; -} - -void ResourcesModelTest::testReload() -{ - QVector apps = m_appBackend->allResources(); - QCOMPARE(apps.count(), m_model->rowCount()); - - QVector appNames(apps.size()); - for(int i=0; irowCount(); ++i) { - AbstractResource* app = apps[i]; - appNames[i]=app->property("packageName"); - } - - m_appBackend->reload(); - m_appBackend->updatesCount(); - QCOMPARE(apps, m_appBackend->allResources() ); - - QVERIFY(!apps.isEmpty()); - QCOMPARE(apps.count(), m_model->rowCount()); - - for(int i=0; irowCount(); ++i) { - AbstractResource* app = apps[i]; - QCOMPARE(appNames[i], app->property("packageName")); -// QCOMPARE(m_model->data(m_model->index(i), ResourcesModel::NameRole).toString(), app->name()); - } -} - -void ResourcesModelTest::testCategories() -{ - ResourcesProxyModel* proxy = new ResourcesProxyModel(m_model); - proxy->setSourceModel(m_model); - QList categories = Category::populateCategories(); - foreach(Category* cat, categories) { - proxy->setFiltersFromCategory(cat); - qDebug() << "fuuuuuu" << proxy->rowCount() << cat->name(); - } -} diff -Nru muon-1.9.60/libmuon/tests/ResourcesModelTest.h muon-2.0.0/libmuon/tests/ResourcesModelTest.h --- muon-1.9.60/libmuon/tests/ResourcesModelTest.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/tests/ResourcesModelTest.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,47 +0,0 @@ -/*************************************************************************** - * Copyright © 2012 Aleix Pol Gonzalez * - * * - * This program is free software; you can redistribute it and/or * - * modify it under the terms of the GNU General Public License as * - * published by the Free Software Foundation; either version 2 of * - * the License or (at your option) version 3 or any later version * - * accepted by the membership of KDE e.V. (or its successor approved * - * by the membership of KDE e.V.), which shall act as a proxy * - * defined in Section 14 of version 3 of the license. * - * * - * This program is distributed in the hope that it will be useful, * - * but WITHOUT ANY WARRANTY; without even the implied warranty of * - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * - * GNU General Public License for more details. * - * * - * You should have received a copy of the GNU General Public License * - * along with this program. If not, see . * - ***************************************************************************/ - -#ifndef RESOURCESMODELTEST_H -#define RESOURCESMODELTEST_H - -#include - -class ResourcesModel; -class ApplicationBackend; -namespace QApt { class Backend; } - -class ResourcesModelTest : public QObject -{ - Q_OBJECT - public: - ResourcesModelTest(); - virtual ~ResourcesModelTest(); - - private slots: - void testReload(); - void testCategories(); - - private: - QApt::Backend* m_backend; - ApplicationBackend* m_appBackend; - ResourcesModel* m_model; -}; - -#endif diff -Nru muon-1.9.60/libmuon/tests/modeltest.cpp muon-2.0.0/libmuon/tests/modeltest.cpp --- muon-1.9.60/libmuon/tests/modeltest.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/tests/modeltest.cpp 1970-01-01 00:00:00.000000000 +0000 @@ -1,566 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#include - -#include "modeltest.h" - -#include -#undef Q_ASSERT -#define Q_ASSERT QVERIFY - -Q_DECLARE_METATYPE ( QModelIndex ) - -/*! - Connect to all of the models signals. Whenever anything happens recheck everything. -*/ -ModelTest::ModelTest ( QAbstractItemModel *_model, QObject *parent ) : QObject ( parent ), model ( _model ), fetchingMore ( false ) -{ - Q_ASSERT ( model ); - - connect ( model, SIGNAL (columnsAboutToBeInserted(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (columnsAboutToBeRemoved(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (columnsInserted(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (columnsRemoved(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (dataChanged(QModelIndex,QModelIndex)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (headerDataChanged(Qt::Orientation,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (layoutAboutToBeChanged()), this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (layoutChanged()), this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (modelReset()), this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (rowsAboutToBeInserted(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (rowsAboutToBeRemoved(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (rowsInserted(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - connect ( model, SIGNAL (rowsRemoved(QModelIndex,int,int)), - this, SLOT (runAllTests()) ); - - // Special checks for inserting/removing - connect ( model, SIGNAL (layoutAboutToBeChanged()), - this, SLOT (layoutAboutToBeChanged()) ); - connect ( model, SIGNAL (layoutChanged()), - this, SLOT (layoutChanged()) ); - - connect ( model, SIGNAL (rowsAboutToBeInserted(QModelIndex,int,int)), - this, SLOT (rowsAboutToBeInserted(QModelIndex,int,int)) ); - connect ( model, SIGNAL (rowsAboutToBeRemoved(QModelIndex,int,int)), - this, SLOT (rowsAboutToBeRemoved(QModelIndex,int,int)) ); - connect ( model, SIGNAL (rowsInserted(QModelIndex,int,int)), - this, SLOT (rowsInserted(QModelIndex,int,int)) ); - connect ( model, SIGNAL (rowsRemoved(QModelIndex,int,int)), - this, SLOT (rowsRemoved(QModelIndex,int,int)) ); - - runAllTests(); -} - -void ModelTest::runAllTests() -{ - if ( fetchingMore ) - return; - nonDestructiveBasicTest(); - rowCount(); - columnCount(); - hasIndex(); - index(); - parent(); - data(); -} - -/*! - nonDestructiveBasicTest tries to call a number of the basic functions (not all) - to make sure the model doesn't outright segfault, testing the functions that makes sense. -*/ -void ModelTest::nonDestructiveBasicTest() -{ - Q_ASSERT ( model->buddy ( QModelIndex() ) == QModelIndex() ); - model->canFetchMore ( QModelIndex() ); - Q_ASSERT ( model->columnCount ( QModelIndex() ) >= 0 ); - Q_ASSERT ( model->data ( QModelIndex() ) == QVariant() ); - fetchingMore = true; - model->fetchMore ( QModelIndex() ); - fetchingMore = false; - Qt::ItemFlags flags = model->flags ( QModelIndex() ); - Q_ASSERT ( flags == Qt::ItemIsDropEnabled || flags == 0 ); - model->hasChildren ( QModelIndex() ); - model->hasIndex ( 0, 0 ); - model->headerData ( 0, Qt::Horizontal ); - model->index ( 0, 0 ); - model->itemData ( QModelIndex() ); - QVariant cache; - model->match ( QModelIndex(), -1, cache ); - model->mimeTypes(); - Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); - Q_ASSERT ( model->rowCount() >= 0 ); - QVariant variant; - model->setData ( QModelIndex(), variant, -1 ); - model->setHeaderData ( -1, Qt::Horizontal, QVariant() ); - model->setHeaderData ( 999999, Qt::Horizontal, QVariant() ); - QMap roles; - model->sibling ( 0, 0, QModelIndex() ); - model->span ( QModelIndex() ); - model->supportedDropActions(); -} - -/*! - Tests model's implementation of QAbstractItemModel::rowCount() and hasChildren() - - Models that are dynamically populated are not as fully tested here. - */ -void ModelTest::rowCount() -{ -// qDebug() << "rc"; - // check top row - QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - int rows = model->rowCount ( topIndex ); - Q_ASSERT ( rows >= 0 ); - if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( topIndex ) == true ); - - QModelIndex secondLevelIndex = model->index ( 0, 0, topIndex ); - if ( secondLevelIndex.isValid() ) { // not the top level - // check a row count where parent is valid - rows = model->rowCount ( secondLevelIndex ); - Q_ASSERT ( rows >= 0 ); - if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( secondLevelIndex ) == true ); - } - - // The models rowCount() is tested more extensively in checkChildren(), - // but this catches the big mistakes -} - -/*! - Tests model's implementation of QAbstractItemModel::columnCount() and hasChildren() - */ -void ModelTest::columnCount() -{ - // check top row - QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - Q_ASSERT ( model->columnCount ( topIndex ) >= 0 ); - - // check a column count where parent is valid - QModelIndex childIndex = model->index ( 0, 0, topIndex ); - if ( childIndex.isValid() ) - Q_ASSERT ( model->columnCount ( childIndex ) >= 0 ); - - // columnCount() is tested more extensively in checkChildren(), - // but this catches the big mistakes -} - -/*! - Tests model's implementation of QAbstractItemModel::hasIndex() - */ -void ModelTest::hasIndex() -{ -// qDebug() << "hi"; - // Make sure that invalid values returns an invalid index - Q_ASSERT ( model->hasIndex ( -2, -2 ) == false ); - Q_ASSERT ( model->hasIndex ( -2, 0 ) == false ); - Q_ASSERT ( model->hasIndex ( 0, -2 ) == false ); - - int rows = model->rowCount(); - int columns = model->columnCount(); - - // check out of bounds - Q_ASSERT ( model->hasIndex ( rows, columns ) == false ); - Q_ASSERT ( model->hasIndex ( rows + 1, columns + 1 ) == false ); - - if ( rows > 0 ) - Q_ASSERT ( model->hasIndex ( 0, 0 ) == true ); - - // hasIndex() is tested more extensively in checkChildren(), - // but this catches the big mistakes -} - -/*! - Tests model's implementation of QAbstractItemModel::index() - */ -void ModelTest::index() -{ -// qDebug() << "i"; - // Make sure that invalid values returns an invalid index - Q_ASSERT ( model->index ( -2, -2 ) == QModelIndex() ); - Q_ASSERT ( model->index ( -2, 0 ) == QModelIndex() ); - Q_ASSERT ( model->index ( 0, -2 ) == QModelIndex() ); - - int rows = model->rowCount(); - int columns = model->columnCount(); - - if ( rows == 0 ) - return; - - // Catch off by one errors - Q_ASSERT ( model->index ( rows, columns ) == QModelIndex() ); - Q_ASSERT ( model->index ( 0, 0 ).isValid() == true ); - - // Make sure that the same index is *always* returned - QModelIndex a = model->index ( 0, 0 ); - QModelIndex b = model->index ( 0, 0 ); - Q_ASSERT ( a == b ); - - // index() is tested more extensively in checkChildren(), - // but this catches the big mistakes -} - -/*! - Tests model's implementation of QAbstractItemModel::parent() - */ -void ModelTest::parent() -{ -// qDebug() << "p"; - // Make sure the model wont crash and will return an invalid QModelIndex - // when asked for the parent of an invalid index. - Q_ASSERT ( model->parent ( QModelIndex() ) == QModelIndex() ); - - if ( model->rowCount() == 0 ) - return; - - // Column 0 | Column 1 | - // QModelIndex() | | - // \- topIndex | topIndex1 | - // \- childIndex | childIndex1 | - - // Common error test #1, make sure that a top level index has a parent - // that is a invalid QModelIndex. - QModelIndex topIndex = model->index ( 0, 0, QModelIndex() ); - Q_ASSERT ( model->parent ( topIndex ) == QModelIndex() ); - - // Common error test #2, make sure that a second level index has a parent - // that is the first level index. - if ( model->rowCount ( topIndex ) > 0 ) { - QModelIndex childIndex = model->index ( 0, 0, topIndex ); - Q_ASSERT ( model->parent ( childIndex ) == topIndex ); - } - - // Common error test #3, the second column should NOT have the same children - // as the first column in a row. - // Usually the second column shouldn't have children. - QModelIndex topIndex1 = model->index ( 0, 1, QModelIndex() ); - if ( model->rowCount ( topIndex1 ) > 0 ) { - QModelIndex childIndex = model->index ( 0, 0, topIndex ); - QModelIndex childIndex1 = model->index ( 0, 0, topIndex1 ); - Q_ASSERT ( childIndex != childIndex1 ); - } - - // Full test, walk n levels deep through the model making sure that all - // parent's children correctly specify their parent. - checkChildren ( QModelIndex() ); -} - -/*! - Called from the parent() test. - - A model that returns an index of parent X should also return X when asking - for the parent of the index. - - This recursive function does pretty extensive testing on the whole model in an - effort to catch edge cases. - - This function assumes that rowCount(), columnCount() and index() already work. - If they have a bug it will point it out, but the above tests should have already - found the basic bugs because it is easier to figure out the problem in - those tests then this one. - */ -void ModelTest::checkChildren ( const QModelIndex &parent, int currentDepth ) -{ - // First just try walking back up the tree. - QModelIndex p = parent; - while ( p.isValid() ) - p = p.parent(); - - // For models that are dynamically populated - if ( model->canFetchMore ( parent ) ) { - fetchingMore = true; - model->fetchMore ( parent ); - fetchingMore = false; - } - - int rows = model->rowCount ( parent ); - int columns = model->columnCount ( parent ); - - if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( parent ) ); - - // Some further testing against rows(), columns(), and hasChildren() - Q_ASSERT ( rows >= 0 ); - Q_ASSERT ( columns >= 0 ); - if ( rows > 0 ) - Q_ASSERT ( model->hasChildren ( parent ) == true ); - - //qDebug() << "parent:" << model->data(parent).toString() << "rows:" << rows - // << "columns:" << columns << "parent column:" << parent.column(); - - Q_ASSERT ( model->hasIndex ( rows + 1, 0, parent ) == false ); - for ( int r = 0; r < rows; ++r ) { - if ( model->canFetchMore ( parent ) ) { - fetchingMore = true; - model->fetchMore ( parent ); - fetchingMore = false; - } - Q_ASSERT ( model->hasIndex ( r, columns + 1, parent ) == false ); - for ( int c = 0; c < columns; ++c ) { - Q_ASSERT ( model->hasIndex ( r, c, parent ) == true ); - QModelIndex index = model->index ( r, c, parent ); - // rowCount() and columnCount() said that it existed... - Q_ASSERT ( index.isValid() == true ); - - // index() should always return the same index when called twice in a row - QModelIndex modifiedIndex = model->index ( r, c, parent ); - Q_ASSERT ( index == modifiedIndex ); - - // Make sure we get the same index if we request it twice in a row - QModelIndex a = model->index ( r, c, parent ); - QModelIndex b = model->index ( r, c, parent ); - Q_ASSERT ( a == b ); - - // Some basic checking on the index that is returned - Q_ASSERT ( index.model() == model ); - Q_ASSERT ( index.row() == r ); - Q_ASSERT ( index.column() == c ); - // While you can technically return a QVariant usually this is a sign - // of an bug in data() Disable if this really is ok in your model. -// Q_ASSERT ( model->data ( index, Qt::DisplayRole ).isValid() == true ); - - // If the next test fails here is some somewhat useful debug you play with. - - if (model->parent(index) != parent) { - qDebug() << r << c << currentDepth << model->data(index).toString() - << model->data(parent).toString(); - qDebug() << index << parent << model->parent(index); -// And a view that you can even use to show the model. -// QTreeView view; -// view.setModel(model); -// view.show(); - } - - // Check that we can get back our real parent. -// qDebug() << model->parent ( index ) << parent ; - Q_ASSERT ( model->parent ( index ) == parent ); - - // recursively go down the children - if ( model->hasChildren ( index ) && currentDepth < 10 ) { - //qDebug() << r << c << "has children" << model->rowCount(index); - checkChildren ( index, ++currentDepth ); - }/* else { if (currentDepth >= 10) qDebug() << "checked 10 deep"; };*/ - - // make sure that after testing the children that the index doesn't change. - QModelIndex newerIndex = model->index ( r, c, parent ); - Q_ASSERT ( index == newerIndex ); - } - } -} - -/*! - Tests model's implementation of QAbstractItemModel::data() - */ -void ModelTest::data() -{ - // Invalid index should return an invalid qvariant - Q_ASSERT ( !model->data ( QModelIndex() ).isValid() ); - - if ( model->rowCount() == 0 ) - return; - - // A valid index should have a valid QVariant data - Q_ASSERT ( model->index ( 0, 0 ).isValid() ); - - // shouldn't be able to set data on an invalid index - Q_ASSERT ( model->setData ( QModelIndex(), QLatin1String ( "foo" ), Qt::DisplayRole ) == false ); - - // General Purpose roles that should return a QString - QVariant variant = model->data ( model->index ( 0, 0 ), Qt::ToolTipRole ); - if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( variant ) ); - } - variant = model->data ( model->index ( 0, 0 ), Qt::StatusTipRole ); - if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( variant ) ); - } - variant = model->data ( model->index ( 0, 0 ), Qt::WhatsThisRole ); - if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( variant ) ); - } - - // General Purpose roles that should return a QSize - variant = model->data ( model->index ( 0, 0 ), Qt::SizeHintRole ); - if ( variant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( variant ) ); - } - - // General Purpose roles that should return a QFont - QVariant fontVariant = model->data ( model->index ( 0, 0 ), Qt::FontRole ); - if ( fontVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( fontVariant ) ); - } - - // Check that the alignment is one we know about - QVariant textAlignmentVariant = model->data ( model->index ( 0, 0 ), Qt::TextAlignmentRole ); - if ( textAlignmentVariant.isValid() ) { - int alignment = textAlignmentVariant.toInt(); - Q_ASSERT ( alignment == ( alignment & ( Qt::AlignHorizontal_Mask | Qt::AlignVertical_Mask ) ) ); - } - - // General Purpose roles that should return a QColor - QVariant colorVariant = model->data ( model->index ( 0, 0 ), Qt::BackgroundColorRole ); - if ( colorVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( colorVariant ) ); - } - - colorVariant = model->data ( model->index ( 0, 0 ), Qt::TextColorRole ); - if ( colorVariant.isValid() ) { - Q_ASSERT ( qVariantCanConvert ( colorVariant ) ); - } - - // Check that the "check state" is one we know about. - QVariant checkStateVariant = model->data ( model->index ( 0, 0 ), Qt::CheckStateRole ); - if ( checkStateVariant.isValid() ) { - int state = checkStateVariant.toInt(); - Q_ASSERT ( state == Qt::Unchecked || - state == Qt::PartiallyChecked || - state == Qt::Checked ); - } -} - -/*! - Store what is about to be inserted to make sure it actually happens - - \sa rowsInserted() - */ -void ModelTest::rowsAboutToBeInserted ( const QModelIndex &parent, int start, int end ) -{ -// Q_UNUSED(end); -// qDebug() << "rowsAboutToBeInserted" << "start=" << start << "end=" << end << "parent=" << model->data ( parent ).toString() -// << "current count of parent=" << model->rowCount ( parent ); // << "display of last=" << model->data( model->index(start-1, 0, parent) ); -// qDebug() << model->index(start-1, 0, parent) << model->data( model->index(start-1, 0, parent) ); - Changing c; - c.parent = parent; - c.oldSize = model->rowCount ( parent ); - c.last = model->data ( model->index ( start - 1, 0, parent ) ); - c.next = model->data ( model->index ( start, 0, parent ) ); - insert.push ( c ); -} - -/*! - Confirm that what was said was going to happen actually did - - \sa rowsAboutToBeInserted() - */ -void ModelTest::rowsInserted ( const QModelIndex & parent, int start, int end ) -{ - Changing c = insert.pop(); - Q_ASSERT ( c.parent == parent ); -// qDebug() << "rowsInserted" << "start=" << start << "end=" << end << "oldsize=" << c.oldSize -// << "parent=" << model->data ( parent ).toString() << "current rowcount of parent=" << model->rowCount ( parent ); - -// for (int ii=start; ii <= end; ii++) -// { -// qDebug() << "itemWasInserted:" << ii << model->data ( model->index ( ii, 0, parent )); -// } -// qDebug(); - - Q_ASSERT ( c.oldSize + ( end - start + 1 ) == model->rowCount ( parent ) ); - Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); - - if (c.next != model->data(model->index(end + 1, 0, c.parent))) { - qDebug() << start << end; - for (int i=0; i < model->rowCount(); ++i) - qDebug() << model->index(i, 0).data().toString(); - qDebug() << c.next << model->data(model->index(end + 1, 0, c.parent)); - } - - Q_ASSERT ( c.next == model->data ( model->index ( end + 1, 0, c.parent ) ) ); -} - -void ModelTest::layoutAboutToBeChanged() -{ - for ( int i = 0; i < qBound ( 0, model->rowCount(), 100 ); ++i ) - changing.append ( QPersistentModelIndex ( model->index ( i, 0 ) ) ); -} - -void ModelTest::layoutChanged() -{ - for ( int i = 0; i < changing.count(); ++i ) { - QPersistentModelIndex p = changing[i]; - Q_ASSERT ( p == model->index ( p.row(), p.column(), p.parent() ) ); - } - changing.clear(); -} - -/*! - Store what is about to be inserted to make sure it actually happens - - \sa rowsRemoved() - */ -void ModelTest::rowsAboutToBeRemoved ( const QModelIndex &parent, int start, int end ) -{ -qDebug() << "ratbr" << parent << start << end; - Changing c; - c.parent = parent; - c.oldSize = model->rowCount ( parent ); - c.last = model->data ( model->index ( start - 1, 0, parent ) ); - c.next = model->data ( model->index ( end + 1, 0, parent ) ); - remove.push ( c ); -} - -/*! - Confirm that what was said was going to happen actually did - - \sa rowsAboutToBeRemoved() - */ -void ModelTest::rowsRemoved ( const QModelIndex & parent, int start, int end ) -{ - qDebug() << "rr" << parent << start << end; - Changing c = remove.pop(); - Q_ASSERT ( c.parent == parent ); - Q_ASSERT ( c.oldSize - ( end - start + 1 ) == model->rowCount ( parent ) ); - Q_ASSERT ( c.last == model->data ( model->index ( start - 1, 0, c.parent ) ) ); - Q_ASSERT ( c.next == model->data ( model->index ( start, 0, c.parent ) ) ); -} - - diff -Nru muon-1.9.60/libmuon/tests/modeltest.h muon-2.0.0/libmuon/tests/modeltest.h --- muon-1.9.60/libmuon/tests/modeltest.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/libmuon/tests/modeltest.h 1970-01-01 00:00:00.000000000 +0000 @@ -1,94 +0,0 @@ -/**************************************************************************** -** -** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -** All rights reserved. -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** This file is part of the test suite of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** GNU Lesser General Public License Usage -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this -** file. Please review the following information to ensure the GNU Lesser -** General Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU General -** Public License version 3.0 as published by the Free Software Foundation -** and appearing in the file LICENSE.GPL included in the packaging of this -** file. Please review the following information to ensure the GNU General -** Public License version 3.0 requirements will be met: -** http://www.gnu.org/copyleft/gpl.html. -** -** Other Usage -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** -** -** -** -** $QT_END_LICENSE$ -** -****************************************************************************/ - - -#ifndef MODELTEST_H -#define MODELTEST_H - -#include -#include -#include - -class ModelTest : public QObject -{ - Q_OBJECT - -public: - ModelTest( QAbstractItemModel *model, QObject *parent = 0 ); - -private Q_SLOTS: - void nonDestructiveBasicTest(); - void rowCount(); - void columnCount(); - void hasIndex(); - void index(); - void parent(); - void data(); - -protected Q_SLOTS: - void runAllTests(); - void layoutAboutToBeChanged(); - void layoutChanged(); - void rowsAboutToBeInserted( const QModelIndex &parent, int start, int end ); - void rowsInserted( const QModelIndex & parent, int start, int end ); - void rowsAboutToBeRemoved( const QModelIndex &parent, int start, int end ); - void rowsRemoved( const QModelIndex & parent, int start, int end ); - -private: - void checkChildren( const QModelIndex &parent, int currentDepth = 0 ); - - QAbstractItemModel *model; - - struct Changing { - QModelIndex parent; - int oldSize; - QVariant last; - QVariant next; - }; - QStack insert; - QStack remove; - - bool fetchingMore; - - QList changing; -}; - -#endif diff -Nru muon-1.9.60/libmuonapt/CMakeLists.txt muon-2.0.0/libmuonapt/CMakeLists.txt --- muon-1.9.60/libmuonapt/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,16 @@ +set(muonapt_SRCS + ChangesDialog.cpp + MuonStrings.cpp + QAptActions.cpp + HistoryView/HistoryProxyModel.cpp + HistoryView/HistoryView.cpp +) + +kde4_add_library(muonapt SHARED ${muonapt_SRCS}) +target_link_libraries(muonapt ${QT_QTCORE_LIBRARY} + ${KDE4_KDECORE_LIBS} ${KDE4_KDEUI_LIBS} ${KDE4_SOLID_LIBS} ${KDE4_KIO_LIBS} + ${QAPT_LIBRARY} muonprivate +) +install(TARGETS muonapt ${INSTALL_TARGETS_DEFAULT_ARGS}) + +add_subdirectory(declarative) \ No newline at end of file diff -Nru muon-1.9.60/libmuonapt/ChangesDialog.cpp muon-2.0.0/libmuonapt/ChangesDialog.cpp --- muon-1.9.60/libmuonapt/ChangesDialog.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/ChangesDialog.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,133 @@ +/*************************************************************************** + * Copyright © 2011 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "ChangesDialog.h" + +// Qt includes +#include +#include +#include +#include + +// KDE includes +#include +#include +#include + +// Own includes +#include "../libmuonapt/MuonStrings.h" + +ChangesDialog::ChangesDialog(QWidget *parent, const QApt::StateChanges &changes) + : QDialog(parent) +{ + setWindowTitle(i18nc("@title:window", "Confirm Additional Changes")); + QVBoxLayout *layout = new QVBoxLayout(this); + setLayout(layout); + + QLabel *headerLabel = new QLabel(this); + headerLabel->setText(i18nc("@info", "

Mark additional changes?

")); + + int count = countChanges(changes); + QLabel *label = new QLabel(this); + label->setText(i18np("This action requires a change to another package:", + "This action requires changes to other packages:", + count)); + + QTreeView *packageView = new QTreeView(this); + packageView->setHeaderHidden(true); + packageView->setRootIsDecorated(false); + + QWidget *bottomBox = new QWidget(this); + QHBoxLayout *bottomLayout = new QHBoxLayout(bottomBox); + bottomLayout->setSpacing(0); + bottomLayout->setMargin(0); + bottomBox->setLayout(bottomLayout); + + QWidget *bottomSpacer = new QWidget(bottomBox); + bottomSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum); + + QPushButton *okButton = new QPushButton(bottomBox); + KGuiItem okItem = KStandardGuiItem::ok(); + okButton->setText(okItem.text()); + okButton->setIcon(okItem.icon()); + connect(okButton, SIGNAL(clicked()), this, SLOT(accept())); + + QPushButton *cancelButton = new QPushButton(bottomBox); + KGuiItem cancelItem = KStandardGuiItem::cancel(); + cancelButton->setText(cancelItem.text()); + cancelButton->setIcon(cancelItem.icon()); + connect(cancelButton, SIGNAL(clicked()), this, SLOT(reject())); + + bottomLayout->addWidget(bottomSpacer); + bottomLayout->addWidget(okButton); + bottomLayout->addWidget(cancelButton); + + m_model = new QStandardItemModel(this); + packageView->setModel(m_model); + addPackages(changes); + packageView->expandAll(); + + layout->addWidget(headerLabel); + layout->addWidget(label); + layout->addWidget(packageView); + layout->addWidget(bottomBox); +} + +void ChangesDialog::addPackages(const QApt::StateChanges &changes) +{ + for (auto i = changes.constBegin(); i != changes.constEnd(); ++i) { + QStandardItem *root = new QStandardItem; + root->setText(MuonStrings::global()->packageStateName(i.key())); + root->setEditable(false); + + QFont font = root->font(); + font.setBold(true); + root->setFont(font); + + const QApt::PackageList packages = i.value(); + + QStandardItem *item = 0; + for (QApt::Package *package : packages) { + item = new QStandardItem; + item->setText(package->name()); + item->setEditable(false); + item->setIcon(KIcon("muon")); + + root->appendRow(item); + } + + m_model->appendRow(root); + } +} + +int ChangesDialog::countChanges(const QApt::StateChanges &changes) +{ + int count = 0; + auto iter = changes.constBegin(); + + while (iter != changes.constEnd()) { + const QApt::PackageList packages = iter.value(); + count += packages.size(); + + ++iter; + } + + return count; +} diff -Nru muon-1.9.60/libmuonapt/ChangesDialog.h muon-2.0.0/libmuonapt/ChangesDialog.h --- muon-1.9.60/libmuonapt/ChangesDialog.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/ChangesDialog.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,47 @@ +/*************************************************************************** + * Copyright © 2011 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef CHANGESDIALOG_H +#define CHANGESDIALOG_H + +// Qt includes +#include +#include + +// LibQApt includes +#include + +#include "libmuonprivate_export.h" + +class QStandardItemModel; + +class MUONPRIVATE_EXPORT ChangesDialog : public QDialog +{ +public: + ChangesDialog(QWidget *parent, const QApt::StateChanges &changes); + +private: + QStandardItemModel *m_model; + + void addPackages(const QApt::StateChanges &changes); + int countChanges(const QApt::StateChanges &changes); +}; + +#endif // CHANGESDIALOG_H diff -Nru muon-1.9.60/libmuonapt/HistoryView/HistoryProxyModel.cpp muon-2.0.0/libmuonapt/HistoryView/HistoryProxyModel.cpp --- muon-1.9.60/libmuonapt/HistoryView/HistoryProxyModel.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/HistoryView/HistoryProxyModel.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,88 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "HistoryProxyModel.h" + +#include +#include +#include + +HistoryProxyModel::HistoryProxyModel(QObject *parent) + : QSortFilterProxyModel(parent) + , m_stateFilter((QApt::Package::State)0) +{ +} + +HistoryProxyModel::~HistoryProxyModel() +{ +} + +void HistoryProxyModel::search(const QString &searchText) +{ + m_searchText = searchText; + invalidate(); +} + +void HistoryProxyModel::setStateFilter(QApt::Package::State state) +{ + m_stateFilter = state; + invalidate(); +} + +bool HistoryProxyModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const +{ + QModelIndex sourceIndex = sourceModel()->index(sourceRow, 0, sourceParent); + for(int i = 0 ; i < sourceModel()->rowCount(sourceIndex); i++) { + if (filterAcceptsRow(i, sourceIndex)) { + return true; + } + } + + //Our "main"-method + QStandardItem *item = static_cast(sourceModel())->itemFromIndex(sourceModel()->index(sourceRow, 0, sourceParent)); + + if (!item) { + return false; + } + + if (!m_stateFilter == 0) { + if ((bool)(item->data(HistoryActionRole).toInt() & m_stateFilter) == false) { + return false; + } + } + + if (!m_searchText.isEmpty()) { + if ((bool)(item->data(Qt::DisplayRole).toString().contains(m_searchText)) == false) { + return false; + } + } + + return true; +} + +bool HistoryProxyModel::lessThan(const QModelIndex &left, const QModelIndex &right) const +{ + QStandardItemModel *parentModel = static_cast(sourceModel()); + + QStandardItem *leftItem = parentModel->itemFromIndex(left); + QStandardItem *rightItem = parentModel->itemFromIndex(right); + + return (leftItem->data(HistoryDateRole).toDateTime() > rightItem->data(HistoryDateRole).toDateTime()); +} diff -Nru muon-1.9.60/libmuonapt/HistoryView/HistoryProxyModel.h muon-2.0.0/libmuonapt/HistoryView/HistoryProxyModel.h --- muon-1.9.60/libmuonapt/HistoryView/HistoryProxyModel.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/HistoryView/HistoryProxyModel.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,52 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef HISTORYPROXYMODEL_H +#define HISTORYPROXYMODEL_H + +#include + +#include + +class HistoryProxyModel : public QSortFilterProxyModel +{ + Q_OBJECT +public: + enum { + HistoryDateRole = Qt::UserRole + 1, + HistoryActionRole = Qt::UserRole + 2 + }; + HistoryProxyModel(QObject *parent); + ~HistoryProxyModel(); + + void search(const QString &searchText); + void setStateFilter(QApt::Package::State state); + + bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const; + +protected: + bool lessThan(const QModelIndex &left, const QModelIndex &right) const; + +private: + QString m_searchText; + QApt::Package::State m_stateFilter; +}; + +#endif diff -Nru muon-1.9.60/libmuonapt/HistoryView/HistoryView.cpp muon-2.0.0/libmuonapt/HistoryView/HistoryView.cpp --- muon-1.9.60/libmuonapt/HistoryView/HistoryView.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/HistoryView/HistoryView.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,238 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "HistoryView.h" + +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include +#include + +#include + +#include "HistoryProxyModel.h" + +HistoryView::HistoryView(QWidget *parent) + : KVBox(parent) +{ + m_history = new QApt::History(this); + + QWidget *headerWidget = new QWidget(this); + QHBoxLayout *headerLayout = new QHBoxLayout(headerWidget); + + QLabel *headerLabel = new QLabel(headerWidget); + headerLabel->setText(i18nc("@info", "History")); + + QWidget *headerSpacer = new QWidget(headerWidget); + headerSpacer->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Preferred); + + m_searchEdit = new KLineEdit(headerWidget); + m_searchEdit->setClickMessage(i18nc("@label Line edit click message", "Search")); + m_searchEdit->setClearButtonShown(true); + + m_searchTimer = new QTimer(this); + m_searchTimer->setInterval(300); + m_searchTimer->setSingleShot(true); + connect(m_searchTimer, SIGNAL(timeout()), this, SLOT(startSearch())); + connect(m_searchEdit, SIGNAL(textChanged(QString)), m_searchTimer, SLOT(start())); + + m_filterBox = new KComboBox(headerWidget); + m_filterBox->insertItem(AllChangesItem, KIcon("bookmark-new-list"), + i18nc("@item:inlistbox Filters all changes in the history view", + "All changes"), + 0); + m_filterBox->insertItem(InstallationsItem, KIcon("download"), + i18nc("@item:inlistbox Filters installations in the history view", + "Installations"), + QApt::Package::ToInstall); + m_filterBox->insertItem(UpdatesItem, KIcon("system-software-update"), + i18nc("@item:inlistbox Filters updates in the history view", + "Updates"), + QApt::Package::ToUpgrade); + m_filterBox->insertItem(RemovalsItem, KIcon("edit-delete"), + i18nc("@item:inlistbox Filters removals in the history view", + "Removals"), + (QApt::Package::State)(QApt::Package::ToRemove | QApt::Package::ToPurge)); + connect(m_filterBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setStateFilter(int))); + + headerLayout->addWidget(headerLabel); + headerLayout->addWidget(headerSpacer); + headerLayout->addWidget(m_searchEdit); + headerLayout->addWidget(m_filterBox); + + m_historyModel = new QStandardItemModel(this); + m_historyModel->setColumnCount(1); + m_historyModel->setHeaderData(0, Qt::Horizontal, i18nc("@title:column", "Date")); + m_historyView = new QTreeView(this); + + KIcon itemIcon("applications-other"); + + QHash categoryHash; + + QHash actionHash; + actionHash[InstalledAction] = i18nc("@info:status describes a past-tense action", "Installed"); + actionHash[UpgradedAction] = i18nc("@info:status describes a past-tense action", "Upgraded"); + actionHash[DowngradedAction] = i18nc("@status describes a past-tense action", "Downgraded"); + actionHash[RemovedAction] = i18nc("@status describes a past-tense action", "Removed"); + actionHash[PurgedAction] = i18nc("@status describes a past-tense action", "Purged"); + + for (const QApt::HistoryItem &item : m_history->historyItems()) { + QDateTime startDateTime = item.startDate(); + QString formattedTime = KGlobal::locale()->formatTime(startDateTime.time()); + QString category; + + QString date = startDateTime.date().toString(); + if (categoryHash.contains(date)) { + category = categoryHash.value(date); + } else { + category = KGlobal::locale()->formatDate(startDateTime.date(), KLocale::FancyShortDate); + categoryHash[date] = category; + } + + QStandardItem *parentItem = 0; + + if (!m_categoryHash.contains(category)) { + parentItem = new QStandardItem; + parentItem->setEditable(false); + parentItem->setText(category); + parentItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); + + m_historyModel->appendRow(parentItem); + m_categoryHash[category] = parentItem; + } else { + parentItem = m_categoryHash.value(category); + } + + foreach (const QString &package, item.installedPackages()) { + QStandardItem *historyItem = new QStandardItem; + historyItem->setEditable(false); + historyItem->setIcon(itemIcon); + + QString action = actionHash.value(InstalledAction); + QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", + package, action, formattedTime); + historyItem->setText(text); + historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); + historyItem->setData(QApt::Package::ToInstall, HistoryProxyModel::HistoryActionRole); + + parentItem->appendRow(historyItem); + } + + foreach (const QString &package, item.upgradedPackages()) { + QStandardItem *historyItem = new QStandardItem; + historyItem->setEditable(false); + historyItem->setIcon(itemIcon); + + QString action = actionHash.value(UpgradedAction); + QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", + package, action, formattedTime); + historyItem->setText(text); + historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); + historyItem->setData(QApt::Package::ToUpgrade, HistoryProxyModel::HistoryActionRole); + + parentItem->appendRow(historyItem); + } + + foreach (const QString &package, item.downgradedPackages()) { + QStandardItem *historyItem = new QStandardItem; + historyItem->setEditable(false); + historyItem->setIcon(itemIcon); + + QString action = actionHash.value(DowngradedAction); + QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", + package, action, formattedTime); + historyItem->setText(text); + historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); + historyItem->setData(QApt::Package::ToDowngrade, HistoryProxyModel::HistoryActionRole); + + parentItem->appendRow(historyItem); + } + + foreach (const QString &package, item.removedPackages()) { + QStandardItem *historyItem = new QStandardItem; + historyItem->setEditable(false); + historyItem->setIcon(itemIcon); + + QString action = actionHash.value(RemovedAction); + QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", + package, action, formattedTime); + historyItem->setText(text); + historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); + historyItem->setData(QApt::Package::ToRemove, HistoryProxyModel::HistoryActionRole); + + parentItem->appendRow(historyItem); + } + + foreach (const QString &package, item.purgedPackages()) { + QStandardItem *historyItem = new QStandardItem; + historyItem->setEditable(false); + historyItem->setIcon(itemIcon); + + QString action = actionHash.value(PurgedAction); + QString text = i18nc("@item example: muon installed at 16:00", "%1 %2 at %3", + package, action, formattedTime); + historyItem->setText(text); + historyItem->setData(startDateTime, HistoryProxyModel::HistoryDateRole); + historyItem->setData(QApt::Package::ToPurge, HistoryProxyModel::HistoryActionRole); + + parentItem->appendRow(historyItem); + } + } + + m_historyView->setMouseTracking(true); + m_historyView->setVerticalScrollMode(QListView::ScrollPerPixel); + + m_proxyModel = new HistoryProxyModel(this); + m_proxyModel->setSourceModel(m_historyModel); + m_proxyModel->sort(0); + + m_historyView->setModel(m_proxyModel); + + setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::MinimumExpanding); +} + +QSize HistoryView::sizeHint() const +{ + return QWidget::sizeHint().expandedTo(QSize(500, 500)); +} + +void HistoryView::setStateFilter(int index) +{ + QApt::Package::State state = (QApt::Package::State)m_filterBox->itemData(index).toInt(); + m_proxyModel->setStateFilter(state); +} + +void HistoryView::startSearch() +{ + m_proxyModel->search(m_searchEdit->text()); +} + +#include "HistoryView.moc" diff -Nru muon-1.9.60/libmuonapt/HistoryView/HistoryView.h muon-2.0.0/libmuonapt/HistoryView/HistoryView.h --- muon-1.9.60/libmuonapt/HistoryView/HistoryView.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/HistoryView/HistoryView.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,82 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef HISTORYVIEW_H +#define HISTORYVIEW_H + +#include + +#include + +#include "../libmuonapt_export.h" + +class QStandardItem; +class QStandardItemModel; +class QTimer; +class QTreeView; + +class KComboBox; +class KLineEdit; + +namespace QApt { + class History; +} + +class HistoryProxyModel; + +class MUONAPT_EXPORT HistoryView : public KVBox +{ + Q_OBJECT +public: + enum ComboItems { + AllChangesItem = 0, + InstallationsItem = 1, + UpdatesItem = 2, + RemovalsItem = 3 + }; + enum PastActions { + InvalidAction = 0, + InstalledAction = 1, + UpgradedAction = 2, + DowngradedAction = 3, + RemovedAction = 4, + PurgedAction = 5 + }; + HistoryView(QWidget *parent); + + QSize sizeHint() const; + +private: + QApt::History *m_history; + QStandardItemModel *m_historyModel; + HistoryProxyModel *m_proxyModel; + QHash m_categoryHash; + + KLineEdit *m_searchEdit; + QTimer *m_searchTimer; + KComboBox *m_filterBox; + QTreeView *m_historyView; + +private Q_SLOTS: + void setStateFilter(int index); + void startSearch(); +}; + +#endif diff -Nru muon-1.9.60/libmuonapt/MuonStrings.cpp muon-2.0.0/libmuonapt/MuonStrings.cpp --- muon-1.9.60/libmuonapt/MuonStrings.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/MuonStrings.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,315 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "MuonStrings.h" + +#include +#include + +#include + +K_GLOBAL_STATIC_WITH_ARGS(MuonStrings, globalMuonStrings, (0)) + +MuonStrings *MuonStrings::global() +{ + return globalMuonStrings; +} + +MuonStrings::MuonStrings(QObject *parent) + : QObject(parent) + , m_groupHash(groupHash()) + , m_stateHash(stateHash()) + , m_archHash(archHash()) +{ +} + +QHash MuonStrings::groupHash() +{ + QHash hash; + hash["admin"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"admin\"", + "System Administration"); + hash["base"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"base\"", + "Base System"); + hash["cli-mono"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"cli-mono\"", + "Mono/CLI Infrastructure"); + hash["comm"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"comm\"", + "Communication"); + hash["database"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"database\"", + "Databases"); + hash["devel"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"devel\"", + "Development"); + hash["doc"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"doc\"", + "Documentation"); + hash["debug"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"debug\"", + "Debug"); + hash["editors"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"editors\"", + "Editors"); + hash["electronics"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"electronics\"", + "Electronics"); + hash["embedded"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"embedded\"", + "Embedded Devices"); + hash["fonts"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"fonts\"", + "Fonts"); + hash["games"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"games\"", + "Games and Amusement"); + hash["gnome"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"gnome\"", + "GNOME Desktop Environment"); + hash["graphics"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"graphics\"", + "Graphics"); + hash["gnu-r"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"", + "GNU R Statistical System"); + hash["gnustep"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"gnustep\"", + "Gnustep Desktop Environment"); + hash["hamradio"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"hamradio\"", + "Amateur Radio"); + hash["haskell"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"haskell\"", + "Haskell Programming Language"); + hash["httpd"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"httpd\"", + "Web Servers"); + hash["interpreters"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"interpreters\"", + "Interpreted Computer Languages"); + hash["java"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"java\"", + "Java Programming Language"); + hash["kde"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"kde\"", + "KDE Software Compilation"); + hash["kernel"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"kernel\"", + "Kernel and Modules"); + hash["libdevel"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"libdevel\"", + "Libraries - Development"); + hash["libs"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"libs\"", + "Libraries"); + hash["lisp"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"lisp\"", + "Lisp Programming Language"); + hash["localization"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"localization\"", + "Localization"); + hash["mail"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"mail\"", + "Email"); + hash["math"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"math\"", + "Mathematics"); + hash["misc"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"misc\"", + "Miscellaneous - Text-based"); + hash["net"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"net\"", + "Networking"); + hash["news"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"news\"", + "Newsgroups"); + hash["ocaml"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"ocaml\"", + "OCaml Programming Language"); + hash["oldlibs"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"oldlibs\"", + "Libraries - Old"); + hash["otherosfs"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"otherosfs\"", + "Cross Platform"); + hash["perl"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"perl\"", + "Perl Programming Language"); + hash["php"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"php\"", + "PHP Programming Language"); + hash["python"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"python\"", + "Python Programming Language"); + hash["ruby"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"ruby\"", + "Ruby Programming Language"); + hash["science"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"science\"", + "Science"); + hash["shells"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"shells\"", + "Shells"); + hash["sound"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"sound\"", + "Multimedia"); + hash["tex"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"tex\"", + "TeX Authoring"); + hash["text"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"text\"", + "Word Processing"); + hash["utils"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"utils\"", + "Utilities"); + hash["vcs"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"vcs\"", + "Version Control Systems"); + hash["video"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"video\"", + "Video Software"); + hash["web"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"web\"", + "Internet"); + hash["x11"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"x11\"", + "Miscellaneous - Graphical"); + hash["xfce"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"xfce\"", + "Xfce Desktop Environment"); + hash["zope"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"zope\"", + "Zope/Plone Environment"); + hash["unknown"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"unknown\"", + "Unknown"); + hash["alien"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"alien\"", + "Converted from RPM by Alien"); + hash["translations"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"translations\"", + "Internationalization and Localization"); + hash["metapackages"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"metapackages\"", + "Meta Packages"); + hash["non-us"] = i18nc("@item:inlistbox Debian package section \"non-US\", for packages that cannot be shipped in the US", + "Restricted On Export"); + hash["non-free"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"non-free\"", + "Non-free"); + hash["contrib"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"contrib\"", + "Contrib"); + hash["education"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"education\"", + "Education"); + hash["introspection"] = i18nc("@item:inlistbox Human-readable name for the Debian package section \"introspection\"", + "GObject Introspection Data"); + return hash; +} + +QString MuonStrings::groupName(const QString &name) const +{ + QString suffix; + + if (name.contains('/')) { + QStringList split = name.split('/'); + suffix = split.at(1); + + return m_groupHash.value(suffix); + } else { + return m_groupHash.value(name); + } +} + +QString MuonStrings::groupKey(const QString &text) const +{ + return m_groupHash.key(text); +} + +QHash MuonStrings::stateHash() +{ + QHash hash; + hash[QApt::Package::NotInstalled] = i18nc("@info:status Package state" , "Not Installed"); + hash[QApt::Package::Installed] = i18nc("@info:status Package state", "Installed"); + hash[QApt::Package::Upgradeable] = i18nc("@info:status Package state", "Upgradeable"); + hash[QApt::Package::NowBroken] = i18nc("@info:status Package state", "Broken"); + hash[QApt::Package::ResidualConfig] = i18nc("@info:status Package state", "Residual Configuration"); + hash[QApt::Package::IsGarbage] = i18nc("@info:status Package state", "Installed (auto-removable)"); + hash[QApt::Package::ToKeep] = i18nc("@info:status Package state", "No Change"); + hash[QApt::Package::ToInstall] = i18nc("@info:status Requested action", "Install"); + hash[QApt::Package::NewInstall] = i18nc("@info:status Requested action", "Install"); + hash[QApt::Package::ToUpgrade] = i18nc("@info:status Requested action", "Upgrade"); + hash[QApt::Package::ToRemove] = i18nc("@info:status Requested action", "Remove"); + hash[QApt::Package::ToPurge] = i18nc("@info:status Requested action", "Purge"); + hash[QApt::Package::ToReInstall] = i18nc("@info:status Requested action", "Reinstall"); + hash[QApt::Package::ToDowngrade] = i18nc("@info:status Requested action", "Downgrade"); + hash[QApt::Package::IsPinned] = i18nc("@info:status Package locked at a certain version", + "Locked"); + + return hash; +} + +QString MuonStrings::packageStateName(QApt::Package::State state) const +{ + return m_stateHash.value(state); +} + +QHash MuonStrings::archHash() +{ + QHash hash; + hash["all"] = i18nc("@item:inlistbox", "Common"); + hash["i386"] = i18nc("@item:inlistbox CPU architecture", "32-bit"); + hash["amd64"] = i18nc("@item:inlistbox CPU architecture", "64-bit"); + hash["powerpc"] = i18nc("@item:inlistbox PU architecture", "Power PC"); + + return hash; +} + +QString MuonStrings::archString(const QString &arch) const +{ + QString str = m_archHash.value(arch); + + if (str.isEmpty()) + str = arch; + + return str; +} + +QString MuonStrings::errorTitle(QApt::ErrorCode error) const +{ + switch (error) { + case QApt::InitError: + return i18nc("@title:window", "Initialization Error"); + case QApt::LockError: + return i18nc("@title:window", "Unable to Obtain Package System Lock"); + case QApt::DiskSpaceError: + return i18nc("@title:window", "Low Disk Space"); + case QApt::FetchError: + case QApt::CommitError: + return i18nc("@title:window", "Failed to Apply Changes"); + case QApt::AuthError: + return i18nc("@title:window", "Authentication error"); + case QApt::WorkerDisappeared: + return i18nc("@title:window", "Unexpected Error"); + case QApt::UntrustedError: + return i18nc("@title:window", "Untrusted Packages"); + case QApt::UnknownError: + default: + return i18nc("@title:window", "Unknown Error"); + } +} + +QString MuonStrings::errorText(QApt::ErrorCode error, QApt::Transaction *trans) const +{ + QString text; + + switch (error) { + case QApt::InitError: + text = i18nc("@label", "The package system could not be initialized, your " + "configuration may be broken."); + break; + case QApt::LockError: + text = i18nc("@label", + "Another application seems to be using the package " + "system at this time. You must close all other package " + "managers before you will be able to install or remove " + "any packages."); + break; + case QApt::DiskSpaceError: + text = i18nc("@label", + "You do not have enough disk space in the directory " + "at %1 to continue with this operation.", trans->errorDetails()); + break; + case QApt::FetchError: + text = i18nc("@label", "Could not download packages"); + break; + case QApt::CommitError: + text = i18nc("@label", "An error occurred while applying changes:"); + break; + case QApt::AuthError: + text = i18nc("@label", + "This operation cannot continue since proper " + "authorization was not provided"); + break; + case QApt::WorkerDisappeared: + text = i18nc("@label", "It appears that the QApt worker has either crashed " + "or disappeared. Please report a bug to the QApt maintainers"); + break; + case QApt::UntrustedError: + text = i18ncp("@label", + "The following package has not been verified by its author. " + "Downloading untrusted packages has been disallowed " + "by your current configuration.", + "The following packages have not been verified by " + "their authors. " + "Downloading untrusted packages has " + "been disallowed by your current configuration.", + trans->untrustedPackages().size()); + break; + default: + break; + } + + return text; +} diff -Nru muon-1.9.60/libmuonapt/MuonStrings.h muon-2.0.0/libmuonapt/MuonStrings.h --- muon-1.9.60/libmuonapt/MuonStrings.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/MuonStrings.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,59 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef MUONSTRINGS_H +#define MUONSTRINGS_H + +#include + +#include + +#include "libmuonprivate_export.h" + +namespace QApt { + class Transaction; +} + +class MUONPRIVATE_EXPORT MuonStrings : public QObject +{ + Q_OBJECT +public: + explicit MuonStrings(QObject *parent); + + static MuonStrings* global(); + + QString groupName(const QString &name) const; + QString groupKey(const QString &text) const; + QString packageStateName(QApt::Package::State state) const; + QString archString(const QString &arch) const; + QString errorTitle(QApt::ErrorCode error) const; + QString errorText(QApt::ErrorCode error, QApt::Transaction *trans) const; + +private: + const QHash m_groupHash; + const QHash m_stateHash; + const QHash m_archHash; + + QHash groupHash(); + QHash stateHash(); + QHash archHash(); +}; + +#endif diff -Nru muon-1.9.60/libmuonapt/QAptActions.cpp muon-2.0.0/libmuonapt/QAptActions.cpp --- muon-1.9.60/libmuonapt/QAptActions.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/QAptActions.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,432 @@ +/*************************************************************************** + * Copyright © 2012 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "QAptActions.h" +#include "MuonStrings.h" + +// Qt includes +#include +#include + +// KDE includes +#include +#include +#include +#include +#include +#include +#include +#include +#include + +// LibQApt includes +#include +#include +#include + +// Own includes +#include "MuonMainWindow.h" + +QAptActions::QAptActions() + : QObject(0) + , m_backend(0) + , m_actionsDisabled(false) + , m_mainWindow(0) + , m_reloadWhenEditorFinished(false) +{ + connect(Solid::Networking::notifier(), SIGNAL(statusChanged(Solid::Networking::Status)), + this, SLOT(networkChanged())); +} + +QAptActions* QAptActions::self() +{ + static QWeakPointer self; + if(!self) { + self = new QAptActions; + } + return self.data(); +} + +void QAptActions::setMainWindow(KXmlGuiWindow* w) +{ + setParent(w); + m_mainWindow = w; + setupActions(); +} + +void QAptActions::setBackend(QApt::Backend* backend) +{ + m_backend = backend; + connect(m_backend, SIGNAL(packageChanged()), this, SLOT(setActionsEnabled())); + + setOriginalState(m_backend->currentCacheState()); + setReloadWhenEditorFinished(true); + // Some actions need an initialized backend to be able to set their enabled state + setActionsEnabled(true); +} + +void QAptActions::setupActions() +{ + KAction* updateAction = m_mainWindow->actionCollection()->addAction("update"); + updateAction->setIcon(KIcon("system-software-update")); + updateAction->setText(i18nc("@action Checks the Internet for updates", "Check for Updates")); + updateAction->setShortcut(QKeySequence(Qt::CTRL + Qt::Key_R)); + connect(updateAction, SIGNAL(triggered()), SIGNAL(checkForUpdates())); + if (!isConnected()) { + updateAction->setDisabled(true); + } + connect(this, SIGNAL(shouldConnect(bool)), updateAction, SLOT(setEnabled(bool))); + m_actions.append(updateAction); + + + KAction* undoAction = KStandardAction::undo(this, SLOT(undo()), actionCollection()); + actionCollection()->addAction("undo", undoAction); + m_actions.append(undoAction); + + KAction* redoAction = KStandardAction::redo(this, SLOT(redo()), actionCollection()); + actionCollection()->addAction("redo", redoAction); + m_actions.append(redoAction); + + KAction* revertAction = actionCollection()->addAction("revert"); + revertAction->setIcon(KIcon("document-revert")); + revertAction->setText(i18nc("@action Reverts all potential changes to the cache", "Unmark All")); + connect(revertAction, SIGNAL(triggered()), this, SLOT(revertChanges())); + m_actions.append(revertAction); + + KAction* softwarePropertiesAction = actionCollection()->addAction("software_properties"); + softwarePropertiesAction->setIcon(KIcon("configure")); + softwarePropertiesAction->setText(i18nc("@action Opens the software sources configuration dialog", "Configure Software Sources")); + connect(softwarePropertiesAction, SIGNAL(triggered()), this, SLOT(runSourcesEditor())); + m_actions.append(softwarePropertiesAction); + + KAction* loadSelectionsAction = actionCollection()->addAction("open_markings"); + loadSelectionsAction->setIcon(KIcon("document-open")); + loadSelectionsAction->setText(i18nc("@action", "Read Markings...")); + connect(loadSelectionsAction, SIGNAL(triggered()), this, SLOT(loadSelections())); + m_actions.append(loadSelectionsAction); + + KAction* saveSelectionsAction = actionCollection()->addAction("save_markings"); + saveSelectionsAction->setIcon(KIcon("document-save-as")); + saveSelectionsAction->setText(i18nc("@action", "Save Markings As...")); + connect(saveSelectionsAction, SIGNAL(triggered()), this, SLOT(saveSelections())); + m_actions.append(saveSelectionsAction); + + KAction* createDownloadListAction = actionCollection()->addAction("save_download_list"); + createDownloadListAction->setIcon(KIcon("document-save-as")); + createDownloadListAction->setText(i18nc("@action", "Save Package Download List...")); + connect(createDownloadListAction, SIGNAL(triggered()), this, SLOT(createDownloadList())); + m_actions.append(createDownloadListAction); + + KAction* downloadListAction = actionCollection()->addAction("download_from_list"); + downloadListAction->setIcon(KIcon("download")); + downloadListAction->setText(i18nc("@action", "Download Packages From List...")); + connect(downloadListAction, SIGNAL(triggered()), this, SLOT(downloadPackagesFromList())); + if (!isConnected()) { + downloadListAction->setDisabled(false); + } + connect(this, SIGNAL(shouldConnect(bool)), downloadListAction, SLOT(setEnabled(bool))); + m_actions.append(downloadListAction); + + KAction* loadArchivesAction = actionCollection()->addAction("load_archives"); + loadArchivesAction->setIcon(KIcon("document-open")); + loadArchivesAction->setText(i18nc("@action", "Add Downloaded Packages")); + connect(loadArchivesAction, SIGNAL(triggered()), this, SLOT(loadArchives())); + m_actions.append(loadArchivesAction); + + KAction* saveInstalledAction = actionCollection()->addAction("save_package_list"); + saveInstalledAction->setIcon(KIcon("document-save-as")); + saveInstalledAction->setText(i18nc("@action", "Save Installed Packages List...")); + connect(saveInstalledAction, SIGNAL(triggered()), this, SLOT(saveInstalledPackagesList())); + m_actions.append(saveInstalledAction); +} + +void QAptActions::setActionsEnabled(bool enabled) +{ + m_actionsDisabled = !enabled; + + for (KAction *action : m_actions) { + action->setEnabled(enabled); + } + + if (!enabled) + return; + + actionCollection()->action("update")->setEnabled(isConnected() && enabled); + + actionCollection()->action("undo")->setEnabled(!m_backend->isUndoStackEmpty()); + actionCollection()->action("redo")->setEnabled(!m_backend->isRedoStackEmpty()); + actionCollection()->action("revert")->setEnabled(!m_backend->isUndoStackEmpty()); + + actionCollection()->action("save_download_list")->setEnabled(isConnected()); + + bool changesPending = m_backend->areChangesMarked(); + actionCollection()->action("open_markings")->setEnabled(true); + actionCollection()->action("save_markings")->setEnabled(changesPending); + actionCollection()->action("save_download_list")->setEnabled(changesPending); + actionCollection()->action("save_package_list")->setEnabled(true); +} + +bool QAptActions::isConnected() const { + int status = Solid::Networking::status(); + bool connected = ((status == Solid::Networking::Connected) || + (status == Solid::Networking::Unknown)); + return connected; +} + + +void QAptActions::networkChanged() +{ + if (m_actionsDisabled) + return; + + emit shouldConnect(isConnected()); +} + +bool QAptActions::saveSelections() +{ + QString filename; + + filename = KFileDialog::getSaveFileName(QString(), QString(), m_mainWindow, + i18nc("@title:window", "Save Markings As")); + + if (filename.isEmpty()) { + return false; + } + + if (!m_backend->saveSelections(filename)) { + QString text = i18nc("@label", "The document could not be saved, as it " + "was not possible to write to " + "%1\n\nCheck " + "that you have write access to this file " + "or that enough disk space is available.", + filename); + KMessageBox::error(m_mainWindow, text, QString()); + return false; + } + + return true; +} + +bool QAptActions::saveInstalledPackagesList() +{ + QString filename; + + filename = KFileDialog::getSaveFileName(QString(), QString(), m_mainWindow, + i18nc("@title:window", "Save Installed Packages List As")); + + if (filename.isEmpty()) { + return false; + } + + if (!m_backend->saveInstalledPackagesList(filename)) { + QString text = i18nc("@label", "The document could not be saved, as it " + "was not possible to write to " + "%1\n\nCheck " + "that you have write access to this file " + "or that enough disk space is available.", + filename); + KMessageBox::error(m_mainWindow, text, QString()); + return false; + } + + return true; +} + +bool QAptActions::createDownloadList() +{ + QString filename; + filename = KFileDialog::getSaveFileName(QString(), QString(), m_mainWindow, + i18nc("@title:window", "Save Download List As")); + + if (filename.isEmpty()) { + return false; + } + + if (!m_backend->saveDownloadList(filename)) { + QString text = i18nc("@label", "The document could not be saved, as it " + "was not possible to write to " + "%1\n\nCheck " + "that you have write access to this file " + "or that enough disk space is available.", + filename); + KMessageBox::error(m_mainWindow, text, QString()); + return false; + } + + return true; +} + +void QAptActions::downloadPackagesFromList() +{ + QString filename = KFileDialog::getOpenFileName(QString(), QString(), + m_mainWindow, i18nc("@title:window", "Open File")); + + if (filename.isEmpty()) { + return; + } + + QString dirName = filename.left(filename.lastIndexOf('/')); + + setActionsEnabled(false); + QApt::Transaction *trans = m_backend->downloadArchives(filename, dirName % QLatin1String("/packages")); + + if (trans) + emit downloadArchives(trans); +} + +void QAptActions::loadSelections() +{ + QString filename = KFileDialog::getOpenFileName(QString(), QString(), + m_mainWindow, i18nc("@title:window", "Open File")); + + if (filename.isEmpty()) { + return; + } + + m_backend->saveCacheState(); + if (!m_backend->loadSelections(filename)) { + QString text = i18nc("@label", "Could not mark changes. Please make sure " + "that the file is a markings file created by " + "either the Muon Package Manager or the " + "Synaptic Package Manager."); + KMessageBox::error(m_mainWindow, text, QString()); + } +} + +void QAptActions::loadArchives() +{ + QString dirName; + + dirName = KFileDialog::getExistingDirectory(KUrl(), m_mainWindow, + i18nc("@title:window", + "Choose a Directory")); + + if (dirName.isEmpty()) { + // User cancelled + return; + } + + QDir dir(dirName); + QStringList archiveFiles = dir.entryList(QDir::Files, QDir::Name); + + int successCount = 0; + foreach (const QString &archiveFile, archiveFiles) { + const QApt::DebFile debFile(dirName % '/' % archiveFile); + + if (debFile.isValid()) { + if (m_backend->addArchiveToCache(debFile)) { + successCount++; + } + } + } + + if (successCount) { + QString message = i18ncp("@label", + "%1 package was successfully added to the cache", + "%1 packages were successfully added to the cache", + successCount); + KMessageBox::information(m_mainWindow, message, QString()); + } else { + QString message = i18nc("@label", + "No valid packages could be found in this directory. " + "Please make sure the packages are compatible with your " + "computer and are at the latest version."); + KMessageBox::error(m_mainWindow, message, i18nc("@title:window", + "Packages Could Not be Found")); + } +} + +void QAptActions::undo() +{ + m_backend->undo(); +} + +void QAptActions::redo() +{ + m_backend->redo(); +} + +void QAptActions::revertChanges() +{ + m_backend->restoreCacheState(m_originalState); + emit changesReverted(); +} + +void QAptActions::runSourcesEditor() +{ + KProcess *proc = new KProcess(this); + QStringList arguments; + int winID = m_mainWindow->effectiveWinId(); + + QString editor = "software-properties-kde"; + + if (m_reloadWhenEditorFinished) { + editor.append(QLatin1String(" --dont-update --attach ") % QString::number(winID)); //krazy:exclude=spelling; + } else { + editor.append(QLatin1String(" --attach ") % QString::number(winID)); + } + + arguments << "/usr/bin/kdesudo" << editor; + + proc->setProgram(arguments); + m_mainWindow->find(winID)->setEnabled(false); + proc->start(); + connect(proc, SIGNAL(finished(int,QProcess::ExitStatus)), + this, SLOT(sourcesEditorFinished(int))); +} + +void QAptActions::sourcesEditorFinished(int exitStatus) +{ + bool reload = (exitStatus == 0); + m_mainWindow->find(m_mainWindow->effectiveWinId())->setEnabled(true); + if (m_reloadWhenEditorFinished && reload) { + emit checkForUpdates(); + } + + emit sourcesEditorClosed(reload); +} + +KActionCollection* QAptActions::actionCollection() +{ + return m_mainWindow->actionCollection(); +} + +void QAptActions::setOriginalState(QApt::CacheState state) +{ + m_originalState = state; +} + +void QAptActions::setReloadWhenEditorFinished(bool reload) +{ + m_reloadWhenEditorFinished = reload; +} + +void QAptActions::initError() +{ + QString details = m_backend->initErrorMessage(); + + MuonStrings *muonStrings = MuonStrings::global(); + + QString title = muonStrings->errorTitle(QApt::InitError); + QString text = muonStrings->errorText(QApt::InitError, nullptr); + + KMessageBox::detailedError(m_mainWindow, text, details, title); + exit(-1); +} diff -Nru muon-1.9.60/libmuonapt/QAptActions.h muon-2.0.0/libmuonapt/QAptActions.h --- muon-1.9.60/libmuonapt/QAptActions.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/QAptActions.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,90 @@ +/*************************************************************************** + * Copyright © 2012 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef QAPTACTIONS_H +#define QAPTACTIONS_H + +#include + +#include + +#include "libmuonprivate_export.h" + +class KXmlGuiWindow; +class KAction; +class KActionCollection; + +namespace QApt { + class Backend; + class Transaction; +} + +class MUONPRIVATE_EXPORT QAptActions : public QObject +{ + Q_OBJECT +public: + static QAptActions* self(); + void setMainWindow(KXmlGuiWindow *parent); + + bool isConnected() const; + void setOriginalState(QApt::CacheState state); + void setReloadWhenEditorFinished(bool reload); + void initError(); + +signals: + void checkForUpdates(); + void shouldConnect(bool isConnected); + void changesReverted(); + void sourcesEditorClosed(bool reload); + void downloadArchives(QApt::Transaction *trans); + +public slots: + void setBackend(QApt::Backend *backend); + void setupActions(); + void setActionsEnabled(bool enabled = true); + void networkChanged(); + + // KAction slots + bool saveSelections(); + bool saveInstalledPackagesList(); + void loadSelections(); + bool createDownloadList(); + void downloadPackagesFromList(); + void loadArchives(); + void undo(); + void redo(); + void revertChanges(); + void runSourcesEditor(); + void sourcesEditorFinished(int exitStatus); + +private: + QAptActions(); + + QApt::Backend *m_backend; + QApt::CacheState m_originalState; + bool m_actionsDisabled; + KXmlGuiWindow* m_mainWindow; + bool m_reloadWhenEditorFinished; + QList m_actions; + + KActionCollection* actionCollection(); +}; + +#endif // QAPTACTIONS_H diff -Nru muon-1.9.60/libmuonapt/declarative/CMakeLists.txt muon-2.0.0/libmuonapt/declarative/CMakeLists.txt --- muon-1.9.60/libmuonapt/declarative/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,12 @@ +project(muonapt-declarative) + +include_directories( ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ..) + +kde4_add_library(muonaptdeclarativeplugin SHARED MuonAptDeclarativePlugin.cpp OriginsBackend.cpp) + +target_link_libraries(muonaptdeclarativeplugin ${QT_QTCORE_LIBRARY} ${QT_QTGUI_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY} ${KDE4_KDEUI_LIBRARY} ${QAPT_LIBRARY} muonprivate muonapt) + +install(TARGETS muonaptdeclarativeplugin DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/muonapt) +install(FILES qmldir DESTINATION ${IMPORTS_INSTALL_DIR}/org/kde/muonapt) + +add_subdirectory(tests) diff -Nru muon-1.9.60/libmuonapt/declarative/MuonAptDeclarativePlugin.cpp muon-2.0.0/libmuonapt/declarative/MuonAptDeclarativePlugin.cpp --- muon-1.9.60/libmuonapt/declarative/MuonAptDeclarativePlugin.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/MuonAptDeclarativePlugin.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#include "MuonAptDeclarativePlugin.h" +#include "OriginsBackend.h" +#include + +void MuonAptDeclarativePlugin::registerTypes(const char* uri) +{ + qmlRegisterType("org.kde.muonapt", 1, 0, "OriginsBackend"); +} diff -Nru muon-1.9.60/libmuonapt/declarative/MuonAptDeclarativePlugin.h muon-2.0.0/libmuonapt/declarative/MuonAptDeclarativePlugin.h --- muon-1.9.60/libmuonapt/declarative/MuonAptDeclarativePlugin.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/MuonAptDeclarativePlugin.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,33 @@ +/* + * Copyright (C) 2012 Aleix Pol Gonzalez + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU Library/Lesser General Public License + * version 2, or (at your option) any later version, as published by the + * Free Software Foundation + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details + * + * You should have received a copy of the GNU Library/Lesser General Public + * License along with this program; if not, write to the + * Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +#ifndef MUONAPTDECLARATIVEPLUGIN_H +#define MUONAPTDECLARATIVEPLUGIN_H + +#include + +class MuonAptDeclarativePlugin : public QDeclarativeExtensionPlugin +{ + public: + virtual void registerTypes(const char* uri); +}; + +Q_EXPORT_PLUGIN2(muonaptdeclarativeplugin, MuonAptDeclarativePlugin); + +#endif // MUONAPTDECLARATIVEPLUGIN_H diff -Nru muon-1.9.60/libmuonapt/declarative/OriginsBackend.cpp muon-2.0.0/libmuonapt/declarative/OriginsBackend.cpp --- muon-1.9.60/libmuonapt/declarative/OriginsBackend.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/OriginsBackend.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,248 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "OriginsBackend.h" +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + +static QObject* applicationBackend() +{ + foreach(AbstractResourcesBackend* b, ResourcesModel::global()->backends()) { + if(QByteArray(b->metaObject()->className())=="ApplicationBackend") + return b; + } + return 0; +} + +OriginsBackend::OriginsBackend(QObject* parent) + : QObject(parent) +{ + qmlRegisterType(); + qmlRegisterType(); + load(); +} + +OriginsBackend::~OriginsBackend() +{ + qDeleteAll(m_sources); +} + +void OriginsBackend::load() +{ + QApt::Backend* backend = qobject_cast(applicationBackend()->property("backend").value()); + if(!backend) { + connect(applicationBackend(), SIGNAL(backendReady()), SLOT(load())); + return; + } + + qDeleteAll(m_sources); + m_sources.clear(); + //load /etc/apt/sources.list + load(backend->config()->findFile("Dir::Etc::sourcelist")); + + //load /etc/apt/sources.list.d/*.list + QDir d(backend->config()->findDirectory("Dir::Etc::sourceparts")); + foreach(const QString& file, d.entryList(QStringList() << "*.list")) { + load(d.filePath(file)); + } +} + +void OriginsBackend::load(const QString& file) +{ + Q_ASSERT(QFile::exists(file)); + QFile f(file); + + if(!f.open(QFile::Text|QFile::ReadOnly)) + return; + //skip comments and empty lines + QRegExp rxComment("(\\s*#\\s*)|(^\\s+$)"); + QRegExp rxArchitecture("\\[(.+)\\] "); + while(!f.atEnd()) { + QByteArray line = f.readLine(); + int comment = rxComment.indexIn(line); + bool enabled = true; + if(comment==0) { + line = line.mid(rxComment.matchedLength()); + if(!line.startsWith(QByteArray("deb"))) { + continue; + } + enabled = false; + } else if(comment>0) + line = line.left(comment); + + if(!line.isEmpty()) { + QString architecture; + int arch = rxArchitecture.indexIn(line); + if(arch>=0) { + architecture = rxArchitecture.cap(1); + line.remove(arch, rxArchitecture.matchedLength()); + } + + QList source = line.split(' '); + if(source.count() < 3) { + return; + } + QByteArray uri; + int opened = 0; + for(int i=1; isetArch(architecture); + entry->setSource(source.first().endsWith(QByteArray("deb-src"))); + entry->setSuite(source[2]); + entry->setEnabled(enabled); + + QStringList args; + foreach(const QByteArray& arg, source.mid(3)) { + args += arg; + } + newSource->addEntry(entry); + } + } + + emit originsChanged(); +} + +Source* OriginsBackend::sourceForUri(const QString& uri) +{ + foreach(Source* s, m_sources) { + if(s->uri()==uri) + return s; + } + Source* s = new Source(this); + s->setUri(uri); + m_sources += s; + return s; +} + +void OriginsBackend::addRepository(const QString& repository) +{ + QProcess* p = new QProcess(this); + p->setProcessChannelMode(QProcess::MergedChannels); + connect(p, SIGNAL(finished(int)), SLOT(additionDone(int))); + connect(p, SIGNAL(finished(int)), p, SLOT(deleteLater())); + p->start("kdesudo", QStringList("--") << "apt-add-repository" << "-y" << repository); +} + +void OriginsBackend::removeRepository(const QString& repository) +{ + QProcess* p = new QProcess(this); + p->setProcessChannelMode(QProcess::MergedChannels); + connect(p, SIGNAL(finished(int)), SLOT(removalDone(int))); + connect(p, SIGNAL(finished(int)), p, SLOT(deleteLater())); + p->start("kdesudo", QStringList("--") << "apt-add-repository" << "--remove" << "-y" << repository); +} + +void OriginsBackend::additionDone(int processErrorCode) +{ + if(processErrorCode==0) { + load(); + QMetaObject::invokeMethod(applicationBackend(), "reload"); + } else { + QProcess* p = qobject_cast(sender()); + Q_ASSERT(p); + QByteArray errorMessage = p->readAllStandardOutput(); + if(errorMessage.isEmpty()) + KMessageBox::error(0, errorMessage, i18n("Adding Origins...")); + } +} + +void OriginsBackend::removalDone(int processErrorCode) +{ + if(processErrorCode==0) { + load(); + QMetaObject::invokeMethod(applicationBackend(), "reload"); + } else { + QProcess* p = qobject_cast(sender()); + Q_ASSERT(p); + QByteArray errorMessage = p->readAllStandardOutput(); + if(errorMessage.isEmpty()) + KMessageBox::error(0, errorMessage, i18n("Removing Origins...")); + } +} + +QVariantList OriginsBackend::sourcesVariant() const +{ + QVariantList ret; + foreach(QObject* source, m_sources) { + ret += qVariantFromValue(source); + } + return ret; +} + + +bool Source::enabled() const +{ + bool ret = false; + foreach(Entry* e, m_entries) { + ret |= e->isEnabled(); + } + return ret; +} + +QDeclarativeListProperty Source::entries() +{ + return QDeclarativeListProperty(this, m_entries); +} + +QString Source::name() const +{ + QUrl uri(m_uri); + QApt::Backend* backend = qobject_cast(applicationBackend()->property("backend").value()); + QStringList origins = backend->originsForHost(uri.host()); + if(origins.size()==1) + return origins.first(); + else if(origins.size()==0) + return QString(); + else { + QString path = uri.path(); + int firstSlash = path.indexOf('/', 1); + int secondSlash = path.indexOf('/', firstSlash+1); + QString launchpadifyUri = path.mid(1,secondSlash-1).replace('/', '-'); + QStringList results = origins.filter(launchpadifyUri, Qt::CaseInsensitive); + if(results.isEmpty()) { + launchpadifyUri = path.mid(1,firstSlash-1).replace('/', '-'); + results = origins.filter(launchpadifyUri, Qt::CaseInsensitive); + } + return results.isEmpty() ? QString() : results.first(); + } +} + +#include "moc_OriginsBackend.cpp" diff -Nru muon-1.9.60/libmuonapt/declarative/OriginsBackend.h muon-2.0.0/libmuonapt/declarative/OriginsBackend.h --- muon-1.9.60/libmuonapt/declarative/OriginsBackend.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/OriginsBackend.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,112 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef ORIGINSBACKEND_H +#define ORIGINSBACKEND_H + +#include +#include +#include +#include + +class Entry : public QObject +{ + Q_OBJECT + Q_PROPERTY(bool hasSource READ hasSource CONSTANT) + Q_PROPERTY(QStringList args READ args CONSTANT) + Q_PROPERTY(QString suite READ suite CONSTANT) + Q_PROPERTY(QString arch READ arch CONSTANT) + Q_PROPERTY(bool enabled READ isEnabled CONSTANT) + + public: + Entry(QObject* parent) : QObject(parent), m_isSource(false) {} + + bool hasSource() const { return m_isSource; } + void setSource(bool s) { m_isSource = s; } + + QStringList args() const { return m_args; } + void setArgs(const QStringList& args) { m_args = args; } + + QString suite() const { return m_suite; } + void setSuite(const QByteArray& suite) { m_suite = suite; } + + void setArch(const QString& arch) { m_arch = arch; } + QString arch() const { return m_arch; } + + void setEnabled(bool enabled) { m_enabled = enabled; } + bool isEnabled() const { return m_enabled; } + private: + bool m_enabled; + bool m_isSource; + QStringList m_args; + QByteArray m_suite; + QString m_arch; +}; + +class Source : public QObject +{ + Q_OBJECT + Q_PROPERTY(QString name READ name CONSTANT) + Q_PROPERTY(QString uri READ uri CONSTANT) + Q_PROPERTY(bool enabled READ enabled CONSTANT) + Q_PROPERTY(QDeclarativeListProperty entries READ entries CONSTANT) + public: + Source(QObject* parent) : QObject(parent) {} + QString uri() { return m_uri; } + void setUri(const QString& uri) { m_uri = uri; } + void addEntry(Entry* entry) { m_entries.append(entry); } + QDeclarativeListProperty entries(); + QString name() const; + bool enabled() const; + private: + QString m_uri; + QList m_entries; +}; + +class OriginsBackend : public QObject +{ + Q_OBJECT + Q_PROPERTY(QVariantList sources READ sourcesVariant NOTIFY originsChanged); + public: + explicit OriginsBackend(QObject* parent = 0); + virtual ~OriginsBackend(); + + void load(const QString& file); + QVariantList sourcesVariant() const; + QList sources() const { return m_sources; } + Source* sourceForUri(const QString& uri); + + public slots: + void addRepository(const QString& repository); + void removeRepository(const QString& repository); + void load(); + + private slots: + void additionDone(int processErrorCode); + void removalDone(int processErrorCode); + + signals: + void originsChanged(); + + private: + QList m_sources; +}; + +#endif // ORIGINSBACKEND_H diff -Nru muon-1.9.60/libmuonapt/declarative/qmldir muon-2.0.0/libmuonapt/declarative/qmldir --- muon-1.9.60/libmuonapt/declarative/qmldir 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/qmldir 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1 @@ +plugin muonaptdeclarativeplugin diff -Nru muon-1.9.60/libmuonapt/declarative/tests/CMakeLists.txt muon-2.0.0/libmuonapt/declarative/tests/CMakeLists.txt --- muon-1.9.60/libmuonapt/declarative/tests/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/tests/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1 @@ + diff -Nru muon-1.9.60/libmuonapt/declarative/tests/OriginsBackendTest.cpp muon-2.0.0/libmuonapt/declarative/tests/OriginsBackendTest.cpp --- muon-1.9.60/libmuonapt/declarative/tests/OriginsBackendTest.cpp 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/tests/OriginsBackendTest.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,74 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#include "OriginsBackendTest.h" +#include +#include +#include + +QTEST_MAIN( OriginsBackendTest ) + +OriginsBackendTest::OriginsBackendTest(QObject* parent) + : QObject(parent) +{ + MuonBackendsFactory f; + ResourcesModel::global()->addResourcesBackend(f.backend("appsbackend")); +} + +void OriginsBackendTest::testLoad() +{ + { + QFile f("testsource.list"); + QVERIFY(f.open(QFile::WriteOnly|QFile::Text)); + f.write("deb file:/home/jason/debian stable main contrib non-free\n"); + f.write("deb ftp://ftp.debian.org/debian stable contrib\n"); + f.write("deb http://nonus.debian.org/debian-non-US stable/non-US main contrib non-free\n"); + f.write("deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/\n"); + f.write("deb [arch=i386,amd64] http://ftp.de.debian.org/debian-non-US unstable\n"); + f.write("# deb http://ftp.de.debian.org/debian-non-US unstable/binary-$(ARCH)/\n"); + f.write("deb cdrom:[Kubuntu 11.10 _Oneiric Ocelot_ - Release amd64 (20111012)]/ dists/oneiric/main/binary-i386/"); + f.write("#hola companys!\n"); + f.write(" #com anem?\n"); + f.write(" \n"); + f.write("\n"); + f.close(); + } + + OriginsBackend origins; + origins.load("testsource.list"); + + QCOMPARE(origins.sources().size(), 5); + foreach(Source* s, origins.sources()) { + QVERIFY(!s->uri().isEmpty()); + QVERIFY(s->uri().contains('[') == s->uri().contains(']')); + } + + QFile::remove("testsource.list"); +} + +void OriginsBackendTest::testLocal() +{ + OriginsBackend origins; + origins.load("/etc/apt/sources.list"); + QDir d("/etc/apt/sources.list.d/"); + foreach(const QString& f, d.entryList(QStringList("*.list"))) { + origins.load(d.filePath(f)); + } +} diff -Nru muon-1.9.60/libmuonapt/declarative/tests/OriginsBackendTest.h muon-2.0.0/libmuonapt/declarative/tests/OriginsBackendTest.h --- muon-1.9.60/libmuonapt/declarative/tests/OriginsBackendTest.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/declarative/tests/OriginsBackendTest.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,38 @@ +/*************************************************************************** + * Copyright © 2012 Aleix Pol Gonzalez * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef ORIGINSBACKENDTEST_H +#define ORIGINSBACKENDTEST_H + +#include +#include <../OriginsBackend.h> + +class OriginsBackendTest : public QObject +{ + Q_OBJECT + public: + explicit OriginsBackendTest(QObject* parent = 0); + + private slots: + void testLoad(); + void testLocal(); +}; + +#endif // ORIGINSBACKENDTEST_H diff -Nru muon-1.9.60/libmuonapt/libmuonapt_export.h muon-2.0.0/libmuonapt/libmuonapt_export.h --- muon-1.9.60/libmuonapt/libmuonapt_export.h 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/libmuonapt/libmuonapt_export.h 2013-04-01 20:32:05.000000000 +0000 @@ -0,0 +1,41 @@ +/*************************************************************************** + * Copyright © 2010 Jonathan Thomas * + * * + * This program is free software; you can redistribute it and/or * + * modify it under the terms of the GNU General Public License as * + * published by the Free Software Foundation; either version 2 of * + * the License or (at your option) version 3 or any later version * + * accepted by the membership of KDE e.V. (or its successor approved * + * by the membership of KDE e.V.), which shall act as a proxy * + * defined in Section 14 of version 3 of the license. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License * + * along with this program. If not, see . * + ***************************************************************************/ + +#ifndef MUONAPT_EXPORT_H +#define MUONAPT_EXPORT_H + +// needed for KDE_EXPORT and KDE_IMPORT macros +#include + +#ifndef MUONAPT_EXPORT +# if defined(MAKE_MUONAPT_LIB) + // We are building this library +# define MUONAPT_EXPORT KDE_EXPORT +# else + // We are using this library +# define MUONAPT_EXPORT KDE_IMPORT +# endif +#endif + +# ifndef MUONAPT_EXPORT_DEPRECATED +# define MUONAPT_EXPORT_DEPRECATED KDE_DEPRECATED MUONAPT_EXPORT +# endif + +#endif diff -Nru muon-1.9.60/muon/CMakeLists.txt muon-2.0.0/muon/CMakeLists.txt --- muon-1.9.60/muon/CMakeLists.txt 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/CMakeLists.txt 2013-04-01 20:32:05.000000000 +0000 @@ -1,7 +1,5 @@ add_subdirectory(icons) -add_definitions(-DQAPT_ENABLED) - set(muon_SRCS main.cpp MainWindow.cpp @@ -38,7 +36,7 @@ kde4_add_executable(muon ${muon_SRCS}) -target_link_libraries(muon muonprivate +target_link_libraries(muon muonprivate muonapt ${KDE4_KIO_LIBS} ${QAPT_LIBRARY} ${DEBCONF_KDE_LIB}) diff -Nru muon-1.9.60/muon/DetailsTabs/MainTab.cpp muon-2.0.0/muon/DetailsTabs/MainTab.cpp --- muon-1.9.60/muon/DetailsTabs/MainTab.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/DetailsTabs/MainTab.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -173,9 +173,10 @@ // Append a newline to give a bit of separation for the support string m_descriptionBrowser->append(QString()); if (m_package->isSupported()) { + QDateTime endDate = m_package->supportedUntil(); m_descriptionBrowser->append(i18nc("@info Tells how long Canonical, Ltd. will support a package", "Canonical provides critical updates for %1 until %2.", - m_package->name(), m_package->supportedUntil())); + m_package->name(), KGlobal::locale()->formatDate(endDate.date()))); } else { m_descriptionBrowser->append(i18nc("@info Tells how long Canonical, Ltd. will support a package", "Canonical does not provide updates for %1. Some updates " diff -Nru muon-1.9.60/muon/DetailsTabs/TechnicalDetailsTab.cpp muon-2.0.0/muon/DetailsTabs/TechnicalDetailsTab.cpp --- muon-1.9.60/muon/DetailsTabs/TechnicalDetailsTab.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/DetailsTabs/TechnicalDetailsTab.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -37,7 +37,7 @@ #include // Own includes -#include "../libmuon/MuonStrings.h" +#include "../libmuonapt/MuonStrings.h" TechnicalDetailsTab::TechnicalDetailsTab(QWidget *parent) : DetailsTab(parent) diff -Nru muon-1.9.60/muon/FilterWidget/ArchitectureFilter.cpp muon-2.0.0/muon/FilterWidget/ArchitectureFilter.cpp --- muon-1.9.60/muon/FilterWidget/ArchitectureFilter.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/FilterWidget/ArchitectureFilter.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -28,7 +28,7 @@ #include // Libmuon includes -#include "../libmuon/MuonStrings.h" +#include "../libmuonapt/MuonStrings.h" ArchitectureFilter::ArchitectureFilter(QObject *parent, QApt::Backend *backend) : FilterModel(parent) diff -Nru muon-1.9.60/muon/FilterWidget/CategoryFilter.cpp muon-2.0.0/muon/FilterWidget/CategoryFilter.cpp --- muon-1.9.60/muon/FilterWidget/CategoryFilter.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/FilterWidget/CategoryFilter.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -31,7 +31,7 @@ #include // Own includes -#include "../libmuon/MuonStrings.h" +#include "../libmuonapt/MuonStrings.h" CategoryFilter::CategoryFilter(QObject *parent, QApt::Backend *backend) : FilterModel(parent) diff -Nru muon-1.9.60/muon/FilterWidget/StatusFilter.cpp muon-2.0.0/muon/FilterWidget/StatusFilter.cpp --- muon-1.9.60/muon/FilterWidget/StatusFilter.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/FilterWidget/StatusFilter.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -28,7 +28,7 @@ #include // Own includes -#include "../libmuon/MuonStrings.h" +#include "../libmuonapt/MuonStrings.h" StatusFilter::StatusFilter(QObject *parent) : FilterModel(parent) diff -Nru muon-1.9.60/muon/MainWindow.cpp muon-2.0.0/muon/MainWindow.cpp --- muon-1.9.60/muon/MainWindow.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/MainWindow.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -45,8 +45,8 @@ #include // Own includes -#include "../libmuon/HistoryView/HistoryView.h" -#include "../libmuon/MuonStrings.h" +#include "../libmuonapt/HistoryView/HistoryView.h" +#include "../libmuonapt/MuonStrings.h" #include "TransactionWidget.h" #include "FilterWidget/FilterWidget.h" #include "ManagerWidget.h" @@ -54,7 +54,7 @@ #include "MuonSettings.h" #include "StatusWidget.h" #include "config/ManagerSettingsDialog.h" -#include "../libmuon/QAptActions.h" +#include "../libmuonapt/QAptActions.h" MainWindow::MainWindow() : MuonMainWindow() @@ -120,13 +120,11 @@ m_stack->setCurrentWidget(m_mainWidget); m_backend = new QApt::Backend(this); + QAptActions* actions = QAptActions::self(); - m_actions = new QAptActions(this, m_backend); - m_actions->setReloadWhenEditorFinished(true); - connect(m_actions, SIGNAL(changesReverted()), - this, SLOT(revertChanges())); - connect(m_actions, SIGNAL(checkForUpdates()), - this, SLOT(checkForUpdates())); + actions->setMainWindow(this); + connect(actions, SIGNAL(changesReverted()), this, SLOT(revertChanges())); + connect(actions, SIGNAL(checkForUpdates()), this, SLOT(checkForUpdates())); setupActions(); m_statusWidget = new StatusWidget(centralWidget); @@ -138,9 +136,12 @@ void MainWindow::initObject() { if (!m_backend->init()) - initError(); + QAptActions::self()->initError(); emit backendReady(m_backend); + QAptActions::self()->setBackend(m_backend); + connect(m_backend, SIGNAL(packageChanged()), + this, SLOT(setActionsEnabled())); // Set up GUI loadSettings(); @@ -148,19 +149,6 @@ m_managerWidget->setFocus(); } -void MainWindow::initError() -{ - QString details = m_backend->initErrorMessage(); - - MuonStrings *muonStrings = MuonStrings::global(); - - QString title = muonStrings->errorTitle(QApt::InitError); - QString text = muonStrings->errorText(QApt::InitError, nullptr); - - KMessageBox::detailedError(this, text, details, title); - exit(-1); -} - void MainWindow::loadSettings() { m_backend->setUndoRedoCacheSize(MuonSettings::self()->undoStackSize()); @@ -186,43 +174,6 @@ void MainWindow::setupActions() { MuonMainWindow::setupActions(); - m_actions->setupActions(); - - m_loadSelectionsAction = actionCollection()->addAction("open_markings"); - m_loadSelectionsAction->setIcon(KIcon("document-open")); - m_loadSelectionsAction->setText(i18nc("@action", "Read Markings...")); - connect(m_loadSelectionsAction, SIGNAL(triggered()), m_actions, SLOT(loadSelections())); - - m_saveSelectionsAction = actionCollection()->addAction("save_markings"); - m_saveSelectionsAction->setIcon(KIcon("document-save-as")); - m_saveSelectionsAction->setText(i18nc("@action", "Save Markings As...")); - connect(m_saveSelectionsAction, SIGNAL(triggered()), m_actions, SLOT(saveSelections())); - - m_createDownloadListAction = actionCollection()->addAction("save_download_list"); - m_createDownloadListAction->setIcon(KIcon("document-save-as")); - m_createDownloadListAction->setText(i18nc("@action", "Save Package Download List...")); - connect(m_createDownloadListAction, SIGNAL(triggered()), m_actions, SLOT(createDownloadList())); - - m_downloadListAction = actionCollection()->addAction("download_from_list"); - m_downloadListAction->setIcon(KIcon("download")); - m_downloadListAction->setText(i18nc("@action", "Download Packages From List...")); - connect(m_downloadListAction, SIGNAL(triggered()), m_actions, SLOT(downloadPackagesFromList())); - connect(m_actions, SIGNAL(downloadArchives(QApt::Transaction*)), - this, SLOT(downloadArchives(QApt::Transaction*))); - if (!m_actions->isConnected()) { - m_downloadListAction->setDisabled(false); - } - connect(m_actions, SIGNAL(shouldConnect(bool)), m_downloadListAction, SLOT(setEnabled(bool))); - - m_loadArchivesAction = actionCollection()->addAction("load_archives"); - m_loadArchivesAction->setIcon(KIcon("document-open")); - m_loadArchivesAction->setText(i18nc("@action", "Add Downloaded Packages")); - connect(m_loadArchivesAction, SIGNAL(triggered()), m_actions, SLOT(loadArchives())); - - m_saveInstalledAction = actionCollection()->addAction("save_package_list"); - m_saveInstalledAction->setIcon(KIcon("document-save-as")); - m_saveInstalledAction->setText(i18nc("@action", "Save Installed Packages List...")); - connect(m_saveInstalledAction, SIGNAL(triggered()), m_actions, SLOT(saveInstalledPackagesList())); m_safeUpgradeAction = actionCollection()->addAction("safeupgrade"); m_safeUpgradeAction->setIcon(KIcon("go-up")); @@ -397,7 +348,7 @@ void MainWindow::reload() { - m_canExit = false; + setCanExit(false); returnFromPreview(); m_stack->setCurrentWidget(m_mainWidget); @@ -411,18 +362,23 @@ m_filterBox->reload(); - m_actions->setOriginalState(m_backend->currentCacheState()); + QAptActions::self()->setOriginalState(m_backend->currentCacheState()); m_statusWidget->updateStatus(); setActionsEnabled(); m_managerWidget->setEnabled(true); - m_canExit = true; + setCanExit(true); } void MainWindow::setActionsEnabled(bool enabled) { - m_actions->setActionsEnabled(enabled); + QAptActions::self()->setActionsEnabled(enabled); if (!enabled) { + m_applyAction->setEnabled(false); + m_safeUpgradeAction->setEnabled(false); + m_distUpgradeAction->setEnabled(false); + m_autoRemoveAction->setEnabled(false); + m_previewAction->setEnabled(false); return; } @@ -430,6 +386,7 @@ bool changesPending = m_backend->areChangesMarked(); int autoRemoveable = m_backend->packageCount(QApt::Package::IsGarbage); + m_applyAction->setEnabled(changesPending); m_safeUpgradeAction->setEnabled(upgradeable > 0); m_distUpgradeAction->setEnabled(upgradeable > 0); m_autoRemoveAction->setEnabled(autoRemoveable > 0); @@ -439,15 +396,6 @@ } else { m_previewAction->setEnabled(changesPending); } - - m_downloadListAction->setEnabled(m_actions->isConnected()); - - m_applyAction->setEnabled(changesPending); - - m_loadSelectionsAction->setEnabled(true); - m_saveSelectionsAction->setEnabled(changesPending); - m_createDownloadListAction->setEnabled(changesPending); - m_saveInstalledAction->setEnabled(true); } void MainWindow::downloadArchives(QApt::Transaction *trans) diff -Nru muon-1.9.60/muon/MainWindow.h muon-2.0.0/muon/MainWindow.h --- muon-1.9.60/muon/MainWindow.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/MainWindow.h 2013-04-01 20:32:05.000000000 +0000 @@ -104,7 +104,6 @@ void downloadArchives(QApt::Transaction *trans); public Q_SLOTS: - void initError(); void revertChanges(); void editSettings(); void closeSettingsDialog(); diff -Nru muon-1.9.60/muon/ManagerWidget.cpp muon-2.0.0/muon/ManagerWidget.cpp --- muon-1.9.60/muon/ManagerWidget.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/ManagerWidget.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -36,7 +36,7 @@ #include // Own includes -#include "../libmuon/MuonStrings.h" +#include "../libmuonapt/MuonStrings.h" #include "DetailsWidget.h" #include "PackageModel/PackageModel.h" #include "PackageModel/PackageProxyModel.h" diff -Nru muon-1.9.60/muon/PackageModel/PackageDelegate.cpp muon-2.0.0/muon/PackageModel/PackageDelegate.cpp --- muon-1.9.60/muon/PackageModel/PackageDelegate.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/PackageModel/PackageDelegate.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -30,7 +30,7 @@ #include // Own -#include "../libmuon/MuonStrings.h" +#include "../libmuonapt/MuonStrings.h" #include "PackageModel.h" PackageDelegate::PackageDelegate(QObject *parent) @@ -44,10 +44,6 @@ m_iconSize = KIconLoader::SizeSmallMedium; } -PackageDelegate::~PackageDelegate() -{ -} - void PackageDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const { if (!index.isValid()) { @@ -284,5 +280,3 @@ int textHeight = QFontInfo(name_item.font).pixelSize() + QFontInfo(description_item.font).pixelSize(); return qMax(textHeight, m_iconSize) + 2 * m_spacing; } - -#include "PackageDelegate.moc" diff -Nru muon-1.9.60/muon/PackageModel/PackageDelegate.h muon-2.0.0/muon/PackageModel/PackageDelegate.h --- muon-1.9.60/muon/PackageModel/PackageDelegate.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/PackageModel/PackageDelegate.h 2013-04-01 20:32:05.000000000 +0000 @@ -30,7 +30,6 @@ Q_OBJECT public: explicit PackageDelegate(QObject *parent = 0); - ~PackageDelegate(); protected: void paint(QPainter *painter, const QStyleOptionViewItem &option, const QModelIndex &index) const; diff -Nru muon-1.9.60/muon/PackageModel/PackageWidget.cpp muon-2.0.0/muon/PackageModel/PackageWidget.cpp --- muon-1.9.60/muon/PackageModel/PackageWidget.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/PackageModel/PackageWidget.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -46,9 +46,11 @@ // LibQApt includes #include +#include +#include // Own includes -#include "../libmuon/ChangesDialog.h" +#include "../libmuonapt/ChangesDialog.h" #include "DetailsWidget.h" #include "MuonSettings.h" #include "PackageModel.h" @@ -605,118 +607,53 @@ void PackageWidget::showBrokenReason(QApt::Package *package) { - QHash > failedReasons = package->brokenReason(); - QString reason; + QList failedReasons = package->brokenReason(); QString dialogText = i18nc("@label", "The \"%1\" package could not be marked for installation or upgrade:", package->name()); dialogText += '\n'; QString title = i18nc("@title:window", "Unable to Mark Package"); - auto reasonIter = failedReasons.constBegin(); - while (reasonIter != failedReasons.constEnd()) { - QApt::BrokenReason failType = (QApt::BrokenReason)reasonIter.key(); - QHash failReason = reasonIter.value(); - dialogText += digestReason(package, failType, failReason); - - reasonIter++; - } + for (const QApt::MarkingErrorInfo &reason : failedReasons) + dialogText += digestReason(package, reason); KMessageBox::information(this, dialogText, title); } -QString PackageWidget::digestReason(QApt::Package *pkg, QApt::BrokenReason failType, QHash failReason) +QString PackageWidget::digestReason(QApt::Package *pkg, const QApt::MarkingErrorInfo &info) { - auto packageIter = failReason.constBegin(); QString reason; + QString relation = QApt::DependencyInfo::typeName(info.errorInfo().dependencyType()); - switch (failType) { - case QApt::ParentNotInstallable: { - reason += '\t'; - reason = i18nc("@label", "The \"%1\" package has no available version, but exists in the database.\n" - "\tThis typically means that the package was mentioned in a dependency and " - "never uploaded, has been obsoleted, or is not available from the currently-enabled " - "repositories.", pkg->name()); - break; - } - case QApt::WrongCandidateVersion: { - while (packageIter != failReason.constEnd()) { - QString package = packageIter.key(); - QString relation = packageIter.value()["Relation"].toString(); - QString requiredVersion = packageIter.value()["RequiredVersion"].toString(); - QString candidateVersion = packageIter.value()["CandidateVersion"].toString(); - bool isFirstOr = !packageIter.value()["IsFirstOr"].toBool(); - - if (isFirstOr) { - reason += '\t'; - reason += i18nc("@label Example: Depends: libqapt 0.1, but 0.2 is to be installed", - "%1: %2 %3, but %4 is to be installed", - relation, package, requiredVersion, candidateVersion); - reason += '\n'; - } else { - reason += '\t'; - reason += QString(i18nc("@label Example: or libqapt 0.1, but 0.2 is to be installed", - "or %1 %2, but %3 is to be installed", - package, requiredVersion, candidateVersion)); - reason += '\n'; - } - packageIter++; - } + reason += '\t'; - return reason; + switch (info.errorType()) { + case QApt::ParentNotInstallable: + reason += i18nc("@label", "The \"%1\" package has no available version, but exists in the database.\n" + "\tThis typically means that the package was mentioned in a dependency and " + "never uploaded, has been obsoleted, or is not available from the currently-enabled " + "repositories.", pkg->name()); break; - } - case QApt::DepNotInstallable: { - while (packageIter != failReason.constEnd()) { - QString package = packageIter.key(); - QString relation = packageIter.value()["Relation"].toString(); - bool isFirstOr = !packageIter.value()["IsFirstOr"].toBool(); - - if (isFirstOr) { - reason += '\t'; - reason += i18nc("@label Example: Depends: libqapt, but is not installable", - "%1: %2, but it is not installable", - relation, package); - reason += '\n'; - } else { - reason += '\t'; - reason += QString(i18nc("@label Example: or libqapt, but is not installable", - "or %1, but is not installable", - package)); - reason += '\n'; - } - packageIter++; - } - - return reason; + case QApt::WrongCandidateVersion: + reason += i18nc("@label Example: Depends: libqapt 0.1, but 0.2 is to be installed", + "%1: %2 %3, but %4 is to be installed", + relation, pkg->name(), info.errorInfo().packageVersion(), + pkg->availableVersion()); + break; + case QApt::DepNotInstallable: + reason += i18nc("@label Example: Depends: libqapt, but is not installable", + "%1: %2, but it is not installable", + relation, pkg->name()); break; - } case QApt::VirtualPackage: - while (packageIter != failReason.constEnd()) { - QString package = packageIter.key(); - QString relation = packageIter.value()["Relation"].toString(); - bool isFirstOr = !packageIter.value()["IsFirstOr"].toBool(); - - if (isFirstOr) { - reason += '\t'; - reason += i18nc("@label Example: Depends: libqapt, but it is a virtual package", - "%1: %2, but it is a virtual package", - relation, package); - reason += '\n'; - } else { - reason += '\t'; - reason += QString(i18nc("@label Example: or libqapt, but it is a virtual package", - "or %1, but it is a virtual package", - package)); - reason += '\n'; - } - packageIter++; - } - - return reason; + reason += i18nc("@label Example: Depends: libqapt, but it is a virtual package", + "%1: %2, but it is a virtual package", + relation, pkg->name()); break; default: break; } + reason += '\n'; + return reason; } diff -Nru muon-1.9.60/muon/PackageModel/PackageWidget.h muon-2.0.0/muon/PackageModel/PackageWidget.h --- muon-1.9.60/muon/PackageModel/PackageWidget.h 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/PackageModel/PackageWidget.h 2013-04-01 20:32:05.000000000 +0000 @@ -99,6 +99,8 @@ void checkChanges(); QApt::PackageList selectedPackages(); QString digestReason(QApt::Package *pkg, + const QApt::MarkingErrorInfo &info); + QString digestReason(QApt::Package *pkg, QApt::BrokenReason failType, QHash failReason); diff -Nru muon-1.9.60/muon/TransactionWidget.cpp muon-2.0.0/muon/TransactionWidget.cpp --- muon-1.9.60/muon/TransactionWidget.cpp 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/TransactionWidget.cpp 2013-04-01 20:32:05.000000000 +0000 @@ -42,7 +42,7 @@ #include // Own includes -#include "../libmuon/MuonStrings.h" +#include "../libmuonapt/MuonStrings.h" #include "DownloadModel/DownloadDelegate.h" #include "DownloadModel/DownloadModel.h" Binary files /tmp/N4tNvE_QsG/muon-1.9.60/muon/icons/muon.svgz and /tmp/UnwRy5itwH/muon-2.0.0/muon/icons/muon.svgz differ diff -Nru muon-1.9.60/muon/main.cpp muon-2.0.0/muon/main.cpp --- muon-1.9.60/muon/main.cpp 2012-10-29 18:36:20.000000000 +0000 +++ muon-2.0.0/muon/main.cpp 2013-04-01 20:34:44.000000000 +0000 @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright © 2010-2012 Jonathan Thomas * + * Copyright © 2010-2013 Jonathan Thomas * * * * This program is free software; you can redistribute it and/or * * modify it under the terms of the GNU General Public License as * @@ -29,12 +29,12 @@ static const char description[] = I18N_NOOP("A package manager"); -static const char version[] = "1.9.60"; +static const char version[] = "2.0.0"; int main(int argc, char **argv) { KAboutData about("muon", 0, ki18n("Muon Package Manager"), version, ki18n(description), - KAboutData::License_GPL, ki18n("© 2009-2012 Jonathan Thomas"), KLocalizedString(), 0); + KAboutData::License_GPL, ki18n("© 2009-2013 Jonathan Thomas"), KLocalizedString(), 0); about.addAuthor(ki18n("Jonathan Thomas"), KLocalizedString(), "echidnaman@kubuntu.org"); about.setProductName("muon/muon"); diff -Nru muon-1.9.60/muon/muon.desktop muon-2.0.0/muon/muon.desktop --- muon-1.9.60/muon/muon.desktop 2012-10-29 18:33:09.000000000 +0000 +++ muon-2.0.0/muon/muon.desktop 2013-04-01 20:32:05.000000000 +0000 @@ -13,19 +13,21 @@ Name[fi]=Muon-paketinhallinta Name[fr]=Gestionnaire de paquetages Muon Name[ga]=Bainisteoir Pacáistí Muon +Name[gl]=Xestor de paquetes de Muon Name[hu]=Muon csomagkezelő Name[it]=Gestore di pacchetti Muon Name[kk]=Muon десте менеджері Name[lt]=Muon paketų tvarkyklė +Name[mr]=म्युओन पॅकेज व्यवस्थापक Name[nb]=Muon pakkebehandler Name[nds]=Paketpleger "Muon" Name[nl]=Muon pakketbeheerder Name[pa]=ਮੂਉਨ ਪੈਕੇਜ ਮੈਨੇਜਰ -Name[pl]=Menadżer pakietów Muon +Name[pl]=Menadżer paczek Muon Name[pt]=Gestor de Pacotes Muon Name[pt_BR]=Gerenciador de pacotes Muon Name[ro]=Administratorul de pachete Muon -Name[ru]=Пакетный менеджер Muon +Name[ru]=Muon Name[sk]=Muon správca balíkov Name[sl]=Upravitelj paketov Muon Name[sr]=Муонов менаџер пакета @@ -57,19 +59,21 @@ GenericName[fi]=Paketinhallinta GenericName[fr]=Gestionnaire de paquetages GenericName[ga]=Bainisteoir Pacáistí +GenericName[gl]=Xestor de paquetes GenericName[hu]=Csomagkezelő GenericName[it]=Gestore di pacchetti GenericName[kk]=Десте менеджері GenericName[lt]=Paketų tvarkyklė +GenericName[mr]=पॅकेज व्यवस्थापक GenericName[nb]=Pakkebehandler GenericName[nds]=Paketpleger GenericName[nl]=Pakketbeheerder GenericName[pa]=ਪੈਕੇਜ ਮੈਨੇਜਰ -GenericName[pl]=Menedżer pakietów +GenericName[pl]=Menedżer paczek GenericName[pt]=Gestor de Pacotes GenericName[pt_BR]=Gerenciador de pacotes GenericName[ro]=Administrator de pachete -GenericName[ru]=Менеджер пакетов +GenericName[ru]=Программа управления пакетами GenericName[sk]=Správca balíkov GenericName[sl]=Upravitelj paketov GenericName[sr]=Менаџер пакета @@ -85,21 +89,24 @@ GenericName[zh_TW]=套件管理器 Categories=Qt;KDE;System; X-KDE-Keywords=program,software,repository,archive,package,install,remove,update,deb +X-KDE-Keywords[bs]=program,software,repository,archive,package,install,remove,update,deb X-KDE-Keywords[ca]=programa,programari,repositori,arxiu,paquet,instal·la,suprimeix,actualitza,deb -X-KDE-Keywords[ca@valencia]=programa,programari,repositori,arxiu,paquet,instal·lació,supressió,actualització,deb +X-KDE-Keywords[ca@valencia]=programa,programari,repositori,arxiu,paquet,instal·la,suprimeix,actualitza,deb X-KDE-Keywords[cs]=program,software,úložiště,archiv,balíček,instalovat,odstranit,aktualizovat,deb X-KDE-Keywords[da]=program,software,repository,softwarekilde,arkiv,pakke,installere,fjerne,opdatere,deb -X-KDE-Keywords[de]=Programm,Sorftware,Archiv,Repository,Paket,Installieren,Entfernen,Aktualisieren,deb +X-KDE-Keywords[de]=Programm,Software,Archiv,Repository,Paket,Installieren,Entfernen,Aktualisieren,deb X-KDE-Keywords[el]=πρόγραμμα,λογισμικό,αποθετήριο,αρχειοθήκη,πακέτο,εγκατάσταση,αφαίρεση,ενημέρωση,deb X-KDE-Keywords[es]=programa,software,repositorio,archivo,paquete,instalar,eliminar,actualizar,deb X-KDE-Keywords[et]=programm,rakendus,tarkvara,hoidla,arhiiv,pakk,pakett,paigaldamine,installimine,eemaldamine,uuendamine,deb X-KDE-Keywords[fi]=ohjelma,sovellus,ohjelmalähde,lähteet,arkisto,paketti,asenna,poista,päivitä,deb X-KDE-Keywords[fr]=programme,logiciel,dépôt,archive,paquetage,installation,suppression,mise à jour,deb X-KDE-Keywords[ga]=clár,ríomhchlár,feidhmchlár,bogearra,bogearraí,stórlann,cartlann,pacáiste,suiteáil,bain,nuashonrú,deb +X-KDE-Keywords[gl]=aplicativo,software,repositorio,ficheiro,paquete,instalar,eliminar,actualizar,deb X-KDE-Keywords[hu]=program,szoftver,tároló,archívum,csomag,telepítés,eltávolítás,frissítés,deb X-KDE-Keywords[it]=programma,software,deposito,archivio,pacchetto,installa,rimuovi,aggiorna,deb X-KDE-Keywords[kk]=program,software,repository,archive,package,install,remove,update,deb X-KDE-Keywords[lt]=programos,programinė įranga,saugykla,archyvas,paketas,įdiegti,pašalinti,atnaujinti,deb +X-KDE-Keywords[mr]=कार्यक्रम,सॉफ़्टवेअर,रिपोझिटरी,संग्रह,पॅकेज,प्रतिष्ठापन,काढून टाका,अद्ययावत,डेब X-KDE-Keywords[nb]=program,programvare,pakkebrønn,arkiv,pakke,installere,fjerne,oppdatere,deb X-KDE-Keywords[nl]=programma,software,opslagruimte,archief,pakket,installeren,verwijderen,bijwerken,deb X-KDE-Keywords[pl]=program,oprogramowanie,repozytorium,archiwum,pakiet,paczka,instaluj,zainstaluj,usuń,odinstaluj,uaktualnij,aktualizuj,deb @@ -117,4 +124,5 @@ X-KDE-Keywords[tr]=uygulama,yazılım,depo,arşiv,paket,yükle,kaldır,güncelle,deb X-KDE-Keywords[uk]=program,software,repository,archive,package,install,remove,update,deb,програма,програмне забезпечення,сховище,архів,пакунок,встановити,встановлення,вилучити,вилучення,оновлення,оновити X-KDE-Keywords[x-test]=xxprogram,software,repository,archive,package,install,remove,update,debxx +X-KDE-Keywords[zh_CN]=program,software,repository,archive,package,install,remove,update,deb,程序,软件,软件源,归档,包,安装,移除,升级,deb X-KDE-Keywords[zh_TW]=program,software,repository,archive,package,install,remove,update,deb diff -Nru muon-1.9.60/po/CMakeLists.txt muon-2.0.0/po/CMakeLists.txt --- muon-1.9.60/po/CMakeLists.txt 2012-10-29 18:36:20.000000000 +0000 +++ muon-2.0.0/po/CMakeLists.txt 2013-04-01 20:34:44.000000000 +0000 @@ -26,6 +26,7 @@ add_subdirectory(da) add_subdirectory(sr) add_subdirectory(is) +add_subdirectory(mr) add_subdirectory(ug) add_subdirectory(sk) add_subdirectory(zh_TW) @@ -48,6 +49,7 @@ add_subdirectory(pl) add_subdirectory(pa) add_subdirectory(hu) +add_subdirectory(gl) add_subdirectory(cs) add_subdirectory(mai) add_subdirectory(kk) diff -Nru muon-1.9.60/po/bs/libmuon.po muon-2.0.0/po/bs/libmuon.po --- muon-1.9.60/po/bs/libmuon.po 2012-10-29 18:33:26.000000000 +0000 +++ muon-2.0.0/po/bs/libmuon.po 2013-04-01 20:32:15.000000000 +0000 @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2011-03-24 14:44+0000\n" -"Last-Translator: Samir Ribić \n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-12-07 00:14+0000\n" +"Last-Translator: Admir Salkanović \n" "Language-Team: Bosnian \n" "Language: bs\n" "MIME-Version: 1.0\n" @@ -17,1192 +17,112 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2011-04-22 16:55+0000\n" -"X-Generator: Launchpad (build 12883)\n" +"X-Launchpad-Export-Date: 2013-01-26 22:18+0000\n" +"X-Generator: Launchpad (build 16451)\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" -msgstr "" +msgstr "Programi" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" -msgstr "" +msgstr "Otvoreni kod" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" -msgstr "" +msgstr "Vlasništvo" -#: libmuon/ApplicationBackend/Application.cpp:267 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Nepoznato" -#: libmuon/ApplicationBackend/Application.cpp:398 -#, fuzzy, kde-format -#| msgctxt "@label showing download and install size" -#| msgid "%1 to download, %2 of space to be used" +#: libmuon/backends/ApplicationBackend/Application.cpp:413 +#, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" -msgstr "%1 za preuzeti, %2 prostora će se koristiti" +msgstr "%1 za preuzeti, %2 na disku" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" -msgstr "" - -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "" - -#: libmuon/categories.xml:27 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Developer Tools" -msgstr "Razvoj" - -#: libmuon/categories.xml:42 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"debug" -#| "\"" -#| msgid "Debug" -msgctxt "Category" -msgid "Debugging" -msgstr "Ispravka grešaka" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "" - -#: libmuon/categories.xml:98 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"localization\"" -#| msgid "Localization" -msgctxt "Category" -msgid "Localization" -msgstr "Lokalizacija" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "" - -#: libmuon/categories.xml:144 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -#| msgid "Version Control Systems" -msgctxt "Category" -msgid "Version Control" -msgstr "Sistemi za kontrolu verzija" - -#: libmuon/categories.xml:158 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Web Development" -msgstr "Razvoj" - -#: libmuon/categories.xml:171 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Education" -msgstr "Lokacija" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "" - -#: libmuon/categories.xml:232 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"electronics\"" -#| msgid "Electronics" -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "" - -#: libmuon/categories.xml:269 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"math" -#| "\"" -#| msgid "Mathematics" -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "" - -#: libmuon/categories.xml:299 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"fonts" -#| "\"" -#| msgid "Fonts" -msgctxt "Category" -msgid "Fonts" -msgstr "Fontovi" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" - -#: libmuon/categories.xml:369 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Simulation" -msgstr "Lokacija" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "" - -#: libmuon/categories.xml:391 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"graphics\"" -#| msgid "Graphics" -msgctxt "Category" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "" +msgstr "%1 na disku" -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Programska pozadina" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Programi u vašem sistemu" -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Prijavite se u Ubuntu SSO servis" -#: libmuon/categories.xml:473 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"web\"" -#| msgid "Internet" -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Bodega pozadina" -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Instalirajte Bodega podatke na vašem sistemu" -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Unesite MakePlayLive akreditive" -#: libmuon/categories.xml:509 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"httpd" -#| "\"" -#| msgid "Web Servers" -msgctxt "Category" -msgid "Web Browsers" -msgstr "Web serveri" - -#: libmuon/categories.xml:521 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"sound" -#| "\"" -#| msgid "Multimedia" -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedija" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Bezvezna pozadina" -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Prazna pozadina za test muon" -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "KNewStuff pozadina" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Instaliraj KNewStuff podataka na sistem" -#: libmuon/Category/Category.cpp:64 +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" -msgstr "" - -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "" +msgstr "Sve" -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historija" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Pretraga" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Sve promjene" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instalacije" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Nadogradnje" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Uklanjanja" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Datum" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Instalirano" - -#: libmuon/HistoryView/HistoryView.cpp:102 -#, fuzzy -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Nadograđeno" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Degradirano" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Uklonjeno" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Očišćeno" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 na %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" -msgstr "" - -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administracija sistema" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Osnovni sistem" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI infrastruktura" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Komunikacija" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Baze podataka" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Razvoj" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentacija" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Ispravka grešaka" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Uređivači" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Elektronički uređaji" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Fontovi" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Igre i zabava" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME grafičko okruženje" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R statistički sistem" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep grafičko okruženje" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amaterski radio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell programski jezik" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Web serveri" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpreterski računarski jezici" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java programski jezik" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE softverska kompilacija" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel i moduli" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Biblioteke - razvoj" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Biblioteke" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp programski jezik" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokalizacija" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-pošta" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Razno- tekst bazirano" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Mreža" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Grupe za vijesti" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCaml programski jezik" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Biblioteke - stare" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Više-platformski" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl programski jezik" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP programski jezik" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python programski jezik" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby programski jezik" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Nauka" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Terminali" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedija" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Tex autorstvo" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Obrada teksta" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Alati" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sistemi za kontrolu verzija" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video softver" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Razno - grafičko" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce grafičko okruženje" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone okruženje" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Nepoznato" +msgstr "Ovaj Muon ima moći super krave" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Konvertovano iz RPM pomoću Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internacionalizaacija i lokalizacija" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta paketi" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Izvozna ograničenja" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Nije slobodno" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Traži neslobodne dijelove" - -#: libmuon/MuonStrings.cpp:165 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Lokacija" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Oštećeni" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Nije instalirano" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Dostupno" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Instalirano" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Nadogradivo" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Oštećeni" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Zaostala konfiguracija" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Instaliran (automatski uklonjiv)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Nema promjene" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Instaliraj" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Nadogradi" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Ukloni" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Očisti" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Ponovna instalacija" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Degradiraj" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "" - -#: libmuon/MuonStrings.cpp:221 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"comm" -#| "\"" -#| msgid "Communication" -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Komunikacija" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Inicijalizacijska greška" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Nije moguće dobiti zaključavanje paketnog sistema" - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Nedovoljan prostor na disku" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Greška autentifikacije" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Neočekivana greška" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Nepouzdani paketi" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Nepoznato" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Paketni sistem ne može biti inicijaliziran, vaša konfiguracija može biti " -"oštećena." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Još jedan program izgleda da koristi paketni sistem u ovom trenutku. Morate " -"zatvoriti sve ostale menadžere paketa prije nego što će se moći instalirati " -"ili ukloniti neki paket." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Nemate dovoljno prostora na disku u direktoriju na %1 da nastavite s ovom " -"operacijom." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Ne mogu preuzeti pakete" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Došlo je do greške pri primjeni promjena:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Ovaj se postupak ne može nastaviti jer odgovarajuće odobrenje nije dato" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Čini se da se QApt izvođač bilo srušio ili je nestao. Molimo prijavite bug " -"QApt održavaocima" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Sljedeći paket nije potvrđen od strane autora. Preuzimanje nepouzdanog " -"paketa je odbijeno od strane vaše trenutne konfiguracije." -msgstr[1] "" -"Sljedeći paketi nisu ovjereni od strane njihovih autora. Preuzimanje " -"nepouzdanih paketa je odbijeno od strane vaše trenutne konfiguracije." -msgstr[2] "" -"Sljedeći paketi nisu ovjereni od strane njihovih autora. Preuzimanje " -"nepouzdanih paketa je odbijeno od strane vaše trenutne konfiguracije." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Provjeri nadogradnje" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Odznači sve" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Konfiguriši softverske izvore" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Snimi markiranja kao" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dokument nije mogao biti sačuvan, jer nije bilo moguće pisati u " -"%1\n" -"\n" -"Provjerite da li imate pristup pisanja za ovu datoteku ili da imate dovoljno " -"prostora na disku na raspolaganju." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Snimi listu instaliranih paketa kao" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Snimi listu preuzimanja kao" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Otvori datoteku" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Nije moguće označiti promjene. Molimo provjerite da li je datoteka kreirana " -"datoteka oznake bilo Muon paket menadžera ili Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Izaberite direktorij" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 paket je uspješno dodat u keš" -msgstr[1] "%1 paketa su uspješno dodana u keš" -msgstr[2] "%1 paketa je uspješno dodano u keš" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Paketi se ne mogu naći" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 -#, fuzzy, kde-format -#| msgctxt "@item:intext Remaining time" -#| msgid " - %1 remaining" +#, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" -msgstr " - %1 preostalo" - -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" +msgstr "%1 preostalo" #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" @@ -1213,10 +133,8 @@ msgstr "Dostupne nadogradnje" #: libmuon/settings/NotifySettingsPage.cpp:49 -#, fuzzy -#| msgid "Available updates" msgid "Show the number of available updates" -msgstr "Dostupne nadogradnje" +msgstr "Prikaži broj dostupnih nadogradnji" #: libmuon/settings/NotifySettingsPage.cpp:50 msgid "Distribution upgrades" @@ -1239,500 +157,32 @@ msgstr "Samo iskočne poruke" #: libmuon/Transaction/TransactionListener.cpp:109 -#, fuzzy -#| msgctxt "@label Label preceding the package's download size" -#| msgid "Download Size:" msgctxt "@info:status" msgid "Downloading" -msgstr "Veličina za preuzeti:" +msgstr "Preuzimanje" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" -msgstr "Završeno" +msgstr "Gotovo" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" -msgstr "" +msgstr "Čekanje" -#: libmuon/Transaction/TransactionListener.cpp:174 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Install" +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" -msgstr "Instaliraj" +msgstr "Instaliranje" #: libmuon/Transaction/TransactionListener.cpp:179 msgctxt "@info:status" msgid "Changing Addons" -msgstr "" +msgstr "Mijenjam dodatke" #: libmuon/Transaction/TransactionListener.cpp:183 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Remove" msgctxt "@info:status" msgid "Removing" -msgstr "Ukloni" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy - - - - - -#, fuzzy - - - - - -#, fuzzy - - - - - -#, fuzzy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy - - - - - - -#, fuzzy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy - - - - -#, fuzzy - - - - -#, fuzzy - - - - -#, fuzzy - - - - -#, fuzzy - - - - -#, fuzzy - - - - -#, fuzzy - - - - -#, fuzzy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy - - - - - - - - - - -#, fuzzy - - - - - - -#, fuzzy \ No newline at end of file +msgstr "Uklanjanje" \ No newline at end of file diff -Nru muon-1.9.60/po/bs/muon-discover.po muon-2.0.0/po/bs/muon-discover.po --- muon-1.9.60/po/bs/muon-discover.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/bs/muon-discover.po 2013-04-01 20:32:15.000000000 +0000 @@ -0,0 +1,314 @@ +# Bosnian translation for bosnianuniversetranslation +# Copyright (c) 2012 Rosetta Contributors and Canonical Ltd 2012 +# This file is distributed under the same license as the bosnianuniversetranslation package. +# FIRST AUTHOR , 2012. +# +msgid "" +msgstr "" +"Project-Id-Version: bosnianuniversetranslation\n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-12-18 22:21+0000\n" +"Last-Translator: Samir Ribić \n" +"Language-Team: Bosnian \n" +"Language: bs\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Launchpad-Export-Date: 2013-01-26 22:16+0000\n" +"X-Generator: Launchpad (build 16451)\n" +"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" +"%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" + +#: discover/main.cpp:29 +msgid "An application discoverer" +msgstr "Otkrivač programa" + +#: discover/main.cpp:35 +msgid "Muon Discover" +msgstr "Muon Otkrivač" + +#: discover/main.cpp:36 +msgid "©2010-2012 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" + +#: discover/main.cpp:37 +msgid "Jonathan Thomas" +msgstr "Jonathan Thomas" + +#: discover/main.cpp:38 +msgid "Aleix Pol Gonzalez" +msgstr "Aleix Pol Gonzalez" + +#: discover/main.cpp:44 +msgid "Directly open the specified application by its package name." +msgstr "Direktno otvori navedenu aplikaciju njenim imenom paketa" + +#: discover/main.cpp:45 +msgid "Open with a program that can deal with the given mimetype." +msgstr "Otvori programom koji može raditi s datim MIME tipom." + +#: discover/main.cpp:46 +msgid "Display a list of entries with a category." +msgstr "Prikaži listu elemenata s kategorijom." + +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Otvori Muon otkrivač u datom režimu. Režimi odgovaraju dugmićima alatne " +"trake." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Prikaži dostupne režime na standardnom izlazu." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Dostupni režimi:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Traži..." + +#: discover/MuonDiscoverMainWindow.cpp:109 +msgid "" +"Found some errors while setting up the GUI, the application can't proceed." +msgstr "" +"Nađene greške pri postavljanju grafičkog okruženja, aplikacija ne može " +"nastaviti." + +#: discover/MuonDiscoverMainWindow.cpp:110 +msgid "Initialization error" +msgstr "Greška inicijalizacije" + +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Meni" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Konfiguriši i nauči Muon otkrivač" + +#: discover/qml/AddonsView.qml:37 +#, kde-format +msgid "%1
%2" +msgstr "%1
%2" + +#: discover/qml/AddonsView.qml:63 +msgid "Apply" +msgstr "Primijeni" + +#: discover/qml/AddonsView.qml:68 +msgid "Discard" +msgstr "Odbaci" + +#: discover/qml/ApplicationOverview.qml:64 +#, kde-format +msgid "%1 reviews" +msgstr "%1 recenzija" + +#: discover/qml/ApplicationOverview.qml:70 +msgid "Homepage" +msgstr "Početna stranica" + +#: discover/qml/ApplicationOverview.qml:79 +msgid "Launch" +msgstr "Pokreni" + +#: discover/qml/ApplicationOverview.qml:86 +msgid "Review" +msgstr "Pregled" + +#: discover/qml/ApplicationOverview.qml:91 +#, kde-format +msgid "Total Size: %1
" +msgstr "Ukupna veličina: %1
" + +#: discover/qml/ApplicationPage.qml:87 +msgid "Overview" +msgstr "Pregled" + +#: discover/qml/ApplicationPage.qml:91 +msgid "Add-ons" +msgstr "Dodaci" + +#: discover/qml/ApplicationPage.qml:96 +msgid "Reviews" +msgstr "Recenzije" + +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 +#: discover/qml/InstallApplicationButton.qml:38 +#: discover/qml/InstalledPage.qml:11 +msgid "Update" +msgstr "Ažuriraj" + +#: discover/qml/ApplicationsListPage.qml:111 +msgid "Name" +msgstr "Ime" + +#: discover/qml/ApplicationsListPage.qml:117 +msgid "Rating" +msgstr "Rejting" + +#: discover/qml/ApplicationsListPage.qml:123 +msgid "Buzz" +msgstr "Zvrrr" + +#: discover/qml/ApplicationsListPage.qml:129 +msgid "Popularity" +msgstr "Popularnost" + +#: discover/qml/ApplicationsListPage.qml:135 +msgid "Origin" +msgstr "Porijeklo" + +#: discover/qml/CategoryPage.qml:34 +#, kde-format +msgid "Search in '%1'..." +msgstr "Tražim u '%1'..." + +#: discover/qml/CategoryPage.qml:139 +msgid "Popularity Contest" +msgstr "Takmičenje popularnosti" + +#: discover/qml/CategoryPage.qml:140 +#, kde-format +msgid "points: %1" +msgstr "poena: %1" + +#: discover/qml/CategoryPage.qml:151 +msgid "Best Ratings" +msgstr "Najbolji plasmani" + +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Dobrodošli u\n" +"Muon Otkrivač" + +#: discover/qml/FeaturedBanner.qml:88 +#, kde-format +msgid "%1
%2" +msgstr "%1
%2" + +#: discover/qml/InstallApplicationButton.qml:43 +msgid "Install" +msgstr "Instaliraj" + +#: discover/qml/InstallApplicationButton.qml:48 +msgid "Remove" +msgstr "Ukloni" + +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 +msgid "Installed" +msgstr "Instalirano" + +#: discover/qml/InstalledPage.qml:31 +msgid "Update All" +msgstr "Ažuriraj sve" + +#: discover/qml/Main.qml:41 +msgid "Loading..." +msgstr "Učitavam..." + +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Nazad" + +#: discover/qml/Main.qml:88 +msgid "Discover" +msgstr "Otkrij" + +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Instalirano (%1 nadogradnja)" +msgstr[1] "Instalirano (%1 nadogradnje)" +msgstr[2] "Instalirano (%1 nadogradnji)" + +#: discover/qml/Main.qml:100 +msgid "Sources" +msgstr "Izvori" + +#: discover/qml/ReviewDialog.qml:11 +#, kde-format +msgid "Reviewing %1" +msgstr "Recenziram %1" + +#: discover/qml/ReviewDialog.qml:21 +msgid "Submit" +msgstr "Predaj" + +#: discover/qml/ReviewDialog.qml:30 +msgid "Close" +msgstr "Zatvori" + +#: discover/qml/ReviewDialog.qml:43 +msgid "Rating:" +msgstr "Ocjena:" + +#: discover/qml/ReviewDialog.qml:49 +msgid "Summary:" +msgstr "Sažetak:" + +#: discover/qml/ReviewsView.qml:21 +msgid "Reviews:" +msgstr "Recenzije:" + +#: discover/qml/ReviewsView.qml:30 +msgid "Tell us about this review!" +msgstr "Recite nam o ovoj recenziji!" + +#: discover/qml/ReviewsView.qml:31 +#, kde-format +msgid "%1 out of %2 people found this review useful" +msgstr "%1 od %2 ljudi smatra ovu recenziju korisnom" + +#: discover/qml/ReviewsView.qml:46 +#, kde-format +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 by %2

%3

%4

" + +#: discover/qml/ReviewsView.qml:59 +msgid "Useful? Yes/No" +msgstr "Korisno? Da/Ne" + +#: discover/qml/SourcesPage.qml:17 +msgid "Add Source" +msgstr "Dodaj izvor" + +#: discover/qml/SourcesPage.qml:40 +msgid "Specify the new source" +msgstr "Navedi novi izvor" + +#: discover/qml/SourcesPage.qml:44 +msgid "OK" +msgstr "U redu" + +#: discover/qml/SourcesPage.qml:50 +msgid "Cancel" +msgstr "Otkaži" + +#: discover/qml/SourcesPage.qml:72 +msgid " - The apt repository source line to add. This is one of:\n" +msgstr "" +" - Izvorna linija apt repozitorija koja se dodaje. Jedna od:\n" + +#: discover/qml/SourcesPage.qml:136 +#, kde-format +msgid "%1 (Binary)" +msgstr "%1 (Binarno)" + +#: discover/qml/SourcesPage.qml:162 +#, kde-format +msgid "%1. %2" +msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/bs/muon-installer.po muon-2.0.0/po/bs/muon-installer.po --- muon-1.9.60/po/bs/muon-installer.po 2012-10-29 18:33:26.000000000 +0000 +++ muon-2.0.0/po/bs/muon-installer.po 2013-04-01 20:32:15.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2011-03-24 14:03+0000\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2013-01-26 14:09+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" "Language: bs\n" @@ -17,18 +17,18 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2011-04-22 16:56+0000\n" -"X-Generator: Launchpad (build 12883)\n" +"X-Launchpad-Export-Date: 2013-01-26 22:16+0000\n" +"X-Generator: Launchpad (build 16451)\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr " ,Launchpad Contributions:,Samir Ribić" +msgstr "Samir Ribić" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr ",," +msgstr "samir.ribic@etf.unsa.ba" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -41,7 +41,7 @@ "Sljedeće aplikacije su upravo instalirane, kliknuti na njih da bi ih " "pokrenuli" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Preuzmi softver" @@ -64,95 +64,86 @@ msgstr "Programski centar Muon" #: installer/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: installer/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Preuzmi softver" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Instalirani softver" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Dao Kubuntu" -#: installer/MainWindow.cpp:311 -#, fuzzy -#| msgctxt "@item:inlistbox" -#| msgid "Provided by Kubuntu" +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" -msgstr "Dao Kubuntu" +msgstr "Omogućio Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 -#, fuzzy +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical partneri" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" -msgstr "" +msgstr "Nezavisno" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Preuzmi softver" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Instalirani softver" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Istorija" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." -msgstr "" +msgstr "%1 je uspješno instalirano." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" -msgstr "" +msgstr "Početak" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." -msgstr "" +msgstr "Programi su uspješno instalirani." -#: installer/MainWindow.cpp:509 -#, fuzzy -#| msgid "Applications" +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." -msgstr "Programi" +msgstr "Pokreni nove programe..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instalacija završena" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" -msgstr "" +msgstr "U Toku" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" -msgstr "" +msgstr "U toku" #: installer/ResourceDetailsView/AddonsWidget.cpp:59 -#, fuzzy msgctxt "@title" msgid "Addons" msgstr "Dodaci" @@ -183,7 +174,6 @@ msgstr "Ukupna veličina:" #: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:244 -#, fuzzy msgctxt "@label/rich Label preceding the app version" msgid "Version:" msgstr "Verzija:" @@ -199,13 +189,13 @@ msgstr "Podrška:" #: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:330 -#, fuzzy, kde-format +#, kde-format msgctxt "@label The number of ratings the app has" msgid "%1 rating" msgid_plural "%1 ratings" -msgstr[0] "Čekam" -msgstr[1] "Čekam" -msgstr[2] "Čekam" +msgstr[0] "%1 recenzija" +msgstr[1] "%1 recenzije" +msgstr[2] "%1 recenzija" #: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:359 msgctxt "@label visible text for an app's URL" @@ -223,18 +213,18 @@ msgid "Install" msgstr "Instaliraj" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Ukloni" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Instaliraj" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -246,129 +236,69 @@ #: installer/ResourceView/ResourceViewWidget.cpp:66 msgid "Show technical items" -msgstr "" +msgstr "Prikaži tehničke mogućnosti" #: installer/ResourceView/ResourceViewWidget.cpp:72 -#, fuzzy -#| msgctxt "@label Label preceding the app support" -#| msgid "Support:" msgid "Sort:" -msgstr "Podrška:" +msgstr "Sortiraj:" #: installer/ResourceView/ResourceViewWidget.cpp:74 msgctxt "@item:inlistbox" msgid "By Name" -msgstr "" +msgstr "Po imenu" #: installer/ResourceView/ResourceViewWidget.cpp:75 msgctxt "@item:inlistbox" msgid "By Top Rated" -msgstr "" +msgstr "Po najbolje ocijenjenim" #: installer/ResourceView/ResourceViewWidget.cpp:76 msgctxt "@item:inlistbox" msgid "By Most Buzz" -msgstr "" +msgstr "Po najzvučnijim" #: installer/ResourceView/ResourceViewWidget.cpp:214 msgctxt "@item:inlistbox" msgid "By Relevancy" -msgstr "" +msgstr "Po relevantnosti" #: installer/ReviewsWidget/ReviewsWidget.cpp:57 -#, fuzzy msgctxt "@title" msgid "Reviews" -msgstr "Ukloni" +msgstr "Recenzije" #: installer/ReviewsWidget/ReviewsWidget.cpp:73 msgctxt "@info:status" msgid "Loading reviews" -msgstr "" +msgstr "Čitam recenzije" #: installer/ReviewsWidget/ReviewsWidget.cpp:79 msgctxt "@action" msgid "Check for more reviews" -msgstr "" +msgstr "Klikni za više recenzija" #: installer/ReviewsWidget/ReviewsWidget.cpp:103 msgctxt "@info:status" msgid "No reviews available" -msgstr "" +msgstr "Nema dostupnih recenzija" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" -msgstr "" +msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" -msgstr "" +msgstr "Ova recenzija je pisana za stariju verziju (Verzija: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" msgid_plural "%1 out of %2 people found this review useful" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy - - - - -#, fuzzy - - - - - - -#, fuzzy - - - - - - -#, fuzzy - - - - - - -#, fuzzy \ No newline at end of file +msgstr[0] "%1 od %2 osobe smatra ovu recenziju korisnom" +msgstr[1] "%1 od %2 osobe smatra ovu recenziju korisnom" +msgstr[2] "%1 od %2 osoba smatra ovu recenziju korisnom" \ No newline at end of file diff -Nru muon-1.9.60/po/bs/muon-notifier.po muon-2.0.0/po/bs/muon-notifier.po --- muon-1.9.60/po/bs/muon-notifier.po 2012-10-29 18:33:26.000000000 +0000 +++ muon-2.0.0/po/bs/muon-notifier.po 2013-04-01 20:32:15.000000000 +0000 @@ -7,9 +7,9 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2011-03-24 11:00+0000\n" -"Last-Translator: Samir Ribić \n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2013-01-26 14:23+0000\n" +"Last-Translator: Vedran Ljubovic \n" "Language-Team: Bosnian \n" "Language: bs\n" "MIME-Version: 1.0\n" @@ -17,16 +17,16 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2011-04-22 16:57+0000\n" -"X-Generator: Launchpad (build 12883)\n" +"X-Launchpad-Export-Date: 2013-01-26 22:18+0000\n" +"X-Generator: Launchpad (build 16451)\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr " ,Launchpad Contributions:,Samir Ribić" +msgstr "Samir Ribić" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr ",," +msgstr "samir.ribic@etf.unsa.ba" #: kded/distupgradeevent/distupgradeevent.cpp:35 msgctxt "Notification when a new version of Kubuntu is available" @@ -52,7 +52,7 @@ #: kded/event.cpp:136 kded/event.cpp:143 kded/event.cpp:183 msgid "System Notification" -msgstr "Sistemska Notifikacija" +msgstr "Sistemsko obavještenje" #: kded/event.cpp:156 msgid "Hide" @@ -67,10 +67,8 @@ msgstr "Notifikacijski Demon za Muon" #: kded/MuonNotifier.cpp:58 -#, fuzzy -#| msgid "(C) 2009-2011 Jonathan Thomas, (C) 2009 Harald Sitter" msgid "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" -msgstr "(C) 2009-2011 Jonathan Thomas, (C) 2009 Harald Sitter" +msgstr "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" #: kded/UpdateEvent/UpdateEvent.cpp:57 #, kde-format @@ -82,16 +80,12 @@ msgstr[2] "%1 sigurnosnih nadogradnji dostupno" #: kded/UpdateEvent/UpdateEvent.cpp:61 -#, fuzzy -#| msgctxt "Notification text" -#| msgid "%1 security update is available" -#| msgid_plural "%1 security updates are available" msgctxt "Notification text" msgid "A security update is available" msgid_plural "Security updates are available" -msgstr[0] "%1 sigurnosna nadogradnja dostupna" -msgstr[1] "%1 sigurnosne nadogradnje dostupne" -msgstr[2] "%1 sigurnosnih nadogradnji dostupno" +msgstr[0] "Sigurnosna nadogradnja je dostupna" +msgstr[1] "Sigurnosne nadogradnje su dostupne" +msgstr[2] "Sigurnosne nadogradnje su dostupne" #: kded/UpdateEvent/UpdateEvent.cpp:69 #, kde-format @@ -103,16 +97,12 @@ msgstr[2] "%1 softverskih nadogradnji dostupno" #: kded/UpdateEvent/UpdateEvent.cpp:73 -#, fuzzy -#| msgctxt "Notification text" -#| msgid "%1 software update is available" -#| msgid_plural "%1 software updates are available" msgctxt "Notification text" msgid "A software update is available" msgid_plural "Software updates are available" -msgstr[0] "%1 softverska nadogradnja dostupna" -msgstr[1] "%1 softverske nadogradnje dostupne" -msgstr[2] "%1 softverskih nadogradnji dostupno" +msgstr[0] "Softverska nadogradnja je dostupna" +msgstr[1] "Softverske nadogradnje su dostupne" +msgstr[2] "Softverske nadogradnje su dostupne" #: kded/UpdateEvent/UpdateEvent.cpp:94 msgctxt "Start the update" diff -Nru muon-1.9.60/po/bs/muon-updater.po muon-2.0.0/po/bs/muon-updater.po --- muon-1.9.60/po/bs/muon-updater.po 2012-10-29 18:33:26.000000000 +0000 +++ muon-2.0.0/po/bs/muon-updater.po 2013-04-01 20:32:15.000000000 +0000 @@ -9,56 +9,58 @@ msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2011-05-08 12:47+0200\n" -"Last-Translator: KDE 4 \n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-01-26 14:09+0000\n" +"Last-Translator: Samir Ribić \n" "Language-Team: bosanski \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2011-04-22 16:56+0000\n" -"X-Generator: KBabel 1.11.4\n" +"X-Launchpad-Export-Date: 2013-01-26 22:16+0000\n" +"X-Generator: Launchpad (build 16451)\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr " ,Launchpad Contributions:,Samir Ribić" +msgstr "Samir Ribić" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr ",," +msgstr "samir.ribic@etf.unsa.ba" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" -msgstr "" +msgstr "Sakrij" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" "The list of changes is not yet available. Please use Launchpad instead." msgstr "" +"Lista promjena još nije dostupna. Koristite Launchpad " +"umjesto toga" -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." -msgstr "" +msgstr "Lista promjena još nije dostupna." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" -msgstr "" +msgstr "Verzija %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" -msgstr "" +msgstr "Nadogradnja je izdata %1" #: updater/config/UpdaterSettingsDialog.cpp:38 msgctxt "@title:window" @@ -79,182 +81,131 @@ msgstr "Muon menadžer nadogradnje" #: updater/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: updater/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Ažuriranje Programa" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." -msgstr "" +msgstr "Bezbjednije je prikopčati napajanje prije nadogradnje" -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." -msgstr "" - -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Snimi spisak paketa za preuzimanje..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Preuzmi pakete s spiska..." +msgstr "Nova verzija Kubuntu je dostupna." -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Dodaj preuzete pakete" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Instaliraj nadogradnje" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." -msgstr "" +msgstr "Istorijat..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" -msgstr "" +msgstr "Nadogradi" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" -msgstr "" +msgstr "Istorijat paketa" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" -msgstr "" +msgstr "Otkaži" -#: updater/ProgressWidget.cpp:128 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Instaliram nadogradnje" +msgstr "Pokrećem" -#: updater/ProgressWidget.cpp:133 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Instaliram nadogradnje" +msgstr "Čekam autentifikaciju" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Instaliram nadogradnje" +msgstr "Čekam" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Čekam da se druge transakcije završe" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Čekam da drugi softverski menadžeri izađu" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Čekam potreban medij" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Čekam konfiguracionu datoteku" -#: updater/ProgressWidget.cpp:172 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Ažuriram softverske izvore" +msgstr "Učitavam listu softvera" -#: updater/ProgressWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Ažuriram softverske izvore" -#: updater/ProgressWidget.cpp:184 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Updates" +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Preuzimam nadogradnje" +msgstr "Preuzimam pakete" -#: updater/ProgressWidget.cpp:193 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Instaliram nadogradnje" +msgstr "Obavljam promjene" -#: updater/ProgressWidget.cpp:198 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Instaliram nadogradnje" +msgstr "Završeno" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Potrebna promjena medija" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Molim ubacite %1 u %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Upozorenje - neverifikovan softver" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -267,15 +218,24 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Sljedeći element softvera se ne može verifikovati. Instalacija " +"neverfikovanog softvera predstavlja sigurnosni rizik, a prisustvo " +"nweverifikovanog softvera je znak upada. Da li želite nastaviti?" msgstr[1] "" +"Sljedeći elementi softvera se ne mogu verifikovati. Instalacija " +"neverfikovanog softvera predstavlja sigurnosni rizik, a prisustvo " +"nweverifikovanog softvera je znak upada. Da li želite nastaviti?" msgstr[2] "" +"Sljedeći elementi softvera se ne mogu verifikovati. Instalacija " +"neverfikovanog softvera predstavlja sigurnosni rizik, a prisustvo " +"nweverifikovanog softvera je znak upada. Da li želite nastaviti?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Promijenjena konfiguraciona datoteka" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -283,108 +243,104 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Nova verzija konfiguracione datoteke %1 je dostupna, " +"ali vaša verzija je izmijenjena. Želite li sačuvati vašu trenutnu verziju " +"ili instalirati novu verziju?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "" +msgstr "Koristi novu verziju" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "" +msgstr "Čuvaj staru verziju" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" -msgstr "" +msgstr "Brzina preuzimanja: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" -msgstr "" +msgstr "%1 preostalo" + +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" #: updater/UpdateModel/UpdateModel.cpp:104 -#, fuzzy -#| msgctxt "@action Downloads and installs updates" -#| msgid "Install Updates" msgctxt "@label Column label" msgid "Updates" -msgstr "Instaliraj nadogradnje" +msgstr "Nadogradnje" #: updater/UpdateModel/UpdateModel.cpp:106 msgctxt "@label Column label" msgid "Version" -msgstr "" +msgstr "Verzija" #: updater/UpdateModel/UpdateModel.cpp:108 msgctxt "@label Column label" msgid "Download Size" -msgstr "" +msgstr "Veličina preuzimanja" -#: updater/UpdaterWidget.cpp:147 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Software Updates" +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Neki paketi nisu markirani za nadogradnju.

Nadogradnja ovih " +"paketa zahtijeva da se neki drugi instaliraju ili uklone.

Želite li da i " +"njih nadogradite?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Označi sve" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" -msgstr "Ažuriranje Programa" +msgstr "Važne sigurnosne nadogradnje" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" -msgstr "" +msgstr "Aplikacijske nadogradnje" -#: updater/UpdaterWidget.cpp:153 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Software Updates" +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" -msgstr "Ažuriranje Programa" - -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "" +msgstr "Sistemske nadogradnje" -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." -msgstr "" +msgstr "Nepoznato vrijeme zadnje provjere za nadogradnje" -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." -msgstr "" +msgstr "Kliknite Provjeri nadogradnje da provjerite." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." -msgstr "" +msgstr "Softver na ovom računaru je ažuriran." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." -msgstr "" +msgstr "Zadnja provjera prije %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." -msgstr "" \ No newline at end of file +msgstr "Nema dostupnih nadogradnji." \ No newline at end of file diff -Nru muon-1.9.60/po/bs/muon.po muon-2.0.0/po/bs/muon.po --- muon-1.9.60/po/bs/muon.po 2012-10-29 18:33:26.000000000 +0000 +++ muon-2.0.0/po/bs/muon.po 2013-04-01 20:32:15.000000000 +0000 @@ -9,9 +9,9 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2011-05-08 12:51+0200\n" -"Last-Translator: KDE 4 \n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-01-26 14:19+0000\n" +"Last-Translator: Admir Salkanović \n" "Language-Team: bosanski \n" "Language: \n" "MIME-Version: 1.0\n" @@ -19,24 +19,24 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n" -"X-Launchpad-Export-Date: 2011-04-22 16:56+0000\n" -"X-Generator: KBabel 1.11.4\n" +"X-Launchpad-Export-Date: 2013-01-26 22:18+0000\n" +"X-Generator: Launchpad (build 16451)\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr " ,Launchpad Contributions:,Samir Ribić" +msgstr "Admir Salkanović,Samir Ribić" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr ",," +msgstr "asalkanovi2@etf.unsa.ba,samir.ribic@etf.unsa.ba" #: muon/config/GeneralSettingsPage.cpp:53 msgid "Ask to confirm changes that affect other packages" -msgstr "" +msgstr "Pitaj za potvrdu provjera koje utiču na druge pakete" #: muon/config/GeneralSettingsPage.cpp:54 msgid "Show foreign-architecture packages that are available natively" -msgstr "" +msgstr "Prikaži pakete stranih arhitektura koji su dostupni nativno" #: muon/config/GeneralSettingsPage.cpp:55 msgid "Treat recommended packages as dependencies" @@ -83,7 +83,7 @@ #: muon/DetailsTabs/ChangelogTab.cpp:42 msgctxt "@title:tab" msgid "Changes List" -msgstr "" +msgstr "Lista promjena" #: muon/DetailsTabs/ChangelogTab.cpp:87 #, kde-format @@ -92,190 +92,181 @@ "The list of changes is not yet available. Please use Launchpad instead." msgstr "" +"Lista promjena još nije dostupna. Koristite Launchpad " +"umjesto toga" #: muon/DetailsTabs/ChangelogTab.cpp:91 msgctxt "@info" msgid "The list of changes is not yet available." -msgstr "" +msgstr "Lista promjena još nije dostupna." #: muon/DetailsTabs/DependsTab.cpp:37 msgctxt "@title:tab" msgid "Dependencies" -msgstr "" +msgstr "Zavisnosti" #: muon/DetailsTabs/DependsTab.cpp:40 msgctxt "@item:inlistbox" msgid "Dependencies of the Current Version" -msgstr "" +msgstr "Zavisnosti trenutne verzije" #: muon/DetailsTabs/DependsTab.cpp:41 msgctxt "@item:inlistbox" msgid "Dependencies of the Latest Version" -msgstr "" +msgstr "Zavisnosti najnovije verzije" #: muon/DetailsTabs/DependsTab.cpp:42 msgctxt "@item:inlistbox" msgid "Dependants (Reverse Dependencies)" -msgstr "" +msgstr "Zavisnici (Inverzna zavisnost)" #: muon/DetailsTabs/DependsTab.cpp:43 msgctxt "@item:inlistbox" msgid "Virtual Packages Provided" -msgstr "" +msgstr "Pruženi virtuelni paketi" #: muon/DetailsTabs/DependsTab.cpp:71 muon/DetailsTabs/DependsTab.cpp:78 -#, fuzzy -#| msgid "Treat suggested packages as dependencies" msgctxt "@label" msgid "This package does not have any dependencies" -msgstr "Smatraj preporučene pakete kao zavisnosti" +msgstr "Ovaj paket nema nikakvih zavisnosti" #: muon/DetailsTabs/DependsTab.cpp:85 msgctxt "@label" msgid "This package has no dependents. (Nothing depends on it.)" -msgstr "" +msgstr "Ovaj paket nema zavisnika. (Ništa od njega ne zavisi.)" #: muon/DetailsTabs/DependsTab.cpp:92 msgctxt "@label" msgid "This package does not provide any virtual packages" -msgstr "" +msgstr "Ovaj paket ne pruža niti jedan virtuelni paket." #: muon/DetailsTabs/InstalledFilesTab.cpp:33 msgctxt "@title:tab" msgid "Installed Files" -msgstr "" +msgstr "Instalirane datoteke" #: muon/DetailsTabs/MainTab.cpp:48 msgctxt "@title:tab" msgid "Details" -msgstr "" +msgstr "Detalji" #: muon/DetailsTabs/MainTab.cpp:64 msgctxt "@label" msgid "Mark for:" -msgstr "" +msgstr "Markiraj za:" #: muon/DetailsTabs/MainTab.cpp:69 msgctxt "@action:button" msgid "Installation" -msgstr "" +msgstr "Instalaciju" #: muon/DetailsTabs/MainTab.cpp:77 msgctxt "@action:button" msgid "Removal" -msgstr "" +msgstr "Uklanjanje" #: muon/DetailsTabs/MainTab.cpp:83 -#, fuzzy -#| msgctxt "" -#| "@action Marks upgradeable packages, including ones that install/remove " -#| "new things" -#| msgid "Full Upgrade" msgctxt "@action:button" msgid "Upgrade" -msgstr "Potpuna nadogradnja" +msgstr "Nadogradi" #: muon/DetailsTabs/MainTab.cpp:89 msgctxt "@action:button" msgid "Reinstallation" -msgstr "" +msgstr "Reinstalaciju" #: muon/DetailsTabs/MainTab.cpp:96 msgctxt "@action:button" msgid "Purge" -msgstr "" +msgstr "Očisti" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" -msgstr "" +msgstr "Demarkiraj" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." -msgstr "" +msgstr "Canonical pruža kritične nadogradnje za %1 do %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" "Canonical does not provide updates for %1. Some updates may be provided by " "the Ubuntu community." msgstr "" +"Canonical ne pruža nadogradnje za %1. Neke nadogradnje može pružati Ubuntu " +"zajednica." #: muon/DetailsTabs/TechnicalDetailsTab.cpp:45 msgctxt "@title:tab" msgid "Technical Details" -msgstr "" +msgstr "Tehnički detalji" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:61 msgctxt "@label Label preceding the package maintainer" msgid "Maintainer:" -msgstr "" +msgstr "Održava:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:68 -#, fuzzy -#| msgctxt "@title:tab" -#| msgid "By Category" msgctxt "@label Label preceding the package category" msgid "Category:" -msgstr "Po kategoriji" +msgstr "Kategorija:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:76 msgctxt "@label The parent package that this package comes from" msgid "Source Package:" -msgstr "" +msgstr "Izvorni paket:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:84 -#, fuzzy -#| msgctxt "@title:tab" -#| msgid "By Origin" msgctxt "@label The software source that this package comes from" msgid "Origin:" -msgstr "Po porijeklu" +msgstr "Porijeklo:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:92 msgctxt "@label The package archive component that this package comes from" msgid "Component:" -msgstr "" +msgstr "Komponenta:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:102 msgctxt "@title:group" msgid "Installed Version" -msgstr "" +msgstr "Instalirana verzija" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:108 #: muon/DetailsTabs/TechnicalDetailsTab.cpp:130 msgctxt "@label Label preceding the package version" msgid "Version:" -msgstr "" +msgstr "Verzija:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:114 #: muon/DetailsTabs/TechnicalDetailsTab.cpp:136 msgctxt "@label Label preceding the package size" msgid "Installed Size:" -msgstr "" +msgstr "Veličina instaliranog:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:124 msgctxt "@title:group" msgid "Available Version" -msgstr "" +msgstr "Dostupne verzije" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:142 msgctxt "@label Label preceding the package's download size" msgid "Download Size:" -msgstr "" +msgstr "Veličina za preuzeti:" #: muon/DetailsTabs/VersionTab.cpp:41 msgctxt "@title:tab" msgid "Versions" -msgstr "" +msgstr "Verzije" #: muon/DetailsTabs/VersionTab.cpp:44 msgctxt "@label" msgid "Available versions:" -msgstr "" +msgstr "Dostupne verzije:" #: muon/DetailsTabs/VersionTab.cpp:62 msgctxt "@label" @@ -284,42 +275,38 @@ "different version from the default one, errors in the dependency handling " "can occur." msgstr "" +"Mion uvek bira najprimenljiviju verziju. Ako forsirate drugačiju verziju od " +"podrazumijevane, greške u zavisnostima se mogu desiti" #: muon/DetailsTabs/VersionTab.cpp:70 msgctxt "@action:button" msgid "Force Version" -msgstr "" +msgstr "Forsiraj verziju" #: muon/DownloadModel/DownloadDelegate.cpp:65 msgctxt "@info:status Progress text when done" msgid "Done" -msgstr "" +msgstr "Završeno" #: muon/DownloadModel/DownloadModel.cpp:61 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Package History" msgctxt "@title:column" msgid "Package" -msgstr "Istorijat paketa" +msgstr "Paket" #: muon/DownloadModel/DownloadModel.cpp:63 -#, fuzzy -#| msgctxt "@title:group" -#| msgid "Notifications" msgctxt "@title:column" msgid "Location" -msgstr "Obavještenja" +msgstr "Lokacija" #: muon/DownloadModel/DownloadModel.cpp:65 msgctxt "@title:column" msgid "Size" -msgstr "" +msgstr "Veličina" #: muon/DownloadModel/DownloadModel.cpp:67 msgctxt "@title:column" msgid "Progress" -msgstr "" +msgstr "Napredak" #: muon/FilterWidget/ArchitectureFilter.cpp:48 #: muon/FilterWidget/CategoryFilter.cpp:58 @@ -352,7 +339,7 @@ #: muon/FilterWidget/FilterWidget.cpp:74 msgctxt "@title:tab" msgid "By Architecture" -msgstr "" +msgstr "Po Arhitekturi" #: muon/main.cpp:30 msgid "A package manager" @@ -363,78 +350,46 @@ msgstr "Upravitelj paketima Muon" #: muon/main.cpp:37 -#, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "© 2009-2011 Jonathan Thomas" +msgstr "© 2009-2012 Jonathan Thomas" #: muon/main.cpp:38 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Čitam oznake..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Snimi markiranja kao..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Snimi listu paketa za preuzimanje..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Preuzmi pakete iz liste..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Dodaj preuzete pakete" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Snimi listu instaliranih paketa..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Pažljiva nadogradnja" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Potpuna nadogradnja" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Ukloni nepotrebne pakete" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Pregledaj promjene" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Primijeni promjene" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Istorijat..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -446,12 +401,12 @@ "isprobate potpunu nadogradnju tako što ćete kliknuti Puna " "nadogradnja dugme." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Ne mogu se označiti nadogradnje" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -460,128 +415,115 @@ "Ne mogu se označiti nadogradnje. Neke nadogradnje mogu imati nezadovoljene " "zavisnosti u ovom trenutku ili su ručno zadržane." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Nazad" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Pregledaj promjene" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Istorijat paketa" #: muon/PackageModel/PackageModel.cpp:79 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Package History" msgid "Package" -msgstr "Istorijat paketa" +msgstr "Paket" #: muon/PackageModel/PackageModel.cpp:81 -#, fuzzy -#| msgctxt "@title:tab" -#| msgid "By Status" msgid "Status" -msgstr "Po statusu" +msgstr "Stanje" #: muon/PackageModel/PackageModel.cpp:83 msgid "Requested" -msgstr "" +msgstr "Zahtjevano" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" -msgstr "" +msgstr "Pretraživanje" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" -msgstr "" +msgstr "Označi za instalaciju" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" -msgstr "" +msgstr "Označi za uklanjanje" -#: muon/PackageModel/PackageWidget.cpp:165 -#, fuzzy -#| msgctxt "@action Marks upgradeable packages for upgrade" -#| msgid "Cautious Upgrade" +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" -msgstr "Pažljiva nadogradnja" +msgstr "Označi za nadogradnju" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" -msgstr "" +msgstr "Označi za reinstalaciju" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" -msgstr "" +msgstr "Oznaći za čišćenje" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" -msgstr "" +msgstr "Zaključaj paket na trenutnoj verziji" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" -msgstr "" +msgstr "Otključaj paket" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" -msgstr "" +msgstr "Zaključaj na trenutnoj verziji" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "" +"Uklanjanje ovog paketa može oštetiti vaš sistem. Da li ste sigurni da ga " +"želite ukloniti?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" -msgstr "" +msgstr "Pažnja - Uklanjanje važnog paketa" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Upgrades" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Ne mogu se označiti nadogradnje" +msgstr "Ne mogu zaključati paket" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." -msgstr "" +msgstr "Paket %1 se ne može zaključati. Neuspio upis datoteke s ključem." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" -msgstr "" +msgstr "Paket \"%1\" se ne može markirati za instalaciju ili nadogradnju" -#: muon/PackageModel/PackageWidget.cpp:613 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Upgrades" +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" -msgstr "Ne mogu se označiti nadogradnje" +msgstr "Ne mogu markirati paket" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -590,42 +532,28 @@ "never uploaded, has been obsoleted, or is not available from the currently-" "enabled repositories." msgstr "" +"Paket \"%1\" nema dostupne verzije ali postoji u bazi.\n" +"\tTo obično znači da se paket koji se pominje u zavisnosti nikada nije " +"otpremljen, je zastario, ili nije dostupan u trenutno omogućenim " +"reopzitorijima." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "" +msgstr "%1: %2 %3, ali %4 se treba instalirati" -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" -msgstr "" +msgstr "%1: %2, se ne može instalirati" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "" +msgstr "%1: %2, ali je virtualni paket" #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" @@ -634,41 +562,40 @@ #: muon/StatusWidget.cpp:52 msgctxt "@info:status" msgid "Rebuilding Search Index" -msgstr "" +msgstr "Rekonstrukcija indeksa pretrage" #: muon/StatusWidget.cpp:91 -#, fuzzy, kde-format -#| msgid "A package manager" +#, kde-format msgctxt "@info:status" msgid "1 package available, " msgid_plural "%1 packages available, " -msgstr[0] "Upravitelj paketima" -msgstr[1] "Upravitelj paketima" -msgstr[2] "Upravitelj paketima" +msgstr[0] "%1 paket dostupan, " +msgstr[1] "%1 paketa dostupna, " +msgstr[2] "%1 paketa dostupno, " #: muon/StatusWidget.cpp:92 #, kde-format msgctxt "@info:status" msgid "%1 installed, " -msgstr "" +msgstr "%1 instaliran, " #: muon/StatusWidget.cpp:96 #, kde-format msgctxt "@info:status" msgid "%1 upgradeable," -msgstr "" +msgstr "%1 nadogradiv," #: muon/StatusWidget.cpp:98 #, kde-format msgctxt "@info:status" msgid "%1 upgradeable" -msgstr "" +msgstr "%1 nadogradiv" #: muon/StatusWidget.cpp:110 #, kde-format msgctxt "@info:status Part of the status label" msgid " %1 to install/upgrade" -msgstr "" +msgstr " %1 za instalaciju/nadogradnju" #: muon/StatusWidget.cpp:115 #, kde-format @@ -676,7 +603,7 @@ "@info:status Label for the number of packages pending removal when packages " "are also pending upgrade" msgid ", %1 to remove" -msgstr "" +msgstr ", %1 za ukloniti" #: muon/StatusWidget.cpp:118 #, kde-format @@ -684,127 +611,106 @@ "@info:status Label for the number of packages pending removal when there are " "only removals" msgid " %1 to remove" -msgstr "" +msgstr " %1 za ukloniti" #: muon/StatusWidget.cpp:127 #, kde-format msgctxt "@label showing download and install size" msgid "%1 to download, %2 of space to be freed" -msgstr "" +msgstr "%1 za preuzeti, %2 prostora za osloboditi" #: muon/StatusWidget.cpp:131 #, kde-format msgctxt "@label showing download and install size" msgid "%1 to download, %2 of space to be used" -msgstr "" +msgstr "%1 za preuzeti, %2 prostora će se koristiti" #: muon/TransactionWidget.cpp:104 msgctxt "@action:button Cancels the download" msgid "Cancel" -msgstr "" +msgstr "Otkaži" #: muon/TransactionWidget.cpp:147 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Upisujem promjene" +msgstr "Pokrećem" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "Čekam pokretanje servisa" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "Čekam autentifikaciju" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Upisujem promjene" +msgstr "Čekam" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Čekam završetak drugih transakcija" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Čekam završetak drugih menadžera softvera" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Čekam potrebni medij" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Čekam konfiguracionu datoteku" #: muon/TransactionWidget.cpp:192 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Ažuriram softverske izvore" +msgstr "Ažuriram softverske liste" #: muon/TransactionWidget.cpp:200 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Ažuriram softverske izvore" #: muon/TransactionWidget.cpp:205 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Preuzimam pakete" #: muon/TransactionWidget.cpp:217 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" msgstr "Upisujem promjene" #: muon/TransactionWidget.cpp:224 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Upisujem promjene" +msgstr "Završeno" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Potrebna promjena medija" #: muon/TransactionWidget.cpp:254 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Molim ubaci %1 u %2" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Pažnja - neverifikovan softve" #: muon/TransactionWidget.cpp:265 msgctxt "@label" @@ -819,13 +725,22 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Sljedeći program se ne može verifikovati. Instalacija " +"neverifikovanog softvera predstavlja sigurnosni rizik, a pristustvo takvog " +"softvera znači provalu. Želite li nastaviti?" msgstr[1] "" +"Sljedeći programi se ne mogu verifikovati. Instalacija " +"neverifikovanog softvera predstavlja sigurnosni rizik, a pristustvo takvog " +"softvera znači provalu. Želite li nastaviti?" msgstr[2] "" +"Sljedeći programi se ne mogu verifikovati. Instalacija " +"neverifikovanog softvera predstavlja sigurnosni rizik, a pristustvo takvog " +"softvera znači provalu. Želite li nastaviti?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Promijenjena konfiguracijska datoteka" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -835,13 +750,16 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Nova verzija konfiguracijske datoteke %1 is dostupna, " +"ali je vaša verzija izmijenjena. Želite li sačuvati trenutnu verziju ili " +"instalirati novu verziju?" #: muon/TransactionWidget.cpp:290 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "" +msgstr "Koristi novu verziju" #: muon/TransactionWidget.cpp:291 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "" \ No newline at end of file +msgstr "Sačuvaj staru verziju" \ No newline at end of file diff -Nru muon-1.9.60/po/ca/libmuon.po muon-2.0.0/po/ca/libmuon.po --- muon-1.9.60/po/ca/libmuon.po 2012-10-29 18:33:29.000000000 +0000 +++ muon-2.0.0/po/ca/libmuon.po 2013-04-01 20:32:17.000000000 +0000 @@ -1,14 +1,15 @@ # Translation of libmuon.po to Catalan -# Copyright (C) 2011 This_file_is_part_of_KDE +# Copyright (C) 2011-2013 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2 or later. # -# Josep Ma. Ferrer , 2011, 2012. +# Josep Ma. Ferrer , 2011, 2012, 2013. +# Orestes Mas , 2012. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-02-24 21:00+0100\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-10 10:22+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -17,1258 +18,271 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" -msgstr "" +msgstr "Aplicacions" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" -msgstr "" +msgstr "Codi Obert" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" -msgstr "" +msgstr "Propietari" -#: libmuon/ApplicationBackend/Application.cpp:267 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Desconegut" -#: libmuon/ApplicationBackend/Application.cpp:398 -#, fuzzy, kde-format -#| msgctxt "@label showing download and install size" -#| msgid "%1 to download, %2 of space to be used" +#: libmuon/backends/ApplicationBackend/Application.cpp:413 +#, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" -msgstr "%1 a baixar, %2 d'espai a utilitzar" +msgstr "%1 a baixar, %2 en el disc" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" -msgstr "" +msgstr "%1 en el disc" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Dorsal d'aplicacions" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Aplicacions en el vostre sistema" + +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Connecteu-vos al servei SSO d'Ubuntu" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Dorsal del Bodega" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Instal·leu el Bodega en el vostre sistema" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Introduïu les credencials del MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Dorsal simulat" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Dorsal simulat per provar els frontals del muon" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Dorsal del KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Instal·leu les dades del KNewStuff en el vostre sistema" + +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Tot" + +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "Aquest Muon té poders de super vaca" + +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Trencat" + +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Disponible" + +#: libmuon/resources/AbstractResource.cpp:83 +msgid "Installed" +msgstr "Instal·lat" + +#: libmuon/resources/AbstractResource.cpp:84 +msgid "Upgradeable" +msgstr "Actualitzable" + +#: libmuon/resources/ResourcesUpdatesModel.cpp:100 +#, kde-format +msgctxt "@item:intext Remaining time" +msgid "%1 remaining" +msgstr "Resta %1" + +#: libmuon/settings/NotifySettingsPage.cpp:46 +msgid "Show notifications for:" +msgstr "Mostra les notificacions per:" + +#: libmuon/settings/NotifySettingsPage.cpp:48 +msgid "Available updates" +msgstr "Actualitzacions disponibles" + +#: libmuon/settings/NotifySettingsPage.cpp:49 +msgid "Show the number of available updates" +msgstr "Mostra el nombre d'actualitzacions disponibles" + +#: libmuon/settings/NotifySettingsPage.cpp:50 +msgid "Distribution upgrades" +msgstr "Actualitzacions de la distribució" + +#: libmuon/settings/NotifySettingsPage.cpp:69 +msgid "Notification type:" +msgstr "Tipus de notificació:" + +#: libmuon/settings/NotifySettingsPage.cpp:72 +msgid "Use both popups and tray icons" +msgstr "Utilitza finestres emergents i icones a la safata del sistema" + +#: libmuon/settings/NotifySettingsPage.cpp:73 +msgid "Tray icons only" +msgstr "Només icones a la safata del sistema" + +#: libmuon/settings/NotifySettingsPage.cpp:74 +msgid "Popup notifications only" +msgstr "Només notificacions emergents" + +#: libmuon/Transaction/TransactionListener.cpp:109 +msgctxt "@info:status" +msgid "Downloading" +msgstr "S'està baixant" + +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 +msgctxt "@info:status Progress text when done" +msgid "Done" +msgstr "Fet" + +#: libmuon/Transaction/TransactionListener.cpp:154 +msgctxt "@info:status Progress text when waiting" +msgid "Waiting" +msgstr "En espera" + +#: libmuon/Transaction/TransactionListener.cpp:175 +msgctxt "@info:status" +msgid "Installing" +msgstr "S'està instal·lant" + +#: libmuon/Transaction/TransactionListener.cpp:179 +msgctxt "@info:status" +msgid "Changing Addons" +msgstr "S'estan canviant els complements" + +#: libmuon/Transaction/TransactionListener.cpp:183 +msgctxt "@info:status" +msgid "Removing" +msgstr "S'està eliminant" + + + + -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "" -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "" -#: libmuon/categories.xml:27 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Developer Tools" -msgstr "Desenvolupament" -#: libmuon/categories.xml:42 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"debug" -#| "\"" -#| msgid "Debug" -msgctxt "Category" -msgid "Debugging" -msgstr "Depuració" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "" -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "" -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "" -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "" -#: libmuon/categories.xml:98 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"localization\"" -#| msgid "Localization" -msgctxt "Category" -msgid "Localization" -msgstr "Traducció" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "" -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "" -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "" -#: libmuon/categories.xml:144 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -#| msgid "Version Control Systems" -msgctxt "Category" -msgid "Version Control" -msgstr "Sistemes de control de versió" -#: libmuon/categories.xml:158 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Web Development" -msgstr "Desenvolupament" -#: libmuon/categories.xml:171 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Education" -msgstr "Ubicació" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "" -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "" -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "" -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "" -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "" -#: libmuon/categories.xml:232 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"electronics\"" -#| msgid "Electronics" -msgctxt "Category" -msgid "Electronics" -msgstr "Electrònica" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "" -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "" -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "" -#: libmuon/categories.xml:269 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"math" -#| "\"" -#| msgid "Mathematics" -msgctxt "Category" -msgid "Mathematics" -msgstr "Matemàtiques" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "" -#: libmuon/categories.xml:299 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"fonts" -#| "\"" -#| msgid "Fonts" -msgctxt "Category" -msgid "Fonts" -msgstr "Tipus de lletres" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "" -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "" -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "" -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "" -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" -#: libmuon/categories.xml:369 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Simulation" -msgstr "Ubicació" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "" -#: libmuon/categories.xml:391 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"graphics\"" -#| msgid "Graphics" -msgctxt "Category" -msgid "Graphics" -msgstr "Gràfics" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "" -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "" -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "" -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "" -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "" -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "" -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "" -#: libmuon/categories.xml:473 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"web\"" -#| msgid "Internet" -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "" -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "" -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "" -#: libmuon/categories.xml:509 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"httpd" -#| "\"" -#| msgid "Web Servers" -msgctxt "Category" -msgid "Web Browsers" -msgstr "Servidors web" -#: libmuon/categories.xml:521 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"sound" -#| "\"" -#| msgid "Multimedia" -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimèdia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "" -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "" -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Confirmació de canvis addicionals" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Marco els canvis addicionals?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Aquesta acció requereix un canvi en un altre paquet:" -msgstr[1] "Aquesta acció requereix canvis en altres paquets:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historial" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Cerca" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Tots els canvis" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instal·lacions" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Actualitzacions" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Eliminacions" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Data" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Instal·lat" -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Actualitzat" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Desactualitzat" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Eliminat" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Purgat" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 a les %3" -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "Aquest Muon té poders de super vaca" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administració del sistema" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Sistema base" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infraestructura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Comunicacions" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Bases de dades" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Desenvolupament" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentació" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Depuració" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editors" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Electrònica" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Dispositius incrustats" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Tipus de lletres" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Jocs i passatemps" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Entorn d'escriptori GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Gràfics" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Sistema estadístic GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Entorn d'escriptori Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Radioafició" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Llenguatge de programació Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Servidors web" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Llenguatges d'ordinador interpretats" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Llenguatge de programació Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Compilació de programari KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Nucli i mòduls" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Biblioteques - Desenvolupament" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Biblioteques" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Llenguatge de programació Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Traducció" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Correu electrònic" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matemàtiques" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Diversos - Basats en text" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Xarxes" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Grups de notícies" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Llenguatge de programació OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Biblioteques - Antigues" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Multiplataforma" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Llenguatge de programació Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Llenguatge de programació PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Llenguatge de programació Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Llenguatge de programació Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Ciència" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Intèrprets d'ordres" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimèdia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Escriptura en TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Processadors de textos" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utilitats" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sistemes de control de versió" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Programari de vídeo" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Diversos - Gràfics" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Entorn d'escriptori XFCE" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Entorn Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Desconegut" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Convertit des d'RPM per l'Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internacionalització i localització" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapaquets" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Restriccions a l'exportació" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "No lliure" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" -#: libmuon/MuonStrings.cpp:165 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Ubicació" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "No instal·lat" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Instal·lat" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Actualitzable" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Trencat" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Configuració residual" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Instal·lat (eliminable automàticament)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Sense canvis" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Instal·la" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Actualitza" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Elimina" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Purga" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinstal·la" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Desactualitza" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Blocat" -#: libmuon/MuonStrings.cpp:221 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"comm" -#| "\"" -#| msgid "Communication" -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Comunicacions" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "" -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "" -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "" -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Error d'inicialització" -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "No s'ha pogut obtenir el bloqueig del sistema de paquets" -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Espai escàs al disc" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Ha fallat en aplicar els canvis" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Error d'autenticació" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Error inesperat" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Paquets no fiables" -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Desconegut" -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"El sistema de paquets no s'ha pogut inicialitzar, la vostra configuració deu " -"estar trencada." -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Una altra aplicació sembla estar usant ara el sistema de paquets. Heu de " -"tancar tots els altres gestors de paquets abans de poder instal·lar o " -"eliminar qualsevol paquet." -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"No teniu espai al disc suficient al directori %1 per continuar amb aquesta " -"operació." -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "No s'han pogut baixar els paquets" -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "S'ha detectat un error en aplicar els canvis:" -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Aquesta operació no pot continuar perquè no s'ha proporcionat l'autorització " -"adequada" -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Sembla que el treballador QApt ha fallat o ha desaparegut. Informeu de " -"l'error als mantenidors del QApt" -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"El següent paquet no ha estat verificat pel seu autor. La vostra " -"configuració actual no permet baixar paquets no verificats." -msgstr[1] "" -"Els següents paquets no han estat verificats pels seus autors. La vostra " -"configuració actual no permet baixar paquets no verificats." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Comprova si hi ha actualitzacions" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Desmarca-ho tot" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configura les fonts de programari" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Desa les marques com a" -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"El document no es pot desar, perquè no ha estat possible escriure a " -"%1\n" -"\n" -"Comproveu que teniu accés d'escriptura a aquest fitxer o que hi ha prou " -"espai disponible al disc." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Desa la llista dels paquets instal·lats com a" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Desa la llista de baixades com a" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Obre fitxer" -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"No s'han pogut marcar els canvis. Verifiqueu que el fitxer sigui un fitxer " -"de marques creat pel gestor de paquets Muon o pel gestor de paquets Synaptic." -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Seleccioneu un directori" -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "S'ha afegit correctament %1 paquet a la memòria cau" -msgstr[1] "S'han afegit correctament %1 paquets a la memòria cau" -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"No s'ha pogut trobar cap paquet vàlid en aquest directori. Assegureu-vos que " -"els paquets siguin compatibles amb l'ordinador i siguin la darrera versió." -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "No s'han pogut trobar alguns paquets" -#: libmuon/resources/ResourcesUpdatesModel.cpp:100 -#, kde-format -msgctxt "@item:intext Remaining time" -msgid "%1 remaining" -msgstr "Resta %1" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" -#: libmuon/settings/NotifySettingsPage.cpp:46 -msgid "Show notifications for:" -msgstr "Mostra les notificacions per:" -#: libmuon/settings/NotifySettingsPage.cpp:48 -msgid "Available updates" -msgstr "Actualitzacions disponibles" -#: libmuon/settings/NotifySettingsPage.cpp:49 -msgid "Show the number of available updates" -msgstr "Mostra el nombre d'actualitzacions disponibles" -#: libmuon/settings/NotifySettingsPage.cpp:50 -msgid "Distribution upgrades" -msgstr "Actualitzacions de la distribució" -#: libmuon/settings/NotifySettingsPage.cpp:69 -msgid "Notification type:" -msgstr "Tipus de notificació:" -#: libmuon/settings/NotifySettingsPage.cpp:72 -msgid "Use both popups and tray icons" -msgstr "Utilitza finestres emergents i icones a la safata del sistema" -#: libmuon/settings/NotifySettingsPage.cpp:73 -msgid "Tray icons only" -msgstr "Només icones a la safata del sistema" -#: libmuon/settings/NotifySettingsPage.cpp:74 -msgid "Popup notifications only" -msgstr "Només notificacions emergents" -#: libmuon/Transaction/TransactionListener.cpp:109 -#, fuzzy -#| msgctxt "@label Label preceding the package's download size" -#| msgid "Download Size:" -msgctxt "@info:status" -msgid "Downloading" -msgstr "Mida de la baixada:" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 -msgctxt "@info:status Progress text when done" -msgid "Done" -msgstr "Fet" -#: libmuon/Transaction/TransactionListener.cpp:153 -msgctxt "@info:status Progress text when waiting" -msgid "Waiting" -msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:174 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Install" -msgctxt "@info:status" -msgid "Installing" -msgstr "Instal·la" -#: libmuon/Transaction/TransactionListener.cpp:179 -msgctxt "@info:status" -msgid "Changing Addons" -msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:183 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Remove" -msgctxt "@info:status" -msgid "Removing" -msgstr "Elimina" @@ -1361,25 +375,21 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1709,11 +719,743 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/ca/muon-discover.po muon-2.0.0/po/ca/muon-discover.po --- muon-1.9.60/po/ca/muon-discover.po 2012-10-29 18:33:29.000000000 +0000 +++ muon-2.0.0/po/ca/muon-discover.po 2013-04-01 20:32:17.000000000 +0000 @@ -1,21 +1,22 @@ # Translation of muon-discover.po to Catalan -# Copyright (C) 2012 This_file_is_part_of_KDE +# Copyright (C) 2012-2013 This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # # Orestes Mas , 2012. +# Josep Ma. Ferrer , 2013. msgid "" msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-30 23:27+0200\n" -"Last-Translator: Orestes Mas \n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-10 10:35+0100\n" +"Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" "Language: ca\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -51,22 +52,44 @@ msgid "Display a list of entries with a category." msgstr "Mostra una llista d'entrades amb una categoria." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Obre el Muon Discover en un mode indicat. Els modes es corresponen als " +"botons de la barra d'eines." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" +"Llista tots els modes disponibles i els mostra en la sortida estàndard " +"(stdout)." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Modes disponibles:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Cerca..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" +"S'ha trobat alguns errors en configurar la IGU, l'aplicació no pot continuar." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" -msgstr "" +msgstr "Error d'inicialització" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "S'estan afegint orígens..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "S'estan eliminant orígens..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menú" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Configureu i apreneu quant al Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -81,94 +104,94 @@ msgid "Discard" msgstr "Descarta" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 revisions" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Pàgina inicial" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Engega" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Comenta" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Mida total: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Resum" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Complements" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Comentaris" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Actualitza" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nom" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Puntuació" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Brunzit" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularitat" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" -msgstr "Orígen" +msgstr "Origen" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Cerca a «%1»..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Cerca..." - -#: discover/qml/CategoryPage.qml:127 -#, fuzzy -#| msgid "Popularity Contest" +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" -msgstr "Concurs de popularitat" +msgstr "Concurs de popularitat" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "punts: %1" -#: discover/qml/CategoryPage.qml:139 -#, fuzzy -#| msgid "Best Ratings" +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" -msgstr "Millors valoracions" +msgstr "Millors valoracions" + +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Benvingut al\n" +"Muon Discover!" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -181,25 +204,34 @@ msgid "Remove" msgstr "Elimina" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Instal·lat" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "Actualitza-ho tot!" +msgstr "Actualitza-ho tot" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "S'està carregant..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Enrere" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Descobreix" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Instal·lat (%1 actualització)" +msgstr[1] "Instal·lat (%1 actualitzacions)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Fonts" @@ -224,55 +256,59 @@ msgid "Summary:" msgstr "Resum:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Revisions:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Parleu-nos d'aquest comentari!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 de %2 persones han trobat útil aquest comentari" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 per %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 per %2

" +"%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Útil? Si/No" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Afegeix font" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Especifiqueu la nova font" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "" +msgstr "D'acord" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Cancel·la" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - La línia de la font del repositori APT a afegir. És una de:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Binària)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/ca/muon-installer.po muon-2.0.0/po/ca/muon-installer.po --- muon-1.9.60/po/ca/muon-installer.po 2012-10-29 18:33:29.000000000 +0000 +++ muon-2.0.0/po/ca/muon-installer.po 2013-04-01 20:32:17.000000000 +0000 @@ -1,5 +1,5 @@ # Translation of muon-installer.po to Catalan -# Copyright (C) 2011 This_file_is_part_of_KDE +# Copyright (C) 2011-2012 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2 or later. # # Josep Ma. Ferrer , 2011, 2012. @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-09-24 13:28+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" @@ -27,7 +27,7 @@ msgid "Your emails" msgstr "txemaq@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ msgstr[1] "" "S'acaben d'instal·lar les aplicacions següents, cliqueu-hi per a iniciar-les:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Programari disponible" @@ -66,74 +66,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Programari disponible" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Programari instal·lat" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Proporcionat per Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Proporcionat per Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" -msgstr "Socis de Canonical" +msgstr "Canonical Partners" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Independent" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Programari disponible" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Programari instal·lat" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historial" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 s'ha instal·lat correctament." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Inicia" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Les aplicacions s'han instal·lat correctament." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Executa les aplicacions noves..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instal·lació completa" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "En curs" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "En curs" @@ -207,18 +207,18 @@ msgid "Install" msgstr "Instal·la" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Elimina" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Instal·la" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -276,19 +276,19 @@ msgid "No reviews available" msgstr "Ni hi ha cap comentari disponible" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Aquest comentari es va escriure per una versió antiga (versió: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/ca/muon-notifier.po muon-2.0.0/po/ca/muon-notifier.po --- muon-1.9.60/po/ca/muon-notifier.po 2012-10-29 18:33:29.000000000 +0000 +++ muon-2.0.0/po/ca/muon-notifier.po 2013-04-01 20:32:17.000000000 +0000 @@ -1,5 +1,5 @@ # Translation of muon-notifier.po to Catalan -# Copyright (C) 2011 This_file_is_part_of_KDE +# Copyright (C) 2011-2012 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2 or later. # # Josep Ma. Ferrer , 2011, 2012. @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2012-09-24 13:19+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" diff -Nru muon-1.9.60/po/ca/muon-updater.po muon-2.0.0/po/ca/muon-updater.po --- muon-1.9.60/po/ca/muon-updater.po 2012-10-29 18:33:29.000000000 +0000 +++ muon-2.0.0/po/ca/muon-updater.po 2013-04-01 20:32:17.000000000 +0000 @@ -1,14 +1,14 @@ # Translation of muon-updater.po to Catalan -# Copyright (C) 2011 This_file_is_part_of_KDE +# Copyright (C) 2011-2013 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2 or later. # -# Josep Ma. Ferrer , 2011, 2012. +# Josep Ma. Ferrer , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-09-24 13:19+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-10 10:47+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -27,12 +27,12 @@ msgid "Your emails" msgstr "txemaq@gmail.com" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Oculta" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -42,18 +42,18 @@ "Encara no és disponible la llista dels canvis. En el seu lloc utilitzeu el " "Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Encara no és disponible la llista dels canvis." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versió %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -85,174 +85,125 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Actualitzacions de programari" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "És més segur endollar el transformador a la corrent abans de l'actualització." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Hi ha disponible una nova versió del Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Desa la llista de baixada de paquets..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Descarrega els paquets des d'una llista..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Afegeix els paquets descarregats" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Instal·la les actualitzacions" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historial..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Actualització" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Historial dels paquets" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Cancel·la" -#: updater/ProgressWidget.cpp:128 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "S'estan efectuant el canvis" +msgstr "s'està iniciant" -#: updater/ProgressWidget.cpp:133 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "S'estan efectuant el canvis" +msgstr "S'està esperant l'autenticació" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "S'estan efectuant el canvis" +msgstr "Esperant" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "S'està esperant que acabin altres transaccions" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "S'està esperant que acabin altres gestors de programari" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "S'està esperant el suport requerit" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "S'està esperant el fitxer de configuració" -#: updater/ProgressWidget.cpp:172 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "S'estan actualitzant les fonts de programari" +msgstr "S'està carregant la llista de programari" -#: updater/ProgressWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "S'estan actualitzant les fonts de programari" -#: updater/ProgressWidget.cpp:184 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Updates" +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "S'estan baixant les actualitzacions" +msgstr "S'estan baixant els paquets" -#: updater/ProgressWidget.cpp:193 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "S'estan efectuant el canvis" +msgstr "S'estan aplicant els canvis" -#: updater/ProgressWidget.cpp:198 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "S'estan efectuant el canvis" +msgstr "Ha finalitzat" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Es requereix un canvi de suport" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Introduïu %1 a %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Avís - Programari no verificat" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -265,14 +216,22 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"La peça següent de programari no es pot verificar. La instal·lació " +"de programari no verificat representa un risc de seguretat, ja que la " +"presència de programari no verificable pot ser un senyal de manipulació. Voleu continuar?" msgstr[1] "" +"Les peces següents programari no es poden verificar. La " +"instal·lació de programari no verificat representa un risc de seguretat, ja " +"que la presència de programari no verificable pot ser un senyal de " +"manipulació. Voleu continuar?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "El fitxer de configuració ha canviat" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -280,35 +239,37 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Hi ha disponible una versió nova del fitxer de configuració %1, però la vostra versió es va modificar. Preferiu mantenir la " +"versió actual o instal·lar la versió nova?" -#: updater/ProgressWidget.cpp:265 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Versió" +msgstr "Usa la nova versió" -#: updater/ProgressWidget.cpp:266 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Versió" +msgstr "Mantén la versió antiga" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Velocitat de baixada: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "Resta %1" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -324,67 +285,60 @@ msgid "Download Size" msgstr "Mida de la baixada" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Alguns paquets no s'han marcat per actualitzar.

L'actualització " +"d'aquests paquets necessita la instal·lació o supressió d'altres.

Els " +"voleu actualitzar també?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Marca'ls tots" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Actualitzacions importants de seguretat" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Actualitzacions d'aplicacions" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Actualitzacions del sistema" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"No s'han pogut marcar tots els paquets per actualització. Les " -"actualitzacions disponibles poden requerir la instal·lació de paquets nous o " -"la seva eliminació. Voleu marcar les actualitzacions que requereixen la " -"instal·lació o eliminació de paquets addicionals?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "No s'han pogut marcar les actualitzacions" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Marca les actualitzacions" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Es desconeix quan es va fer la darrera comprovació d'actualitzacions." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Cliqueu Comprova si hi ha actualitzacions per " "comprovar-ho." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "El programari d'aquest ordinador està actualitzat." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "La darrera comprovació es va fer fa %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "No hi ha actualitzacions disponibles." \ No newline at end of file diff -Nru muon-1.9.60/po/ca/muon.po muon-2.0.0/po/ca/muon.po --- muon-1.9.60/po/ca/muon.po 2012-10-29 18:33:29.000000000 +0000 +++ muon-2.0.0/po/ca/muon.po 2013-04-01 20:32:17.000000000 +0000 @@ -1,15 +1,15 @@ # Translation of muon.po to Catalan -# Copyright (C) 2010 This_file_is_part_of_KDE +# Copyright (C) 2010-2013 This_file_is_part_of_KDE # This file is distributed under the license LGPL version 2 or later. # # Manuel Tortosa , 2010. -# Josep Ma. Ferrer , 2010, 2011, 2012. +# Josep Ma. Ferrer , 2010, 2011, 2012, 2013. msgid "" msgstr "" -"Project-Id-Version: \n" +"Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-09-24 15:45+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-10 13:45+0100\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" "Language: ca\n" @@ -179,18 +179,18 @@ msgid "Purge" msgstr "Purga" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Desmarca" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical proporcionarà actualitzacions crítiques per %1 fins el %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -357,69 +357,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Llegeix les marques..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Desa les marques com a..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Desa la llista de baixada de paquets..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Descarrega els paquets des d'una llista..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Afegeix els paquets descarregats" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Desa la llista dels paquets instal·lats..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Actualització cauta" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Actualització completa" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Elimina els paquets innecessaris" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Vista prèvia dels canvis" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Aplica els canvis" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historial..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -431,12 +401,12 @@ "una actualització completa clicant el botó Actualització " "completa." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "No s'han pogut marcar les actualitzacions" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -446,17 +416,17 @@ "tenir dependències que no es poden satisfer per ara, o poden haver estat " "retingudes." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Enrere" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Vista prèvia dels canvis" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Historial dels paquets" @@ -473,52 +443,52 @@ msgid "Requested" msgstr "Requerit" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Cerca" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Marca per instal·lar" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Marca per eliminar" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Marca per actualitzar" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Marca per reinstal·lar" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Marca per purgar" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Bloqueja el paquet en la versió actual" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Desbloqueja paquet" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Bloqueja en la versió actual" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -527,37 +497,36 @@ "Eliminant aquest paquet es pot trencar el sistema. Esteu segur que el voleu " "eliminar?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Avís - S'està eliminant un paquet important" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "No s'ha pogut marcar un paquet" +msgstr "Ha fallar en bloquejar el paquet" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" +"No s'ha pogut bloquejar el paquet %1. Ha fallat en escriure el fitxer de " +"bloqueig." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "No s'ha pogut marcar el paquet «%1» per a instal·lar o actualitzar:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" -msgstr "No s'ha pogut marcar un paquet" +msgstr "No s'ha pogut marcar el paquet" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -572,42 +541,24 @@ "no s'ha pujat mai, o és obsolet, o no està disponible en els repositoris " "actius actualment." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, però %4 és per instal·lar" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "o %1 %2, però %3 és per instal·lar" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, però no és pot instal·lar" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "o %1, però no és pot instal·lar" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, però és un paquet virtual" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "o %1, però és un paquet virtual" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Revisa i aplica els canvis" @@ -683,107 +634,86 @@ msgstr "Cancel·la" #: muon/TransactionWidget.cpp:147 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "S'estan efectuant el canvis" +msgstr "S'està iniciant" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "S'està esperant que s'iniciï el servei" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "S'està esperant l'autenticació" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "S'estan efectuant el canvis" +msgstr "Esperant" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "S'està esperant que acabin altres transaccions" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "S'està esperant que acabin altres gestors de programari" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "S'està esperant el suport requerit" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "S'està esperant el fitxer de configuració" #: muon/TransactionWidget.cpp:192 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "S'estan actualitzant les fonts de programari" +msgstr "S'està carregant la llista de programari" #: muon/TransactionWidget.cpp:200 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "S'estan actualitzant les fonts de programari" #: muon/TransactionWidget.cpp:205 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "S'estan baixant els paquets" #: muon/TransactionWidget.cpp:217 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" msgstr "S'estan efectuant el canvis" #: muon/TransactionWidget.cpp:224 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "S'estan efectuant el canvis" +msgstr "Finalitzat" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Es requereix un canvi de suport" #: muon/TransactionWidget.cpp:254 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Introduïu %1 a %2" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Avís - Programari no verificat" #: muon/TransactionWidget.cpp:265 msgctxt "@label" @@ -798,12 +728,20 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"La peça següent de programari no es pot verificar. La instal·lació " +"de programari no verificat representa un risc de seguretat, ja que la " +"presència de programari no verificable pot ser un senyal de manipulació. Voleu continuar?" msgstr[1] "" +"Les peces següents programari no es poden verificar. La " +"instal·lació de programari no verificat representa un risc de seguretat, ja " +"que la presència de programari no verificable pot ser un senyal de " +"manipulació. Voleu continuar?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "El fitxer de configuració ha canviat" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -813,19 +751,16 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Hi ha disponible una versió nova del fitxer de configuració %1, però la vostra versió es va modificar. Preferiu mantenir la " +"versió actual o instal·lar la versió nova?" #: muon/TransactionWidget.cpp:290 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Força una versió" +msgstr "Usa la versió nova" #: muon/TransactionWidget.cpp:291 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Força una versió" \ No newline at end of file +msgstr "Mantén la versió antiga" \ No newline at end of file diff -Nru muon-1.9.60/po/ca@valencia/libmuon.po muon-2.0.0/po/ca@valencia/libmuon.po --- muon-1.9.60/po/ca@valencia/libmuon.po 2012-10-29 18:33:31.000000000 +0000 +++ muon-2.0.0/po/ca@valencia/libmuon.po 2013-04-01 20:32:19.000000000 +0000 @@ -3,1272 +3,306 @@ # This file is distributed under the license LGPL version 2 or later. # # Josep Ma. Ferrer , 2011, 2012. +# Orestes Mas , 2012. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-01-06 18:20+0100\n" -"Last-Translator: Josep Ma. Ferrer \n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-08-30 23:37+0200\n" +"Last-Translator: Orestes Mas \n" "Language-Team: Catalan \n" -"Language: ca\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.2\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" -msgstr "" +msgstr "Aplicacions" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" -msgstr "" +msgstr "Codi Obert" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" -msgstr "" +msgstr "Propietari" -#: libmuon/ApplicationBackend/Application.cpp:267 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Desconegut" -#: libmuon/ApplicationBackend/Application.cpp:398 -#, fuzzy, kde-format -#| msgctxt "@label showing download and install size" -#| msgid "%1 to download, %2 of space to be used" +#: libmuon/backends/ApplicationBackend/Application.cpp:413 +#, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" -msgstr "%1 a baixar, %2 d'espai a utilitzar" +msgstr "%1 a baixar, %2 en el disc" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" -msgstr "" - -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "" +msgstr "%1 en el disc" -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "" - -#: libmuon/categories.xml:27 +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Developer Tools" -msgstr "Desenvolupament" +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Aplicacions" -#: libmuon/categories.xml:42 +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"debug" -#| "\"" -#| msgid "Debug" -msgctxt "Category" -msgid "Debugging" -msgstr "Depuració" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Aplicacions" + +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Connecteu-vos al servei SSO d'Ubuntu" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -#: libmuon/categories.xml:98 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"localization\"" -#| msgid "Localization" -msgctxt "Category" -msgid "Localization" -msgstr "Traducció" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" msgstr "" -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" msgstr "" -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -#: libmuon/categories.xml:144 +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Tot" + +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "Este Muon té poders de super vaca" + +#: libmuon/resources/AbstractResource.cpp:81 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -#| msgid "Version Control Systems" -msgctxt "Category" -msgid "Version Control" -msgstr "Sistemes de control de versió" +#| msgctxt "@info:status Package state" +#| msgid "Broken" +msgid "Broken" +msgstr "Trencat" -#: libmuon/categories.xml:158 +#: libmuon/resources/AbstractResource.cpp:82 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Web Development" -msgstr "Desenvolupament" +#| msgid "Available updates" +msgid "Available" +msgstr "Actualitzacions disponibles" -#: libmuon/categories.xml:171 +#: libmuon/resources/AbstractResource.cpp:83 #, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Education" -msgstr "Ubicació" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "" +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "Instal·lat" + +#: libmuon/resources/AbstractResource.cpp:84 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Actualitzable" + +#: libmuon/resources/ResourcesUpdatesModel.cpp:100 +#, kde-format +msgctxt "@item:intext Remaining time" +msgid "%1 remaining" +msgstr "Resta %1" + +#: libmuon/settings/NotifySettingsPage.cpp:46 +msgid "Show notifications for:" +msgstr "Mostra les notificacions per:" + +#: libmuon/settings/NotifySettingsPage.cpp:48 +msgid "Available updates" +msgstr "Actualitzacions disponibles" + +#: libmuon/settings/NotifySettingsPage.cpp:49 +msgid "Show the number of available updates" +msgstr "Mostra el nombre d'actualitzacions disponibles" + +#: libmuon/settings/NotifySettingsPage.cpp:50 +msgid "Distribution upgrades" +msgstr "Actualitzacions de la distribució" + +#: libmuon/settings/NotifySettingsPage.cpp:69 +msgid "Notification type:" +msgstr "Tipus de notificació:" + +#: libmuon/settings/NotifySettingsPage.cpp:72 +msgid "Use both popups and tray icons" +msgstr "Utilitza finestres emergents i icones a la safata del sistema" + +#: libmuon/settings/NotifySettingsPage.cpp:73 +msgid "Tray icons only" +msgstr "Només icones a la safata del sistema" + +#: libmuon/settings/NotifySettingsPage.cpp:74 +msgid "Popup notifications only" +msgstr "Només notificacions emergents" + +#: libmuon/Transaction/TransactionListener.cpp:109 +msgctxt "@info:status" +msgid "Downloading" +msgstr "S'està baixant" + +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 +msgctxt "@info:status Progress text when done" +msgid "Done" +msgstr "Fet" + +#: libmuon/Transaction/TransactionListener.cpp:154 +msgctxt "@info:status Progress text when waiting" +msgid "Waiting" +msgstr "En espera" + +#: libmuon/Transaction/TransactionListener.cpp:175 +msgctxt "@info:status" +msgid "Installing" +msgstr "S'està instal·lant" + +#: libmuon/Transaction/TransactionListener.cpp:179 +msgctxt "@info:status" +msgid "Changing Addons" +msgstr "S'estan canviant els complements" + +#: libmuon/Transaction/TransactionListener.cpp:183 +msgctxt "@info:status" +msgid "Removing" +msgstr "S'està eliminant" + + + + + + + + + + + + + + + + + + + + + -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "" -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "" -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "" -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "" -#: libmuon/categories.xml:232 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"electronics\"" -#| msgid "Electronics" -msgctxt "Category" -msgid "Electronics" -msgstr "Electrònica" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "" -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "" -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "" -#: libmuon/categories.xml:269 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"math" -#| "\"" -#| msgid "Mathematics" -msgctxt "Category" -msgid "Mathematics" -msgstr "Matemàtiques" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "" -#: libmuon/categories.xml:299 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"fonts" -#| "\"" -#| msgid "Fonts" -msgctxt "Category" -msgid "Fonts" -msgstr "Tipus de lletres" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "" -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "" -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "" -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "" -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" -#: libmuon/categories.xml:369 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Simulation" -msgstr "Ubicació" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "" -#: libmuon/categories.xml:391 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"graphics\"" -#| msgid "Graphics" -msgctxt "Category" -msgid "Graphics" -msgstr "Gràfics" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "" -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "" -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "" -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "" -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "" -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "" -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "" -#: libmuon/categories.xml:473 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"web\"" -#| msgid "Internet" -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "" -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "" -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "" -#: libmuon/categories.xml:509 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"httpd" -#| "\"" -#| msgid "Web Servers" -msgctxt "Category" -msgid "Web Browsers" -msgstr "Servidors web" -#: libmuon/categories.xml:521 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"sound" -#| "\"" -#| msgid "Multimedia" -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimèdia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "" -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "" -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Confirmació de canvis addicionals" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Marco els canvis addicionals?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Esta acció requereix un canvi en un altre paquet:" -msgstr[1] "Esta acció requereix canvis en altres paquets:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historial" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Cerca" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Tots els canvis" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instal·lacions" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Actualitzacions" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Eliminacions" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Data" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Instal·lat" -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Actualitzat" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Desactualitzat" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Eliminat" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Purgat" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 a les %3" -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "Este Muon té poders de super vaca" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administració del sistema" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Sistema base" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infraestructura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Comunicacions" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Bases de dades" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Desenvolupament" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentació" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Depuració" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editors" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Electrònica" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Dispositius incrustats" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Tipus de lletres" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Jocs i passatemps" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Entorn d'escriptori GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Gràfics" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Sistema estadístic GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Entorn d'escriptori Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Radioafició" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Llenguatge de programació Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Servidors web" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Llenguatges d'ordinador interpretats" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Llenguatge de programació Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Compilació de programari KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Nucli i mòduls" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Biblioteques - Desenvolupament" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Biblioteques" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Llenguatge de programació Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Traducció" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Correu electrònic" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matemàtiques" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Diversos - Basats en text" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Xarxes" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Grups de notícies" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Llenguatge de programació OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Biblioteques - Antigues" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Multiplataforma" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Llenguatge de programació Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Llenguatge de programació PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Llenguatge de programació Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Llenguatge de programació Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Ciència" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Intèrprets d'ordes" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimèdia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Escriptura en TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Processadors de textos" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utilitats" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sistemes de control de versió" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Programari de vídeo" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Diversos - Gràfics" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Entorn d'escriptori XFCE" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Entorn Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Desconegut" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Convertit des d'RPM per l'Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internacionalització i localització" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapaquets" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Restriccions a l'exportació" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "No lliure" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" -#: libmuon/MuonStrings.cpp:165 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Ubicació" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "No instal·lat" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Instal·lat" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Actualitzable" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Trencat" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Configuració residual" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Instal·lat (eliminable automàticament)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Sense canvis" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Instal·la" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Actualitza" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Elimina" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Purga" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinstal·la" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Desactualitza" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Blocat" -#: libmuon/MuonStrings.cpp:221 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"comm" -#| "\"" -#| msgid "Communication" -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Comunicacions" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "" -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "" -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "" -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Error d'inicialització" -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "No s'ha pogut obtindre el bloqueig del sistema de paquets" -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Espai escàs al disc" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "" -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Error d'autenticació" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Error inesperat" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Paquets no fiables" -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Desconegut" -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"El sistema de paquets no s'ha pogut inicialitzar, la vostra configuració deu " -"estar trencada." -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Una altra aplicació pareix estar usant ara el sistema de paquets. Heu de " -"tancar tots els altres gestors de paquets abans de poder instal·lar o " -"eliminar qualsevol paquet." -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"No teniu espai al disc suficient al directori %1 per continuar amb esta " -"operació." -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "No s'han pogut baixar els paquets" -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "S'ha detectat un error en aplicar els canvis:" -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Esta operació no pot continuar perquè no s'ha proporcionat l'autorització " -"adequada" -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Pareix que el treballador QApt ha fallat o ha desaparegut. Informeu de " -"l'error als mantenidors del QApt" -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"El següent paquet no ha estat verificat pel seu autor. La vostra " -"configuració actual no permet baixar paquets no verificats." -msgstr[1] "" -"Els següents paquets no han estat verificats pels seus autors. La vostra " -"configuració actual no permet baixar paquets no verificats." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Comprova si hi ha actualitzacions" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Desmarca-ho tot" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configura les fonts de programari" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Alça les marques com a" -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"El document no es pot alçar, perquè no ha estat possible escriure a " -"%1\n" -"\n" -"Comproveu que teniu accés d'escriptura a este fitxer o que hi ha prou espai " -"disponible al disc." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Alça la llista dels paquets instal·lats com a" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Alça la llista de baixades com a" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Obri fitxer" -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"No s'han pogut marcar els canvis. Verifiqueu que el fitxer siga un fitxer de " -"marques creat pel gestor de paquets Muon o pel gestor de paquets Synaptic." -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Seleccioneu un directori" -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "S'ha afegit correctament %1 paquet a la memòria cau" -msgstr[1] "S'han afegit correctament %1 paquets a la memòria cau" -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"No s'ha pogut trobar cap paquet vàlid en este directori. Assegureu-vos que " -"els paquets siguen compatibles amb l'ordinador i siguen la darrera versió." -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "No s'han pogut trobar alguns paquets" -#: libmuon/resources/ResourcesUpdatesModel.cpp:100 -#, kde-format -msgctxt "@item:intext Remaining time" -msgid "%1 remaining" -msgstr "Resta %1" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" -#: libmuon/settings/NotifySettingsPage.cpp:46 -msgid "Show notifications for:" -msgstr "Mostra les notificacions per:" -#: libmuon/settings/NotifySettingsPage.cpp:48 -msgid "Available updates" -msgstr "Actualitzacions disponibles" -#: libmuon/settings/NotifySettingsPage.cpp:49 -msgid "Show the number of available updates" -msgstr "Mostra el nombre d'actualitzacions disponibles" -#: libmuon/settings/NotifySettingsPage.cpp:50 -msgid "Distribution upgrades" -msgstr "Actualitzacions de la distribució" -#: libmuon/settings/NotifySettingsPage.cpp:69 -msgid "Notification type:" -msgstr "Tipus de notificació:" -#: libmuon/settings/NotifySettingsPage.cpp:72 -msgid "Use both popups and tray icons" -msgstr "Utilitza finestres emergents i icones a la safata del sistema" -#: libmuon/settings/NotifySettingsPage.cpp:73 -msgid "Tray icons only" -msgstr "Només icones a la safata del sistema" -#: libmuon/settings/NotifySettingsPage.cpp:74 -msgid "Popup notifications only" -msgstr "Només notificacions emergents" -#: libmuon/Transaction/TransactionListener.cpp:109 -#, fuzzy -#| msgctxt "@label Label preceding the package's download size" -#| msgid "Download Size:" -msgctxt "@info:status" -msgid "Downloading" -msgstr "Mida de la baixada:" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 -msgctxt "@info:status Progress text when done" -msgid "Done" -msgstr "Fet" -#: libmuon/Transaction/TransactionListener.cpp:153 -msgctxt "@info:status Progress text when waiting" -msgid "Waiting" -msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:174 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Install" -msgctxt "@info:status" -msgid "Installing" -msgstr "Instal·la" -#: libmuon/Transaction/TransactionListener.cpp:179 -msgctxt "@info:status" -msgid "Changing Addons" -msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:183 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Remove" -msgctxt "@info:status" -msgid "Removing" -msgstr "Elimina" @@ -1354,25 +388,21 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1702,11 +732,745 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/ca@valencia/muon-installer.po muon-2.0.0/po/ca@valencia/muon-installer.po --- muon-1.9.60/po/ca@valencia/muon-installer.po 2012-10-29 18:33:31.000000000 +0000 +++ muon-2.0.0/po/ca@valencia/muon-installer.po 2013-04-01 20:32:19.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-01-06 18:21+0100\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-09-24 13:28+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" -"Language: ca\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -27,7 +27,7 @@ msgid "Your emails" msgstr "txemaq@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ msgstr[1] "" "S'acaben d'instal·lar les aplicacions següents, cliqueu-hi per a iniciar-les:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Programari disponible" @@ -59,86 +59,84 @@ msgstr "Centre de programari Muon" #: installer/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: installer/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Programari disponible" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Programari instal·lat" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Proporcionat per Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Proporcionat per Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" -msgstr "Socis de Canonical" +msgstr "Canonical Partners" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Independent" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Programari disponible" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Programari instal·lat" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historial" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 s'ha instal·lat correctament." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Inicia" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Les aplicacions s'han instal·lat correctament." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Executa les aplicacions noves..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instal·lació completa" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" -msgstr "" +msgstr "En curs" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" -msgstr "" +msgstr "En curs" #: installer/ResourceDetailsView/AddonsWidget.cpp:59 msgctxt "@title" @@ -209,18 +207,18 @@ msgid "Install" msgstr "Instal·la" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Elimina" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Instal·la" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -232,34 +230,31 @@ #: installer/ResourceView/ResourceViewWidget.cpp:66 msgid "Show technical items" -msgstr "" +msgstr "Mostra els elements tècnics" #: installer/ResourceView/ResourceViewWidget.cpp:72 -#, fuzzy -#| msgctxt "@label Label preceding the app support" -#| msgid "Support:" msgid "Sort:" -msgstr "Assistència:" +msgstr "Ordena:" #: installer/ResourceView/ResourceViewWidget.cpp:74 msgctxt "@item:inlistbox" msgid "By Name" -msgstr "" +msgstr "Per nom" #: installer/ResourceView/ResourceViewWidget.cpp:75 msgctxt "@item:inlistbox" msgid "By Top Rated" -msgstr "" +msgstr "Per més puntuació" #: installer/ResourceView/ResourceViewWidget.cpp:76 msgctxt "@item:inlistbox" msgid "By Most Buzz" -msgstr "" +msgstr "Per més popularitat" #: installer/ResourceView/ResourceViewWidget.cpp:214 msgctxt "@item:inlistbox" msgid "By Relevancy" -msgstr "" +msgstr "Per rellevància" #: installer/ReviewsWidget/ReviewsWidget.cpp:57 msgctxt "@title" @@ -274,26 +269,26 @@ #: installer/ReviewsWidget/ReviewsWidget.cpp:79 msgctxt "@action" msgid "Check for more reviews" -msgstr "" +msgstr "Comprova si hi ha més anàlisis" #: installer/ReviewsWidget/ReviewsWidget.cpp:103 msgctxt "@info:status" msgid "No reviews available" msgstr "Ni hi ha cap comentari disponible" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Este comentari es va escriure per una versió antiga (versió: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/ca@valencia/muon-notifier.po muon-2.0.0/po/ca@valencia/muon-notifier.po --- muon-1.9.60/po/ca@valencia/muon-notifier.po 2012-10-29 18:33:31.000000000 +0000 +++ muon-2.0.0/po/ca@valencia/muon-notifier.po 2013-04-01 20:32:19.000000000 +0000 @@ -7,17 +7,17 @@ msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-01-06 18:25+0100\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-09-24 13:19+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" -"Language: ca\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -66,10 +66,8 @@ msgstr "Un dimoni de notificacions pel Muon" #: kded/MuonNotifier.cpp:58 -#, fuzzy -#| msgid "(C) 2009-2011 Jonathan Thomas, (C) 2009 Harald Sitter" msgid "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" -msgstr "(C) 2009-2011 Jonathan Thomas, (C) 2009 Harald Sitter" +msgstr "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" #: kded/UpdateEvent/UpdateEvent.cpp:57 #, kde-format diff -Nru muon-1.9.60/po/ca@valencia/muon-updater.po muon-2.0.0/po/ca@valencia/muon-updater.po --- muon-1.9.60/po/ca@valencia/muon-updater.po 2012-10-29 18:33:31.000000000 +0000 +++ muon-2.0.0/po/ca@valencia/muon-updater.po 2013-04-01 20:32:19.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-01-06 18:34+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-09-24 13:19+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" -"Language: ca\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" @@ -27,12 +27,12 @@ msgid "Your emails" msgstr "txemaq@gmail.com" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Oculta" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -42,18 +42,18 @@ "Encara no és disponible la llista dels canvis. En el seu lloc utilitzeu el " "Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Encara no és disponible la llista dels canvis." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versió %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -78,82 +78,55 @@ msgstr "Gestor d'actualitzacions Muon" #: updater/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: updater/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Actualitzacions de programari" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "És més segur endollar el transformador a la corrent abans de l'actualització." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." -msgstr "" - -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" +msgstr "Hi ha disponible una nova versió del Kubuntu." -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Alça la llista de baixada de paquets..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Descarrega els paquets des d'una llista..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Afig els paquets descarregats" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Instal·la les actualitzacions" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historial..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" -msgstr "" +msgstr "Actualització" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Historial dels paquets" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Cancel·la" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -161,7 +134,7 @@ msgid "Starting" msgstr "S'estan efectuant el canvis" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -169,8 +142,8 @@ msgid "Waiting for Authentication" msgstr "S'estan efectuant el canvis" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -178,27 +151,27 @@ msgid "Waiting" msgstr "S'estan efectuant el canvis" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -206,7 +179,7 @@ msgid "Loading Software List" msgstr "S'estan actualitzant les fonts de programari" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -214,7 +187,7 @@ msgid "Updating software sources" msgstr "S'estan actualitzant les fonts de programari" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 #, fuzzy #| msgctxt "@info" #| msgid "Downloading Updates" @@ -222,7 +195,7 @@ msgid "Downloading Packages" msgstr "S'estan baixant les actualitzacions" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -230,7 +203,7 @@ msgid "Applying Changes" msgstr "S'estan efectuant el canvis" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -238,23 +211,23 @@ msgid "Finished" msgstr "S'estan efectuant el canvis" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -269,12 +242,12 @@ msgstr[0] "" msgstr[1] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -283,109 +256,108 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Versió %1:" +msgstr "Versió" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Versió %1:" +msgstr "Versió" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Velocitat de baixada: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "Resta %1" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" msgstr "Actualitzacions" #: updater/UpdateModel/UpdateModel.cpp:106 -#, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@label Column label" msgid "Version" -msgstr "Versió %1:" +msgstr "Versió" #: updater/UpdateModel/UpdateModel.cpp:108 msgctxt "@label Column label" msgid "Download Size" msgstr "Mida de la baixada" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +#, fuzzy +#| msgctxt "@action Reverts all potential changes to the cache" +#| msgid "Unmark All" +msgid "Mark All" +msgstr "Desmarca-ho tot" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Actualitzacions importants de seguretat" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Actualitzacions d'aplicacions" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Actualitzacions del sistema" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Es desconeix quan es va fer la darrera comprovació d'actualitzacions." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Cliqueu Comprova si hi ha actualitzacions per " "comprovar-ho." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "El programari d'este ordinador està actualitzat." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "La darrera comprovació es va fer fa %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "No hi ha actualitzacions disponibles." \ No newline at end of file diff -Nru muon-1.9.60/po/ca@valencia/muon.po muon-2.0.0/po/ca@valencia/muon.po --- muon-1.9.60/po/ca@valencia/muon.po 2012-10-29 18:33:31.000000000 +0000 +++ muon-2.0.0/po/ca@valencia/muon.po 2013-04-01 20:32:19.000000000 +0000 @@ -8,17 +8,17 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-01-06 19:17+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-09-24 15:45+0200\n" "Last-Translator: Josep Ma. Ferrer \n" "Language-Team: Catalan \n" -"Language: ca\n" +"Language: ca@valencia\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Accelerator-Marker: &\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -35,6 +35,8 @@ #: muon/config/GeneralSettingsPage.cpp:54 msgid "Show foreign-architecture packages that are available natively" msgstr "" +"Mostra els paquets d'arquitectures diferents de la que està disponible de " +"manera nativa." #: muon/config/GeneralSettingsPage.cpp:55 msgid "Treat recommended packages as dependencies" @@ -177,18 +179,18 @@ msgid "Purge" msgstr "Purga" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Desmarca" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical proporcionarà actualitzacions crítiques per %1 fins el %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -226,7 +228,7 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:92 msgctxt "@label The package archive component that this package comes from" msgid "Component:" -msgstr "" +msgstr "Component:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:102 msgctxt "@title:group" @@ -273,7 +275,7 @@ "can occur." msgstr "" "El Muon sempre selecciona la versió disponible més aplicable. Si forceu una " -"versió diferent de la predeterminada, poden donar-s'errors en la gestió de " +"versió diferent de la predeterminada, poden donar-se errors en la gestió de " "les dependències." #: muon/DetailsTabs/VersionTab.cpp:70 @@ -337,7 +339,7 @@ #: muon/FilterWidget/FilterWidget.cpp:74 msgctxt "@title:tab" msgid "By Architecture" -msgstr "" +msgstr "Per arquitectura" #: muon/main.cpp:30 msgid "A package manager" @@ -348,78 +350,46 @@ msgstr "Gestor de paquets Muon" #: muon/main.cpp:37 -#, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "© 2009-2011 Jonathan Thomas" +msgstr "© 2009-2012 Jonathan Thomas" #: muon/main.cpp:38 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Llig les marques..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Alça les marques com a..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Alça la llista de baixada de paquets..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Descarrega els paquets des d'una llista..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Afig els paquets descarregats" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Alça la llista dels paquets instal·lats..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Actualització cauta" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Actualització completa" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Elimina els paquets innecessaris" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Vista prèvia dels canvis" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Aplica els canvis" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historial..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -431,12 +401,12 @@ "una actualització completa clicant el botó Actualització " "completa." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "No s'han pogut marcar les actualitzacions" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -446,17 +416,17 @@ "tindre dependències que no es poden satisfer per ara, o poden haver estat " "retingudes." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Arrere" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Vista prèvia dels canvis" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Historial dels paquets" @@ -473,52 +443,52 @@ msgid "Requested" msgstr "Requerit" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Cerca" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Marca per instal·lar" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Marca per eliminar" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Marca per actualitzar" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Marca per reinstal·lar" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Marca per purgar" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Bloqueja el paquet en la versió actual" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Desbloqueja paquet" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Bloqueja en la versió actual" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -527,37 +497,37 @@ "Eliminant este paquet es pot trencar el sistema. Esteu segur que el voleu " "eliminar?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Avís - S'està eliminant un paquet important" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 #, fuzzy #| msgctxt "@title:window" #| msgid "Unable to Mark Package" msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "No s'ha pogut marcar un paquet" +msgstr "No s'ha pogut marcar el paquet" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "No s'ha pogut marcar el paquet «%1» per a instal·lar o actualitzar:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" -msgstr "No s'ha pogut marcar un paquet" +msgstr "No s'ha pogut marcar el paquet" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -572,42 +542,24 @@ "no s'ha pujat mai, o és obsolet, o no està disponible en els repositoris " "actius actualment." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, però %4 és per instal·lar" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "o %1 %2, però %3 és per instal·lar" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, però no és pot instal·lar" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "o %1, però no és pot instal·lar" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, però és un paquet virtual" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "o %1, però és un paquet virtual" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Revisa i aplica els canvis" diff -Nru muon-1.9.60/po/cs/libmuon.po muon-2.0.0/po/cs/libmuon.po --- muon-1.9.60/po/cs/libmuon.po 2012-10-29 18:33:34.000000000 +0000 +++ muon-2.0.0/po/cs/libmuon.po 2013-04-01 20:32:22.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2010, 2011, 2012. -# Tomáš Chvátal , 2012. +# Vít Pelčák , 2010, 2011, 2012, 2013. +# Tomáš Chvátal , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-18 14:22+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-15 09:24+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -16,1078 +16,105 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Aplikace" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Open Source" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Proprietární" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Neznámý" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 ke stažení, %2 na disku" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 na disku" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Příslušenství" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Zpřístupnění" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Vývojové nástroje" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Ladění" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Návrh grafického rozhraní" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Překlad" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilování" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Správa verzí" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Vývoj webu" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Výuka" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Věda a inženýrství" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomie" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologie" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Chemie" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Počítače a robotika" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Inženýrství" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Zeměpis" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologie" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fyzika" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Písma" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Hry" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arkády" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Deskové hry" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Karetní hry" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Puzzle" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Hry na hrdiny" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulace" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sporty" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Kreslení" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Malování a editace" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografie" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Publikování" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Skenování a OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Prohlížeče" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Chat" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Sdílení souborů" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Pošta" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Webové prohlížeče" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Kancelář" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Nastavení systému" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Komiksy" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Podpůrná vrstva aplikace" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Aplikace ve vašem systému" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Vše" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Přihlaste se do služby Ubuntu SSO" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Potvrdit dodatečné změny" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Označit dodatečné změny?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Tato činnost vyžaduje změnu jiného balíčku:" -msgstr[1] "Tato činnost vyžaduje změny jiných balíčků:" -msgstr[2] "Tato činnost vyžaduje změny jiných balíčků:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historie" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Hledat" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Všechny změny" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instalace" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Aktualizuje" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Odstranění" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Datum" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Podpůrná vrstva Bodega" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Nainstalováno" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Nainstalovat Bodega data do vašeho systému" -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Aktualizováno" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Sníženo" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Odstraněno" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Pročištěno" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 na %3" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Zadejte přihlašovací údaje MakePlayLive" -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "Muon má schopnosti super krávy" - -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administrace systému" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Základní systém" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infrastruktura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Komunikace" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Databáze" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Vývoj" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentace" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Ladění" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editory" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Zapouzdřená zařízení" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Písma" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Hry a zábava" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME Desktop Environment" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Statistický systém GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Pracovní prostředí Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amatérské Rádio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Programovací jazyk Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Webové Servery" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpretované počítačové jazyky" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Programovací jazyk Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE Software Compilation" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Jádro a moduly" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Knihovny - Vývoj" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Knihovny" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Programovací jazyk Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Překlad" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Pošta" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Různé - Textové" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Síťové nástroje" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Diskuzní skupiny" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Programovací jazyk OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Knihovny - staré" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Multiplatformní" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Programovací jazyk Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Programovací jazyk PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Programovací jazyk Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Programovací jazyk Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Věda" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Shelly" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Sázení v TeXu" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Zpracování textu" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Nástroje" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Systémy pro správu verzí" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Práce s videem" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Různé - Grafické" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce Desktop Environment" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Prostředí Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Neznámý" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Převedeno Alienem z RPM" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Překlad a lokalizace" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta balíčky" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Falešná podpůrná vrstva" -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Nesvobodný" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Falešná podpůrná vrstva pro testování rozhraní muonu" -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Výuka" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Podpůrná vrstva KNewStuff" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Nenainstalováno" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Nainstalovat data KNewStuff do vašeho systému" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Nainstalováno" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Vše" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Aktualizovatelné" +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "Muon má schopnosti super krávy" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:81 msgid "Broken" msgstr "Poškozené" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Zbytkové nastavení" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Nainstalované (automaticky odstranitelné)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Žádná změna" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Nainstalovat" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Aktualizovat" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Odstranit" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Pročistit" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Přeinstalovat" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Snížit" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Uzamčeno" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Společné" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Chyba inicializace" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Nelze získat zámek balíčkovacího systému" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Málo místa na disku" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Chyba ověření" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Neočekávaná chyba" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Nedůvěryhodné balíčky" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Neznámá chyba" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Systém pro práci s balíčky nemohl být spuštěn. Možná má vadné nastavení." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Jiná aplikace právě používá balíčkovací systém. Musíte zavřít všechny " -"ostatní správce balíčků před započetím manipulací s balíčky." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Pro pokračování této operace nemáte dostatek volného místa v adresáři %1." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Nepovedlo se stáhnout balíčky" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Při provádění změn došlo k chybě:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Tato operace nemůže pokračovat protože nebylo provedeno udělení oprávnění" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Zdá se, že QApt zmizel nebo spadl. Pošlete, prosím, chybové hlášení správcům " -"QApt" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Následující balíček nebyl autorem podepsán. Stahování nedůvěryhodných " -"balíčků není ve Vašem nastavení povolené." -msgstr[1] "" -"Následující balíček nebyl autorem podepsán. Stahování nedůvěryhodných " -"balíčků není ve Vašem nastavení povolené." -msgstr[2] "" -"Následující balíček nebyl autorem podepsán. Stahování nedůvěryhodných " -"balíčků není ve Vašem nastavení povolené." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Zkontrolovat aktualizace" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Zrušit označení všech" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Nastavit zdroje software" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Uložit označení jako" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dokument nelze uložit, protože nelze zapisovat do %1\n" -"\n" -"Zkontrolujte, zda máte oprávnění k zápisu do tohoto souboru a že je na disku " -"dostatek místa." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Uložit seznam nainstalovaných balíčků jako" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Uložit seznam balíčků jako" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Otevřít soubor" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Nelze označit změny. Přesvědčete se, že daný soubor je značkovacím souborem " -"správce balíčků Muon nebo Synaptic." +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Dostupné" -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Vyberte adresář" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 balíček byl úspěšně přidán do mezipaměti" -msgstr[1] "%1 balíčky byly úspěšně přidány do mezipaměti" -msgstr[2] "%1 balíčků bylo úspěšně přidáno do mezipaměti" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"V tomto adresáři se nenašly platné balíčky. Přesvědčete se, že balíčky jsou " -"kompatibilní s Vaším počítačem a že je to jejich poslední verze." +#: libmuon/resources/AbstractResource.cpp:83 +msgid "Installed" +msgstr "Nainstalováno" -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Některé balíčky nebylo možno nalézt" +#: libmuon/resources/AbstractResource.cpp:84 +msgid "Upgradeable" +msgstr "Aktualizovatelné" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1095,11 +122,6 @@ msgid "%1 remaining" msgstr "%1 zbývá" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Zobrazit upozornění pro:" @@ -1137,18 +159,18 @@ msgid "Downloading" msgstr "Stahuje se" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Hotovo" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Čeká se" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Instaluje se" diff -Nru muon-1.9.60/po/cs/muon-discover.po muon-2.0.0/po/cs/muon-discover.po --- muon-1.9.60/po/cs/muon-discover.po 2012-10-29 18:33:34.000000000 +0000 +++ muon-2.0.0/po/cs/muon-discover.po 2013-04-01 20:32:22.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vit Pelcak , 2012. +# Vit Pelcak , 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-24 11:49+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-27 09:36+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" #: discover/main.cpp:29 msgid "An application discoverer" @@ -23,7 +23,7 @@ #: discover/main.cpp:35 msgid "Muon Discover" -msgstr "" +msgstr "Muon Discover" #: discover/main.cpp:36 msgid "©2010-2012 Jonathan Thomas" @@ -49,21 +49,38 @@ msgid "Display a list of entries with a category." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 msgid "" -"Found some errors while setting up the GUI, the application can't proceed." +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:154 -msgid "Initialization error" +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." msgstr "" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Hledat..." + +#: discover/MuonDiscoverMainWindow.cpp:109 +msgid "" +"Found some errors while setting up the GUI, the application can't proceed." msgstr "" -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." +#: discover/MuonDiscoverMainWindow.cpp:110 +msgid "Initialization error" +msgstr "Chyba inicializace" + +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Nabídka" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" msgstr "" #: discover/qml/AddonsView.qml:37 @@ -79,90 +96,92 @@ msgid "Discard" msgstr "Zahodit" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Domovská stránka" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Spustit" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Kontrola" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Celková velikost: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Přehled" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Doplňky" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Recenze" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Aktualizovat" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Název" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Hodnocení" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Cvrkot" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularita" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Původ" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Hledat v '%1'..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Hledat..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Hodnocení popularity" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "bodů: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Nejlepší hodnocení" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -175,23 +194,35 @@ msgid "Remove" msgstr "Odstranit" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Nainstalováno" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 msgid "Update All" msgstr "Aktualizovat vše" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Nahrávám..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Zpět" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Nainstalováno (%1 aktualizace)" +msgstr[1] "Nainstalováno (%1 aktualizace)" +msgstr[2] "Nainstalováno (%1 aktualizací)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Zdroje" @@ -216,54 +247,58 @@ msgid "Summary:" msgstr "Shrnutí:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Recenze:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 z %2 osob shledaly recenzi užitečnou" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 od %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 od %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" -msgstr "" +msgstr "Užitečné? Ano/Ne" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Přidat zdroj" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" -msgstr "" +msgstr "Zadejte nový zdroj" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Zrušit" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Binární)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/cs/muon-installer.po muon-2.0.0/po/cs/muon-installer.po --- muon-1.9.60/po/cs/muon-installer.po 2012-10-29 18:33:34.000000000 +0000 +++ muon-2.0.0/po/cs/muon-installer.po 2013-04-01 20:32:22.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2010, 2011, 2012. +# Vít Pelčák , 2010, 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-21 12:18+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2013-03-15 09:26+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -25,7 +25,7 @@ msgid "Your emails" msgstr "vit@pelcak.org" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ msgstr[2] "" "Byly nainstalovány následující aplikace, spusťte je kliknutím na ně:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Získat software" @@ -66,77 +66,77 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Získat software" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Nainstalovaný software" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Poskytnuto Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Poskytnuto Debianem" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partneři Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Nezávislý" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Získat software" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Nainstalovaný software" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historie" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 byl úspěšně nainstalován." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Spustit" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Aplikace úspěšně nainstalovány." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Spustit nové aplikace..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instalace dokončena" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" -msgstr "" +msgstr "Probíhá" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" -msgstr "" +msgstr "Probíhá" #: installer/ResourceDetailsView/AddonsWidget.cpp:59 msgctxt "@title" @@ -208,18 +208,18 @@ msgid "Install" msgstr "Nainstalovat" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Odstranit" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Nainstalovat" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -231,7 +231,7 @@ #: installer/ResourceView/ResourceViewWidget.cpp:66 msgid "Show technical items" -msgstr "" +msgstr "Zobrazit technické položky" #: installer/ResourceView/ResourceViewWidget.cpp:72 msgid "Sort:" @@ -277,19 +277,19 @@ msgid "No reviews available" msgstr "Žádná recenze" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Tato recenze byla napsána pro starší verzi (verze: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/cs/muon-notifier.po muon-2.0.0/po/cs/muon-notifier.po --- muon-1.9.60/po/cs/muon-notifier.po 2012-10-29 18:33:34.000000000 +0000 +++ muon-2.0.0/po/cs/muon-notifier.po 2013-04-01 20:32:22.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2012-05-14 14:31+0200\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" diff -Nru muon-1.9.60/po/cs/muon-updater.po muon-2.0.0/po/cs/muon-updater.po --- muon-1.9.60/po/cs/muon-updater.po 2012-10-29 18:33:34.000000000 +0000 +++ muon-2.0.0/po/cs/muon-updater.po 2013-04-01 20:32:22.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2010, 2011, 2012. +# Vít Pelčák , 2010, 2011, 2012, 2013. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-18 14:21+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-25 09:31+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "vit@pelcak.org" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Skrýt" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -40,18 +40,18 @@ "Seznam změn ještě není dostupný. Prosím použijte namísto toho Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Seznam změn ještě není dostupný." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Verze %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -83,149 +83,124 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Aktualizace softwaru" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." -msgstr "" +msgstr "Je bezpečnější před instalací připojit napájecí kabel." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Je dostupná nová verze Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Uložit seznam balíčků ke stažení..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Stáhnout balíčky ze seznamu..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Přidat stažené balíčky" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Nainstalovat aktualizace" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historie..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Aktualizovat" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Historie balíčku" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Zrušit" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "" +msgstr "Spouštím" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "" +msgstr "Čeká se na ověření" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "Čeká se" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "čeká se na dokončení ostatních transakcí" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Čeká se na ukončení jiného správce softwaru" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Čeká se na potřebné médium" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Čeká se na konfigurační soubor" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "Načítání seznamu programů" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Aktualizují se zdroje software" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Stahují se balíčky" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "" +msgstr "Provádějí se změny" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" msgstr "Dokončeno" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Je vyžadována změna média" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Prosím vložte %1 do %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Varování - Neověřený software" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -238,15 +213,24 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Následující software nelze ověřit.Instalace neověřeného softwaru " +"představuje bezpečnostní riziko, jelikož jeho přítomnost může být znamením " +"něčeho nekalého. Přejete si pokračovat?" msgstr[1] "" +"Následující software nelze ověřit.Instalace neověřeného softwaru " +"představuje bezpečnostní riziko, jelikož jeho přítomnost může být znamením " +"něčeho nekalého. Přejete si pokračovat?" msgstr[2] "" +"Následující software nelze ověřit.Instalace neověřeného softwaru " +"představuje bezpečnostní riziko, jelikož jeho přítomnost může být znamením " +"něčeho nekalého. Přejete si pokračovat?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Konfigurační soubor byl změněn" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -254,29 +238,37 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Je k dispozici nová verze konfiguračního souboru %1, " +"ale vaše verze byla upravena. Chcete ponechat vaši současnou verzi nebo si " +"přejete nainstalovat novou?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Použít novou verzi" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Ponechat starou verze" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Rychlost stahování: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 zbývá" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -292,61 +284,55 @@ msgid "Download Size" msgstr "Stahovaná velikost" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Označit vše" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Důležité bezpečnostní aktualizace" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Aktualizace aplikací" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Aktualizace systému" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Nelze označit aktualizace" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Označit aktualizace" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Software na tomto počítači je aktuální." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Naposledy kontrolováno před %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Nejsou dostupné žádné aktualizace." \ No newline at end of file diff -Nru muon-1.9.60/po/cs/muon.po muon-2.0.0/po/cs/muon.po --- muon-1.9.60/po/cs/muon.po 2012-10-29 18:33:34.000000000 +0000 +++ muon-2.0.0/po/cs/muon.po 2013-04-01 20:32:22.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Vít Pelčák , 2010, 2011, 2012. +# Vít Pelčák , 2010, 2011, 2012, 2013. # Tomáš Chvátal , 2012. # msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-23 09:49+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-15 09:26+0100\n" "Last-Translator: Vit Pelcak \n" "Language-Team: Czech \n" "Language: cs\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -32,7 +32,7 @@ #: muon/config/GeneralSettingsPage.cpp:54 msgid "Show foreign-architecture packages that are available natively" -msgstr "" +msgstr "Zobrazit vlastní dostupné balíčky jiných architektur" #: muon/config/GeneralSettingsPage.cpp:55 msgid "Treat recommended packages as dependencies" @@ -176,18 +176,18 @@ msgid "Purge" msgstr "Pročištění" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Zrušit označení" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical poskytuje kritické aktualizace pro %1 do %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -353,69 +353,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Přečíst označení..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Uložit označení jako..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Uložit seznam balíčků ke stažení..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Stáhnout balíčky ze seznamu..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Přidat stažené balíčky" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Uložit seznam nainstalovaných balíčků..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Opatrná aktualizace" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Plná aktualizace" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Odstranit nepotřebné balíčky" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Náhled změn" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Provést změny" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historie..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -426,12 +396,12 @@ "nových balíčků nebo jejich odstranění. Možná si přejete provést plnou " "aktualizaci kliknutím na tlačítko Plná aktualizace." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Nelze označit aktualizace" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -440,17 +410,17 @@ "Nelze označit aktualizace. Některé aktualizace momentálně mají nesplnitelné " "závislosti nebo tyto byly ručně zamčeny ve stávajících verzích." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Zpět" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Náhled změn" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Historie balíčku" @@ -467,52 +437,52 @@ msgid "Requested" msgstr "Vyžádané" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Hledat" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Označit pro instalaci" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Označit pro odstranění" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Označit pro aktualizaci" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Označit pro přeinstalaci" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Označit pro úplné odstranění" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Uzamknout balíček v současné verzi" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Odemknout balíček" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Uzamknout v současné verzi" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -521,34 +491,34 @@ "Odinstalací tohoto balíčku můžete poškodit svůj systém. Opravdu si jej " "přejete odstranit?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Varování = odstraňování důležitého balíčku" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "Selhalo uzamčení balíčku" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." -msgstr "" +msgstr "balíček %1 nemohl být uzamčen. Nepovedlo se zapsat soubor zámku." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Balíček \"%1\" nemohl být označen pro instalaci nebo aktualizaci:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Balíček nelze označit" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -561,42 +531,24 @@ "\tTo obvykle znamená, že balíček byl zmíněn v závislostech ale nikdy nebyl " "nahrán, zastaral nebo není dostupný v momentálně povolených repozitářích." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, ale %4 bude nainstalován" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "nebo %1 %2, ale %3 bude nainstalován" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, ale není instalovatelný" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "nebo %1, ale není instalovatelný" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, ale je to virtuální balíček" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "nebo %1, ale to je virtuální balíček" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Prohlédnout a provést změny" @@ -680,12 +632,12 @@ #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "Čeká se na start služby" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "Čeká se na ověření" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 @@ -696,22 +648,22 @@ #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "čeká se na dokončení ostatních transakcí" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Čeká se na ukončení jiného správce softwaru" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Čeká se na potřebné médium" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Čeká se na konfigurační soubor" #: muon/TransactionWidget.cpp:192 msgctxt "@info Status info" @@ -741,18 +693,18 @@ #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Je vyžadována změna média" #: muon/TransactionWidget.cpp:254 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Prosím vložte %1 do %2" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Varování - Neověřený software" #: muon/TransactionWidget.cpp:265 msgctxt "@label" @@ -767,13 +719,22 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Následující software nelze ověřit.Instalace neověřeného softwaru " +"představuje bezpečnostní riziko, jelikož jeho přítomnost může být znamením " +"něčeho nekalého. Přejete si pokračovat?" msgstr[1] "" +"Následující software nelze ověřit.Instalace neověřeného softwaru " +"představuje bezpečnostní riziko, jelikož jeho přítomnost může být znamením " +"něčeho nekalého. Přejete si pokračovat?" msgstr[2] "" +"Následující software nelze ověřit.Instalace neověřeného softwaru " +"představuje bezpečnostní riziko, jelikož jeho přítomnost může být znamením " +"něčeho nekalého. Přejete si pokračovat?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Konfigurační soubor byl změněn" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -783,6 +744,9 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Je k dispozici nová verze konfiguračního souboru %1, " +"ale vaše verze byla upravena. Chcete ponechat vaši současnou verzi nebo si " +"přejete nainstalovat novou?" #: muon/TransactionWidget.cpp:290 msgctxt "@action Use the new config file" diff -Nru muon-1.9.60/po/da/libmuon.po muon-2.0.0/po/da/libmuon.po --- muon-1.9.60/po/da/libmuon.po 2012-10-29 18:33:40.000000000 +0000 +++ muon-2.0.0/po/da/libmuon.po 2013-04-01 20:32:26.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander , 2010, 2011, 2012. +# Martin Schlander , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-18 18:43+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-17 08:23+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" @@ -15,1087 +15,112 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Programmer" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Open source" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Proprietært" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Ukendt" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 til download, %2 på disken" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 på disken" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Tilbehør" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Tilgængelighed" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Udviklingsværktøjer" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Fejlsøgning" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Design af grafiske brugerflader" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE'er" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Lokalisering" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilering" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Versionsstyring" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Webudvikling" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Uddannelse" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Videnskab og ingeniørarbejde" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomi" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologi" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Kemi" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Datalogi og robotvidenskab" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronik" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Ingeniørarbejde" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografi" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologi" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematik" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fysik" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Skrifttyper" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Spil" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arkade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Brætspil" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Kortspil" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Logik" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Rollespil" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulatorer" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sport" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafik" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Tegning" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Tegning og redigering" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Foto" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Publicering" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Scanning og OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Fremvisere" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Chat" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Fildeling" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "E-mail" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Webbrowsere" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedie" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Kontor" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "System og indstillinger" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Tegneserier" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Plasma Desktop-widgets" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Programmotor" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Programmer på dit system" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Log ind på Ubuntus SSO-tjeneste" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Bodega-motor" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Installér Bodega-data på dit system" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Angiv MakePlayLive-akkreditiver" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Attrap-backend" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Attrap-backend til at teste moun-frontends" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "KNewStuff-motor" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Installér KNewStuff-data på dit system" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Alle" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Bekræft yderligere ændringer" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Markér yderligere ændringer?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Denne handling kræver en ændring af en anden pakke:" -msgstr[1] "Denne handling kræver ændringer af andre pakker:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historik" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Søg" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Alle ændringer" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Installationer" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Opdateringer" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Fjernelser" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Dato" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Installeret" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Opgraderet" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Nedgraderet" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Fjernet" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Udrenset" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 kl. %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Denne Muon har superko-kræfter" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Systemadministration" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Basissystem" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI-infrastruktur" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Kommunikation" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Databaser" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Udvikling" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentation" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Fejlsøgning" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editorer" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronik" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Indlejrede enheder" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Skrifttyper" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Spil og underholdning" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME skrivebordsmiljø" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafik" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Statistiksystemet GNU R " - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Skrivebordsmiljøet Gnustep " - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amatørradio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Programmeringssproget Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Webservere" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Fortolkede computersprog" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Programmeringssproget Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE Software Compilation" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kerne og moduler" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Biblioteker - udvikling" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Biblioteker" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Programmeringssproget Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokalisering" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-mail" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematik" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Diverse - tekstbaseret" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Netværk" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Nyhedsgrupper" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Programmeringssproget OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Biblioteker - gamle" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Platformsuafhængige" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Programmeringssproget Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Programmeringssproget PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Programmeringssproget Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Programmeringssproget Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Videnskab" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Skaller" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedie" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX-skrivning" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Tekstbehandling" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Værktøjer" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Versionsstyringssystemer" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video-software" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Diverse - grafisk" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce skrivebordsmiljø" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope-/Plone-miljø" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Ukendt" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Defekt" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Konverteret fra RPM af Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internationalisering og lokalisering" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapakker" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Indskrænket ved eksport" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Non-free" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Uddannelse" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Introspektionsdata til GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Ikke installeret" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Tilgængelig" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Installeret" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Kan opgraderes" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Defekt" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Tilbageværende konfiguration" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Installeret (auto-fjernbar)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Ingen ændring" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Installér" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Opgradér" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Fjern" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Udrens" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Geninstallér" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Nedgradér" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Låst" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Fælles" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Initialiseringsfejl" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Kan ikke opnå lås af pakkesystem" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Lav diskplads" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Kunne ikke anvende ændringer" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Autentificeringsfejl" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Uventet fejl" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Ikke-betroede pakker" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Ukendt fejl" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Pakkesystemet kunne ikke initialiseres, din konfiguration er måske defekt." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Et andet program lader til at bruge pakkesystemet på nuværende tidspunkt. Du " -"skal lukke al anden pakkehåndtering før du vil kunne installere eller fjerne " -"nogen pakker." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Du har ikke nok diskplads i mappen %1 til at fortsætte med denne handling." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Kunne ikke downloade pakker" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "En fejl opstod under anvendelse af ændringer:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Denne handling kan ikke fortsætte da der ikke blev givet korrekt godkendelse" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Det lader til at QApt worker enten er brudt sammen eller forsvundet. " -"Rapportér venligst fejlen til QApt-udviklerne." - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Følgende pakke er ikke blevet verificeret af dens ophavsmand. Download af " -"ikke-betroede pakker er forbudt af din nuværende konfiguration." -msgstr[1] "" -"Følgende pakker er ikke blevet verificeret af deres ophavsmænd. Download af " -"ikke-betroede pakker er blevet forbudt af din nuværende konfiguration." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Tjek efter opdateringer" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Afmarkér alle" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Indstil softwarekilder" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Gem markeringer som" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dokumentet kunne ikke gemmes, da det ikke var muligt at skrive til " -"%1\n" -"\n" -"Kontrollér at du har skriveadgang til denne fil og at der er plads nok på " -"disken." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Gem liste over installerede pakker som" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Gem downloadliste som " - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Åbn fil" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Kunne ikke markere ændringer. Sørg for at filen er en markeringsfil oprettet " -"af enten Muon pakkehåndtering eller Synaptic pakkehåndtering." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Vælg en mappe" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 pakke blev føjet til cachen" -msgstr[1] "%1 pakker blev føjet til cachen" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Ingen gyldige pakker kunne findes i denne mappe. Sørg for at pakkerne er " -"kompatible med din computer og er den seneste version." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Pakker kunne ikke findes" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 tilbage" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Log ind på Ubuntus SSO-tjeneste" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Vis bekendtgørelser for:" @@ -1133,18 +158,18 @@ msgid "Downloading" msgstr "Downloader" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Færdig" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Venter" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Installerer" @@ -1157,116 +182,4 @@ #: libmuon/Transaction/TransactionListener.cpp:183 msgctxt "@info:status" msgid "Removing" -msgstr "Fjerner" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy \ No newline at end of file +msgstr "Fjerner" \ No newline at end of file diff -Nru muon-1.9.60/po/da/muon-discover.po muon-2.0.0/po/da/muon-discover.po --- muon-1.9.60/po/da/muon-discover.po 2012-10-29 18:33:40.000000000 +0000 +++ muon-2.0.0/po/da/muon-discover.po 2013-04-01 20:32:26.000000000 +0000 @@ -1,20 +1,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander , 2012. +# Martin Schlander , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-27 12:53+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-17 08:24+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: discover/main.cpp:29 @@ -49,24 +49,43 @@ msgid "Display a list of entries with a category." msgstr "Vis en liste over indgange med en kategori." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Åbn Muon Discover i nævnte tilstand. Tilstande svarer til " +"værktøjslinjeknapperne." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Oplist alle tilgængelige tilstande og send outputtet til stdout." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Tilgængelige tilstande:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Søg..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Fandt nogle fejl under opsætning af brugerfladen, programmet kan ikke " "fortsætte." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Initialiseringsfejl" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Tilføjer oprindelser..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Fjerner oprindelser..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menu" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Indstil og lær mere om Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -81,90 +100,94 @@ msgid "Discard" msgstr "Kassér" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 anmeldelser" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Hjemmeside" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Kør" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Anmeld" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Størrelse i alt: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Oversigt" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Tilføjelser" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Anmeldelser" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Opdatér" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Navn" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Karakter" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Omtale" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularitet" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Oprindelse" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Søg i \"%1\"..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Søg..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Popularitetskonkurrence" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "point: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Bedste karakterer" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Velkommen til\n" +"Muon Discover!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -177,23 +200,34 @@ msgid "Remove" msgstr "Fjern" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Installeret" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 msgid "Update All" msgstr "Opdatér alle" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Indlæser..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Tilbage" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Opdag" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Installeret (%1 opdatering)" +msgstr[1] "Installeret (%1 opdateringer)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Kilder" @@ -218,56 +252,60 @@ msgid "Summary:" msgstr "Resumé:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Anmeldelser:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Fortæl os om denne anmeldelse!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 ud af %2 personer syntes denne anmeldelse var nyttig" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 af %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 af %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Nyttig? Ja/Nej" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Tilføj kilde" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Angiv den ny kilde" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "O.k." -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Annullér" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - Den softwarekildelinje der skal tilføjes til apt. Det er en " "af:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (binær)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/da/muon-installer.po muon-2.0.0/po/da/muon-installer.po --- muon-1.9.60/po/da/muon-installer.po 2012-10-29 18:33:40.000000000 +0000 +++ muon-2.0.0/po/da/muon-installer.po 2013-04-01 20:32:26.000000000 +0000 @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-09-09 17:21+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-08-19 14:14+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.2\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" @@ -25,7 +25,7 @@ msgid "Your emails" msgstr "mschlander@opensuse.org" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -34,7 +34,7 @@ msgstr[1] "" "Følgende programmer blev netop installeret, klik på dem for at starte dem:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Hent software" @@ -64,74 +64,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Hent software" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Installeret software" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Leveret af Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Leveret af Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical-partnere" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Uafhængig" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Hent software" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Installeret software" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historik" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "Installation af %1 gennemført." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Start" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Installation af programmer gennemført." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Kør nye programmer..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Installation gennemført" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "I gang" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "I gang" @@ -205,18 +205,18 @@ msgid "Install" msgstr "Installér" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Fjern" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Installér" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -274,19 +274,19 @@ msgid "No reviews available" msgstr "Ingen anmeldelser tilgængelige" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Denne anmeldelse blev skrevet om en ældre version (version: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/da/muon-notifier.po muon-2.0.0/po/da/muon-notifier.po --- muon-1.9.60/po/da/muon-notifier.po 2012-10-29 18:33:40.000000000 +0000 +++ muon-2.0.0/po/da/muon-notifier.po 2013-04-01 20:32:26.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-05-22 20:40+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-08-04 09:29+0200\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" @@ -79,8 +79,8 @@ msgctxt "Notification text" msgid "A security update is available" msgid_plural "Security updates are available" -msgstr[0] "en sikkerhedsopdatering er tilgængelig" -msgstr[1] "Sikkerhedsopdateringer er tilgængelige" +msgstr[0] "En sikkerhedsopdatering er tilgængelig" +msgstr[1] "%1 sikkerhedsopdateringer er tilgængelige" #: kded/UpdateEvent/UpdateEvent.cpp:69 #, kde-format diff -Nru muon-1.9.60/po/da/muon-updater.po muon-2.0.0/po/da/muon-updater.po --- muon-1.9.60/po/da/muon-updater.po 2012-10-29 18:33:40.000000000 +0000 +++ muon-2.0.0/po/da/muon-updater.po 2013-04-01 20:32:26.000000000 +0000 @@ -1,20 +1,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander , 2010, 2011, 2012. +# Martin Schlander , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-22 17:06+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-17 08:25+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "mschlander@opensuse.org" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Skjul" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -40,18 +40,18 @@ "Listen over ændringer er endnu ikke tilgængelig. Brug venligst Launchpad i stedet." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Listen over ændringer er endnu ikke tilgængelig." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Version %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -83,149 +83,124 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Softwareopdateringer" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Det er sikrest at tilslutte strømforsyningen før opdatering." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "En ny version af Kubuntu er tilgængelig." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Læs markeringer..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Gem markeringer som..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Gem liste over downloadede pakker..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Download pakker fra liste..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Tilføj downloadede pakker" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Installér opdateringer" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historik..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Opgradér" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Pakkehistorik" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Annullér" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" msgstr "Starter" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "Venter på autentificering" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "Venter" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "Venter på at andre transaktioner er gennemført" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "Venter på at anden pakkehåndtering skal afslutte" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "Venter på påkrævet medie" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "Venter på konfigurationsfil" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "Indlæser softwareliste" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Opdaterer softwarekilder" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Downloader pakker" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "Anvender ændringer" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" msgstr "Færdig" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "Medieskift påkrævet" +msgstr "Skift af medie kræves" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Indsæt venligst %1 i %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "Advarsel - ikke-verificeret software" +msgstr "Advarsel - Ikke-verificeret software" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -239,21 +214,21 @@ "continue?" msgstr[0] "" "Følgende stykke software kan ikke verificeres. Installation af ikke-" -"verificeret software udgør en sikkerhedsrisiko, da tilstedeværelsen ikke-" -"verificerbar software kan være et tegn på fifleri. Vil du " +"verificeret software udgør en sikkerhedsrisiko, da tilstedeværelsen af ikke-" +"verificérbar software kan være et tegn på forfalskning. Vil du " "fortsætte?" msgstr[1] "" "Følgende stykker software kan ikke verificeres. Installation af " -"ikke-verificeret software udgør en sikkerhedsrisiko, da tilstedeværelsen " -"ikke-verificerbar software kan være et tegn på fifleri. Vil du " -"fortsætte?" +"ikke-verificeret software udgør en sikkerhedsrisiko, da tilstedeværelsen af " +"ikke-verificérbar software kan være et tegn på forfalskning. Vil " +"du fortsætte?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "Konfigurationsfil ændret" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -265,28 +240,33 @@ "men din version er blevet ændret. Vil du beholde din nuværende version eller " "installere den nye version?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Brug ny version" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Behold gammel version" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Downloadhast.: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 tilbage" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -302,65 +282,58 @@ msgid "Download Size" msgstr "Downloadstørrelse" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Nogle pakker blev ikke markeret til opdatering.

Opdatering af " +"disse pakker kræver at andre pakker installeres eller fjernes.

Vil du " +"også opdatere disse?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Markér alle" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Vigtige sikkerhedsopdateringer" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Programopdateringer" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Systemopdateringer" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Ikke alle pakker kunne markeres til opgradering. De tilgængelige " -"opgraderinger kan kræve at nye pakker installeres eller fjernes. Vil du " -"markere opgraderinger der kan kræve installation eller fjernelse af andre " -"pakker?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Kan ikke markere opgraderinger" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Markér opgraderinger" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Det er uvist hvornår seneste tjek for opdateringer fandt sted." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "Tryk på Tjek for opdateringer for at tjekke." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Softwaren på denne computer er fuldt opdateret." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Senest tjekket for %1 siden." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Ingen opdateringer er tilgængelige." \ No newline at end of file diff -Nru muon-1.9.60/po/da/muon.po muon-2.0.0/po/da/muon.po --- muon-1.9.60/po/da/muon.po 2012-10-29 18:33:40.000000000 +0000 +++ muon-2.0.0/po/da/muon.po 2013-04-01 20:32:26.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Martin Schlander , 2010, 2011, 2012. +# Martin Schlander , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-27 12:54+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-17 08:26+0100\n" "Last-Translator: Martin Schlander \n" "Language-Team: Danish \n" "Language: da\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -174,18 +174,18 @@ msgid "Purge" msgstr "Rydning" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Afmarkér" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical leverer kritiske opdateringer til %1 indtil %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -352,69 +352,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Læs markeringer..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Gem markeringer som..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Gem liste over downloadede pakker..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Download pakker fra liste..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Tilføj downloadede pakker" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Gem liste over installerede pakker..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Forsigtig opgradering" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Fuld opgradering" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Fjern unødvendige pakker" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Forhåndsvis ændringer" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Anvend ændringer" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historik..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -426,12 +396,12 @@ "en fuld opgradering ved at trykke på knappen Fuld opgradering." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Kan ikke markere opgraderinger" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -440,17 +410,17 @@ "Kan ikke markere opgraderinger. Nogle opgraderinger har måske afhængigheder " "der ikke kan opfyldes i øjeblikket eller som manuelt er blevet tilbageholdt." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Tilbage" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Forhåndsvis ændringer" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Pakkehistorik" @@ -467,52 +437,52 @@ msgid "Requested" msgstr "Anmodet" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Søg" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Markér til installation" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Markér til fjernelse" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Markér til opgradering" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Markér til geninstallation" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Markér til udrensning" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Lås pakke til den nuværende version" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Lås pakken op" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Lås til den nuværende version" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -521,34 +491,34 @@ "Fjernelse af denne pakke vil måske ødelægge dit system. Vil du virkelig " "fjerne den?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Advarsel - fjernelse af vigtig pakke" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "Kunne ikke låse pakken" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "Pakken %1 kunne ikke låses. Kunne ikke skrive lock-filen." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Pakken \"%1\" kunne ikke markeres til installation eller opgradering." -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Kan ikke markere pakke" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -562,42 +532,24 @@ "blev uploadet, er blevet overflødig, eller ikke er tilgængelig i aktuelt " "aktiverede softwarekilder." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, men %4 vil blive installeret" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "eller %1 %2, men %3 vil blive installeret" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, men den er ikke installérbar" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "eller %1, men er ikke installérbar" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, men det er en virtuel pakke" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "eller %1, men det er en virtuel pakke" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Efterse og anvend ændringer" diff -Nru muon-1.9.60/po/de/libmuon.po muon-2.0.0/po/de/libmuon.po --- muon-1.9.60/po/de/libmuon.po 2012-10-29 18:33:43.000000000 +0000 +++ muon-2.0.0/po/de/libmuon.po 2013-04-01 20:32:29.000000000 +0000 @@ -1,13 +1,13 @@ # Panagiotis Papadopoulos , 2010. # Jonathan Raphael Joachim Kolberg , 2010. # Frederik Schwarzer , 2010, 2011. -# Burkhard Lück , 2011, 2012. +# Burkhard Lück , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-08-04 14:46+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-12 06:19+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" @@ -15,1103 +15,105 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Programme" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Open Source" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Proprietär" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Unbekannt" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 herunterzuladen, %2 auf der Festplatte" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 auf der Festplatte" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Dienstprogramme" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Zugangshilfen" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Entwicklungswerkzeuge" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Fehlersuche" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Design grafischer Oberflächen" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "Entwicklungsumgebungen" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Lokalisierung" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profiling" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Versionsverwaltungssysteme" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Web-Entwicklung" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Lernprogramme" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Wissenschaft & Ingenieurwesen" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomie" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologie" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Chemie" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Computer-Wissenschaften & Robotik" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronik" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Ingenieurwesen" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografie" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologie" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Mathematik" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Physik" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Schriftarten" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Spiele" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arcade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Brettspiele" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Kartenspiele" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Puzzle" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Rollenspiele" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulation" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sport" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafik" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Zeichnen" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Malen & Bearbeiten" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografie" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Veröffentlichen" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Scannen & Texterkennung" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Dateibetrachter" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Chat" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Dateifreigabe" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "E-Mail" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Webbrowser" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Büroprogramme" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "System & Einstellungen" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Comics" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Dienstprogramm für Anwendungen" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Programme in Ihrem System" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Alle" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Beim Ubuntu-SSO-Dienste anmelden" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Zusätzliche Änderungen bestätigen" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Zusätzliche Änderungen markieren?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Diese Aktion erfordert die Änderung eines anderes Pakets" -msgstr[1] "Diese Aktion erfordert die Änderung anderer Pakete" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Verlauf" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Suchen" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Alle Änderungen" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Installationen" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Aktualisierungen" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Entfernungen" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Datum" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Bodega-Backend" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Installiert" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Bodega-Daten in Ihrem System installieren" -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Aktualisiert" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Herabgestuft" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Deinstalliert" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Vollständig deinstalliert" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 ist um %3 %2 worden" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Anmeldeinformationen für MakePlayLive eingeben" -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "Dieses Muon hat Superkuh-Kräfte" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Dummy-Backend" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Systemverwaltung" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Basissystem" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI-Infrastruktur" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Kommunikation" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Datenbanken" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Entwicklung" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentation" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Fehlersuche" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editoren" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronik" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Eingebettete Geräte" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Schriftarten" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Spiele und Vergnügen" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME-Arbeitsflächenumgebung" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafik" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU-R-Statistiksystem" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep-Arbeitsflächenumgebung" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amateurfunk" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell-Programmiersprache" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Webserver" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpretierte Programmiersprachen" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java-Programmiersprache" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel und Module" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Bibliotheken – Entwicklung" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Bibliotheken" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp-Programmiersprache" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokalisierung" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-Mail" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Mathematik" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Sonstiges – Textbasiert" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Netzwerk" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Newsgruppen" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCaml-Programmiersprache" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Bibliotheken – Alt" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Plattformübergreifend" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl-Programmiersprache" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP-Programmiersprache" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python-Programmiersprache" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby-Programmiersprache" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Wissenschaft" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Shells" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX-Autorensystem" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Textverarbeitung" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Dienstprogramme" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Versionsverwaltungssysteme" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Videoprogramme" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Sonstiges – Grafisch" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce-Arbeitsflächenumgebung" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone-Umgebung" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Unbekannt" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Dummy-Backend zum Testen von Muon-Vordergrundprogrammen" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Mit Alien aus RPM erstellt" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internationalisierung und Lokalisierung" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta-Pakete" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Eingeschränkt im Export" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Non-Free" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Lernprogramme" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "KNewStuff-Backend" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Nicht installiert" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Installiert Daten von „Neuen Erweiterungen“ in Ihrem System" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Installiert" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Alle" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Aktualisierbar" +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "Dieses Muon hat Superkuh-Kräfte" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:81 msgid "Broken" msgstr "Defekt" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Übriggebliebene Konfigurationen" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Installiert (automatisch entfernbar)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Keine Änderung" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Installieren" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Aktualisieren" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Entfernen" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Vollständig entfernen" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Neu installieren" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Herabstufen" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Gesperrt" - -#: libmuon/MuonStrings.cpp:221 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"comm" -#| "\"" -#| msgid "Communication" -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Kommunikation" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Fehler bei der Initialisierung" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Das Paketsystem kann nicht gesperrt werden" - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Wenig Speicherplatz" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Anwenden der Änderungen fehlgeschlagen" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Authentifizierungsfehler" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Unerwarteter Fehler" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Nicht vertrauenswürdige Pakete" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Unbekannt" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Das Paketsystem kann nicht initialisiert werden. Ihre Einrichtung könnte " -"fehlerhaft sein." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Das Paketsystem scheint zurzeit von einer anderen Anwendung verwendet zu " -"werden. Sie müssen erst alle anderen Paketverwaltungsprogramme schließen, " -"bevor Sie ein Paket installieren oder entfernen können." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Sie haben nicht genug Festplattenspeicher im Ordner %1, um diese Aktion " -"fortzusetzen." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Pakete können nicht heruntergeladen werden" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Beim Anwenden der Änderungen ist ein Fehler aufgetreten:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Diese Aktion kann nicht fortgesetzt werden, da keine korrekte Autorisierung " -"vorliegt." - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Es scheint, dass der „QApt-Worker“ entweder abgestürzt ist oder beendet " -"wurde. Bitte berichten Sie den Fehler den QApt-Entwicklern" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Folgendes Paket ist von seinem Autor nicht verifiziert worden. Das " -"Herunterladen von nicht vertrauenswürdigen Paketen ist durch Ihre aktuellen " -"Einstellungen verboten." -msgstr[1] "" -"Folgende Pakete sind von ihren Autoren nicht verifiziert worden. Das " -"Herunterladen von nicht vertrauenswürdigen Paketen ist durch Ihre aktuellen " -"Einstellungen verboten." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Auf Aktualisierungen prüfen" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Alle abwählen" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Software-Quellen einrichten" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Markierungen speichern als" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Die Datei kann nicht gespeichert werden, da es nicht möglich ist, nach " -"%1 zu schreiben\n" -"\n" -"Prüfen Sie, ob Sie Schreibrechte für diese Datei haben und ob genug " -"Speicherplatz verfügbar ist." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Liste der installierten Pakete speichern als" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Liste der herunterzuladenen Pakete speichern als" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Datei öffnen" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Die Änderungen können nicht markieren werden. Bitte stellen Sie sicher, dass " -"die Datei eine Markierungsdatei ist, die entweder von der Paketverwaltung " -"Muon oder Synaptic erstellt wurde." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Wählen Sie einen Ordner aus" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Verfügbar" -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 Paket ist erfolgreich zum Zwischenspeicher hinzugefügt worden" -msgstr[1] "%1 Pakete sind erfolgreich zum Zwischenspeicher hinzugefügt worden" +#: libmuon/resources/AbstractResource.cpp:83 +msgid "Installed" +msgstr "Installiert" -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"In diesem Ordner sind keine gültigen Pakete gefunden worden. Stellen Sie " -"bitte sicher, dass die Pakete mit Ihrem System kompatibel sind und in der " -"neusten Version vorliegen." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Es sind keine Pakete gefunden worden" +#: libmuon/resources/AbstractResource.cpp:84 +msgid "Upgradeable" +msgstr "Aktualisierbar" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1119,11 +121,6 @@ msgid "%1 remaining" msgstr "%1 verbleibend" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Benachrichtigungen anzeigen für:" @@ -1163,18 +160,18 @@ msgid "Downloading" msgstr "Wird heruntergeladen" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Abgeschlossen" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Wartend" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Wird installiert" @@ -1282,43 +279,36 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1656,14 +646,12 @@ -#, fuzzy -#, fuzzy @@ -1696,7 +684,6 @@ -#, fuzzy @@ -1711,7 +698,6 @@ -#, fuzzy @@ -1811,34 +797,28 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1847,14 +827,12 @@ -#, fuzzy -#, fuzzy @@ -1862,7 +840,6 @@ -#, fuzzy @@ -1870,7 +847,6 @@ -#, fuzzy @@ -1878,10 +854,823 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + +#, fuzzy + + + +#, fuzzy + + + +#, fuzzy + + + +#, fuzzy + + + + +#, fuzzy + + + + +#, fuzzy + + + + +#, fuzzy + + + +#, fuzzy + + + + + + +#, fuzzy + + + + + + +#, fuzzy + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/de/muon-discover.po muon-2.0.0/po/de/muon-discover.po --- muon-1.9.60/po/de/muon-discover.po 2012-10-29 18:33:43.000000000 +0000 +++ muon-2.0.0/po/de/muon-discover.po 2013-04-01 20:32:29.000000000 +0000 @@ -1,18 +1,18 @@ # Frederik Schwarzer , 2012. -# Burkhard Lück , 2012. +# Burkhard Lück , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-04 21:40+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-11 23:02+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" #: discover/main.cpp:29 @@ -37,31 +37,52 @@ #: discover/main.cpp:44 msgid "Directly open the specified application by its package name." -msgstr "" +msgstr "Öffnet die angegebene Anwendung direkt über seinen Paketnamen." #: discover/main.cpp:45 msgid "Open with a program that can deal with the given mimetype." msgstr "" +"Mit einem Programm öffnen, das den angegebenen Mime-Typ verarbeiten kann." #: discover/main.cpp:46 msgid "Display a list of entries with a category." +msgstr "Zeigt eine Liste von Einträgen mit einer Kategorie." + +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." msgstr "" +"Zeigt alle verfügbaren Modi und gibt sie auf der Standardausgabe (stout) aus." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Verfügbare Modi:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Suchen ..." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" +"Es sind Fehler beim Einrichten der grafischen Bedienungsoberfläche " +"aufgetreten, das Programm kann nicht fortgesetzt werden." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Fehler bei der Initialisierung" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "" +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menü" -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" msgstr "" #: discover/qml/AddonsView.qml:37 @@ -77,92 +98,92 @@ msgid "Discard" msgstr "Verwerfen" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Webseite" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" -msgstr "" +msgstr "Starten" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Gesamtgröße: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Übersicht" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" -msgstr "" +msgstr "Erweiterungen" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Aktualisierung" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Name" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Bewertung" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularität" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" -msgstr "" +msgstr "Paketquelle" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Suchen in „%1“ ..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Suchen ..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" -msgstr "" +msgstr "Beliebtheitswettbewerb" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "Punkte: %1" -#: discover/qml/CategoryPage.qml:139 -#, fuzzy -#| msgid "Rating" +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" -msgstr "Bewertung" +msgstr "Beste Bewertungen" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -175,25 +196,34 @@ msgid "Remove" msgstr "Entfernen" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Installiert" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "Alles aktualisieren!" +msgstr "Alles aktualisieren" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Wird geladen ..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Zurück" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Installiert (%1 Aktualisierung)" +msgstr[1] "Installiert (%1 Aktualisierungen)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Quellen" @@ -218,54 +248,58 @@ msgid "Summary:" msgstr "Zusammenfassung:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 von %2 Personen fanden diese Rezension hilfreich" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 by %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 von %2

" +"%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" -msgstr "" +msgstr "Nützlich? Ja/Nein" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Quelle hinzufügen" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" -msgstr "" +msgstr "Geben Sie die neue Quelle an" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Abbrechen" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" -msgstr "" +msgstr "%1 (Binär)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/de/muon-installer.po muon-2.0.0/po/de/muon-installer.po --- muon-1.9.60/po/de/muon-installer.po 2012-10-29 18:33:43.000000000 +0000 +++ muon-2.0.0/po/de/muon-installer.po 2013-04-01 20:32:29.000000000 +0000 @@ -1,20 +1,20 @@ # Panagiotis Papadopoulos , 2010. # Jonathan Raphael Joachim Kolberg , 2010, 2011. -# Frederik Schwarzer , 2010, 2011, 2012. +# Frederik Schwarzer , 2010, 2011. # Burkhard Lück , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-07-15 21:16+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-12-04 05:31+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" @@ -25,7 +25,7 @@ msgid "Your emails" msgstr "pano_90@gmx.net,bulldog98@kubuntu-de.org" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ "Die folgenden Anwendungen wurden gerade installiert. Klicken Sie darauf, um " "sie zu starten:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Programme beziehen" @@ -59,83 +59,81 @@ msgstr "Muon-Programmverwaltung" #: installer/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "© 2010, 2011 Jonathan Thomas" +msgstr "© 2010, 2012 Jonathan Thomas" #: installer/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Programme beziehen" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Installierte Programme" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Bereitgestellt von Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Bereitgestellt von Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partner von Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Unabhängig" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Programme beziehen" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Installierte Programme" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Verlauf" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 ist erfolgreich installiert worden." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Starten" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Anwendung erfolgreich installiert." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Neue Anwendungen ausführen ..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Installation abgeschlossen" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "In Bearbeitung" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "In Bearbeitung" @@ -209,18 +207,18 @@ msgid "Install" msgstr "Installieren" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Entfernen" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Installieren" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -278,19 +276,19 @@ msgid "No reviews available" msgstr "Keine Rezensionen vorhanden" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Diese Rezension bezieht sich auf eine frühere Version (Version: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" @@ -611,5 +609,4 @@ - #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/de/muon-notifier.po muon-2.0.0/po/de/muon-notifier.po --- muon-1.9.60/po/de/muon-notifier.po 2012-10-29 18:33:43.000000000 +0000 +++ muon-2.0.0/po/de/muon-notifier.po 2013-04-01 20:32:29.000000000 +0000 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-07-15 21:16+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-07-22 06:57+0200\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" diff -Nru muon-1.9.60/po/de/muon-updater.po muon-2.0.0/po/de/muon-updater.po --- muon-1.9.60/po/de/muon-updater.po 2012-10-29 18:33:43.000000000 +0000 +++ muon-2.0.0/po/de/muon-updater.po 2013-04-01 20:32:29.000000000 +0000 @@ -1,20 +1,20 @@ # Panagiotis Papadopoulos , 2010. # Jonathan Raphael Joachim Kolberg , 2010, 2011. # Frederik Schwarzer , 2010, 2011, 2012. -# Burkhard Lück , 2011, 2012. +# Burkhard Lück , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-07-15 21:16+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-13 17:35+0100\n" "Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "pano_90@gmx.net,bulldog98@kubuntu-de.org" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Ausblenden" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -40,18 +40,18 @@ "Die Liste der Änderungen ist noch nicht verfügbar. Bitte verwenden Sie " "stattdessen Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Die Liste der Änderungen ist noch nicht verfügbar." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Version %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -76,182 +76,133 @@ msgstr "Muon-Aktualisierungsverwaltung" #: updater/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "© 2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: updater/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Softwareaktualisierungen" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Es ist sicherer, vor der Aktualisierung das Netzteil anzuschließen." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Eine neue Version von Kubuntu ist verfügbar." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Liste der herunterzuladenen Pakete speichern als ..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Pakete mithilfe einer Liste herunterladen ..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Heruntergeladene Pakete hinzufügen" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Aktualisierungen installieren" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Verlauf ..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Aktualisieren" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Paket-Verlauf" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Abbrechen" -#: updater/ProgressWidget.cpp:128 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Änderungen werden durchgeführt" +msgstr "Startvorgang" -#: updater/ProgressWidget.cpp:133 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Änderungen werden durchgeführt" +msgstr "Es wird auf Authentifizierung gewartet" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Änderungen werden durchgeführt" +msgstr "Warten ..." -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Es wird darauf gewartet, dass andere Vorgänge abgeschlossen werden" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" +"Es wird darauf gewartet, dass andere Software-Verwaltungsprogramme beendet " +"werden" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Es wird auf ein erforderliches Medium gewartet" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Es wird auf eine Einrichtungsdatei gewartet" -#: updater/ProgressWidget.cpp:172 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Programmquellen aktualisieren" +msgstr "Softwareliste wird geladen" -#: updater/ProgressWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" -msgstr "Programmquellen aktualisieren" +msgstr "Softwarequellen werden aktualisiert" -#: updater/ProgressWidget.cpp:184 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Updates" +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Aktualisierungen werden heruntergeladen" +msgstr "Pakete werden heruntergeladen" -#: updater/ProgressWidget.cpp:193 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Änderungen werden durchgeführt" +msgstr "Änderungen werden angewendet" -#: updater/ProgressWidget.cpp:198 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Änderungen werden durchgeführt" +msgstr "Fertiggestellt" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Ein Wechsel des Mediums ist erforderlich" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Bitte legen Sie %1 in %2 ein" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Achtung – Nicht verifizierte Software" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -264,14 +215,22 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Die folgende Software kann nicht verifiziert werden. Das " +"Installieren von nicht verifizierter Software ist ein Sicherheitsrisiko, da " +"nicht verifizierte Software ein Zeichen für Sabotage sein kann. " +"Möchten Sie wirklich fortfahren?" msgstr[1] "" +"Folgende Software kann nicht verifiziert werden. Das Installieren " +"von nicht verifizierter Software ist ein Sicherheitsrisiko, da nicht " +"verifizierte Software ein Zeichen für Sabotage sein kann. Möchten " +"Sie wirklich fortfahren?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Einrichtungsdatei wurde geändert" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -279,35 +238,37 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Eine neue Version der Konfigurationsdatei %1 ist " +"verfügbar, aber Ihre Version wurde geändert. Möchten Sie Ihre aktuelle " +"Version behalten oder die neue Version installieren?" -#: updater/ProgressWidget.cpp:265 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Version" +msgstr "Neue Version verwenden" -#: updater/ProgressWidget.cpp:266 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Version" +msgstr "Alte Version behalten" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Downloadrate: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 verbleibend" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -323,69 +284,62 @@ msgid "Download Size" msgstr "Download-Größe" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Einige Pakete sind nicht zur Aktualisierung markiert.

Zur " +"Aktualisierung dieser Pakete müssen einige andere installiert oder entfernt " +"werden.

Möchten Sie diese Pakete ebenfalls aktualisieren?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Alle markieren" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Wichtige sicherheitskritische Aktualisierung" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Programm-Aktualisierungen" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "System-Aktualisierungen" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Es sind nicht alle Pakete zur Aktualisierung markiert worden. Die " -"verfügbaren Aktualisierungen erfordern die Installation neuer Pakete oder " -"das Entfernen vorhandener. Möchten Sie auch Pakete markieren, die eine " -"Installation oder das Entfernen anderer Pakete erfordern?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Aktualisierungen können nicht markiert werden" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Aktualisierungen markieren" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" "Es kann nicht bestimmt werden, wann zuletzt nach Aktualisierungen gesucht " "worden ist." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Klicken Sie auf Nach Aktualisierungen suchen, um dies " "zu prüfen." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Die Software auf diesem Rechner ist auf dem neuesten Stand." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Zuletzt geprüft vor %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Es sind keine Aktualisierungen verfügbar." \ No newline at end of file diff -Nru muon-1.9.60/po/de/muon.po muon-2.0.0/po/de/muon.po --- muon-1.9.60/po/de/muon.po 2012-10-29 18:33:43.000000000 +0000 +++ muon-2.0.0/po/de/muon.po 2013-04-01 20:32:29.000000000 +0000 @@ -1,21 +1,21 @@ # Panagiotis Papadopoulos , 2010, 2011. # Jonathan Raphael Joachim Kolberg , 2010, 2011. # Frederik Schwarzer , 2010, 2011, 2012. -# Burkhard Lück , 2011, 2012. +# Burkhard Lück , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-05-11 00:08+0200\n" -"Last-Translator: Frederik Schwarzer \n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-12 06:24+0100\n" +"Last-Translator: Burkhard Lück \n" "Language-Team: German \n" "Language: de\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -31,7 +31,7 @@ #: muon/config/GeneralSettingsPage.cpp:54 msgid "Show foreign-architecture packages that are available natively" -msgstr "" +msgstr "Pakete anderer Architekturen anzeigen, die nativ verfügbar sind" #: muon/config/GeneralSettingsPage.cpp:55 msgid "Treat recommended packages as dependencies" @@ -174,19 +174,19 @@ msgid "Purge" msgstr "Vollständig entfernen" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Abwählen" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "" "Canonical stellt Aktualisierungen für kritische Fehler von %1 bis %2 bereit." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -219,7 +219,7 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:84 msgctxt "@label The software source that this package comes from" msgid "Origin:" -msgstr "Herkunft:" +msgstr "Paketquelle:" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:92 msgctxt "@label The package archive component that this package comes from" @@ -330,7 +330,7 @@ #: muon/FilterWidget/FilterWidget.cpp:68 msgctxt "@title:tab" msgid "By Origin" -msgstr "Nach Ursprung" +msgstr "Nach Quellen" #: muon/FilterWidget/FilterWidget.cpp:74 msgctxt "@title:tab" @@ -346,78 +346,46 @@ msgstr "Muon-Paketverwaltung" #: muon/main.cpp:37 -#, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "© 2009-2011 Jonathan Thomas" +msgstr "© 2009-2012 Jonathan Thomas" #: muon/main.cpp:38 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Markierungen lesen ..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Markierungen speichern als ..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Liste der herunterzuladenen Pakete speichern als ..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Pakete mithilfe einer Liste herunterladen ..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Heruntergeladene Pakete hinzufügen" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Eine Liste aller installierten Pakete speichern ..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Vorsichtige Aktualisierung" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Vollständige Aktualisierung" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Unnötige Pakete entfernen" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Vorschau der Änderungen" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Änderungen anwenden" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Verlauf ..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -430,12 +398,12 @@ "durchführen, indem Sie auf den Knopf Vollständige Aktualisierung klicken." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Aktualisierungen können nicht markiert werden" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -445,17 +413,17 @@ "Aktualisierungen könnten momentan nicht erfüllbare Abhängigkeiten haben, " "oder sind manuell zurückgehalten worden." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Zurück" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Vorschau der Änderungen" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Paket-Verlauf" @@ -472,52 +440,52 @@ msgid "Requested" msgstr "Angefordert" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Suche" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Für Installation vormerken" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Für Deinstallation vormerken" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Für Aktualisierung vormerken" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Für Neuinstallation vormerken" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Für vollständige Deinstallation vormerken" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Derzeitige Version des Pakets beibehalten" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Paketsperre aufheben" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Derzeitige Version beibehalten" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -526,26 +494,25 @@ "Das Entfernen dieses Pakets könnte Ihr System unbenutzbar machen. Sind Sie " "sicher, dass Sie es entfernen möchten?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Achtung – Wichtiges Paket wird entfernt" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Das Paket kann nicht markiert werden" +msgstr "Das Sperren des Pakets ist fehlgeschlagen." -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" +"Das Paket %1 kann nicht gesperrt werden. Das Schreiben der Sperrdatei ist " +"nicht möglich." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" @@ -553,12 +520,12 @@ "Das Paket „%1“ kann nicht zur Installation oder zur Aktualisierung markiert " "werden:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Das Paket kann nicht markiert werden" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -573,42 +540,24 @@ "wurde, aber nie hochgeladen wurde, veraltet, oder nicht in den aktuell " "verfügbaren Quellen vorhanden ist." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, aber %4 soll installiert werden" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "oder %1 %2, aber %3 soll installiert werden" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, aber es ist nicht installierbar" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "oder %1, aber es ist nicht installierbar" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, aber es ist ein virtuelles Paket" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "oder %1, aber es ist ein virtuelles Paket" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Ansehen und Anwenden der Änderungen" @@ -684,91 +633,72 @@ msgstr "Abbrechen" #: muon/TransactionWidget.cpp:147 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Änderungen werden angewandt" +msgstr "Startvorgang" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "Warten auf Start des Dienstes" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "Es wird auf Authentifizierung gewartet" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Änderungen werden angewandt" +msgstr "Warten ..." #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Es wird darauf gewartet, dass andere Vorgänge abgeschlossen werden" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" +"Es wird darauf gewartet, dass andere Software-Verwaltungsprogramme beendet " +"werden" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Es wird auf ein erforderliches Medium gewartet" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Es wird auf eine Einrichtungsdatei gewartet" #: muon/TransactionWidget.cpp:192 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Softwarequellen werden aktualisiert" +msgstr "Softwareliste wird geladen" #: muon/TransactionWidget.cpp:200 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Softwarequellen werden aktualisiert" #: muon/TransactionWidget.cpp:205 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Pakete werden heruntergeladen" #: muon/TransactionWidget.cpp:217 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" msgstr "Änderungen werden angewandt" #: muon/TransactionWidget.cpp:224 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Änderungen werden angewandt" +msgstr "Fertiggestellt" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" @@ -776,9 +706,7 @@ msgstr "Ein Wechsel des Mediums ist erforderlich" #: muon/TransactionWidget.cpp:254 -#, fuzzy, kde-format -#| msgctxt "@label Asks for a CD change" -#| msgid "Please insert %1 into %2" +#, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Bitte legen Sie %1 in %2 ein" @@ -789,18 +717,6 @@ msgstr "Achtung – Nicht verifizierte Software" #: muon/TransactionWidget.cpp:265 -#, fuzzy -#| msgctxt "@label" -#| msgid "" -#| "The following piece of software cannot be verified. Installing " -#| "unverified software represents a security risk, as the presence of " -#| "unverifiable software can be a sign of tampering. Do you wish " -#| "to continue?" -#| msgid_plural "" -#| "The following pieces of software cannot be authenticated. " -#| "Installing unverified software represents a security risk, as " -#| "the presence of unverifiable software can be a sign of tampering. Do you wish to continue?" msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -826,7 +742,7 @@ #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Einrichtungsdatei wurde geändert" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -836,22 +752,19 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Eine neue Version der Konfigurationsdatei %1 ist " +"verfügbar, aber Ihre Version wurde geändert. Möchten Sie Ihre aktuelle " +"Version behalten oder die neue Version installieren?" #: muon/TransactionWidget.cpp:290 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Version erzwingen" +msgstr "Neue Version verwenden" #: muon/TransactionWidget.cpp:291 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Version erzwingen" +msgstr "Alte Version behalten" @@ -877,28 +790,23 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -918,18 +826,23 @@ +#, fuzzy +#, fuzzy +#, fuzzy +#, fuzzy +#, fuzzy @@ -1495,7 +1408,6 @@ -#, fuzzy @@ -1503,13 +1415,11 @@ -#, fuzzy -#, fuzzy @@ -1517,7 +1427,6 @@ -#, fuzzy @@ -1526,10 +1435,10 @@ -#, fuzzy +#, fuzzy @@ -1537,11 +1446,11 @@ - #, fuzzy +#, fuzzy @@ -1551,6 +1460,7 @@ +#, fuzzy @@ -1558,7 +1468,7 @@ - +#, fuzzy @@ -1569,15 +1479,14 @@ - #, fuzzy -#, fuzzy +#, fuzzy @@ -1587,4 +1496,8 @@ +#, fuzzy + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/el/libmuon.po muon-2.0.0/po/el/libmuon.po --- muon-1.9.60/po/el/libmuon.po 2012-10-29 18:33:46.000000000 +0000 +++ muon-2.0.0/po/el/libmuon.po 2013-04-01 20:32:31.000000000 +0000 @@ -2,15 +2,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Stelios , 2011, 2012. +# Stelios , 2011. # Dimitrios Glentadakis , 2012. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-18 20:28+0300\n" -"Last-Translator: Stelios \n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-09-14 19:44+0200\n" +"Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" @@ -19,1078 +19,118 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Εφαρμογές" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Ανοιχτός κώδικας" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Ιδιοκτησιακό" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Άγνωστη" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 για λήψη, %2 στο δίσκο" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 στο δίσκο" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Εξαρτήματα" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Προσβασιμότητα" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Εργαλεία προγραμματιστή" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Διόρθωση σφαλμάτων" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Σχεδιασμός γραφικού περιβάλλοντος" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDEs" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Τοπική προσαρμογή" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Ανάλυση επιδόσεων" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Έλεγχος εκδόσεων" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Ανάπτυξη ιστού" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Εκπαίδευση" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Επιστήμη και Τεχνολογία" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Αστρονομία" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Βιολογία" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Χημεία" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Πληροφορική & Ρομποτική" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Ηλεκτρονικά" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Τεχνολογία" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Γεωγραφία" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Γεωλογία" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Μαθηματικά" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Φυσική" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Γραμματοσειρές" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Παιχνίδια" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arcade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Επιτραπέζια" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Κάρτες" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Σπαζοκεφαλιές" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Παιχνίδια ρόλων" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Προσομοίωση" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Αθλητικά" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Γραφικά" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "Τρισδιάστατα" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Σχεδίαση" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Ζωγραφική και Επεξεργασία" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Φωτογραφία" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Τυπογραφία" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Σάρωση & OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Θεατές" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Διαδίκτυο" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Συνομιλία" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Διαμοιρασμός αρχείων" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Αλληλογραφία" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Περιηγητές ιστού" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Πολυμέσα" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Γραφείο" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Σύστημα & Ρυθμίσεις" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Κόμικς" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Γραφικά συστατικά Plasma Desktop" - -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Όλα" - -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Επιβεβαίωση επιπλέον αλλαγών" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Να σημειωθούν οι επιπλέον αλλαγές;

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Η ενέργεια αυτή απαιτεί μια αλλαγή σε άλλο πακέτο:" -msgstr[1] "Η ενέργεια αυτή απαιτεί αλλαγές σε άλλα πακέτα:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Ιστορικό" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Αναζήτηση" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Όλες οι αλλαγές" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Εγκαταστάσεις" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Ενημερώσεις" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Αφαιρέσεις" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Ημερομηνία" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Εγκαταστάθηκε" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Αναβαθμίστηκε" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Υποβαθμίστηκε" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Αφαιρέθηκε" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Διαγράφηκε" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 στις %3" - -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "This Muon has super cow powers" - -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Διαχείριση συστήματος" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Βασικό σύστημα" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI υποδομή" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Επικοινωνία" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Βάσεις δεδομένων" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Ανάπτυξη" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Τεκμηρίωση" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Διόρθωση σφαλμάτων" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Κειμενογράφοι" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Ηλεκτρονικά" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Ενσωματωμένες συσκευές" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Γραμματοσειρές" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Παιχνίδια και διασκέδαση" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Περιβάλλον γραφείου GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Γραφικά" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Στατιστικό σύστημα GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Περιβάλλον γραφείου Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Ερασιτεχνική ραδιοφωνία" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Γλώσσα προγραμματισμού Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Εξυπηρετητές ιστού" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Γλώσσες διερμηνείας" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Γλώσσα προγραμματισμού Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Μεταγλώττιση λογισμικού KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Πυρήνας και ενότητες" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Βιβλιοθήκες - Ανάπτυξη" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Βιβλιοθήκες" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Γλώσσα προγραμματισμού Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Τοπική προσαρμογή" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Ηλεκτρονικό ταχυδρομείο" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Μαθηματικά" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Διάφορα - Με βάση το κείμενο" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Δικτύωση" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Ομάδες συζήτησης" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Γλώσσα προγραμματισμού OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Βιβλιοθήκες - Παλαιές" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Για πολλαπλές πλατφόρμες" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Γλώσσα προγραμματισμού Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Γλώσσα προγραμματισμού PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Γλώσσα προγραμματισμού Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Γλώσσα προγραμματισμού Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Επιστήμη" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Φλοιοί" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Πολυμέσα" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Συγγραφή TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Επεξεργασία κειμένου" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Βοηθήματα" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Συστήματα ελέγχου εκδόσεων" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Λογισμικό για βίντεο" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Διαδίκτυο" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Διάφορα - Γραφικά" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Περιβάλλον γραφείου Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Περιβάλλον Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Άγνωστο" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Μετατροπή από RPM με το Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Διεθνοποίηση και τοπική προσαρμογή" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Μετα πακέτα" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Περιορισμοί εξαγωγής" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Μη-ελεύθερα" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Εκπαίδευση" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Δεδομένα ενδοσκόπησης GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Μη εγκατεστημένο" - -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Εγκατεστημένο" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Εφαρμογές" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Αναβαθμίσιμο" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Εφαρμογές" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Κατεστραμμένο" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Είσοδος στην υπηρεσία Ubuntu SSO" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Υπολειπόμενη διαμόρφωση" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Εγκατεστημένο (με αυτόματη αφαίρεση)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Χωρίς αλλαγή" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Εγκατάσταση" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Αναβάθμιση" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Αφαίρεση" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Διαγραφή" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Επανεγκατάσταση" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Υποβάθμιση" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Κλείδωμα" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Common" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Σφάλμα αρχικοποίησης" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Αδυναμία ανάκτησης κλειδώματος του συστήματος πακέτων" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Ανεπαρκής χώρος στο δίσκο" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Αποτυχία εφαρμογής αλλαγών" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Σφάλμα ταυτοποίησης" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Απροσδόκητο σφάλμα" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Μη-έμπιστα πακέτα" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Άγνωστο σφάλμα" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "" -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -"το σύστημα πακέτων δεν μπορεί να αρχικοποιηθεί, η διαμόρφωσή σας ίσως έχει " -"καταστραφεί." -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -"Μια άλλη εφαρμογή φαίνεται να χρησιμοποιεί τώρα το σύστημα πακέτων. Πρέπει " -"να κλείσετε όλους τους άλλους διαχειριστές πακέτων για να καταφέρετε να " -"εγκαταστήσετε ή να αφαιρέσετε οποιοδήποτε πακέτο." -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -"Δεν έχετε επαρκή χώρο στο δίσκο στον κατάλογο στο %1 για να συνεχίσετε αυτήν " -"τη λειτουργία." -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Αδυναμία λήψης πακέτων" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Παρουσιάστηκε σφάλμα κατά την εφαρμογή αλλαγών:" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "" -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" msgstr "" -"Η λειτουργία αυτή δεν μπορεί να συνεχίσει επειδή δεν έχει δοθεί η κατάλληλη " -"εξουσιοδότηση" -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -"Φαίνεται ότι το πρόγραμμα QApt έχει καταστραφεί ή εξαφανιστεί. Αναφέρετε το " -"σφάλμα στους συντηρητές του QApt" -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Το ακόλουθο πακέτο δεν έχει επιβεβαιωθεί από το συγγραφέα του. Η λήψη μη-" -"έμπιστων πακέτων έχει απαγορευτεί από την τρέχουσα διαμόρφωση." -msgstr[1] "" -"Τα ακόλουθα πακέτα δεν έχουν επιβεβαιωθεί από τους συγγραφείς τους. Η λήψη " -"μη-έμπιστων πακέτων έχει απαγορευτεί από την τρέχουσα διαμόρφωση." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Έλεγχος ενημερώσεων" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Αναίρεση σημείωσης για όλα" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Διαμόρφωση πηγών λογισμικού" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Αποθήκευση ιχνοδοτήσεων ως" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Όλα" -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Το έγγραφο δεν ήταν δυνατό να αποθηκευτεί, καθώς δεν ήταν δυνατή η εγγραφή " -"στο %1\n" -"\n" -"Ελέγξτε ότι έχετε δικαίωμα εγγραφής στο αρχείο αυτό ή ότι υπάρχει επάρκεια " -"χώρου στο δίσκο." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Αποθήκευση λίστας εγκατεστημένων πακέτων ως" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Αποθήκευση λίστας λήψης ως" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Άνοιγμα αρχείου" +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "This Muon has super cow powers" -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Αδυναμία σημείωσης αλλαγών. Βεβαιωθείτε ότι το αρχείο είναι ένα αρχείο " -"ιχνοδοτήσεων που δημιουργήθηκε από το διαχειριστή πακέτων Muon ή το " -"διαχειριστή πακέτων Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Επιλογή καταλόγου" +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" +msgid "Broken" +msgstr "Κατεστραμμένο" -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 πακέτο προστέθηκε με επιτυχία στη λανθάνουσα μνήμη" -msgstr[1] "%1 πακέτα προστέθηκαν με επιτυχία στη λανθάνουσα μνήμη" +#: libmuon/resources/AbstractResource.cpp:82 +#, fuzzy +#| msgid "Available updates" +msgid "Available" +msgstr "Διαθέσιμες ενημερώσεις" -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Αδυναμία εύρεσης έγκυρων πακέτων στον κατάλογο αυτό. Βεβαιωθείτε ότι τα " -"πακέτα είναι συμβατά με τον υπολογιστή σας και ότι βρίσκονται στην πιο " -"πρόσφατη έκδοση." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Αδυναμία εύρεσης των πακέτων" +#: libmuon/resources/AbstractResource.cpp:83 +#, fuzzy +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "Εγκαταστάθηκε" + +#: libmuon/resources/AbstractResource.cpp:84 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Αναβαθμίσιμο" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1098,11 +138,6 @@ msgid "%1 remaining" msgstr "%1 υπολείπονται" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Είσοδος στην υπηρεσία Ubuntu SSO" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Εμφάνιση ειδοποιήσεων για:" @@ -1140,18 +175,18 @@ msgid "Downloading" msgstr "Γίνεται λήψη" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Ολοκληρώθηκε" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Σε αναμονή" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Γίνεται εγκατάσταση" @@ -1164,238 +199,4 @@ #: libmuon/Transaction/TransactionListener.cpp:183 msgctxt "@info:status" msgid "Removing" -msgstr "Γίνεται αφαίρεση" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy \ No newline at end of file +msgstr "Γίνεται αφαίρεση" \ No newline at end of file diff -Nru muon-1.9.60/po/el/muon-discover.po muon-2.0.0/po/el/muon-discover.po --- muon-1.9.60/po/el/muon-discover.po 2012-10-29 18:33:46.000000000 +0000 +++ muon-2.0.0/po/el/muon-discover.po 2013-04-01 20:32:31.000000000 +0000 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-09-25 15:08+0200\n" -"Last-Translator: Stelios \n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-09-02 08:08+0200\n" +"Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" @@ -52,24 +52,39 @@ msgid "Display a list of entries with a category." msgstr "Εμφανίζει μια λίστα εγγραφών με κατηγορία." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Αναζήτηση..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" -"Βρέθηκαν μερικά σφάλματα στη ρύθμιση του γραφικού περιβάλλοντος, η εφαρμογή " -"δεν μπορεί να συνεχίσει." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" -msgstr "Σφάλμα αρχικοποίησης" +msgstr "" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Γίνεται προσθήκη πηγών..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Γίνεται αφαίρεση πηγών..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -84,90 +99,98 @@ msgid "Discard" msgstr "Απόρριψη" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 κριτικές" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Αρχική" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Εκκίνηση" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Κριτική" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Συνολικό μέγεθος: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Επισκόπηση" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Πρόσθετα" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Κριτικές" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Ενημέρωση" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Όνομα" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Αξιολόγηση" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Φήμη" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Δημοτικότητα" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Πηγή" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Αναζήτηση στο '%1'..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Αναζήτηση..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 +#, fuzzy +#| msgid "Popularity Contest" msgid "Popularity Contest" -msgstr "Διαγωνισμός δημοτικότητας" +msgstr "Διαγωνισμός δημοτικότητας" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "πόντοι: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 +#, fuzzy +#| msgid "Best Ratings" msgid "Best Ratings" -msgstr "Οι καλύτερες αξιολογήσεις" +msgstr "Οι καλύτερες αξιολογήσεις" + +#: discover/qml/DefaultBanner.qml:16 +#, fuzzy +#| msgid "Muon Discover" +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "Muon Discover" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -180,23 +203,37 @@ msgid "Remove" msgstr "Αφαίρεση" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Εγκατεστημένο" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 +#, fuzzy +#| msgid "Update All!" msgid "Update All" -msgstr "Ενημέρωση όλων" +msgstr "Ενημέρωση όλων!" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Φόρτωση..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Εξερεύνηση" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Εγκατεστημένο" +msgstr[1] "Εγκατεστημένο" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Πηγές" @@ -221,56 +258,58 @@ msgid "Summary:" msgstr "Περίληψη:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Κριτικές:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Πείτε μας για αυτήν την κριτική!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 από %2 άτομα βρήκαν την κριτική αυτή χρήσιμη" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 by %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Χρήσιμη; Ναι/Όχι" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Προσθήκη πηγής" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Καθορισμός της νέας πηγής" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "Εντάξει" +msgstr "" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Ακύρωση" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - Η γραμμή από το αποθετήριο πηγής apt που θα προστεθεί. Είναι " "ένα από τα:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Binary)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/el/muon-installer.po muon-2.0.0/po/el/muon-installer.po --- muon-1.9.60/po/el/muon-installer.po 2012-10-29 18:33:46.000000000 +0000 +++ muon-2.0.0/po/el/muon-installer.po 2013-04-01 20:32:31.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-09-02 08:08+0200\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" @@ -27,7 +27,7 @@ msgid "Your emails" msgstr "sstavra@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -38,7 +38,7 @@ "Οι ακόλουθες εφαρμογές έχουν μόλις εγκατασταθεί, κάνετε κλικ σε αυτές για " "εκκίνηση:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Λήψη λογισμικού" @@ -68,74 +68,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Λήψη λογισμικού" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Εγκατεστημένο λογισμικό" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Παρέχεται από Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Παρέχεται από Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical Partners" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Ανεξάρτητο" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Λήψη λογισμικού" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Εγκατεστημένο λογισμικό" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Ιστορικό" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "Το %1 εγκαταστάθηκε επιτυχώς." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Εκκίνηση" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Οι εφαρμογές εγκαταστάθηκαν επιτυχώς." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Εκτέλεση νέων εφαρμογών..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Η εγκατάσταση ολοκληρώθηκε" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Σε εξέλιξη" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Σε εξέλιξη" @@ -209,18 +209,18 @@ msgid "Install" msgstr "Εγκατάσταση" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Αφαίρεση" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Εγκατάσταση" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -278,19 +278,19 @@ msgid "No reviews available" msgstr "Δεν υπάρχουν διαθέσιμες αναλύσεις" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Η ανάλυση αυτή γράφτηκε για μια παλαιότερη έκδοση (Έκδοση: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/el/muon-notifier.po muon-2.0.0/po/el/muon-notifier.po --- muon-1.9.60/po/el/muon-notifier.po 2012-10-29 18:33:46.000000000 +0000 +++ muon-2.0.0/po/el/muon-notifier.po 2013-04-01 20:32:31.000000000 +0000 @@ -4,28 +4,29 @@ # # Stelios , 2011. # Dimitrios Glentadakis , 2012. +# Petros Vidalis , 2012. msgid "" msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-05-17 07:30+0200\n" -"Last-Translator: Dimitrios Glentadakis \n" -"Language-Team: Greek \n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-09-20 17:49+0300\n" +"Last-Translator: Petros Vidalis \n" +"Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Stelios" +msgstr "Stelios, Petros Vidalis" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "sstavra@gmail.com" +msgstr "sstavra@gmail.com, p_vidalis@hotmail.com" #: kded/distupgradeevent/distupgradeevent.cpp:35 msgctxt "Notification when a new version of Kubuntu is available" @@ -67,7 +68,7 @@ #: kded/MuonNotifier.cpp:58 msgid "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" -msgstr "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" +msgstr "(C) 2009-2011 Jonathan Thomas, (C) 2009 Harald Sitter" #: kded/UpdateEvent/UpdateEvent.cpp:57 #, kde-format diff -Nru muon-1.9.60/po/el/muon-updater.po muon-2.0.0/po/el/muon-updater.po --- muon-1.9.60/po/el/muon-updater.po 2012-10-29 18:33:46.000000000 +0000 +++ muon-2.0.0/po/el/muon-updater.po 2013-04-01 20:32:31.000000000 +0000 @@ -2,15 +2,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Stelios , 2011, 2012. +# Stelios , 2011. # Dimitrios Glentadakis , 2012. msgid "" msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-24 15:36+0300\n" -"Last-Translator: Stelios \n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-10-19 19:49+0200\n" +"Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" "Language: el\n" "MIME-Version: 1.0\n" @@ -27,12 +27,12 @@ msgid "Your emails" msgstr "sstavra@gmail.com" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Απόκρυψη" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -42,18 +42,18 @@ "Η λίστα των αλλαγών δεν είναι ακόμη διαθέσιμη. Προτιμήστε το Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Η λίστα των αλλαγών δεν είναι ακόμη διαθέσιμη." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Έκδοση %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -85,149 +85,148 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Ενημερώσεις λογισμικού" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Είναι ασφαλέστερο να συνδέσετε το μετασχηματιστή πριν την ενημέρωση." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Μια νέα έκδοση του Kubuntu είναι διαθέσιμη." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Ανάγνωση ιχνοδοτήσεων..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Αποθήκευση ιχνοδοτήσεων ως..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Αποθήκευση λίστας πακέτων για λήψη..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Λήψη πακέτων από τη λίστα..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Προσθήκη πακέτων που ελήφθησαν" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Εγκατάσταση ενημερώσεων" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Ιστορικό..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Αναβάθμιση" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Ιστορικό πακέτων" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Ακύρωση" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Έναρξη" +msgstr "Εγκατάσταση ενημερώσεων" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Αναμονή για ταυτοποίηση" +msgstr "Γίνεται ενημέρωση πηγών λογισμικού" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Αναμονή" +msgstr "Εγκατάσταση ενημερώσεων" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "Αναμονή για την ολοκλήρωση άλλων συναλλαγών" +msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "Αναμονή τερματισμού άλλων διαχειριστών λογισμικού" +msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "Αναμονή για το απαιτούμενο μέσο" +msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "Αναμονή για το αρχείο διαμόρφωσης" +msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Φορτώνεται η λίστα λογισμικού" +msgstr "Γίνεται ενημέρωση πηγών λογισμικού" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Γίνεται ενημέρωση πηγών λογισμικού" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 +#, fuzzy +#| msgctxt "@info" +#| msgid "Downloading Updates" msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Γίνεται λήψη πακέτων" +msgstr "Λήψη ενημερώσεων" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Εφαρμογή αλλαγών" +msgstr "Εγκατάσταση ενημερώσεων" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Ολοκληρώθηκε" +msgstr "Εγκατάσταση ενημερώσεων" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "Απαιτείται αλλαγή μέσων" +msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "Εισαγάγετε το %1 στο %2" +msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "Προειδοποίηση - ανεπιβεβαίωτο λογισμικό" +msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -240,22 +239,14 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"Αδυναμία επαλήθευσης του ακόλουθου κομματιού λογισμικού. Η " -"εγκατάσταση ανεπιβεβαίωτου λογισμικού αντιπροσωπεύει κίνδυνο ασφαλείας, " -"καθώς η παρουσία μη επαληθεύσιμου λογισμικού ίσως να είναι ένδειξη " -"εξωτερικής παρέμβασης. Θέλετε να συνεχίσετε;" msgstr[1] "" -"Αδυναμία επαλήθευσης των ακόλουθων κομματιών λογισμικού. Η " -"εγκατάσταση ανεπιβεβαίωτου λογισμικού αντιπροσωπεύει κίνδυνο ασφαλείας, " -"καθώς η παρουσία μη επαληθεύσιμου λογισμικού ίσως να είναι ένδειξη " -"εξωτερικής παρέμβασης. Θέλετε να συνεχίσετε;" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "Το αρχείο διαμόρφωσης άλλαξε" +msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -263,32 +254,40 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" -"Μια νέα έκδοση του αρχείου διαμόρφωσης %1 είναι " -"διαθέσιμη, αλλά η έκδοσή σας έχει τροποποιηθεί. Θέλετε να διατηρήσετε την " -"τρέχουσα έκδοσή σας ή να εγκαταστήσετε τη νέα έκδοση;" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 +#, fuzzy +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Να γίνει χρήση της νέας έκδοσης" +msgstr "Έκδοση" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 +#, fuzzy +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Να διατηρηθεί η παλιά έκδοση" +msgstr "Έκδοση" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Ρυθμός λήψης: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 απομένουν" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -304,66 +303,59 @@ msgid "Download Size" msgstr "Μέγεθος λήψης" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +#, fuzzy +#| msgctxt "@action Reverts all potential changes to the cache" +#| msgid "Unmark All" +msgid "Mark All" +msgstr "Αναίρεση σημείωσης για όλα" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Σημαντικές ενημερώσεις ασφαλείας" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Ενημερώσεις εφαρμογών" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Ενημερώσεις συστήματος" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Δεν ήταν δυνατό όλα τα πακέτα να σημειωθούν για αναβάθμιση. Οι διαθέσιμες " -"αναβαθμίσεις ίσως να απαιτήσουν νέα πακέτα να εγκατασταθούν ή να αφαιρεθούν. " -"Θέλετε να σημειώσετε αναβαθμίσεις που ίσως να απαιτήσουν την εγκατάσταση ή " -"την απομάκρυνση επιπλέον πακέτων;" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Αδυναμία σημείωσης αναβαθμίσεων" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Σημείωση αναβαθμίσεων" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Άγνωστο πότε έγινε ο τελευταίος έλεγχος για ενημερώσεις." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Κάνετε κλικ στο Έλεγχος ενημερώσεων για να ελέγξετε." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "το λογισμικό σε αυτόν τον υπολογιστή είναι ενημερωμένο." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Τελευταίος έλεγχος πριν από %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Δεν υπάρχουν διαθέσιμες ενημερώσεις." \ No newline at end of file diff -Nru muon-1.9.60/po/el/muon.po muon-2.0.0/po/el/muon.po --- muon-1.9.60/po/el/muon.po 2012-10-29 18:33:46.000000000 +0000 +++ muon-2.0.0/po/el/muon.po 2013-04-01 20:32:31.000000000 +0000 @@ -2,13 +2,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Stelios , 2011, 2012. +# Stelios , 2011. # Dimitrios Glentadakis , 2012. msgid "" msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2012-10-19 19:49+0200\n" "Last-Translator: Dimitrios Glentadakis \n" "Language-Team: Greek \n" @@ -176,18 +176,18 @@ msgid "Purge" msgstr "Διαγραφή" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Αναίρεση σημείωσης" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Η Canonical παρέχει κρίσιμες ενημερώσεις για %1 μέχρι %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -354,69 +354,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Ανάγνωση σημειώσεων..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Αποθήκευση σημειώσεων ως..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Αποθήκευση λίστας λήψης πακέτων..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Λήψη πακέτων από λίστα..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Προσθήκη ληφθέντων πακέτων" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Αποθήκευση λίστας εγκατεστημένων πακέτων..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Προσεκτική αναβάθμιση" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Πλήρης αναβάθμιση" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Αφαίρεση μη απαραίτητων πακέτων" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Προεπισκόπηση αλλαγών" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Εφαρμογή αλλαγών" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Ιστορικό..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -428,12 +398,12 @@ "προσπαθήσετε μία πλήρη αναβάθμιση με κλικ στο κουμπί Πλήρης " "αναβάθμιση." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Αδυναμία σημείωσης αναβαθμίσεων" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -442,17 +412,17 @@ "Αδυναμία σημείωσης αναβαθμίσεων. Ορισμένες αναβαθμίσεις ίσως έχουν προς το " "παρόν ανεκπλήρωτες εξαρτήσεις, ή μπορεί να έχουν εμποδιστεί χειροκίνητα." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Πίσω" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Προεπισκόπηση αλλαγών" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Ιστορικό πακέτων" @@ -469,52 +439,52 @@ msgid "Requested" msgstr "Ζητήθηκε" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Αναζήτηση" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Σημείωση για εγκατάσταση" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Σημείωση για αφαίρεση" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Σημείωση για αναβάθμιση" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Σημείωση για επανεγκατάσταση" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Σημείωση για διαγραφή" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Κλείδωμα πακέτου στην τρέχουσα έκδοση" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Ξεκλείδωμα πακέτου" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Κλείδωμα στην τρέχουσα έκδοση" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -523,36 +493,37 @@ "Η αφαίρεση του πακέτου αυτού ίσως καταστρέψει το σύστημα. Είστε βέβαιοι ότι " "θέλετε να το αφαιρέσετε;" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Προειδοποίηση - Αφαίρεση σημαντικού πακέτου" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 +#, fuzzy +#| msgctxt "@title:window" +#| msgid "Unable to Mark Package" msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Αποτυχία κλειδώματος πακέτου" +msgstr "Αδυναμία σημείωσης πακέτου" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -"Αδυναμία κλειδώματος του πακέτου %1. Αποτυχία εγγραφής στο αρχείο " -"κλειδώματος." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Αδυναμία σημείωσης του πακέτου \"%1\" για εγκατάσταση ή αναβάθμιση:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Αδυναμία σημείωσης πακέτου" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -567,42 +538,24 @@ "εστάλη ποτέ, έχει ξεπεραστεί ή δεν είναι διαθέσιμο από τα τρέχοντα ενεργά " "αποθετήρια." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, αλλά η %4 θα εγκατασταθεί" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "ή %1 %2, αλλά η %3 θα εγκατασταθεί" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, αλλά δεν είναι για εγκατάσταση" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "ή το %1, αλλά δεν είναι για εγκατάσταση" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, αλλά πρόκειται για εικονικό πακέτο" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "ή το %1, αλλά πρόκειται για εικονικό πακέτο" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Επισκόπηση και εφαρμογή αλλαγών" @@ -678,86 +631,107 @@ msgstr "Ακύρωση" #: muon/TransactionWidget.cpp:147 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Έναρξη" +msgstr "Γίνεται commit των αλλαγών" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "Αναμονή έναρξης της υπηρεσίας" +msgstr "" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "Αναμονή για ταυτοποίηση" +msgstr "" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Αναμονή" +msgstr "Γίνεται commit των αλλαγών" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "Αναμονή για την ολοκλήρωση άλλων συναλλαγών" +msgstr "" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "Αναμονή τερματισμού άλλων διαχειριστών λογισμικού" +msgstr "" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "Αναμονή για το απαιτούμενο μέσο" +msgstr "" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "Αναμονή για το αρχείο διαμόρφωσης" +msgstr "" #: muon/TransactionWidget.cpp:192 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Φορτώνεται η λίστα λογισμικού" +msgstr "Γίνεται ενημέρωση των πηγών λογισμικού" #: muon/TransactionWidget.cpp:200 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Γίνεται ενημέρωση των πηγών λογισμικού" #: muon/TransactionWidget.cpp:205 +#, fuzzy +#| msgctxt "@info" +#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Γίνεται λήψη πακέτων" #: muon/TransactionWidget.cpp:217 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" msgstr "Γίνεται commit των αλλαγών" #: muon/TransactionWidget.cpp:224 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Ολοκληρώθηκε" +msgstr "Γίνεται commit των αλλαγών" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" msgid "Media Change Required" -msgstr "Απαιτείται αλλαγή μέσων" +msgstr "" #: muon/TransactionWidget.cpp:254 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "Εισαγάγετε το %1 στο %2" +msgstr "" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "Προειδοποίηση - ανεπιβεβαίωτο λογισμικό" +msgstr "" #: muon/TransactionWidget.cpp:265 msgctxt "@label" @@ -772,20 +746,12 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"Αδυναμία επαλήθευσης του ακόλουθου κομματιού λογισμικού. Η " -"εγκατάσταση ανεπιβεβαίωτου λογισμικού αντιπροσωπεύει κίνδυνο ασφαλείας, " -"καθώς η παρουσία μη επαληθεύσιμου λογισμικού ίσως να είναι ένδειξη " -"εξωτερικής παρέμβασης. Θέλετε να συνεχίσετε;" msgstr[1] "" -"Αδυναμία επαλήθευσης των ακόλουθων κομματιών λογισμικού. Η " -"εγκατάσταση ανεπιβεβαίωτου λογισμικού αντιπροσωπεύει κίνδυνο ασφαλείας, " -"καθώς η παρουσία μη επαληθεύσιμου λογισμικού ίσως να είναι ένδειξη " -"εξωτερικής παρέμβασης. Θέλετε να συνεχίσετε;" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "Το αρχείο διαμόρφωσης άλλαξε" +msgstr "" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -795,16 +761,19 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" -"Μια νέα έκδοση του αρχείου διαμόρφωσης %1 είναι " -"διαθέσιμη, αλλά η έκδοσή σας έχει τροποποιηθεί. Θέλετε να διατηρήσετε την " -"τρέχουσα έκδοσή σας ή να εγκαταστήσετε τη νέα έκδοση;" #: muon/TransactionWidget.cpp:290 +#, fuzzy +#| msgctxt "@action:button" +#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Να γίνει χρήση της νέας έκδοσης" +msgstr "Εξαναγκασμός έκδοσης" #: muon/TransactionWidget.cpp:291 +#, fuzzy +#| msgctxt "@action:button" +#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Να διατηρηθεί η παλιά έκδοση" \ No newline at end of file +msgstr "Εξαναγκασμός έκδοσης" \ No newline at end of file diff -Nru muon-1.9.60/po/en_GB/libmuon.po muon-2.0.0/po/en_GB/libmuon.po --- muon-1.9.60/po/en_GB/libmuon.po 2012-10-29 18:33:48.000000000 +0000 +++ muon-2.0.0/po/en_GB/libmuon.po 2013-04-01 20:32:33.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" "PO-Revision-Date: 2011-02-05 17:29+0000\n" "Last-Translator: Andrew Coles \n" "Language-Team: British English \n" @@ -17,1262 +17,288 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.2\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" msgctxt "@info license" msgid "Unknown" msgstr "Unknown" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, fuzzy, kde-format -#| msgctxt "@label showing download and install size" -#| msgid "%1 to download, %2 of space to be used" msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 to download, %2 of space to be used" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" msgstr "" -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" msgstr "" -#: libmuon/categories.xml:27 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Developer Tools" -msgstr "Development" - -#: libmuon/categories.xml:42 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"debug" -#| "\"" -#| msgid "Debug" -msgctxt "Category" -msgid "Debugging" -msgstr "Debug" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" msgstr "" -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -#: libmuon/categories.xml:98 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"localization\"" -#| msgid "Localization" -msgctxt "Category" -msgid "Localization" -msgstr "Localisation" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" msgstr "" -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" msgstr "" -#: libmuon/categories.xml:144 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -#| msgid "Version Control Systems" -msgctxt "Category" -msgid "Version Control" -msgstr "Version Control Systems" - -#: libmuon/categories.xml:158 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Web Development" -msgstr "Development" - -#: libmuon/categories.xml:171 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Education" -msgstr "Location" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" msgstr "" -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" msgstr "" -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "" +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" +msgid "Broken" +msgstr "Broken" -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "" +#: libmuon/resources/AbstractResource.cpp:82 +#, fuzzy +#| msgid "Available updates" +msgid "Available" +msgstr "Available updates" -#: libmuon/categories.xml:232 +#: libmuon/resources/AbstractResource.cpp:83 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"electronics\"" -#| msgid "Electronics" -msgctxt "Category" -msgid "Electronics" -msgstr "Electronics" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "" +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "Installed" -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "" +#: libmuon/resources/AbstractResource.cpp:84 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Upgradeable" -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "" +#: libmuon/resources/ResourcesUpdatesModel.cpp:100 +#, fuzzy, kde-format +msgctxt "@item:intext Remaining time" +msgid "%1 remaining" +msgstr " - %1 remaining" -#: libmuon/categories.xml:269 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"math" -#| "\"" -#| msgid "Mathematics" -msgctxt "Category" -msgid "Mathematics" -msgstr "Mathematics" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:46 +msgid "Show notifications for:" +msgstr "Show notifications for:" + +#: libmuon/settings/NotifySettingsPage.cpp:48 +msgid "Available updates" +msgstr "Available updates" -#: libmuon/categories.xml:299 +#: libmuon/settings/NotifySettingsPage.cpp:49 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"fonts" -#| "\"" -#| msgid "Fonts" -msgctxt "Category" -msgid "Fonts" -msgstr "Fonts" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "" +msgid "Show the number of available updates" +msgstr "Available updates" -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:50 +msgid "Distribution upgrades" +msgstr "Distribution upgrades" -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:69 +msgid "Notification type:" +msgstr "Notification type:" -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:72 +msgid "Use both popups and tray icons" +msgstr "Use both popups and tray icons" -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:73 +msgid "Tray icons only" +msgstr "Tray icons only" -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:74 +msgid "Popup notifications only" +msgstr "Popup notifications only" -#: libmuon/categories.xml:369 +#: libmuon/Transaction/TransactionListener.cpp:109 #, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Simulation" -msgstr "Location" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" +msgctxt "@info:status" +msgid "Downloading" +msgstr "Download Size:" + +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 +msgctxt "@info:status Progress text when done" +msgid "Done" +msgstr "Done" + +#: libmuon/Transaction/TransactionListener.cpp:154 +msgctxt "@info:status Progress text when waiting" +msgid "Waiting" msgstr "" -#: libmuon/categories.xml:391 +#: libmuon/Transaction/TransactionListener.cpp:175 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"graphics\"" -#| msgid "Graphics" -msgctxt "Category" -msgid "Graphics" -msgstr "Graphics" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "" +msgctxt "@info:status" +msgid "Installing" +msgstr "Install" -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" +#: libmuon/Transaction/TransactionListener.cpp:179 +msgctxt "@info:status" +msgid "Changing Addons" msgstr "" -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "" +#: libmuon/Transaction/TransactionListener.cpp:183 +#, fuzzy +msgctxt "@info:status" +msgid "Removing" +msgstr "Remove" -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "" +#, fuzzy -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "" -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "" -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "" -#: libmuon/categories.xml:473 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"web\"" -#| msgid "Internet" -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "" -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "" -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "" -#: libmuon/categories.xml:509 + #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"httpd" -#| "\"" -#| msgid "Web Servers" -msgctxt "Category" -msgid "Web Browsers" -msgstr "Web Servers" - -#: libmuon/categories.xml:521 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"sound" -#| "\"" -#| msgid "Multimedia" -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "" -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "" -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "" +#, fuzzy -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "" -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "" -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "" -msgstr[1] "" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "History" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Search" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "All changes" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Installations" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Updates" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Removals" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Date" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Installed" +#, fuzzy + + + -#: libmuon/HistoryView/HistoryView.cpp:102 #, fuzzy -#| msgctxt "@status describes a past-tense action" -#| msgid "Upgraded" -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Upgraded" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Downgraded" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Removed" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Purged" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 at %3" -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "System Administration" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Base System" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI Infrastructure" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Communication" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Databases" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Development" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentation" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Debug" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editors" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Electronics" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Embedded Devices" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Fonts" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Games and Amusement" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME Desktop Environment" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Graphics" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R Statistical System" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep Desktop Environment" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amateur Radio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell Programming Language" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Web Servers" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpreted Computer Languages" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java Programming Language" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE Software Compilation" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel and Modules" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Libraries - Development" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Libraries" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp Programming Language" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Localisation" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Email" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Mathematics" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Miscellaneous - Text-based" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Networking" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Newsgroups" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCaml Programming Language" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Libraries - Old" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Cross Platform" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl Programming Language" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP Programming Language" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python Programming Language" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby Programming Language" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Science" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Shells" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX Authoring" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Word Processing" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utilities" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Version Control Systems" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video Software" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Miscellaneous - Graphical" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce Desktop Environment" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone Environment" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Unknown" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Converted from RPM by Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internationalisation and Localisation" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta Packages" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Restricted On Export" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Non-free" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Location" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Not Installed" +#, fuzzy -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Installed" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Upgradeable" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Broken" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Residual Configuration" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Installed (auto-removable)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "No Change" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Install" +#, fuzzy -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Upgrade" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Remove" -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Purge" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinstall" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Downgrade" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Locked" - -#: libmuon/MuonStrings.cpp:221 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"comm" -#| "\"" -#| msgid "Communication" -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Communication" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "" -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "" -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "" +#, fuzzy + + + -#: libmuon/MuonStrings.cpp:243 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Initialisation error" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Unable to obtain package system lock" - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Low disk space" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "" -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Authentication error" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Unexpected Error" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Untrusted Packages" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Unknown" -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"The package system could not be initialised, your configuration may be " -"broken." -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." +#, fuzzy -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Could not download packages" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "An error occurred while applying changes:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"This operation cannot continue since proper authorisation was not provided" -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[1] "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Check for Updates" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Unmark All" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configure Software Sources" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Save Markings As" -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Save Installed Packages List As" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Save Download List As" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Open File" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." +#, fuzzy -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Choose a Directory" -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 package was successfully added to the cache" -msgstr[1] "%1 packages were successfully added to the cache" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Packages Could Not be Found" -#: libmuon/resources/ResourcesUpdatesModel.cpp:100 -#, fuzzy, kde-format -#| msgctxt "@item:intext Remaining time" -#| msgid " - %1 remaining" -msgctxt "@item:intext Remaining time" -msgid "%1 remaining" -msgstr " - %1 remaining" +#, fuzzy -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" -#: libmuon/settings/NotifySettingsPage.cpp:46 -msgid "Show notifications for:" -msgstr "Show notifications for:" -#: libmuon/settings/NotifySettingsPage.cpp:48 -msgid "Available updates" -msgstr "Available updates" -#: libmuon/settings/NotifySettingsPage.cpp:49 #, fuzzy -#| msgid "Available updates" -msgid "Show the number of available updates" -msgstr "Available updates" -#: libmuon/settings/NotifySettingsPage.cpp:50 -msgid "Distribution upgrades" -msgstr "Distribution upgrades" -#: libmuon/settings/NotifySettingsPage.cpp:69 -msgid "Notification type:" -msgstr "Notification type:" -#: libmuon/settings/NotifySettingsPage.cpp:72 -msgid "Use both popups and tray icons" -msgstr "Use both popups and tray icons" -#: libmuon/settings/NotifySettingsPage.cpp:73 -msgid "Tray icons only" -msgstr "Tray icons only" -#: libmuon/settings/NotifySettingsPage.cpp:74 -msgid "Popup notifications only" -msgstr "Popup notifications only" -#: libmuon/Transaction/TransactionListener.cpp:109 -#, fuzzy -#| msgctxt "@label Label preceding the package's download size" -#| msgid "Download Size:" -msgctxt "@info:status" -msgid "Downloading" -msgstr "Download Size:" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 -msgctxt "@info:status Progress text when done" -msgid "Done" -msgstr "Done" -#: libmuon/Transaction/TransactionListener.cpp:153 -msgctxt "@info:status Progress text when waiting" -msgid "Waiting" -msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:174 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Install" -msgctxt "@info:status" -msgid "Installing" -msgstr "Install" -#: libmuon/Transaction/TransactionListener.cpp:179 -msgctxt "@info:status" -msgid "Changing Addons" -msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:183 + + + + + + + + + + + + + + + + + + + + + #, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Remove" -msgctxt "@info:status" -msgid "Removing" -msgstr "Remove" @@ -1358,25 +384,21 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1465,14 +487,12 @@ -#, fuzzy -#, fuzzy @@ -1513,7 +533,6 @@ -#, fuzzy @@ -1703,7 +722,6 @@ -#, fuzzy @@ -1718,11 +736,566 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/en_GB/muon-installer.po muon-2.0.0/po/en_GB/muon-installer.po --- muon-1.9.60/po/en_GB/muon-installer.po 2012-10-29 18:33:48.000000000 +0000 +++ muon-2.0.0/po/en_GB/muon-installer.po 2013-04-01 20:32:33.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2011-02-05 17:29+0000\n" "Last-Translator: Andrew Coles \n" "Language-Team: British English \n" @@ -25,7 +25,7 @@ msgid "Your emails" msgstr "andrew_coles@yahoo.co.uk" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -34,7 +34,7 @@ msgstr[1] "" "The following applications were just installed, click on them to launch:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Get Software" @@ -66,90 +66,83 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Get Software" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Installed Software" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Provided by Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 #, fuzzy -#| msgctxt "@item:inlistbox" -#| msgid "Provided by Kubuntu" msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Provided by Kubuntu" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 #, fuzzy -#| msgctxt "@item:inlistbox " -#| msgid "Canonical Partners" msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical Partners" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Independent" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Get Software" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Installed Software" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "History" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "" -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "" -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 #, fuzzy -#| msgid "Applications" msgctxt "@action" msgid "Run New Applications..." msgstr "Applications" -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Installation Complete" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "" #: installer/ResourceDetailsView/AddonsWidget.cpp:59 #, fuzzy -#| msgctxt "@title:group" -#| msgid "Addons" msgctxt "@title" msgid "Addons" msgstr "Addons" @@ -181,8 +174,6 @@ #: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:244 #, fuzzy -#| msgctxt "@label Label preceding the app version" -#| msgid "Version:" msgctxt "@label/rich Label preceding the app version" msgid "Version:" msgstr "Version:" @@ -199,8 +190,6 @@ #: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:330 #, fuzzy, kde-format -#| msgctxt "@info:status Progress text when waiting" -#| msgid "Waiting" msgctxt "@label The number of ratings the app has" msgid "%1 rating" msgid_plural "%1 ratings" @@ -223,18 +212,18 @@ msgid "Install" msgstr "Install" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Remove" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Install" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -250,8 +239,6 @@ #: installer/ResourceView/ResourceViewWidget.cpp:72 #, fuzzy -#| msgctxt "@label Label preceding the app support" -#| msgid "Support:" msgid "Sort:" msgstr "Support:" @@ -277,7 +264,6 @@ #: installer/ReviewsWidget/ReviewsWidget.cpp:57 #, fuzzy -#| msgid "Remove" msgctxt "@title" msgid "Reviews" msgstr "Remove" @@ -297,19 +283,19 @@ msgid "No reviews available" msgstr "" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" @@ -317,6 +303,7 @@ msgstr[0] "" msgstr[1] "" +#, fuzzy @@ -325,10 +312,6 @@ -#, fuzzy - - - @@ -360,34 +343,24 @@ - - #, fuzzy - - #, fuzzy - - #, fuzzy - - #, fuzzy - - #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/en_GB/muon-notifier.po muon-2.0.0/po/en_GB/muon-notifier.po --- muon-1.9.60/po/en_GB/muon-notifier.po 2012-10-29 18:33:48.000000000 +0000 +++ muon-2.0.0/po/en_GB/muon-notifier.po 2013-04-01 20:32:33.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2011-01-20 11:08+0000\n" "Last-Translator: Andrew Coles \n" "Language-Team: British English \n" @@ -65,7 +65,6 @@ #: kded/MuonNotifier.cpp:58 #, fuzzy -#| msgid "(C) 2009-2011 Jonathan Thomas, (C) 2009 Harald Sitter" msgid "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" msgstr "(C) 2009-2011 Jonathan Thomas, (C) 2009 Harald Sitter" @@ -79,9 +78,6 @@ #: kded/UpdateEvent/UpdateEvent.cpp:61 #, fuzzy -#| msgctxt "Notification text" -#| msgid "%1 security update is available" -#| msgid_plural "%1 security updates are available" msgctxt "Notification text" msgid "A security update is available" msgid_plural "Security updates are available" @@ -98,9 +94,6 @@ #: kded/UpdateEvent/UpdateEvent.cpp:73 #, fuzzy -#| msgctxt "Notification text" -#| msgid "%1 software update is available" -#| msgid_plural "%1 software updates are available" msgctxt "Notification text" msgid "A software update is available" msgid_plural "Software updates are available" diff -Nru muon-1.9.60/po/en_GB/muon-updater.po muon-2.0.0/po/en_GB/muon-updater.po --- muon-1.9.60/po/en_GB/muon-updater.po 2012-10-29 18:33:48.000000000 +0000 +++ muon-2.0.0/po/en_GB/muon-updater.po 2013-04-01 20:32:33.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2011-02-05 17:29+0000\n" "Last-Translator: Andrew Coles \n" "Language-Team: British English \n" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "andrew_coles@yahoo.co.uk" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -38,18 +38,18 @@ "url='%1'>Launchpad instead." msgstr "" -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "" -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -83,72 +83,47 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Software Updates" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "" -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Save Package Download List..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Download Packages From List..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Add Downloaded Packages" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Install Updates" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -156,7 +131,7 @@ msgid "Starting" msgstr "Committing Changes" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -164,8 +139,8 @@ msgid "Waiting for Authentication" msgstr "Committing Changes" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -173,27 +148,27 @@ msgid "Waiting" msgstr "Committing Changes" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -201,7 +176,7 @@ msgid "Loading Software List" msgstr "Updating software sources" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -209,7 +184,7 @@ msgid "Updating software sources" msgstr "Updating software sources" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 #, fuzzy #| msgctxt "@info" #| msgid "Downloading Updates" @@ -217,7 +192,7 @@ msgid "Downloading Packages" msgstr "Downloading Updates" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -225,7 +200,7 @@ msgid "Applying Changes" msgstr "Committing Changes" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -233,23 +208,23 @@ msgid "Finished" msgstr "Committing Changes" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -264,12 +239,12 @@ msgstr[0] "" msgstr[1] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -278,32 +253,35 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 #, fuzzy -#| msgctxt "@action Downloads and installs updates" -#| msgid "Install Updates" msgctxt "@label Column label" msgid "Updates" msgstr "Install Updates" @@ -318,67 +296,60 @@ msgid "Download Size" msgstr "" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +#, fuzzy +#| msgctxt "@action Reverts all potential changes to the cache" +#| msgid "Unmark All" +msgid "Mark All" +msgstr "Unmark All" + +#: updater/UpdaterWidget.cpp:164 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Software Updates" msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Software Updates" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Software Updates" msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Software Updates" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "" -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "" -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "" \ No newline at end of file diff -Nru muon-1.9.60/po/en_GB/muon.po muon-2.0.0/po/en_GB/muon.po --- muon-1.9.60/po/en_GB/muon.po 2012-10-29 18:33:48.000000000 +0000 +++ muon-2.0.0/po/en_GB/muon.po 2013-04-01 20:32:33.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2011-02-05 17:29+0000\n" "Last-Translator: Andrew Coles \n" "Language-Team: British English \n" @@ -81,10 +81,6 @@ #: muon/DetailsTabs/ChangelogTab.cpp:87 #, fuzzy, kde-format -#| msgctxt "@info/rich" -#| msgid "" -#| "The list of changes is not available yet. Please use Launchpad instead." msgctxt "@info/rich" msgid "" "The list of changes is not yet available. Please use Full Upgrade button." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Unable to Mark Upgrades" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -463,25 +416,23 @@ "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " "at the moment, or may have been manually held back." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Back" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Preview Changes" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Package History" #: muon/PackageModel/PackageModel.cpp:79 #, fuzzy -#| msgctxt "@label Shows which package failed" -#| msgid "Package: %1" msgid "Package" msgstr "Package: %1" @@ -493,76 +444,60 @@ msgid "Requested" msgstr "Requested" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Search" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 #, fuzzy -#| msgctxt "@action:button" -#| msgid "Installation" msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Installation" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 #, fuzzy -#| msgctxt "@label" -#| msgid "Mark for:" msgctxt "@action:button" msgid "Mark for Removal" msgstr "Mark for:" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 #, fuzzy -#| msgctxt "@label" -#| msgid "Mark for:" msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Mark for:" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 #, fuzzy -#| msgctxt "@action:button" -#| msgid "Reinstallation" msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Reinstallation" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 #, fuzzy -#| msgctxt "@label" -#| msgid "Mark for:" msgctxt "@action:button" msgid "Mark for Purge" msgstr "Mark for:" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 #, fuzzy -#| msgctxt "@item:inlistbox" -#| msgid "Dependencies of the Current Version" msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Dependencies of the Current Version" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" msgctxt "@action:button" msgid "Unlock package" msgstr "Unable to Mark Package" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 #, fuzzy -#| msgctxt "@item:inlistbox" -#| msgid "Dependencies of the Current Version" msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Dependencies of the Current Version" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -571,12 +506,12 @@ "Removing this package may break your system. Are you sure you want to remove " "it?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Warning - Removing Important Package" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 #, fuzzy #| msgctxt "@title:window" #| msgid "Unable to Mark Package" @@ -584,24 +519,24 @@ msgid "Failed to Lock Package" msgstr "Unable to Mark Package" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "The \"%1\" package could not be marked for installation or upgrade:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Unable to Mark Package" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -615,58 +550,36 @@ "never uploaded, has been obsoleted, or is not available from the currently-" "enabled repositories." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, but %4 is to be installed" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "or %1 %2, but %3 is to be installed" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, but it is not installable" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "or %1, but is not installable" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, but it is a virtual package" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "or %1, but it is a virtual package" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Review and Apply Changes" #: muon/StatusWidget.cpp:52 #, fuzzy -#| msgctxt "@status" -#| msgid "Rebuilding Search Index" msgctxt "@info:status" msgid "Rebuilding Search Index" msgstr "Rebuilding Search Index" #: muon/StatusWidget.cpp:91 #, fuzzy, kde-format -#| msgid "1 package available, " -#| msgid_plural "%1 packages available, " msgctxt "@info:status" msgid "1 package available, " msgid_plural "%1 packages available, " @@ -675,39 +588,30 @@ #: muon/StatusWidget.cpp:92 #, fuzzy, kde-format -#| msgid "%1 installed, " msgctxt "@info:status" msgid "%1 installed, " msgstr "%1 installed, " #: muon/StatusWidget.cpp:96 #, fuzzy, kde-format -#| msgid "%1 upgradeable," msgctxt "@info:status" msgid "%1 upgradeable," msgstr "%1 upgradeable," #: muon/StatusWidget.cpp:98 #, fuzzy, kde-format -#| msgid "%1 upgradeable" msgctxt "@info:status" msgid "%1 upgradeable" msgstr "%1 upgradeable" #: muon/StatusWidget.cpp:110 #, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" msgctxt "@info:status Part of the status label" msgid " %1 to install/upgrade" msgstr " %1 to install/upgrade" #: muon/StatusWidget.cpp:115 #, fuzzy, kde-format -#| msgctxt "" -#| "Label for the number of packages pending removal when packages are also " -#| "pending upgrade" -#| msgid ", %1 to remove" msgctxt "" "@info:status Label for the number of packages pending removal when packages " "are also pending upgrade" @@ -716,10 +620,6 @@ #: muon/StatusWidget.cpp:118 #, fuzzy, kde-format -#| msgctxt "" -#| "Label for the number of packages pending removal when there are only " -#| "removals" -#| msgid " %1 to remove" msgctxt "" "@info:status Label for the number of packages pending removal when there are " "only removals" @@ -922,6 +822,4 @@ - - #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/eo/muon.po muon-2.0.0/po/eo/muon.po --- muon-1.9.60/po/eo/muon.po 2012-10-29 18:33:51.000000000 +0000 +++ muon-2.0.0/po/eo/muon.po 2013-04-01 20:32:35.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2010-06-20 20:01+0200\n" "Last-Translator: Axel Rousseau \n" "Language-Team: esperanto \n" @@ -133,49 +133,42 @@ #: muon/DetailsTabs/InstalledFilesTab.cpp:33 #, fuzzy -#| msgid "Install" msgctxt "@title:tab" msgid "Installed Files" msgstr "Instalu" #: muon/DetailsTabs/MainTab.cpp:48 #, fuzzy -#| msgid "Details" msgctxt "@title:tab" msgid "Details" msgstr "Detaloj" #: muon/DetailsTabs/MainTab.cpp:64 #, fuzzy -#| msgid "Upgrade" msgctxt "@label" msgid "Mark for:" msgstr "Aktualigo" #: muon/DetailsTabs/MainTab.cpp:69 #, fuzzy -#| msgid "Install" msgctxt "@action:button" msgid "Installation" msgstr "Instalu" #: muon/DetailsTabs/MainTab.cpp:77 #, fuzzy -#| msgid "Remove" msgctxt "@action:button" msgid "Removal" msgstr "Forigi" #: muon/DetailsTabs/MainTab.cpp:83 #, fuzzy -#| msgid "Upgrade" msgctxt "@action:button" msgid "Upgrade" msgstr "Aktualigo" #: muon/DetailsTabs/MainTab.cpp:89 #, fuzzy -#| msgid "Install" msgctxt "@action:button" msgid "Reinstallation" msgstr "Instalu" @@ -185,18 +178,18 @@ msgid "Purge" msgstr "" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "" -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -206,7 +199,6 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:45 #, fuzzy -#| msgid "Technical Details" msgctxt "@title:tab" msgid "Technical Details" msgstr "Teĥnikaj detaloj" @@ -238,7 +230,6 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:102 #, fuzzy -#| msgid "Install" msgctxt "@title:group" msgid "Installed Version" msgstr "Instalu" @@ -252,21 +243,18 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:114 #: muon/DetailsTabs/TechnicalDetailsTab.cpp:136 #, fuzzy -#| msgid "Install" msgctxt "@label Label preceding the package size" msgid "Installed Size:" msgstr "Instalu" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:124 #, fuzzy -#| msgid "Install" msgctxt "@title:group" msgid "Available Version" msgstr "Instalu" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:142 #, fuzzy -#| msgid "Install" msgctxt "@label Label preceding the package's download size" msgid "Download Size:" msgstr "Instalu" @@ -278,7 +266,6 @@ #: muon/DetailsTabs/VersionTab.cpp:44 #, fuzzy -#| msgid "Install" msgctxt "@label" msgid "Available versions:" msgstr "Instalu" @@ -370,73 +357,41 @@ msgid "Jonathan Thomas" msgstr "" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "" - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 #, fuzzy -#| msgid "Upgrade" msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Aktualigo" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 #, fuzzy -#| msgid "Upgrade" msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Aktualigo" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -444,29 +399,29 @@ "Full Upgrade button." msgstr "" -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " "at the moment, or may have been manually held back." msgstr "" -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "" @@ -483,96 +438,91 @@ msgid "Requested" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 #, fuzzy -#| msgid "Install" msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Instalu" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 #, fuzzy -#| msgid "Upgrade" msgctxt "@action:button" msgid "Mark for Removal" msgstr "Aktualigo" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 #, fuzzy -#| msgid "Upgrade" msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Aktualigo" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 #, fuzzy -#| msgid "Install" msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Instalu" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 #, fuzzy -#| msgid "Upgrade" msgctxt "@action:button" msgid "Mark for Purge" msgstr "Aktualigo" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -582,48 +532,24 @@ "enabled repositories." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, fuzzy, kde-format -#| msgid "Install" msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "Instalu" -#: muon/PackageModel/PackageWidget.cpp:658 -#, fuzzy, kde-format -#| msgid "Install" -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "Instalu" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, fuzzy, kde-format -#| msgid "Install" msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "Instalu" -#: muon/PackageModel/PackageWidget.cpp:683 +#: muon/PackageModel/PackageWidget.cpp:649 #, fuzzy, kde-format -#| msgid "Install" -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "Instalu" - -#: muon/PackageModel/PackageWidget.cpp:702 -#, fuzzy, kde-format -#| msgid "Install" msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "Instalu" -#: muon/PackageModel/PackageWidget.cpp:708 -#, fuzzy, kde-format -#| msgid "Install" -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "Instalu" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "" @@ -643,28 +569,24 @@ #: muon/StatusWidget.cpp:92 #, fuzzy, kde-format -#| msgid "Install" msgctxt "@info:status" msgid "%1 installed, " msgstr "Instalu" #: muon/StatusWidget.cpp:96 #, fuzzy, kde-format -#| msgid "Upgrade" msgctxt "@info:status" msgid "%1 upgradeable," msgstr "Aktualigo" #: muon/StatusWidget.cpp:98 #, fuzzy, kde-format -#| msgid "Upgrade" msgctxt "@info:status" msgid "%1 upgradeable" msgstr "Aktualigo" #: muon/StatusWidget.cpp:110 #, fuzzy, kde-format -#| msgid "Install" msgctxt "@info:status Part of the status label" msgid " %1 to install/upgrade" msgstr "Instalu" @@ -699,7 +621,6 @@ #: muon/TransactionWidget.cpp:104 #, fuzzy -#| msgid "Cancel" msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Rezigni" @@ -817,14 +738,12 @@ #: muon/TransactionWidget.cpp:290 #, fuzzy -#| msgid "Install" msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Instalu" #: muon/TransactionWidget.cpp:291 #, fuzzy -#| msgid "Install" msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Instalu" @@ -834,7 +753,6 @@ - #, fuzzy @@ -845,7 +763,6 @@ - #, fuzzy @@ -855,7 +772,6 @@ - #, fuzzy @@ -865,37 +781,32 @@ - #, fuzzy - #, fuzzy - #, fuzzy - #, fuzzy - #, fuzzy - - #, fuzzy +#, fuzzy + #, fuzzy @@ -903,25 +814,21 @@ - #, fuzzy - #, fuzzy - #, fuzzy - #, fuzzy @@ -936,6 +843,8 @@ +#, fuzzy + #, fuzzy @@ -947,10 +856,12 @@ +#, fuzzy + -#, fuzzy +#, fuzzy diff -Nru muon-1.9.60/po/es/libmuon.po muon-2.0.0/po/es/libmuon.po --- muon-1.9.60/po/es/libmuon.po 2012-10-29 18:33:53.000000000 +0000 +++ muon-2.0.0/po/es/libmuon.po 2013-04-01 20:32:38.000000000 +0000 @@ -2,13 +2,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Kira J. Fernandez , 2010, 2011, 2012. -# Eloy Cuadra , 2012. +# Eloy Cuadra , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-08-06 17:02+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-11 11:45+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" "Language: es\n" @@ -16,1108 +16,112 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Aplicaciones" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Código abierto" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Propietario" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Desconocido" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 para descargar, %2 en disco" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 en disco" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Accesorios" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Accesibilidad" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Herramientas de desarrollo" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Depuración" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Diseño de interfaces gráficas" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Localización" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Análisis de rendimiento" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Control de versiones" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Desarrollo web" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Educación" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Ciencia e ingeniería" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomía" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biología" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Química" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Informática y robótica" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Electrónica" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Ingeniería" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografía" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geología" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matemáticas" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Física" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Tipos de letra" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Juegos" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arcade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Juegos de tablero" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Juegos de cartas" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Rompecabezas" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Juegos de rol" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulación" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Deportes" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Gráficos" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Dibujo" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Pintura y edición" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografía" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Autoedición" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Escáner y OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Visores" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Charla" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Intercambio de datos" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Correo" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Navegadores web" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Oficina" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Sistema y preferencias" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Cómics" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Elementos gráficos del escritorio Plasma" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Motor de aplicaciones" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Aplicaciones de su sistema" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Inicio de sesión en el servicio SSO de Ubuntu" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Motor para Bodega" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Instalar datos de Bodega en su sistema" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Introduzca las credenciales para MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Motor simulado" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Motor simulado para probar interfaces de muon" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Motor para KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Instalar datos de KNewStuff en su sistema" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Todo" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Confirmar cambios adicionales" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

¿Marcar cambios adicionales?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Esta acción requiere cambiar otro paquete" -msgstr[1] "Esta acción requiere cambiar otros paquetes" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historial" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Buscar" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Todos los cambios" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instalaciones" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Actualizaciones" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Eliminaciones" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Fecha" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Instalado" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Actualizado" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Desactualizado" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Eliminado" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Purgado" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 en %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Este Muon tiene poderes de súper vaca" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administración del sistema" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Sistema base" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infraestructura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Comunicación" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Bases de datos" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Desarrollo" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentación" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Depurar" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editores" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Electrónica" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Dispositivos integrados" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Fuentes" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Juegos y diversión" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Entorno de escritorio GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Gráficos" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Sistema estadístico R de GNU" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Entorno de escritorio Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Radio amateur" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Lenguaje de programación Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Servidores web" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Lenguajes informáticos interpretados" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Lenguaje de programación Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Compilación de software KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel y módulos" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Bibliotecas - Desarrollo" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Bibliotecas" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lenguaje de programación Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Localización" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Correo electrónico" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matemáticas" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Varios - Basados en texto" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Redes" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Grupos de noticias" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Lenguaje de programación OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Bibliotecas - Antiguas" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Multiplataforma" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Lenguaje de programación Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Lenguaje de programación PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Lenguaje de programación Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Lenguaje de programación Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Ciencia" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Shells" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Autoría de TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Proceso de texto" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utilidades" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sistemas de control de versiones" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Software de vídeo" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Varios - Gráficos" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Entorno de escritorio Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Entorno Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Desconocido" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Roto" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Convertido de RPM mediante Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internacionalización y localización" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapaquetes" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Restringido en la exportación" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "No libre" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Educación" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Datos de Introspección de GObjet" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "No instalado" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Disponible" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Instalado" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Actualizable" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Roto" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Configuración residual" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Instalado (autoeliminable)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Sin cambios" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Instalar" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Actualización" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Eliminar" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Purgar" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinstalar" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Desactualizar" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Bloqueado" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Común" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32 bits" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64 bits" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Error de inicio" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "No se ha podido obtener el paquete. Sistema bloqueado" - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Poco espacio en disco" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Fallo al aplicar los cambios" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Error de autenticación" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Error inesperado" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Paquetes no confiables" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Desconocido" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"El sistema de paquetes no se ha podido iniciar. Su configuración puede estar " -"defectuosa." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Parece que otra aplicación está usando el sistema de paquetes en este " -"momento. Debe cerrar todos los demás gestores de paquetes antes de poder " -"instalar o eliminar cualquier paquete." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"No tiene suficiente espacio en disco en el directorio de %1 para continuar " -"con esta operación." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "No se han podido descargar los paquetes" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Ha ocurrido un error al aplicar los cambios:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Esta operación no puede continuar, ya que no se ha proporcionado una " -"identificación adecuada" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Parece que el trabajador de QApt ha fallado o ha desaparecido. Por favor, " -"informe del fallo a los mantenedores de QApt." - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"El paquete siguiente no ha sido verificado por su autor. La descarga de " -"paquetes no fiables se ha deshabilitado en su configuración actual." -msgstr[1] "" -"Los siguientes paquetes no han sido verificados por sus autores. La descarga " -"de paquetes no fiables se ha deshabilitado en su configuración actual." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Comprobar actualizaciones" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Desmarcar todo" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configurar las fuentes del software" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Guardar marcas como" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"El documento no se ha podido guardar, ya que no ha sido posible escribir en " -"%1\n" -"\n" -"Compruebe que tiene permisos de escritura en este archivo o que hay " -"disponible suficiente espacio en el disco." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Guardar la lista de paquetes instalados como" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Guardar lista de descargas como" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Abrir archivo" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"No se han podido marcar los cambios. Por favor, asegúrese de que el archivo " -"es un archivo de marcas creado bien por el gestor de paquetes de Muon o por " -"el gestor de paquetes de Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Elija un directorio" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "Se ha añadido con éxito %1 paquete a la caché" -msgstr[1] "Se han añadido con éxito %1 paquetes a la caché" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"No se han encontrado paquetes válidos en este directorio. Por favor, " -"asegúrese de que los paquetes son compatibles con su equipo y que están en " -"la última versión." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "No se han podido encontrar los paquetes" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 restante" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Inicio de sesión en el servicio SSO de Ubuntu" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Mostrar notificaciones para:" @@ -1155,18 +159,18 @@ msgid "Downloading" msgstr "Descargando" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Hecho" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Esperando" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Instalando" @@ -1179,116 +183,4 @@ #: libmuon/Transaction/TransactionListener.cpp:183 msgctxt "@info:status" msgid "Removing" -msgstr "Eliminando" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy \ No newline at end of file +msgstr "Eliminando" \ No newline at end of file diff -Nru muon-1.9.60/po/es/muon-discover.po muon-2.0.0/po/es/muon-discover.po --- muon-1.9.60/po/es/muon-discover.po 2012-10-29 18:33:53.000000000 +0000 +++ muon-2.0.0/po/es/muon-discover.po 2013-04-01 20:32:38.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Eloy Cuadra , 2012. +# Eloy Cuadra , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-22 15:09+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-11 11:46+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" "Language: es\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" #: discover/main.cpp:29 msgid "An application discoverer" @@ -26,10 +26,8 @@ msgstr "Muon Discover" #: discover/main.cpp:36 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: discover/main.cpp:37 msgid "Jonathan Thomas" @@ -52,24 +50,43 @@ msgid "Display a list of entries with a category." msgstr "Mostrar una lista de entradas con una categoría." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Abrir Muon Discover en uno de los modos mencionados. Los modos se " +"corresponden con los botones de la barra de herramientas." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Listar todos los modos disponibles y mostrarlos en la salida estándar." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Modos disponibles:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Buscar..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Se han encontrado algunos errores al configurar la interfaz gráfica; la " "aplicación no puede continuar." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Error de inicialización" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Añadiendo orígenes..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Eliminando orígenes..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menú" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Configurar y aprender acerca de Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -84,90 +101,94 @@ msgid "Discard" msgstr "Descartar" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 comentarios" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Página web" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Lanzar" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Comentar" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Tamaño total: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Resumen" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Complementos" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Comentarios" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Actualizar" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nombre" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Puntuación" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Comentarios" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularidad" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Origen" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Buscar en «%1»..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Buscar..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Concurso de popularidad" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "puntos: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Mejor puntuación" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"¡Bienvenido a\n" +"Muon Discover!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -180,25 +201,34 @@ msgid "Remove" msgstr "Eliminar" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Instalado" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" msgstr "Actualizar todo" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Cargando..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Atrás" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Descubrir" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Instalado (%1 actualización)" +msgstr[1] "Instalados (%1 actualizaciones)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Fuentes" @@ -223,56 +253,60 @@ msgid "Summary:" msgstr "Sumario:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Comentarios:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Diga algo sobre este comentario" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 de %2 personas han encontrado útil este comentario" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 por %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 por %2

" +"%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "¿Útil? Sí/No" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Añadir origen" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Especifique la nueva fuente" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "" +msgstr "Aceptar" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Cancelar" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - La línea fuente del repositorio apt a añadir. Puede ser uno " "de:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (binario)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/es/muon-installer.po muon-2.0.0/po/es/muon-installer.po --- muon-1.9.60/po/es/muon-installer.po 2012-10-29 18:33:53.000000000 +0000 +++ muon-2.0.0/po/es/muon-installer.po 2013-04-01 20:32:38.000000000 +0000 @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-05-01 10:57+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-08-20 13:05+0200\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" "Language: es\n" @@ -27,7 +27,7 @@ msgid "Your emails" msgstr "kirajfdez@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -38,7 +38,7 @@ "Se acaban de instalar las siguientes aplicaciones; haga clic sobre ellas " "para ejecutarlas:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Obtener software" @@ -61,83 +61,81 @@ msgstr "Centro de software de Muon" #: installer/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: installer/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Obtener software" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Software instalado" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Proporcionado por Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Proporcionado por Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Socios de Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Independiente" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Obtener software" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Software instalado" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historial" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 se ha instalado con éxito." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Inicio" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Aplicaciones instaladas con éxito." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Ejecutar aplicaciones nuevas..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instalación completa" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "En progreso" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "En progreso" @@ -211,18 +209,18 @@ msgid "Install" msgstr "Instalar" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Eliminar" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Instalar" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -280,19 +278,19 @@ msgid "No reviews available" msgstr "No hay reseñas disponibles" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Esta revisión fue escrita para una versión más antigua (versión: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/es/muon-notifier.po muon-2.0.0/po/es/muon-notifier.po --- muon-1.9.60/po/es/muon-notifier.po 2012-10-29 18:33:53.000000000 +0000 +++ muon-2.0.0/po/es/muon-notifier.po 2013-04-01 20:32:38.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Kira J. Fernandez , 2010, 2011. +# Kira J. Fernandez , 2010, 2011, 2012. # Eloy Cuadra , 2011, 2012. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-05-24 12:09+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-07-22 11:00+0200\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" "Language: es\n" @@ -80,8 +80,8 @@ msgctxt "Notification text" msgid "A security update is available" msgid_plural "Security updates are available" -msgstr[0] "Hay una actualización de seguridad disponible" -msgstr[1] "Hay actualizaciones de seguridad disponibles" +msgstr[0] "Hay disponible una actualización de seguridad" +msgstr[1] "Hay disponibles actualizaciones de seguridad" #: kded/UpdateEvent/UpdateEvent.cpp:69 #, kde-format @@ -95,8 +95,8 @@ msgctxt "Notification text" msgid "A software update is available" msgid_plural "Software updates are available" -msgstr[0] "Hay una actualización de software disponible" -msgstr[1] "Hay actualizaciones de software disponibles" +msgstr[0] "Hay disponible una actualización de software" +msgstr[1] "Hay disponibles actualizaciones de software" #: kded/UpdateEvent/UpdateEvent.cpp:94 msgctxt "Start the update" diff -Nru muon-1.9.60/po/es/muon-updater.po muon-2.0.0/po/es/muon-updater.po --- muon-1.9.60/po/es/muon-updater.po 2012-10-29 18:33:53.000000000 +0000 +++ muon-2.0.0/po/es/muon-updater.po 2013-04-01 20:32:38.000000000 +0000 @@ -2,36 +2,36 @@ # This file is distributed under the same license as the PACKAGE package. # # Kira J. Fernandez , 2010, 2011, 2012. -# Eloy Cuadra , 2011, 2012. +# Eloy Cuadra , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-07-15 16:15+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-11 11:49+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" "Language: es\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Kira J. Fernández" +msgstr "Rafael Belmonte,Kira J. Fernández" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "kirajfdez@gmail.com" +msgstr "eaglescreen@gmail.com,kirajfdez@gmail.com" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Ocultar" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -41,18 +41,18 @@ "La lista de cambios aún no está disponible. Por favor, use Launchpad en su lugar." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "La lista de cambios aún no está disponible." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versión %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -77,182 +77,131 @@ msgstr "Gestor de actualizaciones Muon" #: updater/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: updater/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Actualizaciones de software" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Es más seguro enchufar el adaptador de corriente antes de actualizar." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Hay disponible una nueva versión de Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Guardar lista de descarga de paquetes..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Descargar paquetes de la lista..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Añadir paquetes descargados" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Instalar actualizaciones" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historial..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Actualizar" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Historial de paquetes" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Cancelar" -#: updater/ProgressWidget.cpp:128 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Enviando cambios" +msgstr "Iniciando" -#: updater/ProgressWidget.cpp:133 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Enviando cambios" +msgstr "Esperando autenticación" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Enviando cambios" +msgstr "En espera" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Esperando que terminen otras transacciones" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Esperando que terminen otros gestores de software" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Esperando el medio necesario" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Esperando archivo de configuración" -#: updater/ProgressWidget.cpp:172 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Actualizando las fuentes de software" +msgstr "Cargando la lista de software" -#: updater/ProgressWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Actualizando las fuentes de software" -#: updater/ProgressWidget.cpp:184 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Updates" +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Descargando actualizaciones" +msgstr "Descargando paquetes" -#: updater/ProgressWidget.cpp:193 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Enviando cambios" +msgstr "Aplicando cambios" -#: updater/ProgressWidget.cpp:198 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Enviando cambios" +msgstr "Terminado" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Se necesita un cambio de medio" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Por favor, inserte %1 en %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Advertencia: software sin verificar" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -265,14 +214,22 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"El siguiente paquete de software no se puede verificar. La " +"instalación de software sin verificar representa un riesgo de seguridad, ya " +"que la presencia de dicho software puede ser una señal de falsificación. ¿Desea continuar?" msgstr[1] "" +"Los siguientes paquetes de software no se pueden verificar. La " +"instalación de software sin verificar representa un riesgo de seguridad, ya " +"que la presencia de dicho software puede ser una señal de falsificación. ¿Desea continuar?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "El archivo de configuración ha cambiado" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -280,35 +237,37 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Está disponible una nueva versión del archivo de configuración %1, pero su versión ha sido modificada. ¿Desea conservar su versión " +"actual, o instalar la nueva versión?" -#: updater/ProgressWidget.cpp:265 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Versión" +msgstr "Usar la nueva versión" -#: updater/ProgressWidget.cpp:266 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Versión" +msgstr "Conservar la versión anterior" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Tasa de descarga: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 restante" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -324,67 +283,60 @@ msgid "Download Size" msgstr "Tamaño de la descarga" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Algunos paquetes no han sido marcados para actualizar.

La " +"actualización de esos paquetes requiere que se instalen o eliminen otros.

" +"¿Desea atualizar esos paquetes también?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Marcar todo" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Actualizaciones de seguridad importantes" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Actualizaciones de la aplicación" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Actualizaciones de sistema" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"No todos los paquetes se han podido marcar para actualizar. Las " -"actualizaciones disponibles pueden requerir que se instalen o eliminen " -"paquetes nuevos. ¿Desea marcar las actualizaciones que requieran la " -"instalación o la eliminación de paquetes adicionales?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "No se han podido marcar las actualizaciones" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Marcar actualizaciones" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Se desconoce cuándo fue la última comprobación de actualizaciones." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Por favor, haga clic en Comprobar actualizaciones " "para comprobar." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "El software de este equipo está actualizado." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Comprobado por última vez hace %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "No hay actualizaciones disponibles." \ No newline at end of file diff -Nru muon-1.9.60/po/es/muon.po muon-2.0.0/po/es/muon.po --- muon-1.9.60/po/es/muon.po 2012-10-29 18:33:53.000000000 +0000 +++ muon-2.0.0/po/es/muon.po 2013-04-01 20:32:38.000000000 +0000 @@ -3,13 +3,13 @@ # # Cristina Yenyxe González García , 2010. # Kira J. Fernandez , 2010, 2011, 2012. -# Eloy Cuadra , 2011, 2012. +# Eloy Cuadra , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-04-03 17:17+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-11 11:46+0100\n" "Last-Translator: Eloy Cuadra \n" "Language-Team: Spanish \n" "Language: es\n" @@ -17,7 +17,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -178,18 +178,18 @@ msgid "Purge" msgstr "Purga" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Desmarcar" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical proporciona actualizaciones críticas para %1 hasta el %2" -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -349,78 +349,46 @@ msgstr "Gestor de paquetes Muon" #: muon/main.cpp:37 -#, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "© 2009-2011 Jonathan Thomas" +msgstr "© 2009-2012 Jonathan Thomas" #: muon/main.cpp:38 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Leyendo marcas..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Guardar marcas como..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Guardar lista de descarga de paquetes..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Descargar paquetes de la lista..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Añadir paquetes descargados" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Guardar lista de paquetes instalados..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Actualización cuidadosa" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Actualización completa" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Eliminar paquetes innecesarios" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Previsualizar cambios" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Aplicar cambios" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historial..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -432,12 +400,12 @@ "que desee intentar una actualización completa haciendo clic en el botón " "Actualización completa." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "No se han podido marcar las actualizaciones" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -447,17 +415,17 @@ "tener dependencias no satisfechas en este momento, o se han retenido " "manualmente." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Volver" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Previsualizar cambios" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Historial de paquetes" @@ -474,52 +442,52 @@ msgid "Requested" msgstr "Solicitado" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Buscar" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Marcar para instalación" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Marcar para eliminación" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Marcar para actualización" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Marcar para reinstalación" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Marcar para purgar" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Bloquear el paquete en la versión actual" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" -msgstr "Desbloquear paquete" +msgstr "Desbloquear el paquete" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Bloquear en la versión actual" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -528,38 +496,37 @@ "Eliminar este paquete puede perjudicar su sistema. ¿Está seguro de que desea " "eliminarlo?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Advertencia - Eliminación de paquetes importantes" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "No se pudo marcar el paquete" +msgstr "No se ha podido bloquear el paquete" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" +"El paquete %1 no se puede bloquear. Ha ocurrido un error al escribir en el " +"archivo de bloqueo." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" "El paquete «%1» no se ha podido marcar para instalación o actualización:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "No se pudo marcar el paquete" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -574,42 +541,24 @@ "dependencia y nunca se ha cargado, está anticuado o no está disponible desde " "los repositorios habilitados actualmente." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, pero %4 está para ser instalado" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "o %1 %2, pero %3 está para ser instalado" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, pero no es instalable" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "o %1, pero no es instalable" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, pero es un paquete virtual" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "o %1, pero es un paquete virtual" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Revisar y aplicar los cambios" @@ -617,7 +566,7 @@ #: muon/StatusWidget.cpp:52 msgctxt "@info:status" msgid "Rebuilding Search Index" -msgstr "Reconstruir el índice de búsqueda" +msgstr "Reconstruyendo el índice de búsqueda" #: muon/StatusWidget.cpp:91 #, kde-format @@ -637,7 +586,7 @@ #, kde-format msgctxt "@info:status" msgid "%1 upgradeable," -msgstr "%1 actualizables, " +msgstr "%1 actualizables," #: muon/StatusWidget.cpp:98 #, kde-format @@ -685,91 +634,70 @@ msgstr "Cancelar" #: muon/TransactionWidget.cpp:147 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Confirmando cambios" +msgstr "Iniciando" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "Esperando que se inicie el servicio" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "Esperando autenticación" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Confirmando cambios" +msgstr "En espera" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Esperando que terminen otras transacciones" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Esperando que terminen otros gestores de software" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Esperando el medio necesario" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Esperando archivo de configuración" #: muon/TransactionWidget.cpp:192 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Actualizando orígenes de software" +msgstr "Cargando la lista de software" #: muon/TransactionWidget.cpp:200 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" -msgstr "Actualizando orígenes de software" +msgstr "Actualizando las fuentes de software" #: muon/TransactionWidget.cpp:205 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Descargando paquetes" #: muon/TransactionWidget.cpp:217 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" msgstr "Confirmando cambios" #: muon/TransactionWidget.cpp:224 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Confirmando cambios" +msgstr "Terminado" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" @@ -777,9 +705,7 @@ msgstr "Se requiere el cambio del medio" #: muon/TransactionWidget.cpp:254 -#, fuzzy, kde-format -#| msgctxt "@label Asks for a CD change" -#| msgid "Please insert %1 into %2" +#, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Por favor, inserte %1 en %2" @@ -790,18 +716,6 @@ msgstr "Advertencia - Software sin verificar" #: muon/TransactionWidget.cpp:265 -#, fuzzy -#| msgctxt "@label" -#| msgid "" -#| "The following piece of software cannot be verified. Installing " -#| "unverified software represents a security risk, as the presence of " -#| "unverifiable software can be a sign of tampering. Do you wish " -#| "to continue?" -#| msgid_plural "" -#| "The following pieces of software cannot be authenticated. " -#| "Installing unverified software represents a security risk, as " -#| "the presence of unverifiable software can be a sign of tampering. Do you wish to continue?" msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -814,20 +728,20 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"El siguiente software no se puede verificar. Instalar software sin " -"verificar representa un riesgo para la seguridad, ya que la presencia de " -"software no verificable puede ser una señal de manipulación. " -"¿Desea continuar?" +"El siguiente paquete de software no se puede verificar. La " +"instalación de software sin verificar representa un riesgo de seguridad, ya " +"que la presencia de dicho software puede ser una señal de falsificación. ¿Desea continuar?" msgstr[1] "" -"El siguiente software no se puede verificar. Instalar software sin " -"verificar representa un riesgo para la seguridad, ya que la presencia de " -"software no verificable puede ser una señal de manipulación. " -"¿Desea continuar?" +"Los siguientes paquetes de software no se puede verificar. La " +"instalación de software sin verificar representa un riesgo de seguridad, ya " +"que la presencia de dicho software puede ser una señal de falsificación. ¿Desea continuar?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "El archivo de configuración ha cambiado" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -837,19 +751,16 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Está disponible una nueva versión del archivo de configuración %1, pero su versión ha sido modificada. ¿Desea conservar su versión " +"actual, o instalar la nueva versión?" #: muon/TransactionWidget.cpp:290 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Forzar versión" +msgstr "Usar la nueva versión" #: muon/TransactionWidget.cpp:291 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Forzar versión" \ No newline at end of file +msgstr "Conservar la versión anterior" \ No newline at end of file diff -Nru muon-1.9.60/po/et/libmuon.po muon-2.0.0/po/et/libmuon.po --- muon-1.9.60/po/et/libmuon.po 2012-10-29 18:33:56.000000000 +0000 +++ muon-2.0.0/po/et/libmuon.po 2013-04-01 20:32:40.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-18 12:10+0300\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-07-23 14:42+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "Language: etX-Generator: Lokalize 1.2\n" @@ -17,1072 +17,118 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Rakendused" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Avatud lähtekoodiga" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Omanduslik" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Tundmatu" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 alla laadida, %2 kettal" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 kettal" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Tarvikud" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Hõlbustus" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Arendaja tööriistad" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Silumine" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Graafilise liidese kujundus" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "Arenduskeskkonnad" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Lokaliseerimine" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profileerimine" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Versioonihaldus" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Veebiarendus" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Haridus" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Reaal- ja inseneriteadused" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronoomia" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Bioloogia" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Keemia" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Arvutiteadus ja robootika" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektroonika" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Inseneriteadus" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geograafia" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geoloogia" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matemaatika" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Füüsika" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Fondid" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Mängud" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arkaadmängud" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Lauamängud" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Kaardimängud" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Pusled" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Rollimängud" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulatsioonid" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sport" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Graafika" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Joonistamine" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Joonistamine ja pilditöötlus" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotograafia" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Kirjastamine" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Skannimine ja OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Näitajad" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Vestlus" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Failijagamine" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "E-post" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Veebibrauserid" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimeedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Kontoritöö" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Süsteem ja seadistused" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Koomiksid" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Plasma töölauavidinad" - -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Kõik" - -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Täiendavate muudatuste kinnitamine" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Kas märkida ära täiendavad muudatused?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "See nõuab muudatust teises paketis:" -msgstr[1] "See nõuab muudatusi teistes pakettides:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Ajalugu" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Otsing" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Kõik muudatused" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Paigaldamised" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Uuendamised" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Eemaldamised" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Kuupäev" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Paigaldatud" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Paigaldatud uuem versioon" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Paigaldatud varasem versioon" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Eemaldatud" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Kustutatud" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 %3" - -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "Muon on tõeline supermänn" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Rakendused" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Süsteemi haldamine" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Baassüsteem" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI infrastruktuur" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Side" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Andmebaasid" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Arendus" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentatsioon" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Silumine" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Redaktorid" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektroonika" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Sardseadmed" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Fondid" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Mängud ja meelelahutus" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME töökeskkond" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Graafika" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R statistikasüsteem" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustepi töökeskkond" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amatöörraadio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskelli programmeerimiskeel" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Veebiserverid" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpreteeritavad arvutikeeled" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java programmeerimiskeel" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE tarkvarakomplekt" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel ja moodulid" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Teegid - arendus" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Teegid" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lispi programmeerimiskeel" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokaliseerimine" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-post" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matemaatika" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Muu - tekstipõhine" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Võrk" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Uudistegrupid" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCamli programmeerimiskeel" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Teegid - vana" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Mitmeplatvormne" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perli programmeerimiskeel" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP programmeerimiskeel" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Pythoni programmeerimiskeel" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby programmeerimiskeel" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Teadus" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Shellid" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimeedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeXi ladumissüsteem" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Tekstitöötlus" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Abivahendid" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Versioonihaldussüsteemid" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Videotarkvara" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Muu - graafiline" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce töökeskkond" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone'i keskkond" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Tundmatu" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Rakendused" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Alieniga RPM-ist teisendatud" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internatsionaliseerimine ja lokaliseerimine" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapaketid" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Ekspordipiiranguga" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Mittevaba" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Haridus" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "GObjecti introspektsiooni andmed" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Pole paigaldatud" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Sisselogimine Ubuntu SSO teenusesse" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Paigaldatud" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Uuendatav" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Katki" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Pärandseadistus" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Paigaldatud (automaatselt eemalduv)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Muutusi pole" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Paigaldamine" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "" -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Uuendamine" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Eemaldamine" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Kustutamine" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Taaspaigaldamine" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Varasema versiooni paigaldamine" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Lukustatud" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Üldine" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bitine" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bitine" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Initsialiseerimistõrge" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Paketisüsteemi lukustamine nurjus" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Kettaruumi napib" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Muudatuste rakendamine nurjus" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Autentimise viga" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Ootamatu viga" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Ebausaldusväärsed paketid" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Tundmatu tõrge" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" msgstr "" -"Paketisüsteemi ei õnnestu initsialiseerida, seadistus võib olla vigane." -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" msgstr "" -"Paistab, et parajasti kasutab paketisüsteemi mõni muu rakendus. Enne seda, " -"kui pakette paigaldada või eemaldada, tuleb kindlasti sulgeda kõik teised " -"tarkvarahaldurid." -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "Selleks toiminguks ei jagu kataloogis %1 enam ruumi." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Pakettide allalaadimine nurjus" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Muudatuste rakendamisel tekkis tõrge:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "Seda toimingut ei saa jätkata, sest sobivat autentimist ei toimunud." - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -"Tundub, et QApti programmi tabas krahh või see lõpetas töö. Palun anna veast " -"teada QApti arendajatele" -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Järgmist paketti ei ole autor verifitseerinud. Ebausaldusväärsete pakettide " -"allalaadimine on praeguse seadistusega keelatud." -msgstr[1] "" -"Järgmisi pakette ei ole autorid verifitseerinud. Ebausaldusväärsete " -"pakettide allalaadimine on praeguse seadistusega keelatud." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Otsi uuendusi" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Eemalda kõigi märgistus" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Tarkvaraallikate seadistamine" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Tähistuste salvestamine" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Kõik" -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dokumenti ei saa salvestada, sest ei ole võimalik kirjutada faili " -"%1.\n" -"\n" -"Palun kontrolli, et sul oleks selle faili kirjutamisõigus ja et kettal " -"jaguks ruumi." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Paigaldatud pakettide nimekirja salvestamine" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Allalaaditud pakettide nimekirja salvestamine" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Faili avamine" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Muudatuste tähistamine nurjus. Palun kontrolli, kas tegemist on ikka " -"muudatuste tähistamise failiga, mis on loodud kas Muoni või Synapticu " -"takrvarahalduriga." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Kataloogi valimine" +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "Muon on tõeline supermänn" -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 pakett lisati edukalt puhvrisse" -msgstr[1] "%1 paketti lisati edukalt puhvrisse" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Selles kataloogis ei leitud ühtego korrektset paketti. Palun kontrolli, kas " -"paketid ikka ühilduvad sinu arvuti süsteemiga ja on uusima versiooniga." +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" +msgid "Broken" +msgstr "Katki" -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Pakette ei leitud" +#: libmuon/resources/AbstractResource.cpp:82 +#, fuzzy +#| msgid "Available updates" +msgid "Available" +msgstr "Saadaolevad uuendused" + +#: libmuon/resources/AbstractResource.cpp:83 +#, fuzzy +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "Paigaldatud" + +#: libmuon/resources/AbstractResource.cpp:84 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Uuendatav" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1090,11 +136,6 @@ msgid "%1 remaining" msgstr "%1 jäänud" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Sisselogimine Ubuntu SSO teenusesse" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Märguannete näitamine:" @@ -1132,18 +173,18 @@ msgid "Downloading" msgstr "Allalaadimine" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Tehtud" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Ootel" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Paigaldamine" @@ -1156,243 +197,4 @@ #: libmuon/Transaction/TransactionListener.cpp:183 msgctxt "@info:status" msgid "Removing" -msgstr "Eemaldamine" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy - - - - - -#, fuzzy - - - - - -#, fuzzy - - - - - -#, fuzzy - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy \ No newline at end of file +msgstr "Eemaldamine" \ No newline at end of file diff -Nru muon-1.9.60/po/et/muon-discover.po muon-2.0.0/po/et/muon-discover.po --- muon-1.9.60/po/et/muon-discover.po 2012-10-29 18:33:56.000000000 +0000 +++ muon-2.0.0/po/et/muon-discover.po 2013-04-01 20:32:40.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-29 13:23+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-10-08 20:06+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "Language: et\n" @@ -49,24 +49,39 @@ msgid "Display a list of entries with a category." msgstr "Kirjete loendi kuvamine kategooriatega." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Otsi..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" -"Graafilise kasutajaliidese loomisel tekkisid mõned tõrked, rakendust ei saa " -"kasutada." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" -msgstr "Initsialiseerimisviga" +msgstr "" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Algupära lisamine..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Algupära eemaldamine..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -81,90 +96,98 @@ msgid "Discard" msgstr "Unusta" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 arvustust" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Kodulehekülg" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Käivita" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Arvusta" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Kogusuurus: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Ülevaade" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Lisandid" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Arvustused" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Uuendatav" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nimi" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Hinnang" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Kõmu" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Menu" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Algupära" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Otsi kategoorias \"%1\"..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Otsi..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 +#, fuzzy +#| msgid "Popularity Contest" msgid "Popularity Contest" -msgstr "Menukaimad" +msgstr "Menukaimad" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "punktid: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 +#, fuzzy +#| msgid "Best Ratings" msgid "Best Ratings" -msgstr "Parimad hinnangud" +msgstr "Parimad hinnangud" + +#: discover/qml/DefaultBanner.qml:16 +#, fuzzy +#| msgid "Muon Discover" +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "Muoni avastusretk" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -177,24 +200,37 @@ msgid "Remove" msgstr "Eemalda" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Paigaldatud" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 +#, fuzzy #| msgid "Update All!" msgid "Update All" -msgstr "Uuenda kõik" +msgstr "Uuenda kõik!" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Laadimine..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Avastusretk" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Paigaldatud" +msgstr[1] "Paigaldatud" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Allikad" @@ -219,55 +255,57 @@ msgid "Summary:" msgstr "Kokkuvõte:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Arvustused:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Hinda seda arvustust!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%2 inimesest %1 pidas(id) seda arvustust kasulikuks" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 hindajalt %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "" "Kas see oli kasulik? Jah/Ei" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Lisa allikas" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Uue allika määramine" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "OK" +msgstr "" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Loobu" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr " - lisatav apt-hoidla lähterida. See on üks järgmistest:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (binaar)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/et/muon-installer.po muon-2.0.0/po/et/muon-installer.po --- muon-1.9.60/po/et/muon-installer.po 2012-10-29 18:33:56.000000000 +0000 +++ muon-2.0.0/po/et/muon-installer.po 2013-04-01 20:32:40.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-10-08 20:06+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" @@ -25,14 +25,14 @@ msgid "Your emails" msgstr "bald@smail.ee" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" msgstr[0] "Järgmine rakendust just paigaldati, klõpsa käivitamiseks:" msgstr[1] "Järgmised rakendused just paigaldati, klõpsa käivitamiseks:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Paigaldatav tarkvara" @@ -62,74 +62,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Paigaldatav tarkvara" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Paigaldatud tarkvara" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Pakub Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Pakub Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonicali partnerid" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Sõltumatu" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Paigaldatav tarkvara" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Paigaldatud tarkvara" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Ajalugu" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 paigaldati edukalt." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Käivita" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Rakendused paigaldati edukalt." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Käivita uued rakendused..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Paigaldamine on lõpetatud" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Töös" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Töös" @@ -203,18 +203,18 @@ msgid "Install" msgstr "Paigalda" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Eemalda" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Paigalda" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -272,19 +272,19 @@ msgid "No reviews available" msgstr "Ülevaateid pole" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "See ülevaade käib vanema versiooni kohta (versioon: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/et/muon-notifier.po muon-2.0.0/po/et/muon-notifier.po --- muon-1.9.60/po/et/muon-notifier.po 2012-10-29 18:33:56.000000000 +0000 +++ muon-2.0.0/po/et/muon-notifier.po 2013-04-01 20:32:40.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-05-14 15:39+0300\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-07-23 14:40+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "Language: etX-Generator: Lokalize 1.2\n" @@ -15,7 +15,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -Nru muon-1.9.60/po/et/muon-updater.po muon-2.0.0/po/et/muon-updater.po --- muon-1.9.60/po/et/muon-updater.po 2012-10-29 18:33:56.000000000 +0000 +++ muon-2.0.0/po/et/muon-updater.po 2013-04-01 20:32:40.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-22 20:35+0300\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-10-08 20:06+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "Language: etX-Generator: Lokalize 1.2\n" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "bald@smail.ee" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Peida" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -40,18 +40,18 @@ "Muutuste nimekiri pole veel kättesaadav Palun kasuta selle asemel Launchpadi." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Muutuste nimekiri pole veel kättesaadav." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versioon %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -83,149 +83,148 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Tarkvarauuendused" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Enne uuendamist oleks mõttekas lülituda seinatoitele." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Saadaval on Kubuntu uus versioon." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Loe tähistusi..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Salvesta tähistused kui..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Salvesta allalaaditud pakettide nimekiri..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Laadi alla nimekirja paketid..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Lisa allalaaditud paketid" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Paigalda uuendused" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Ajalugu..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Uuenda" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Paketiajalugu" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Loobu" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Alustamine" +msgstr "Muudatuste sooritamine" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Autentimise ootamine" +msgstr "Muudatuste sooritamine" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Ootamine" +msgstr "Muudatuste sooritamine" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "Oodatakse teiste tehingute lõpetamist" +msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "Oodatakse teiste tarkvarahaldurite töö lõppemist" +msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "Oodatakse nõutavat andmekandjat" +msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "Oodatakse seadistusfaili" +msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Tarkvaraloendi laadimine" +msgstr "Tarkvaraallikate uuendamine" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Tarkvaraallikate uuendamine" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 +#, fuzzy +#| msgctxt "@info" +#| msgid "Downloading Updates" msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Pakettide allalaadimine" +msgstr "Uuenduste allalaadimine" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Muudatuste rakendamine" +msgstr "Muudatuste sooritamine" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Lõpetatud" +msgstr "Muudatuste sooritamine" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "Andmekandja vajab vahetamist" +msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "Palun sisesta %1 seadmesse %2" +msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "Hoiatus - verifitseerimata tarkvara" +msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -238,22 +237,14 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"Järgmise tarkvarapaketi verifitseerimine nurjus. Verifitseerimata " -"tarkvara paigaldamine kujutab endast turberiski, sest verifitseerimata " -"tarkvara võib osutada kellegi võõra sekkumisele. Kas soovid " -"jätkata?" msgstr[1] "" -"Järgmiste tarkvarapakettide verifitseerimine nurjus. " -"Verifitseerimata tarkvara paigaldamine kujutab endast turberiski, " -"sest verifitseerimata tarkvara võib osutada kellegi võõra sekkumisele. Kas soovid jätkata?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "Seadistusfaili on muudetud" +msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -261,32 +252,40 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" -"Saadaval on seadistusfaili %1 uus versioon, aga sinu " -"versiooni on muudetud. Kas soovid alles hoida oma praeguse versiooni või " -"paigaldada uue versiooni?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 +#, fuzzy +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Kasuta uut versiooni" +msgstr "Versioon" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 +#, fuzzy +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Säilita vana versioon" +msgstr "Versioon" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Allalaadimiskiirus: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 jäänud" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -302,64 +301,58 @@ msgid "Download Size" msgstr "Allalaadimissuurus" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +#, fuzzy +#| msgctxt "@action Reverts all potential changes to the cache" +#| msgid "Unmark All" +msgid "Mark All" +msgstr "Eemalda kõigi märgistus" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Tähtsad turvauuendused" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Rakenduste uuendused" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Süsteemsed uuendused" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Kõiki pakette ei saa uuendamiseks märkida. Saadaolevad uuendused võivad " -"nõuda uute pakettide paigaldamist või eemaldamist. Kas märkida uuendused, " -"mis võivad nõuda lisapakettide paigaldamist või eemaldamist?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Uuenduste märkimine nurjus" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Märgi uuendused" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Pole teada, millal viimati uuenduste olemasolu kontrolliti." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "Kontrollimiseks klõpsa palun Otsi uuendusi." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Sinu arvuti tarkvara on igati ajakohane." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Viimati kontrolliti %1 tagasi." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Uuendusi pole." \ No newline at end of file diff -Nru muon-1.9.60/po/et/muon.po muon-2.0.0/po/et/muon.po --- muon-1.9.60/po/et/muon.po 2012-10-29 18:33:56.000000000 +0000 +++ muon-2.0.0/po/et/muon.po 2013-04-01 20:32:40.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-29 13:24+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-10-08 20:07+0300\n" "Last-Translator: Marek Laane \n" "Language-Team: Estonian \n" "Language: et\n" @@ -174,18 +174,18 @@ msgid "Purge" msgstr "Kustutamine" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Eemalda märgistus" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical pakub paketile %1 kriitilisi uuendusi kuni %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -351,69 +351,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Tähistuste lugemine..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Tähistuste salvestamine..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Salvesta allalaaditud pakettide nimekiri..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Laadi alla nimekirja paketid..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Lisa allalaaditud paketid" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Salvesta paigaldatud pakettide nimekiri..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Ettevaatlik uuendamine" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Täielik uuendamine" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Ebavajalike pakettide eemaldamine" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Vaata muutusi" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Rakenda muudatused" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Ajalugu..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -425,12 +395,12 @@ "täielikku uuendamist, milleks klõpsa nupule Täielik uuendamine." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Uuendamiseks märkimine nurjus" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -439,17 +409,17 @@ "Uuendamiseks märkimine ei ole võimalik. Mõnel uuendusel võivad olla " "sõltuvused praegu rahuldamata või on nende uuendamine otseselt keelatud." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Tagasi" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Vaata muutusi" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Paketiajalugu" @@ -466,88 +436,89 @@ msgid "Requested" msgstr "Tegevus" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Otsing" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Märgi paigaldamiseks" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Märgi eemaldamiseks" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Märgi uuendamiseks" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Märgi taaspaigaldamiseks" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Märgi kustutamiseks" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Lukusta paketi aktiivne versioon" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Eemalda paketi lukustus" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Lukusta aktiivne versioon" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "Selle paketi eemaldamine lõhub sinu süsteemi.Kas tõesti see eemaldada?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Hoiatus - tähtsa paketi eemaldamine" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 +#, fuzzy +#| msgctxt "@title:window" +#| msgid "Unable to Mark Package" msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Paketi lukustamine nurjus" +msgstr "Paketi märkimine nurjus" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format -#| msgctxt "@info Error text" -#| msgid "The package %1 could notbe locked. Failed to write lock file." msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." -msgstr "Paketti %1 ei saa lukustada. Lukustusfaili kirjutamine nurjus." +msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Paketti \"%1\" ei saa märkida paigaldamiseks ega uuendamiseks:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Paketi märkimine nurjus" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -561,42 +532,24 @@ "laaditudki üles, see on iganenud või ei ole praegu aktiveeritud hoidlates " "saadaval." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, kuid kavas on paigaldada %4" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "või %1 %2, kuid kavas on paigaldada %3" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, kuid see ei ole paigaldatav" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "või %1, kuid see ei ole paigaldatav" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, kuid see on virtuaalne pakett" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "või %1, kuid see on virtuaalne pakett" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Muudatuste ülevaatamine ja rakendamine" @@ -672,70 +625,91 @@ msgstr "Loobu" #: muon/TransactionWidget.cpp:147 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Alustamine" +msgstr "Muudatuste sooritamine" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "Oodatakse teenuse käivitumist" +msgstr "" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "Oodatakse autentimist" +msgstr "" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Ootamine" +msgstr "Muudatuste sooritamine" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "Oodatakse teiste tehingute lõpetamist" +msgstr "" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "Oodatakse teiste tarkvarahaldurite töö lõppemist" +msgstr "" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "Oodatakse nõutavat andmekandjat" +msgstr "" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "Oodatakse seadistusfaili" +msgstr "" #: muon/TransactionWidget.cpp:192 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Tarkvaraloendi laadimine" +msgstr "Tarkvaraallikate uuendamine" #: muon/TransactionWidget.cpp:200 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Tarkvaraallikate uuendamine" #: muon/TransactionWidget.cpp:205 +#, fuzzy +#| msgctxt "@info" +#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Pakettide allalaadimine" #: muon/TransactionWidget.cpp:217 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" msgstr "Muudatuste sooritamine" #: muon/TransactionWidget.cpp:224 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Lõpetatud" +msgstr "Muudatuste sooritamine" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" @@ -743,7 +717,9 @@ msgstr "Andmekandja vahetamise vajadus" #: muon/TransactionWidget.cpp:254 -#, kde-format +#, fuzzy, kde-format +#| msgctxt "@label Asks for a CD change" +#| msgid "Please insert %1 into %2" msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Palun sisesta %1 seadmesse %2" @@ -754,6 +730,18 @@ msgstr "Hoiatus - verifitseerimata tarkvara" #: muon/TransactionWidget.cpp:265 +#, fuzzy +#| msgctxt "@label" +#| msgid "" +#| "The following piece of software cannot be verified. Installing " +#| "unverified software represents a security risk, as the presence of " +#| "unverifiable software can be a sign of tampering. Do you wish " +#| "to continue?" +#| msgid_plural "" +#| "The following pieces of software cannot be authenticated. " +#| "Installing unverified software represents a security risk, as " +#| "the presence of unverifiable software can be a sign of tampering. Do you wish to continue?" msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -779,7 +767,7 @@ #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "Seadistusfaili on muudetud" +msgstr "" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -789,16 +777,19 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" -"Saadaval on seadistusfaili %1 uus versioon, aga sinu " -"versiooni on muudetud. Kas soovid alles hoida oma praeguse versiooni või " -"paigaldada uue versiooni?" #: muon/TransactionWidget.cpp:290 +#, fuzzy +#| msgctxt "@action:button" +#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Kasuta uut versiooni" +msgstr "Sunni versioon peale" #: muon/TransactionWidget.cpp:291 +#, fuzzy +#| msgctxt "@action:button" +#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Säilita vana versioon" \ No newline at end of file +msgstr "Sunni versioon peale" \ No newline at end of file diff -Nru muon-1.9.60/po/fi/libmuon.po muon-2.0.0/po/fi/libmuon.po --- muon-1.9.60/po/fi/libmuon.po 2012-10-29 18:34:01.000000000 +0000 +++ muon-2.0.0/po/fi/libmuon.po 2013-04-01 20:32:44.000000000 +0000 @@ -3,18 +3,18 @@ # This file is distributed under the same license as the extragear_sysadmin package. # Tommi Nieminen , 2011. # Jorma Karvonen , 2011. -# Lasse Liehu , 2011, 2012. +# Lasse Liehu , 2011, 2012, 2013. # Jiri Grönroos , 2012. # -# KDE 4.9 Finnish translation sprint 2012-06/07 +# KDE Finnish translation sprint participants: # Author: Artnay # Author: Lliehu msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-08-13 22:41+0300\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-06 18:33+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -22,1106 +22,112 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 2012-06-15 07:17:06+0000\n" +"X-POT-Import-Date: 2013-01-13 20:43:19+0000\n" "X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Sovellukset" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Avoin lähdekoodi" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Suljettu lähdekoodi" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Tuntematon" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 ladattavaa, %2 levyllä" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 levyllä" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Apuohjelmat" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Esteettömyys" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Kehitystyökalut" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Vianjäljitys" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Graafisten käyttöliittymien suunnittelu" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "Kehitysympäristöt" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Lokalisointi" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilointi" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Versionhallinta" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Web-kehitys" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Koulutus" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Tieteet ja suunnittelu" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Tähtitiede" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologia" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Kemia" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Tietojenkäsittelytiede ja robotiikka" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektroniikka" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Insinöörityökalut" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Maantiede" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologia" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematiikka" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fysiikka" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Kirjasimet" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Pelit" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Pelihallipelit" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Lautapelit" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Korttipelit" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Pulmapelit" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Roolipelit" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulaatio" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Urheilu" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafiikka" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Piirtäminen" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Maalaus ja muokkaus" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Valokuvaus" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Julkaiseminen" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Skannaus ja tekstintunnistus" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Katselimet" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Keskustelu" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Tiedostojen jakaminen" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Sähköposti" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "WWW-selaimet" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Toimisto" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Järjestelmä ja asetukset" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Sarjakuvat" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Plasma-työpöytäsovelmat" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Sovellukset-taustaosa" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Järjestelmäsi sovellukset" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Kirjaudu Ubuntun kertakirjautumispalveluun" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Bodega-taustaosa" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Asenna Bodega-dataa järjestelmääsi" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Anna MakePlayLive-tunnistautumistiedot" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Valetaustaosa" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Valetaustaosa muon-käyttöliittymien testaukseen" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "KNewStuff-taustaosa" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Asenna KNewStuff-dataa järjestelmääsi" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Kaikki" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Vahvista lisämuutokset" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Merkitäänkö lisämuutokset?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Tämä toiminto vaatii muutosta toiseen pakettiin:" -msgstr[1] "Tämä toiminto vaatii muutoksia toisiin paketteihin:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historia" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Etsi" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Kaikki muutokset" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Asennukset" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Päivitykset" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Poistot" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Päiväys" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Asennettu" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Päivitetty" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Päivitetty alaspäin" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Poistettu" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Siivottu" - -# ”muon Asennettu klo 16:00” → ”muon asennettu klo 16:00” -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 klo %3|/|%1 $[pieni_alkukirjain %2] klo %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Tällä Muon-ohjelmalla on superlehmävoimat" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Järjestelmänhallinta" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Perusjärjestelmä" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI-infrastruktuuri" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Viestintä" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Tietokannat" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Kehitys" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Ohjeet" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Vianjäljitys" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Muokkaimet" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektroniikka" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Upotetut laitteet" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Kirjasimet" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Pelit ja viihde" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Gnome-työpöytäympäristö" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafiikka" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R -tilastolaskentajärjestelmä" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep-työpöytäympäristö" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amatööriradio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell-ohjelmointikieli" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Web-palvelimet" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Tulkatut ohjelmointikielet" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java-ohjelmointikieli" - -# Onko tälle ”oikeaa” käännöstä vai pitäisikö jättää kääntämättä? -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE-ohjelmistokokonaisuus" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Ydin ja moduulit" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Kirjastot – Kehitys" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Kirjastot" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp-ohjelmointikieli" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokalisointi" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Sähköposti" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematiikka" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Sekalaiset – Tekstipohjaiset" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Verkko" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Keskusteluryhmät" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCaml-ohjelmointikieli" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Kirjastot – Vanhat" - -# packages.debian.org:in suomennos -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Muut käyttö- ja tiedostojärjestelmät" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl-ohjelmointikieli" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP-ohjelmointikieli" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python-ohjelmointikieli" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby-ohjelmointikieli" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Tiede" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Komentotulkit" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX-tekstinkäsittely" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Tekstinkäsittely" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Apuohjelmat" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Versionhallintajärjestelmät" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video-ohjelmat" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Sekalaiset – Graafiset" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce-työpöytäympäristö" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone-ympäristö" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Tuntematon" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Alienin RPM:stä muuntama" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Kansainvälistys ja lokalisointi" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapaketit" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Vientirajoituksiset" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Ei-vapaat" - -# Debian.org ei tätä suomenna ja open-tran.eu:n mukaan ei juuri muukaan. -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Koulutus" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Rikki" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Ei asennettu" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Saatavilla" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Asennettu" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Päivitettävissä" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Rikki" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Asetusjäännökset" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Asennettu (automaattipoistettavissa)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Ei muutosta" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Asenna" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Päivitä" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Poista" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Siivoa" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Asenna uudelleen" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Päivitä alaspäin" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Lukittu" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Yleinen" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bittinen" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bittinen" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Alustusvirhe" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Paketinhallintajärjestelmää ei saada lukituksi" - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Levytila vähissä" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Muutosten toteutus epäonnistui" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Tunnistautumisvirhe" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Odottamaton virhe" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Ei-luotettuja paketteja" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Tuntematon" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "Paketinhallintaa ei voitu alustaa: asetuksesi voivat olla rikki." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Toinen sovellus vaikuttaa käyttävän paketinhallintaa nyt. Sulje kaikki muut " -"paketinhallintaohjelmat ennen kuin yrität asentaa tai poistaa paketteja." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "Kansiossa %1 ei ole tarpeeksi levytilaa, jotta toimintoa voisi jatkaa." - -#: libmuon/MuonStrings.cpp:285 -#, fuzzy -msgctxt "@label" -msgid "Could not download packages" -msgstr "Paketteja ei voi ladata" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Sattui virhe toteutettaessa muutoksia:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "Toimintoa ei voi jatkaa, koska oikeaa tunnistautumista ei tarjottu" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Vaikuttaa siltä, että QApt-osa on joko kaatunut tai kadonnut. Ilmoita " -"ohjelmavirheestä QAptin ylläpitäjille" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Tekijä ei ole tarkistanut seuraavaa pakettia. Asetuksesi estävät lataamasta " -"ei-luotettuja paketteja." -msgstr[1] "" -"Tekijä ei ole tarkistanut seuraavia paketteja. Asetuksesi estävät lataamasta " -"ei-luotettuja paketteja." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Tarkista päivitykset" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Poista kaikki merkinnät" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Aseta ohjelmalähteet" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Tallenna merkinnät nimellä" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Asiakirjaa ei voitu tallentaa, koska kohteeseen %1 ei " -"voi kirjoittaa.\n" -"\n" -"Tarkista, että sinulla on kirjoitusoikeudet tiedostoon ja ettei levytila ole " -"lopussa." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Tallenna asennettujen pakettien luettelo nimellä" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Tallenna latausluettelo nimellä" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Avaa tiedosto" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Muutoksia ei voitu merkitä. Varmista, että tiedosto on Muon- tai Synaptic-" -"paketinhallinnan tuottama merkintätiedosto." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Valitse hakemisto" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 paketin lisäys välimuistiin onnistui" -msgstr[1] "%1 paketin lisäys välimuistiin onnistui" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Tästä hakemistosta ei löytynyt kelvollisia paketteja. Varmista, että paketit " -"ovat yhteensopivia koneesi kanssa ja ne ovet viimeisintä versiota." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Joitakin paketteja ei voitu löytää" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 -#, fuzzy, kde-format -#| msgctxt "@item:intext Remaining time" -#| msgid " - %1 remaining" +#, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" -msgstr " – %1 jäljellä" - -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Kirjaudu Ubuntun kertakirjautumispalveluun" +msgstr "%1 jäljellä" #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" @@ -1160,18 +166,18 @@ msgid "Downloading" msgstr "Ladataan" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Valmis" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Odottaa" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Asennetaan" @@ -1275,25 +281,21 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1377,14 +379,12 @@ -#, fuzzy -#, fuzzy @@ -1417,7 +417,200 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# ”muon Asennettu klo 16:00” → ”muon asennettu klo 16:00” + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1455,49 +648,42 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1625,7 +811,6 @@ -#, fuzzy @@ -1640,11 +825,354 @@ -#, fuzzy -#, fuzzy \ No newline at end of file + + + + + +# Onko tälle ”oikeaa” käännöstä vai pitäisikö jättää kääntämättä? + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# packages.debian.org:in suomennos + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# Debian.org ei tätä suomenna ja open-tran.eu:n mukaan ei juuri muukaan. + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# Konteksti: ”Mark for: ” [painike, jossa lukee ”Installation”, ”Removal” tai ”Unmark” jne.] \ No newline at end of file diff -Nru muon-1.9.60/po/fi/muon-discover.po muon-2.0.0/po/fi/muon-discover.po --- muon-1.9.60/po/fi/muon-discover.po 2012-10-29 18:34:01.000000000 +0000 +++ muon-2.0.0/po/fi/muon-discover.po 2013-04-01 20:32:44.000000000 +0000 @@ -1,35 +1,36 @@ -# KDE 4.9 Finnish translation sprint 2012-06/07 +# KDE Finnish translation sprint participants: # Author: Artnay -# Lasse Liehu , 2012. +# Author: Lliehu +# Lasse Liehu , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-13 23:05+0300\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-06 16:46+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" "Language: fi\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POT-Import-Date: 2012-07-19 16:33:13+0000\n" +"X-POT-Import-Date: 2012-12-01 22:21:39+0000\n" "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" #: discover/main.cpp:29 msgid "An application discoverer" -msgstr "" +msgstr "Sovellusten hakuohjelma" +# pmap: =:gen=Muon-sovellushausta: +# pmap: =:elat=Muon-sovellushausta: #: discover/main.cpp:35 msgid "Muon Discover" -msgstr "" +msgstr "Muon-sovellushaku" #: discover/main.cpp:36 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "© 2010, 2011 Jonathan Thomas" +msgstr "© 2010–2012 Jonathan Thomas" #: discover/main.cpp:37 msgid "Jonathan Thomas" @@ -41,32 +42,54 @@ #: discover/main.cpp:44 msgid "Directly open the specified application by its package name." -msgstr "" +msgstr "Avaa määräsovellus suoraan sen pakettinimen perusteella" #: discover/main.cpp:45 msgid "Open with a program that can deal with the given mimetype." -msgstr "" +msgstr "Avaa ohjelmalla, joka osaa käsitellä annetun MIME-tyypin tiedostoja" #: discover/main.cpp:46 msgid "Display a list of entries with a category." -msgstr "" +msgstr "Näyttää luettelon luokan sovelluksista." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 msgid "" -"Found some errors while setting up the GUI, the application can't proceed." +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." msgstr "" +"Avaa Muon-sovellushaku mainitussa tilassa. Tilat vastaavat työkalurivin " +"painikkeita." -#: discover/MuonDiscoverMainWindow.cpp:154 -msgid "Initialization error" +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." msgstr "" +"Luettele kaikki käytettävissä olevat tilat ja tulosta ne " +"vakiotulostusvirtaan." -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "" +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Käytettävissä olevat tilat:\n" -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Etsi..." + +#: discover/MuonDiscoverMainWindow.cpp:109 +msgid "" +"Found some errors while setting up the GUI, the application can't proceed." msgstr "" +"Käyttöliittymän valmistelemisessa tapahtui virhe. Sovellus ei voi jatkaa." + +#: discover/MuonDiscoverMainWindow.cpp:110 +msgid "Initialization error" +msgstr "Alustusvirhe" + +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Valikko" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Muuta asetuksia ja perehdy Muon-sovellushakuun" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -81,92 +104,94 @@ msgid "Discard" msgstr "Hylkää" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 arvostelua" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Verkkosivu" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Käynnistä" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" -msgstr "" +msgstr "Arvostele" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Koko yhteensä: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" -msgstr "" +msgstr "Yleiskatsaus" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Lisäosat" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Arvostelut" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Päivitä" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nimi" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Arvostelu" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" -msgstr "" +msgstr "Suosio" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Alkuperä" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." -msgstr "" +msgstr "Etsi luokasta %1..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Etsi..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" -msgstr "" +msgstr "Suosiokilpailu" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" -msgstr "" +msgstr "pisteet: %1" -#: discover/qml/CategoryPage.qml:139 -#, fuzzy -#| msgid "Rating" +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" -msgstr "Arvostelu" +msgstr "Parhaat arvostelut" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Tervetuloa\n" +"Muon-sovellushakuun!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -179,32 +204,44 @@ msgid "Remove" msgstr "Poista" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +# Viittaa asennettuijen ohjelmien luetteloon. +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" -msgstr "Asennettu" +msgstr "Asennetut" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "Päivitä kaikki!" +msgstr "Päivitä kaikki" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Ladataan..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Takaisin" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Löydä" -#: discover/qml/Main.qml:91 +# Viittaa asennettuijen ohjelmien luetteloon. +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Asennetut (%1 päivitys)" +msgstr[1] "Asennetut (%1 päivitystä)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Lähteet" +# @title:window #: discover/qml/ReviewDialog.qml:11 #, kde-format msgid "Reviewing %1" -msgstr "" +msgstr "%1 – arvosteleminen" #: discover/qml/ReviewDialog.qml:21 msgid "Submit" @@ -222,54 +259,59 @@ msgid "Summary:" msgstr "Yhteenveto:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Arvostelut:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" -msgstr "" +msgstr "Kerro meille tästä arvostelusta!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1/%2 ihmisen mielestä tämä arvostelu on hyödyllinen" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" msgstr "" +"

%1 by %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Hyödyllinen? Kyllä/Ei" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Lisää lähde" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Määritä uusi lähde" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "" +msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Peru" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" +" – lisättävä apt-ohjelmalähderivi, joka on jokin seuraavista:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (binaari)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" -msgstr "" \ No newline at end of file +msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/fi/muon-installer.po muon-2.0.0/po/fi/muon-installer.po --- muon-1.9.60/po/fi/muon-installer.po 2012-10-29 18:34:01.000000000 +0000 +++ muon-2.0.0/po/fi/muon-installer.po 2013-04-01 20:32:44.000000000 +0000 @@ -5,14 +5,15 @@ # Jiri Grönroos , 2012. # # -# KDE 4.9 Finnish translation sprint 2012-06/07 +# KDE Finnish translation sprint participants: # Author: Artnay +# Author: Lliehu msgid "" msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-07-08 16:55:48+0000\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2013-01-20 20:02:15+0000\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -20,8 +21,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 2012-06-15 07:17:06+0000\n" -"X-Generator: MediaWiki 1.20alpha (r113129); Translate 2012-07-04\n" +"X-POT-Import-Date: 2012-12-01 22:21:39+0000\n" +"X-Generator: MediaWiki 1.21alpha (963ddae); Translate 2012-11-08\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -31,7 +32,7 @@ msgid "Your emails" msgstr "translator@legisign.org, sasu.karttunen@tpnet.fi, jiri.gronroos@iki.fi" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -39,7 +40,7 @@ msgstr[1] "" "Seuraavat sovellukset asennettiin juuri, käynnistä ne napsauttamalla:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Nouda ohjelmia" @@ -64,83 +65,81 @@ msgstr "Muon-sovellusvalikoima" #: installer/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "© 2010, 2011 Jonathan Thomas" +msgstr "© 2010–2012 Jonathan Thomas" #: installer/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Nouda ohjelmia" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Asennetut ohjelmat" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Kubuntun tarjoama" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Debianin tarjoama" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonicalin kumppanit" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Riippumaton" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Nouda ohjelmia" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Asennetut ohjelmat" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historia" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 asennettiin onnistuneesti." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Käynnistä" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Ohjelmien asennus onnistui." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Käytä juuri asennettuja sovelluksia..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Asennus valmis" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Meneillään" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Meneillään" @@ -214,18 +213,18 @@ msgid "Install" msgstr "Asenna" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Poista" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Asenna" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -283,19 +282,19 @@ msgid "No reviews available" msgstr "Arvosteluja ei ole saatavilla" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Tämä arvostelu on kirjoitettu vanhemmalle versiolle (Versio: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/fi/muon-notifier.po muon-2.0.0/po/fi/muon-notifier.po --- muon-1.9.60/po/fi/muon-notifier.po 2012-10-29 18:34:01.000000000 +0000 +++ muon-2.0.0/po/fi/muon-notifier.po 2013-04-01 20:32:44.000000000 +0000 @@ -3,14 +3,14 @@ # Tommi Nieminen , 2011. # Jiri Grönroos , 2012. # -# KDE 4.9 Finnish translation sprint 2012-06/07 +# KDE Finnish translation sprint participants: # Author: Lliehu msgid "" msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-07-04 13:36:40+0000\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-07-22 17:42:26+0000\n" "Last-Translator: Jiri Grönroos \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -18,8 +18,8 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 2012-06-15 07:17:06+0000\n" -"X-Generator: MediaWiki 1.20alpha (r113129); Translate 2012-07-04\n" +"X-POT-Import-Date: 2012-12-01 22:21:39+0000\n" +"X-Generator: MediaWiki 1.21alpha (963ddae); Translate 2012-11-08\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -Nru muon-1.9.60/po/fi/muon-updater.po muon-2.0.0/po/fi/muon-updater.po --- muon-1.9.60/po/fi/muon-updater.po 2012-10-29 18:34:01.000000000 +0000 +++ muon-2.0.0/po/fi/muon-updater.po 2013-04-01 20:32:44.000000000 +0000 @@ -3,16 +3,16 @@ # Tommi Nieminen , 2011. # Sasu Karttunen , 2011. # Jiri Grönroos , 2012. -# Lasse Liehu , 2012. +# Lasse Liehu , 2012, 2013. # -# KDE 4.9 Finnish translation sprint 2012-06/07 +# KDE Finnish translation sprint participants: # Author: Lliehu msgid "" msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-08-13 22:17+0300\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-13 19:46+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -20,7 +20,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 2012-07-19 16:33:13+0000\n" +"X-POT-Import-Date: 2012-12-01 22:21:40+0000\n" "X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" @@ -31,12 +31,12 @@ msgid "Your emails" msgstr "translator@legisign.org, sasu.karttunen@tpnet.fi, jiri.gronroos@iki.fi" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Piilota" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -46,18 +46,18 @@ "Muutosluetteloa ei ole vielä saatavilla. Käytä Launchpadia nähdäksesi muutokset." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." -msgstr "Muutosluettelo ei ole vielä saatavilla." +msgstr "Muutosluetteloa ei ole vielä saatavilla." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versio %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -82,184 +82,133 @@ msgstr "Muon-päivitystenhallinta" #: updater/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "© 2010, 2011 Jonathan Thomas" +msgstr "© 2010–2012 Jonathan Thomas" #: updater/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Ohjelmapäivitykset" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "Ennen päivityksen aloittamista on suositeltavaa liittää tietokone " "virtalähteeseen." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Uusi versio Kubuntusta on saatavilla." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Tallenna pakettien latauslista..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Lataa paketit listalta..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Lisää ladatut paketit" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Asenna päivitykset" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historia..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Päivitä" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Pakettihistoria" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Peru" -#: updater/ProgressWidget.cpp:128 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Toteutetaan muutoksia" +msgstr "Käynnistetään" -#: updater/ProgressWidget.cpp:133 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Toteutetaan muutoksia" +msgstr "Odotetaan tunnistautumista" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Toteutetaan muutoksia" +msgstr "Odotetaan" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Odotetaan muiden toimien valmistumista" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Odotetaan muiden ohjelmistonhallintojen päättymistä" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Odotetaan vaadittua tietovälinettä" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Odotetaan asetustiedostoa" -#: updater/ProgressWidget.cpp:172 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Päivitetään ohjelmalähteitä" +msgstr "Ladataan ohjelmaluetteloa" -#: updater/ProgressWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Päivitetään ohjelmalähteitä" -#: updater/ProgressWidget.cpp:184 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Updates" +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Päivityksiä ladataan" +msgstr "Ladataan paketteja" -#: updater/ProgressWidget.cpp:193 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "Toteutetaan muutoksia" -#: updater/ProgressWidget.cpp:198 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Toteutetaan muutoksia" +msgstr "Valmis" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Tietovälineen vaihto tarpeen" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Anna %1 asemaan %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Varoitus – varmentamattomia ohjelmia" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -272,14 +221,20 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Seuraavaa ohjelmaa ei voida varmentaa. Varmentamattoman ohjelman " +"asentaminen on turvallisuusriski, koska varmentamattomuus on usein merkki " +"väärentämisestä. Haluatko jatkaa?" msgstr[1] "" +"Seuraavia ohjelmia ei voida varmentaa Varmentamattomien ohjelmien " +"asentaminen on turvallisuusriski, koska varmentamattomuus on usein merkki " +"väärentämisestä. Haluatko jatkaa?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Asetustiedosto on muuttunut" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -287,35 +242,37 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Asetustiedostosta %1 on saatavilla uusi versio, mutta " +"versiotasi on muutettu. Haluatko pitää nykyisen version vai asentaa uuden " +"version?" -#: updater/ProgressWidget.cpp:265 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Versio" +msgstr "Käytä uutta versiota" -#: updater/ProgressWidget.cpp:266 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Versio" +msgstr "Pidä vanha versio" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Latausnopeus: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 jäljellä" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -331,65 +288,58 @@ msgid "Download Size" msgstr "Latauksen koko" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Joitain paketteja ei ollut merkitty päivitettäväksi.

Niiden " +"päivittämiseksi jotain muita paketteja tarvitsee joko asentaa tai poistaa

Haluatko päivittää kyseiset paketit?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Merkitse kaikki" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Tärkeät turvallisuuspäivitykset" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Sovelluspäivitykset" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Järjestelmäpäivitykset" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Kaikkia paketteja ei voi merkitä päivitettäväksi. Päivitykset saattavat " -"vaatia uusia paketteja asennettavaksi tai vanhoja poistettavaksi. Haluatko " -"merkitä kaikki paketit päivitettäviksi, jotka saattavat vaatia uusien " -"pakettien asennuksia tai vanhojen poistoa?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Päivitysten merkintä epäonnistui" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Merkitse päivitykset" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Päivitysten viimeisin tarkistusajankohta ei ole tiedossa." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "Napsauta Tarkista päivitykset tarkistaaksesi." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Kaikki ohjelmistot ovat ajan tasalla." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Viimeksi tarkistettu %1 sitten." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Päivityksiä ei ole saatavilla." \ No newline at end of file diff -Nru muon-1.9.60/po/fi/muon.po muon-2.0.0/po/fi/muon.po --- muon-1.9.60/po/fi/muon.po 2012-10-29 18:34:01.000000000 +0000 +++ muon-2.0.0/po/fi/muon.po 2013-04-01 20:32:44.000000000 +0000 @@ -3,17 +3,17 @@ # Tommi Nieminen , 2011. # Sasu Karttunen , 2011. # Jiri Grönroos , 2012. -# Lasse Liehu , 2012. +# Lasse Liehu , 2012, 2013. # -# KDE 4.9 Finnish translation sprint 2012-06/07 +# KDE Finnish translation sprint participants: # Author: Artnay # Author: Lliehu msgid "" msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-08-19 21:12+0300\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-06 16:55+0200\n" "Last-Translator: Lasse Liehu \n" "Language-Team: Finnish \n" "Language: fi\n" @@ -21,16 +21,18 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-POT-Import-Date: 2012-06-15 07:17:06+0000\n" +"X-POT-Import-Date: 2012-12-01 22:21:39+0000\n" "X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Tommi Nieminen, Sasu Karttunen, Jiri Grönroos" +msgstr "Tommi Nieminen, Sasu Karttunen, Jiri Grönroos, Lasse Liehu" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "translator@legisign.org, sasu.karttunen@tpnet.fi, jiri.gronroos@iki.fi" +msgstr "" +"translator@legisign.org, sasu.karttunen@tpnet.fi, jiri.gronroos@iki.fi, " +"lasse.liehu@gmail.com" #: muon/config/GeneralSettingsPage.cpp:53 msgid "Ask to confirm changes that affect other packages" @@ -95,8 +97,8 @@ "The list of changes is not yet available. Please use Launchpad instead." msgstr "" -"Muutosluetteloa ei ole saatavilla. Käytä Launchpadia " -"nähdäksesi muutokset." +"Muutosluetteloa ei ole vielä saatavilla. Käytä Launchpadia nähdäksesi muutokset." #: muon/DetailsTabs/ChangelogTab.cpp:91 msgctxt "@info" @@ -184,18 +186,18 @@ msgid "Purge" msgstr "Hävitettäväksi" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Poista merkintä" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "%1 saa päivityksiä Canonicalilta ajankohtaan %2 saakka." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -350,84 +352,52 @@ msgstr "Paketinhallinta" # pmap: =/gen=Muon-paketinhallinnan/ -# pmap: =/gen=Muon-paketinhallinnasta/ +# pmap: =/elat=Muon-paketinhallinnasta/ #: muon/main.cpp:36 msgid "Muon Package Manager" msgstr "Muon-paketinhallinta" #: muon/main.cpp:37 -#, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "© 2009-2011 Jonathan Thomas" +msgstr "© 2009–2012 Jonathan Thomas" #: muon/main.cpp:38 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Lue merkinnät..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Tallenna merkinnät nimellä..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Tallenna pakettien latauslista..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Lataa paketit listalta..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Lisää ladatut paketit" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Tallenna asennettujen pakettien lista..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Varovainen päivitys" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Täysi päivitys" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Poista tarpeettomat paketit" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Esikatsele muutoksia" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Toteuta muutokset" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historia..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -438,12 +408,12 @@ "uusien pakettien asentamista tai poistamista. Kannattanee yrittää täyttä " "päivitystä napsauttamalla Täysi päivitys -painiketta." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Päivityksiä ei voi merkitä" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -452,17 +422,17 @@ "Päivityksiä ei voi merkitä. Joidenkin päivitysten riippuvuudet saattavat " "olla tyydyttämättä juuri nyt tai ne on käsin merkitty estetyiksi." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Takaisin" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Esikatsele muutokset" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Paketin historia" @@ -479,52 +449,52 @@ msgid "Requested" msgstr "Pyydetty" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Etsi" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Merkitse asennettavaksi" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Merkitse poistettavaksi" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Merkitse päivitettäväksi" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Merkitse asennettavaksi uudelleen" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Merkitse hävitettäväksi" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Lukitse paketti nykyiseen versioon" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Poista paketin lukitus" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Lukitse nykyiseen versioon" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -532,37 +502,36 @@ msgstr "" "Paketin poistaminen voi rikkoa järjestelmäsi. Haluatko varmasti poistaa sen?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Varoitus – Poistetaan tärkeää pakettia" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Paketin merkintä epäonnistui" +msgstr "Paketin lukitseminen epäonnistui" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" +"Paketin %1 lukitseminen epäonnistui, koska lukitustiedostoon kirjoittaminen " +"epäonnistui." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Pakettia ”%1” ei voi merkitä asennettavaksi tai päivitettäväksi:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Paketin merkintä epäonnistui" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -577,42 +546,24 @@ "sitä ei saatettu saataville ohjelmistolähteeseen, se on vanhentunut tai sitä " "ei ole saatavilla käytössä olevista ohjelmistolähteistä." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, mutta %4 aiotaan asentaa" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "tai %1 %2, mutta %3 aiotaan asentaa" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, mutta sitä ei voi asentaa" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "tai %1, mutta sitä ei voi asentaa" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, mutta se on virtuaalipaketti" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "tai %1, mutta se on virtuaalipaketti" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Tarkista ja toteuta muutokset" @@ -688,107 +639,86 @@ msgstr "Peru" #: muon/TransactionWidget.cpp:147 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Toteutetaan muutoksia" +msgstr "Käynnistetään" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "Odotetaan palvelun käynnistymistä" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "Odotetaan tunnistautumista" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Toteutetaan muutoksia" +msgstr "Odotetaan" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Odotetaan muiden toimien valmistumista" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Odotetaan muiden ohjelmistonhallintojen päättymistä" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Odotetaan vaadittua tietovälinettä" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Odotetaan asetustiedostoa" #: muon/TransactionWidget.cpp:192 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Päivitetään ohjelmalähteitä" +msgstr "Ladataan ohjelmaluetteloa" #: muon/TransactionWidget.cpp:200 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Päivitetään ohjelmalähteitä" #: muon/TransactionWidget.cpp:205 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Ladataan paketteja" #: muon/TransactionWidget.cpp:217 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" msgstr "Toteutetaan muutoksia" #: muon/TransactionWidget.cpp:224 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Toteutetaan muutoksia" +msgstr "Valmis" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Tietovälineen vaihto tarpeen" #: muon/TransactionWidget.cpp:254 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Anna %1 asemaan %2" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Varoitus – varmentamattomia ohjelmia" #: muon/TransactionWidget.cpp:265 msgctxt "@label" @@ -803,12 +733,18 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Seuraavaa ohjelmaa ei voida varmentaa. Varmentamattoman ohjelman " +"asentaminen on turvallisuusriski, koska varmentamattomuus on usein merkki " +"väärentämisestä. Haluatko jatkaa?" msgstr[1] "" +"Seuraavia ohjelmia ei voida varmentaa Varmentamattomien ohjelmien " +"asentaminen on turvallisuusriski, koska varmentamattomuus on usein merkki " +"väärentämisestä. Haluatko jatkaa?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Asetustiedosto on muuttunut" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -818,19 +754,16 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Asetustiedostosta %1 on saatavilla uusi versio, mutta " +"versiotasi on muutettu. Haluatko pitää nykyisen version vai asentaa uuden " +"version?" #: muon/TransactionWidget.cpp:290 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Pakota versio" +msgstr "Käytä uutta versiota" #: muon/TransactionWidget.cpp:291 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Pakota versio" \ No newline at end of file +msgstr "Pidä vanha versio" \ No newline at end of file diff -Nru muon-1.9.60/po/fr/libmuon.po muon-2.0.0/po/fr/libmuon.po --- muon-1.9.60/po/fr/libmuon.po 2012-10-29 18:34:04.000000000 +0000 +++ muon-2.0.0/po/fr/libmuon.po 2013-04-01 20:32:46.000000000 +0000 @@ -1,14 +1,14 @@ # translation of libmuon.po to Français # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. +# Joëlle Cornavin , 2010, 2011, 2012, 2013. # -# Joëlle Cornavin , 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-08-22 13:23+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-02-21 19:49+0100\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" "Language: fr\n" @@ -18,1110 +18,110 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Applications" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Open Source" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Propriétaire(s)" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Inconnu(s)" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 à télécharger, %2 sur le disque" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 sur le disque" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Accessoires" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Accessibilité" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Outils de developpement" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Débogage" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Conception d'interfaces graphiques" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "EDI" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Localisation" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilage" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Contrôle de versions" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Développement web" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Éducation" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Science & Ingénierie" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomie" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologie" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Chimie" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Informatique & Robotique" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Électronique" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Ingénierie" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Géographie" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Géologie" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Mathématiques" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Physique" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Polices" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Jeux" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arcade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Jeux de plateau" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Jeux de cartes" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Puzzles" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Jeux de rôle" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulation" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sports" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Graphisme" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Dessin" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Création artistique & Édition" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Photographie" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Publication" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Numérisation é OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Afficheurs" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Discussion" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Partage de fichiers" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Courrier" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Navigateurs web" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Bureautique" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Système & Configuration" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Bandes dessinées" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Composants graphiques pour le bureau Plasma" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Moteur des applications" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Applications présentes dans votre système" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Se connecter au service SSO de Ubuntu" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Moteur Bodega" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Installez des données Bodega dans votre système" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Saisissez les justificatifs d'identité de MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Moteur factice" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Moteur factice pour tester les interfaces de « muon »" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Moteur KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Installez des données KNewStuff dans votre système" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Tous" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Confirmer les changements additionnels" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Marquer les changements additionnels ?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Cette action nécessite un changement vers un autre paquetage :" -msgstr[1] "Cette action nécessite des changements vers d'autres paquetages :" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historique" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Recherche" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Tous les changements" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Installations" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Mises à jour" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Suppressions" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Date" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Installé(s)" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Mis à niveau" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Revenu(s) à une version antérieure" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Supprimé(s)" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Purgé(s)" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 à %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Ce Muon a les pouvoirs de la « vache sacrée »" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administration du système" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Système de base" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infrastructure Mono / CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Communication" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Bases de données" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Développement" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentation" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Débogage" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Éditeurs" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Électronique" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Périphériques intégrés" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Polices" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Jeux & Divertissement" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Environnement de Bureau GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Graphisme" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Système d'analyse statistique R de GNU" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Environnement de Bureau Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Radio-amateur" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Langage de programmation Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Serveurs web" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Langages de programmation interprétés" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Langage de programmation Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Compilation de logiciels de KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Noyau & Modules" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Bibliothèques - Développement" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Bibliothèques" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Langage de programmation Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Localisation" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Courrier électronique" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Mathématiques" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Divers - Logiciels de type texte" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Gestion réseau" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Forums de discussion" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Langage de programmation OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Bibliothèques - Anciennes" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Multi plates-formes" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Langage de programmation Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Langage de programmation PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Langage de programmation Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Langage de programmation Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Science" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Interpréteurs" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Création de documents avec TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Traitement de texte" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utilitaires" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Systèmes de contrôles de versions" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Logiciels de vidéo" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Divers - Graphiques" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Environnement de Bureau XFCE" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Environnement ZOPE / Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Inconnu(s)" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Cassé(s)" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Converti depuis RPM par Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internationalisation & Localisation" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Méta-paquetages" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Restreint(s) lors de l'exportation" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Non libre(s)" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Éducation" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Données d'introspection GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Non installé(s)" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Disponible(s)" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Installé(s)" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Évolutif(s)" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Cassé(s)" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Configuration résiduelle" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Installé(s) (pouvant être désinstallé(s) automatiquement)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Pas de changement" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Installer" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Mettre à niveau" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Supprimer" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Purger" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Réinstaller" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Revenir à une version antérieure" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Verrouillé" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Commun" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32 bits" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64 bits" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Erreur d'initialisation" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Impossible d'obtenir le verrou du système de paquetages" - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Espace disque faible" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Impossible d'appliquer les changements" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Erreur d'authentification" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Erreur inattendue" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Paquetages non sécurisés" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Inconnu(s)" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Impossible d'initialiser le système de paquetages, il se peut que votre " -"configuration soit brisée." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Il semble qu'une autre application utilise le système de paquetages en ce " -"moment. Vous devez fermer tous les autres gestionnaires de paquetages avant " -"de pouvoir installer ou supprimer un quelconque paquetage." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Vous n'avez pas assez d'espace disque dans le dossier à %1 pour poursuivre " -"cette opération." - -#: libmuon/MuonStrings.cpp:285 -#, fuzzy -#| msgctxt "@label" -#| msgid "Unable to download the following packages:" -msgctxt "@label" -msgid "Could not download packages" -msgstr "Impossible de télécharger les paquetages suivants :" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Une erreur est survenue lors de l'application des changements :" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Il est impossible de poursuivre cette opération car aucune autorisation " -"correcte n'a été fournie" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Il semble que l'outil QApt se soit arrêté brutalement ou ait disparu. " -"Veuillez envoyer un rapport de bogue aux mainteneurs de QApt" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Le paquetage suivant n'a pas été vérifié par son auteur. Le téléchargement " -"de paquetages non sécurisés est refusé par votre configuration actuelle." -msgstr[1] "" -"Les paquetages suivants n'ont pas été vérifiés par leurs auteurs. Le " -"téléchargement de paquetages non sécurisés est refusé par votre " -"configuration actuelle." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Vérifie s'il existe des mises à jour" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Supprime toutes les marques" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configure les sources de logiciels" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Enregistrer les marquages sous" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"L'enregistrement du document a échoué, car il n'est pas possible d'écrire " -"dans %1\n" -"\n" -"Vérifiez que vous disposez des droits en écriture dans ce fichier ou qu'il y " -"a assez d'espace disque disponible." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Enregistrer la liste des paquetages installés sous" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Enregistrer la liste de téléchargement sous" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Ouvrir un fichier" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Impossible de marquer les changements. Veuillez vous assurer que le fichier " -"est un fichier de marquages créés soit par le gestionnaire de paquetages " -"Muon soit par le gestionnaire de paquetages Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Choisissez un dossier" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 paquetage a été ajouté avec succès au cache" -msgstr[1] "%1 paquetages ont été ajoutés avec succès au cache" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Impossible de trouver un quelconque paquetage valable dans ce dossier. " -"Veuillez vous assurer que les paquetages sont compatibles avec votre " -"ordinateur et qu'il s'agit de la toute dernière version." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Impossible de trouver des paquetages" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 restant(s)" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Se connecter au service SSO de Ubuntu" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Afficher les notifications pour :" @@ -1140,7 +140,7 @@ #: libmuon/settings/NotifySettingsPage.cpp:69 msgid "Notification type:" -msgstr "Type de notifications :" +msgstr "Type de la notification :" #: libmuon/settings/NotifySettingsPage.cpp:72 msgid "Use both popups and tray icons" @@ -1150,7 +150,7 @@ #: libmuon/settings/NotifySettingsPage.cpp:73 msgid "Tray icons only" -msgstr "Les icônes de la boîte à miniatures uniquement" +msgstr "es icônes de la boîte à miniatures uniquement" #: libmuon/settings/NotifySettingsPage.cpp:74 msgid "Popup notifications only" @@ -1161,18 +161,18 @@ msgid "Downloading" msgstr "Téléchargement en cours" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Fait" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "En attente" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Installation en cours" @@ -1185,4 +185,408 @@ #: libmuon/Transaction/TransactionListener.cpp:183 msgctxt "@info:status" msgid "Removing" -msgstr "Suppression en cours" \ No newline at end of file +msgstr "Suppression en cours" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/fr/muon-discover.po muon-2.0.0/po/fr/muon-discover.po --- muon-1.9.60/po/fr/muon-discover.po 2012-10-29 18:34:04.000000000 +0000 +++ muon-2.0.0/po/fr/muon-discover.po 2013-04-01 20:32:46.000000000 +0000 @@ -1,14 +1,14 @@ # translation of muon-discover.po to Français # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. +# Joëlle Cornavin , 2012, 2013. # -# Joëlle Cornavin , 2012. msgid "" msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-22 13:26+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-02-10 19:31+0100\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" "Language: fr\n" @@ -40,7 +40,7 @@ #: discover/main.cpp:44 msgid "Directly open the specified application by its package name." -msgstr "Ouvre directement l'application spécifiée par son nom de paquetage." +msgstr "Ouvre directement l'application spécifiée par son nom de paquet." #: discover/main.cpp:45 msgid "Open with a program that can deal with the given mimetype." @@ -50,24 +50,43 @@ msgid "Display a list of entries with a category." msgstr "Affiche une liste des éléments comportant une catégorie." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Ouvre Muon  Discover dans un mode indiqué. Les modes correspondent aux " +"boutons de barres d'outils." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Liste tous les modes disponibles et les sort sur la sorite standard." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Modes disponibles :\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Chercher..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Certaines erreurs ont été trouvées lors de la configuration de l'interface " "graphique, il est impossible que l'application continue." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Erreur d'initialisation" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Ajouter des origines..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Supprimerdes origines..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menu" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Configurer et en savoir plus sur Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -82,90 +101,94 @@ msgid "Discard" msgstr "Abandonner" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 révisions" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Page d'accueil" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Lancer" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Réviser" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Taille totale : %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Vue d'ensemble" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Modules complémentaires" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Révisions" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Mettre à jour" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nom" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Note" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Réactions" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularité" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Origine" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Chercher dans « %1 »..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Chercher..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Concours de popularité" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "points : %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Meilleures notes" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Bienvenue dans\n" +"Muon Discover !" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -178,25 +201,34 @@ msgid "Remove" msgstr "Supprimer" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Installé(s)" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "Tout mettre à jour !" +msgstr "Tout mettre à jour" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Chargement..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Précédent" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Découvrir" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Installé (%1 mise à jour)" +msgstr[1] "Installés (%1 mises à jour)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Sources" @@ -221,56 +253,60 @@ msgid "Summary:" msgstr "Résumé :" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Révisions :" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Informez-nous à propos de cette révision  !" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 personnes sur %2 ont trouvé cette révision utile" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 par %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 par %2

" +"%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Utile ? Oui/Non" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Ajouter une source" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Spécifier la nouvelle source" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "" +msgstr "Ok" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Annuler" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - La ligne de source du dépôt « apt » à ajouter. Il s'agit " "de :\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (binaire)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/fr/muon-installer.po muon-2.0.0/po/fr/muon-installer.po --- muon-1.9.60/po/fr/muon-installer.po 2012-10-29 18:34:04.000000000 +0000 +++ muon-2.0.0/po/fr/muon-installer.po 2013-04-01 20:32:46.000000000 +0000 @@ -1,13 +1,13 @@ # translation of muon-installer.po to Français # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# # Joëlle Cornavin , 2010, 2011, 2012. +# msgid "" msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-08-22 13:26+0200\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" @@ -16,7 +16,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -26,7 +25,7 @@ msgid "Your emails" msgstr "jcornavin_AT_laposte_DOT_net" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -37,7 +36,7 @@ "Les applications suivantes viennent d'être installées, cliquez dessus pour " "les lancer :" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Obtenir des logiciels" @@ -67,74 +66,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Obtenir des logiciels" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Logiciels installés" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Fournis par Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Fournis par Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partenaires de Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Indépendant" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Obtenir des logiciels" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Logiciels installés" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historique" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 a été installé avec succès." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Démarrer" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Applications installées avec succès." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Lancer de nouvelles applications..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Installation achevée" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "En cours" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "En cours" @@ -208,18 +207,18 @@ msgid "Install" msgstr "Installer" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Supprimer" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Installer" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -277,22 +276,239 @@ msgid "No reviews available" msgstr "Pas de révisions disponibles" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Cette révision a été écrite pour une version antérieure (version : %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" msgid_plural "%1 out of %2 people found this review useful" msgstr[0] "%1 personne sur %2 a trouvé utile cette révision" -msgstr[1] "%1 personnes sur %2 ont trouvé utile cette révision" \ No newline at end of file +msgstr[1] "%1 personnes sur %2 ont trouvé utile cette révision" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/fr/muon-notifier.po muon-2.0.0/po/fr/muon-notifier.po --- muon-1.9.60/po/fr/muon-notifier.po 2012-10-29 18:34:04.000000000 +0000 +++ muon-2.0.0/po/fr/muon-notifier.po 2013-04-01 20:32:46.000000000 +0000 @@ -1,13 +1,13 @@ # translation of muon-notifier.po to Français # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# # Joëlle Cornavin , 2011, 2012. +# msgid "" msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2012-07-10 10:34+0200\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" @@ -16,7 +16,6 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -24,7 +23,7 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "jcorn@free.fr" +msgstr "jcornavin@laposte.net" #: kded/distupgradeevent/distupgradeevent.cpp:35 msgctxt "Notification when a new version of Kubuntu is available" @@ -54,7 +53,7 @@ #: kded/event.cpp:156 msgid "Hide" -msgstr "Cacher" +msgstr "Masquer" #: kded/MuonNotifier.cpp:55 msgid "Muon Notification Daemon" diff -Nru muon-1.9.60/po/fr/muon-updater.po muon-2.0.0/po/fr/muon-updater.po --- muon-1.9.60/po/fr/muon-updater.po 2012-10-29 18:34:04.000000000 +0000 +++ muon-2.0.0/po/fr/muon-updater.po 2013-04-01 20:32:46.000000000 +0000 @@ -1,14 +1,14 @@ # translation of muon-updater.po to Français # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. +# Joëlle Cornavin , 2010, 2011, 2012, 2013. # -# Joëlle Cornavin , 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-08-22 13:26+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-02-10 18:07+0100\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" "Language: fr\n" @@ -26,12 +26,12 @@ msgid "Your emails" msgstr "jcorn@free.fr" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Cacher" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -41,18 +41,18 @@ "La liste des modifications n'est pas encore disponible. Veuillez utiliser " "Launchpad à la place." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "La liste des modifications n'est pas encore disponible." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Version %1 :" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -84,175 +84,126 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Mises à jour des logiciels" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "Il est plus prudent de brancher l'adaptateur secteur avant d'effectuer la " "mise à jour." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Une nouvelle version de Kubuntu est disponible." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Enregistrer la liste de téléchargement de paquetages..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Télécharger des paquetages depuis la liste..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Tous les paquetages téléchargés" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Installer les mises à jour" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historique..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Mise à niveau" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" -msgstr "Historique des paquetages" +msgstr "Historique des paquets" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Annuler" -#: updater/ProgressWidget.cpp:128 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Installation des mises à jour" +msgstr "Démarrer" -#: updater/ProgressWidget.cpp:133 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Mise à jour des sources de logiciels" +msgstr "En attente d'authentification" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Installation des mises à jour" +msgstr "En attente" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "En attente de la fin d'autres transactions" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "En attente de la fermeture d'autres gestionnaires de logiciels" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "En attente d'un média requis" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "En attente d'un fichier de configuration" -#: updater/ProgressWidget.cpp:172 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Mise à jour des sources de logiciels" +msgstr "Chargement de la liste des logiciels" -#: updater/ProgressWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Mise à jour des sources de logiciels" -#: updater/ProgressWidget.cpp:184 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Updates" +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Téléchargement des mises à jour" +msgstr "Téléchargement des paquets" -#: updater/ProgressWidget.cpp:193 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Installation des mises à jour" +msgstr "Application des changements" -#: updater/ProgressWidget.cpp:198 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Installation des mises à jour" +msgstr "Terminé" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Changement de média requis" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Veuillez insérer %1 dans %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Avertissement - Logiciel(s) non vérifié(s)" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -265,14 +216,22 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Impossible de vérifier le logiciel suivant. Installer des logiciels " +"non vérifiés représente un risque en matière de sécurité, car la présence de " +"logiciels invérifiables peut être un signe de falsification. " +"Voulez-vous continuer ?" msgstr[1] "" +"Impossible de vérifier les logiciels suivants. Installer des " +"logiciels non vérifiés représente un risque en matière de sécurité, car la " +"présence de logiciels invérifiables peut être un signe de falsification. Voulez-vous continuer ?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Fichier de configuration changé" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -280,35 +239,37 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Une nouvelle version du fichier de configuration %1 est " +"disponible, mais votre version a été modifiée.Voulez-vous conserver votre " +"version actuellementou installer la nouvelle version ?" -#: updater/ProgressWidget.cpp:265 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Version" +msgstr "Utiliser la nouvelle version" -#: updater/ProgressWidget.cpp:266 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Version" +msgstr "Conserver l'ancienne version" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" -msgstr "Débit de téléchargement : %1/s" +msgstr "Taux de téléchargement : %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 restant(s)" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -324,70 +285,62 @@ msgid "Download Size" msgstr "Taille du téléchargement" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Certains paquets n'ont pas été marqués pour la mise à jour.

La " +"mise à jour de ces paquets nécessite l'installation ou la suppression " +"d'autres paquets.

Voulez-vous les mettre à jour également ?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Tout marquer" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Mises à jour de sécurité importantes" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Mises à jour d'applications" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Mises à jour système" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Il est impossible de marquer tous les paquetages pour mise à niveau. Il se " -"peut que les mises à niveau disponibles nécessitent l'installation ou la " -"suppression de nouveaux paquetages. Voulez-vous marquer les mises à niveau " -"pouvant nécessiter l'installation ou la suppression de paquetage " -"additionnels ?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Impossible de marquer les mises à niveau" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Marquer les mises à niveau" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" "La date de la dernière vérification de la présence de mises à jour est " "inconnue." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" -"Veuillez cliquer sur Vérifier s'il y a des mises à jourVérifier s'il existe des mises à jour pour vous en assurer." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Les logiciels présents sur cet ordinateur sont à jour." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "La dernière vérification remonte à %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Aucune mise à jour n'est disponible." \ No newline at end of file diff -Nru muon-1.9.60/po/fr/muon.po muon-2.0.0/po/fr/muon.po --- muon-1.9.60/po/fr/muon.po 2012-10-29 18:34:04.000000000 +0000 +++ muon-2.0.0/po/fr/muon.po 2013-04-01 20:32:46.000000000 +0000 @@ -1,14 +1,14 @@ # translation of muon.po to Français # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. +# Joëlle Cornavin , 2010, 2011, 2012, 2013. # -# Joëlle Cornavin , 2010, 2011, 2012. msgid "" msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-08-22 13:26+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-02-10 19:31+0100\n" "Last-Translator: Joëlle Cornavin \n" "Language-Team: French \n" "Language: fr\n" @@ -24,32 +24,31 @@ msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "jcornavin_AT_laposte_DOT_net" +msgstr "jcorn@free.fr" #: muon/config/GeneralSettingsPage.cpp:53 msgid "Ask to confirm changes that affect other packages" -msgstr "Demander pour confirmer les changements affectant d'autres paquetages" +msgstr "Demander pour confirmer les changements affectant d'autres paquets" #: muon/config/GeneralSettingsPage.cpp:54 msgid "Show foreign-architecture packages that are available natively" -msgstr "" -"Afficher les paquetages d'architecture étrangère disponibles nativement" +msgstr "Afficher les paquets d'architecture étrangère disponibles nativement" #: muon/config/GeneralSettingsPage.cpp:55 msgid "Treat recommended packages as dependencies" -msgstr "Considérer les paquetages recommandés comme des dépendances" +msgstr "Considérer les paquets recommandés comme des dépendances" #: muon/config/GeneralSettingsPage.cpp:56 msgid "Treat suggested packages as dependencies" -msgstr "Considérer les paquetages suggérés comme des dépendances" +msgstr "Considérer les paquets suggérés comme des dépendances" #: muon/config/GeneralSettingsPage.cpp:57 msgid "Allow the installation of untrusted packages" -msgstr "Autoriser l'installation de paquetages non sécurisés" +msgstr "Autoriser l'installation de paquets non sécurisés" #: muon/config/GeneralSettingsPage.cpp:68 msgid "Delete obsolete cached packages every:" -msgstr "Supprimer les paquetages obsolètes mis en cache tous les :" +msgstr "Supprimer les paquets obsolètes mis en cache tous les :" #: muon/config/GeneralSettingsPage.cpp:86 msgid "Number of undo operations:" @@ -119,22 +118,22 @@ #: muon/DetailsTabs/DependsTab.cpp:43 msgctxt "@item:inlistbox" msgid "Virtual Packages Provided" -msgstr "Paquetages virtuels fournis" +msgstr "Paquets virtuels fournis" #: muon/DetailsTabs/DependsTab.cpp:71 muon/DetailsTabs/DependsTab.cpp:78 msgctxt "@label" msgid "This package does not have any dependencies" -msgstr "Ce paquetage ne comporte aucune dépendance" +msgstr "Ce paquet ne comporte aucune dépendance" #: muon/DetailsTabs/DependsTab.cpp:85 msgctxt "@label" msgid "This package has no dependents. (Nothing depends on it.)" -msgstr "Ce paquetage ne comporte aucun dépendant (rien n'en dépend)" +msgstr "Ce paquet ne comporte aucun paquet dépendant (rien n'en dépend)" #: muon/DetailsTabs/DependsTab.cpp:92 msgctxt "@label" msgid "This package does not provide any virtual packages" -msgstr "Ce paquetage ne fournit aucun paquetage virtuel" +msgstr "Ce paquet ne fournit aucun paquet virtuel" #: muon/DetailsTabs/InstalledFilesTab.cpp:33 msgctxt "@title:tab" @@ -176,26 +175,26 @@ msgid "Purge" msgstr "Purge" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" -msgstr "Supression des marques" +msgstr "Suppression des marques" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." -msgstr "Canonical fournit des mises à jour critiques pour %1 jusqu'à %2." +msgstr "« Canonical » fournit des mises à jour critiques pour %1 jusqu'à %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" "Canonical does not provide updates for %1. Some updates may be provided by " "the Ubuntu community." msgstr "" -"Canonical ne fournit pas de mises à jour pour %1. Il se peut que certaines " -"mises à jour soient fournies par la communauté Ubuntu." +"« Canonical » ne fournit pas de mises à jour pour %1. Il se peut que " +"certaines mises à jour soient fournies par la communauté Ubuntu." #: muon/DetailsTabs/TechnicalDetailsTab.cpp:45 msgctxt "@title:tab" @@ -215,7 +214,7 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:76 msgctxt "@label The parent package that this package comes from" msgid "Source Package:" -msgstr "Paquetages source :" +msgstr "Paquets sources :" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:84 msgctxt "@label The software source that this package comes from" @@ -288,7 +287,7 @@ #: muon/DownloadModel/DownloadModel.cpp:61 msgctxt "@title:column" msgid "Package" -msgstr "Paquetage" +msgstr "Paquet" #: muon/DownloadModel/DownloadModel.cpp:63 msgctxt "@title:column" @@ -340,11 +339,11 @@ #: muon/main.cpp:30 msgid "A package manager" -msgstr "Un gestionnaire de paquetages" +msgstr "Un gestionnaire de paquets" #: muon/main.cpp:36 msgid "Muon Package Manager" -msgstr "Gestionnaire de paquetages Muon" +msgstr "Gestionnaire de paquets Muon" #: muon/main.cpp:37 msgid "© 2009-2012 Jonathan Thomas" @@ -354,69 +353,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Lire les marquages..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Enregistrer les marquages sous..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Enregistrer la liste de téléchargement des paquetages..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Télécharger des paquetages depuis la liste..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Tous les paquetages téléchargés" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Enregistrer la liste des paquetages installés..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Mise à niveau de sécurité" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Mise à niveau complète" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" -msgstr "Supprimer les paquetages inutiles" +msgstr "Supprimer les paquets inutiles" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Aperçu des changements" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Appliquer les changements" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historique..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -424,16 +393,16 @@ "Full Upgrade button." msgstr "" "Impossible de marquer les mises à niveau. Les mises à niveau peuvent " -"nécessiter l'installation ou la suppression de nouveaux paquetages. Vous " -"pouvez essayer d'effectuer une mise à niveau complète en cliquant sur le " -"bouton Mise à niveau complète." +"nécessiter l'installation ou la suppression de nouveaux paquets. Vous pouvez " +"essayer d'effectuer une mise à niveau complète en cliquant sur le bouton " +"Mise à niveau complète." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Impossible de marquer les mises à niveau" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -443,24 +412,24 @@ "de présenter des dépendances impossibles à satisfaire pour le moment ou " "peuvent avoir été manuellement empêchées." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Précédent" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Aperçu des changements" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" -msgstr "Historique des paquetages" +msgstr "Historique des paquets" #: muon/PackageModel/PackageModel.cpp:79 msgid "Package" -msgstr "Paquetage" +msgstr "Paquet" #: muon/PackageModel/PackageModel.cpp:81 msgid "Status" @@ -470,93 +439,91 @@ msgid "Requested" msgstr "Demandé" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Chercher" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Marquer pour installation" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Marquer pour suppression" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Marquer pour mise à niveau" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Marquer pour réinstallation" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Marquer pour purge" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" -msgstr "Verrouiller le paquetage à la version actuelle" +msgstr "Verrouiller le paquet à la version actuelle" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" -msgstr "Déverrouiller un paquetage" +msgstr "Déverrouiller un paquet" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Verrouiller à la version actuelle" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "" -"Supprimer ce paquetage risque de casser votre système. Voulez-vous vraiment " -"le supprimer ?" +"Supprimer ce paquet risque de casser votre système. Voulez-vous vraiment le " +"supprimer ?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" -msgstr "Avertissement - Suppression de paquetage important" +msgstr "Avertissement - Suppression de paquet important" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Impossible de marquer le paquetage" +msgstr "Impossible de verrouiller un paquet" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" +"Impossible de verrouiller le paquet %1. L'écriture dans le fichier verrou a " +"échoué." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" -"Impossible de marquer le paquetage « %1 » pour installation ou mise à " -"niveau :" +"Impossible de marquer le paquet « %1 » pour installation ou mise à niveau :" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" -msgstr "Impossible de marquer le paquetage" +msgstr "Impossible de marquer le paquet" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -565,47 +532,29 @@ "never uploaded, has been obsoleted, or is not available from the currently-" "enabled repositories." msgstr "" -"Le paquetage « %1 » ne comporte pas de version disponible mais existe dans " -"la base de données.\n" -"\tCela signifie généralement que le paquetage a été mentionné dans une " +"Le paquet « %1 » ne comporte pas de version disponible mais existe dans la " +"base de données.\n" +"\tCela signifie généralement que le paquet a été mentionné dans une " "dépendance et n'a jamais été mis en ligne, qu'il est devenu obsolète ou " "n'est pas disponible à partir des dépôts actuellement activés." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, mais %4 doit être installé" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "ou %1 %2, mais %3 doit être installé" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1 : %2, mais n'est pas installable" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "ou %1, mais n'est pas installable" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" -msgstr "%1 : %2, mais il s'agit d'un paquetage virtuel" - -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "ou %1, mais il s'agit d'un paquetage virtuel" +msgstr "%1 : %2, mais il s'agit d'un paquet virtuel" #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" @@ -621,8 +570,8 @@ msgctxt "@info:status" msgid "1 package available, " msgid_plural "%1 packages available, " -msgstr[0] "Un paquetage est disponible, " -msgstr[1] "%1 paquetages sont disponibles, " +msgstr[0] "Un seul paquet est disponible, " +msgstr[1] "%1 paquets sont disponibles, " #: muon/StatusWidget.cpp:92 #, kde-format @@ -682,107 +631,86 @@ msgstr "Annuler" #: muon/TransactionWidget.cpp:147 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Validations des changements" +msgstr "Démarrage" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "En attente du démarrage d'un service" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "En attente d'authentification" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Validations des changements" +msgstr "En attente" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "En attente de la fin d'autres transactions" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "En attente de la terminaison d'autres gestionnaires de paquets" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "En attente d'un média requis" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "En attente d'un fichier de configuration" #: muon/TransactionWidget.cpp:192 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Mise à jour des sources de logiciels" +msgstr "Chargement de la liste de logiciels" #: muon/TransactionWidget.cpp:200 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Mise à jour des sources de logiciels" #: muon/TransactionWidget.cpp:205 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Téléchargement des paquetages" +msgstr "Téléchargement des paquets" #: muon/TransactionWidget.cpp:217 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" -msgstr "Validations des changements" +msgstr "Validation des changements" #: muon/TransactionWidget.cpp:224 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Validations des changements" +msgstr "Terminé" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Changement de média requis" #: muon/TransactionWidget.cpp:254 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Veuillez insérer %1 dans %2" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Avertissement - Logiciel(s) non vérifié(s)" #: muon/TransactionWidget.cpp:265 msgctxt "@label" @@ -797,12 +725,20 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Il est impossible de vérifier le logiciel suivant. Installer des " +"logiciels non vérifiés représente un risque en matière de sécurité, car la " +"présence de logiciels invérifiables peut être un signe de falsification. Voulez-vous continuer ?" msgstr[1] "" +"Il est impossible de vérifier les logiciels suivants. Installer des " +"logiciels non vérifiés représente un risque en matière de sécurité, car le " +"présence de logiciels invérifiables peut être un signe de falsification. Voulez-vous continuer ?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Fichier de configuration changé" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -812,19 +748,16 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"Une nouvelle version du fichier de configuration %1 est " +"disponible, mais votre version a été modifiée. Voulez-vous conserver votre " +"version actuelle ou installer la nouvelle version ?" #: muon/TransactionWidget.cpp:290 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Forcer une version" +msgstr "Utiliser la nouvelle version" #: muon/TransactionWidget.cpp:291 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Forcer une version" \ No newline at end of file +msgstr "Conserver l'ancienne version" \ No newline at end of file diff -Nru muon-1.9.60/po/ga/libmuon.po muon-2.0.0/po/ga/libmuon.po --- muon-1.9.60/po/ga/libmuon.po 2012-10-29 18:34:07.000000000 +0000 +++ muon-2.0.0/po/ga/libmuon.po 2013-04-01 20:32:49.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2011-12-28 12:28-0500\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2011-01-27 15:44-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" "Language: ga\n" @@ -17,1067 +17,117 @@ "Plural-Forms: nplurals=5; plural=n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n < 11 ? " "3 : 4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" -msgstr "" +msgstr "Feidhmchláir" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" -msgstr "" +msgstr "Foinse Oscailte" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" -msgstr "" +msgstr "Dílsithe" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" -msgstr "" +msgstr "Anaithnid" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" -msgstr "" +msgstr "%1 le híosluchtú, %2 ar an diosca" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" -msgstr "" - -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "" +msgstr "%1 ar an diosca" -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Feidhmchláir" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Feidhmchláir" -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" msgstr "" -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" msgstr "" -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -#: libmuon/Category/Category.cpp:64 +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" -msgstr "" - -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "" -msgstr[1] "" -msgstr[2] "" -msgstr[3] "" -msgstr[4] "" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Dáta" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "" +msgstr "Uile" -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" msgstr "" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" msgstr "" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 +#, fuzzy +#| msgctxt "@info:status" +#| msgid "Installing" msgid "Installed" -msgstr "" +msgstr "Á Shuiteáil" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -msgstr[1] "" - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "" -msgstr[1] "" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "" @@ -1113,30 +163,30 @@ #: libmuon/Transaction/TransactionListener.cpp:109 msgctxt "@info:status" msgid "Downloading" -msgstr "" +msgstr "Á Íosluchtú" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" -msgstr "" +msgstr "Críochnaithe" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" -msgstr "" +msgstr "Ar Feitheamh" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" -msgstr "" +msgstr "Á Shuiteáil" #: libmuon/Transaction/TransactionListener.cpp:179 msgctxt "@info:status" msgid "Changing Addons" -msgstr "" +msgstr "Breiseáin á nAthrú" #: libmuon/Transaction/TransactionListener.cpp:183 msgctxt "@info:status" msgid "Removing" -msgstr "" \ No newline at end of file +msgstr "Á Bhaint" \ No newline at end of file diff -Nru muon-1.9.60/po/ga/muon-discover.po muon-2.0.0/po/ga/muon-discover.po --- muon-1.9.60/po/ga/muon-discover.po 2012-10-29 18:34:07.000000000 +0000 +++ muon-2.0.0/po/ga/muon-discover.po 2013-04-01 20:32:49.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" "PO-Revision-Date: 2012-05-14 16:25-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" @@ -26,10 +26,8 @@ msgstr "" #: discover/main.cpp:36 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: discover/main.cpp:37 msgid "Jonathan Thomas" @@ -51,21 +49,38 @@ msgid "Display a list of entries with a category." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" msgstr "" -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" msgstr "" #: discover/qml/AddonsView.qml:37 @@ -81,92 +96,94 @@ msgid "Discard" msgstr "Ná Sábháil" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Leathanach Baile" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Tosaigh" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Athbhreithnigh" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Foramharc" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Anótálacha" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Nuashonraigh" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Ainm" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Rátáil" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Bunphointe" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "" -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "" - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 #, fuzzy #| msgid "Rating" msgid "Best Ratings" msgstr "Rátáil" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "" @@ -179,25 +196,40 @@ msgid "Remove" msgstr "Bain" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Suiteáilte" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 #, fuzzy -#| msgid "Update" +#| msgid "Update All!" msgid "Update All" -msgstr "Nuashonraigh" +msgstr "Nuashonraigh Uile!" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." +msgstr "Á Luchtú..." + +#: discover/qml/Main.qml:79 +msgid "Back" msgstr "" -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Suiteáilte" +msgstr[1] "Suiteáilte" +msgstr[2] "Suiteáilte" +msgstr[3] "Suiteáilte" +msgstr[4] "Suiteáilte" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Foinsí" @@ -222,54 +254,56 @@ msgid "Summary:" msgstr "Achoimre:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" msgstr "" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Cuir Foinse Leis" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Cealaigh" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" -msgstr "" \ No newline at end of file +msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/ga/muon-installer.po muon-2.0.0/po/ga/muon-installer.po --- muon-1.9.60/po/ga/muon-installer.po 2012-10-29 18:34:07.000000000 +0000 +++ muon-2.0.0/po/ga/muon-installer.po 2013-04-01 20:32:49.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2011-12-28 12:28-0500\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2011-01-27 15:44-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" "Language: ga\n" @@ -25,7 +25,7 @@ msgid "Your emails" msgstr "kscanne@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -40,7 +40,7 @@ msgstr[4] "" "Bhí na feidhmchláir seo a leanas suiteáilte. Cliceáil orthu chun iad a thosú:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Faigh Bogearraí" @@ -63,86 +63,84 @@ msgstr "Lárionad Bogearraí Muon" #: installer/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: installer/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Faigh Bogearraí" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Bogearraí Suiteáilte" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Soláthraithe ag Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Soláthraithe ag Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Comhpháirtithe de chuid Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Neamhspleách" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Faigh Bogearraí" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Bogearraí Suiteáilte" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Stair" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "D'éirigh le suiteáil %1." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Tosaigh" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "D'éirigh le suiteáil na bhfeidhmchlár." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Rith Feidhmchláir Nua..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Suiteáil Críochnaithe" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" -msgstr "" +msgstr "Ar Siúl" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" -msgstr "" +msgstr "Ar Siúl" #: installer/ResourceDetailsView/AddonsWidget.cpp:59 msgctxt "@title" @@ -216,18 +214,18 @@ msgid "Install" msgstr "Suiteáil" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Bain" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Suiteáil" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -239,31 +237,31 @@ #: installer/ResourceView/ResourceViewWidget.cpp:66 msgid "Show technical items" -msgstr "" +msgstr "Taispeáin míreanna teicniúla" #: installer/ResourceView/ResourceViewWidget.cpp:72 msgid "Sort:" -msgstr "" +msgstr "Sórtáil:" #: installer/ResourceView/ResourceViewWidget.cpp:74 msgctxt "@item:inlistbox" msgid "By Name" -msgstr "" +msgstr "De Réir Ainm" #: installer/ResourceView/ResourceViewWidget.cpp:75 msgctxt "@item:inlistbox" msgid "By Top Rated" -msgstr "" +msgstr "Rátálacha js Airde" #: installer/ResourceView/ResourceViewWidget.cpp:76 msgctxt "@item:inlistbox" msgid "By Most Buzz" -msgstr "" +msgstr "Comhrá is Mó" #: installer/ResourceView/ResourceViewWidget.cpp:214 msgctxt "@item:inlistbox" msgid "By Relevancy" -msgstr "" +msgstr "De Réir Ábharthachta" #: installer/ReviewsWidget/ReviewsWidget.cpp:57 msgctxt "@title" @@ -278,26 +276,26 @@ #: installer/ReviewsWidget/ReviewsWidget.cpp:79 msgctxt "@action" msgid "Check for more reviews" -msgstr "" +msgstr "Lorg tuilleadh léirmheasanna" #: installer/ReviewsWidget/ReviewsWidget.cpp:103 msgctxt "@info:status" msgid "No reviews available" msgstr "Níl aon léirmheasanna ar fáil" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Baineann an léirmheas seo le leagan níos sine (Leagan: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" @@ -306,4 +304,251 @@ msgstr[1] "Bhain %1 as %2 dhuine tairbhe as an léirmheas seo" msgstr[2] "Bhain %1 as %2 dhuine tairbhe as an léirmheas seo" msgstr[3] "Bhain %1 as %2 nduine tairbhe as an léirmheas seo" -msgstr[4] "Bhain %1 as %2 duine tairbhe as an léirmheas seo" \ No newline at end of file +msgstr[4] "Bhain %1 as %2 duine tairbhe as an léirmheas seo" + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +# ambiguous, not "Oscail Foinse" anseo \ No newline at end of file diff -Nru muon-1.9.60/po/ga/muon-notifier.po muon-2.0.0/po/ga/muon-notifier.po --- muon-1.9.60/po/ga/muon-notifier.po 2012-10-29 18:34:07.000000000 +0000 +++ muon-2.0.0/po/ga/muon-notifier.po 2013-04-01 20:32:49.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2011-12-28 12:28-0500\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2011-01-27 15:44-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" "Language: ga\n" @@ -28,28 +28,28 @@ #: kded/distupgradeevent/distupgradeevent.cpp:35 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available" -msgstr "" +msgstr "Tá leagan nua de Kubuntu ar fáil" #: kded/distupgradeevent/distupgradeevent.cpp:37 msgctxt "Start the upgrade" msgid "Upgrade" -msgstr "" +msgstr "Uasghrádaigh" #: kded/distupgradeevent/distupgradeevent.cpp:38 #: kded/UpdateEvent/UpdateEvent.cpp:95 msgctxt "Button to dismiss this notification once" msgid "Ignore for now" -msgstr "" +msgstr "Déan neamhaird de faoi láthair" #: kded/distupgradeevent/distupgradeevent.cpp:40 #: kded/UpdateEvent/UpdateEvent.cpp:97 msgctxt "Button to make this notification never show up again" msgid "Never show again" -msgstr "" +msgstr "Ná taispeáin arís" #: kded/event.cpp:136 kded/event.cpp:143 kded/event.cpp:183 msgid "System Notification" -msgstr "" +msgstr "Fógairt an Chórais" #: kded/event.cpp:156 msgid "Hide" @@ -57,16 +57,15 @@ #: kded/MuonNotifier.cpp:55 msgid "Muon Notification Daemon" -msgstr "" +msgstr "Deamhan Fógartha Muon" #: kded/MuonNotifier.cpp:56 msgid "A Notification Daemon for Muon" -msgstr "" +msgstr "Deamhan Fógartha Muon" #: kded/MuonNotifier.cpp:58 -#, fuzzy msgid "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" -msgstr "© 2009-2011 Jonathan Thomas, © 2009 Harald Sitter" +msgstr "© 2009-2012 Jonathan Thomas, © 2009 Harald Sitter" #: kded/UpdateEvent/UpdateEvent.cpp:57 #, kde-format @@ -107,4 +106,4 @@ #: kded/UpdateEvent/UpdateEvent.cpp:94 msgctxt "Start the update" msgid "Update" -msgstr "" \ No newline at end of file +msgstr "Nuashonraigh" \ No newline at end of file diff -Nru muon-1.9.60/po/ga/muon-updater.po muon-2.0.0/po/ga/muon-updater.po --- muon-1.9.60/po/ga/muon-updater.po 2012-10-29 18:34:07.000000000 +0000 +++ muon-2.0.0/po/ga/muon-updater.po 2013-04-01 20:32:49.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2011-12-28 12:28-0500\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2011-01-27 15:44-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" "Language: ga\n" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "kscanne@gmail.com" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -38,18 +38,18 @@ "url='%1'>Launchpad instead." msgstr "" -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "" -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" -msgstr "" +msgstr "Leagan %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -74,158 +74,131 @@ msgstr "" #: updater/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010, 2012 Jonathan Thomas" #: updater/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "" -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Stair an Phacáiste" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" -msgstr "" +msgstr "Cealaigh" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" msgstr "" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" msgstr "" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -243,12 +216,12 @@ msgstr[3] "" msgstr[4] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -257,28 +230,33 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -294,61 +272,55 @@ msgid "Download Size" msgstr "" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "" -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "" -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "" \ No newline at end of file diff -Nru muon-1.9.60/po/ga/muon.po muon-2.0.0/po/ga/muon.po --- muon-1.9.60/po/ga/muon.po 2012-10-29 18:34:07.000000000 +0000 +++ muon-2.0.0/po/ga/muon.po 2013-04-01 20:32:49.000000000 +0000 @@ -1,13 +1,13 @@ # Irish translation of muon -# Copyright (C) 2011 This_file_is_part_of_KDE +# Copyright (C) 2010 This_file_is_part_of_KDE # This file is distributed under the same license as the muon package. -# Kevin Scannell , 2011. +# Kevin Scannell , 2010. msgid "" msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2011-12-28 12:28-0500\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2010-09-12 10:10-0500\n" "Last-Translator: Kevin Scannell \n" "Language-Team: Irish \n" "Language: ga\n" @@ -175,18 +175,18 @@ msgid "Purge" msgstr "Purgú" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Dímharcáil" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "" -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -277,7 +277,7 @@ #: muon/DownloadModel/DownloadDelegate.cpp:65 msgctxt "@info:status Progress text when done" msgid "Done" -msgstr "" +msgstr "Críochnaithe" #: muon/DownloadModel/DownloadModel.cpp:61 msgctxt "@title:column" @@ -341,78 +341,46 @@ msgstr "" #: muon/main.cpp:37 -#, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "© 2009-2011 Jonathan Thomas" +msgstr "© 2009-2012 Jonathan Thomas" #: muon/main.cpp:38 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "" - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -420,29 +388,29 @@ "Full Upgrade button." msgstr "" -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " "at the moment, or may have been manually held back." msgstr "" -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Stair an Phacáiste" @@ -459,86 +427,86 @@ msgid "Requested" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" -msgstr "" +msgstr "Cuardaigh" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -548,42 +516,24 @@ "enabled repositories." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "" diff -Nru muon-1.9.60/po/gl/CMakeLists.txt muon-2.0.0/po/gl/CMakeLists.txt --- muon-1.9.60/po/gl/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/gl/CMakeLists.txt 2013-04-01 20:32:51.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES(gl ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru muon-1.9.60/po/gl/libmuon.po muon-2.0.0/po/gl/libmuon.po --- muon-1.9.60/po/gl/libmuon.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/gl/libmuon.po 2013-04-01 20:32:51.000000000 +0000 @@ -0,0 +1,203 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Miguel Branco, 2012, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-01-12 13:04+0100\n" +"Last-Translator: Miguel Branco \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: libmuon/backends/ApplicationBackend/Application.cpp:177 +msgid "Applications" +msgstr "Aplicativos" + +#: libmuon/backends/ApplicationBackend/Application.cpp:278 +msgctxt "@info license" +msgid "Open Source" +msgstr "Código libre" + +#: libmuon/backends/ApplicationBackend/Application.cpp:280 +msgctxt "@info license" +msgid "Proprietary" +msgstr "Propietario" + +#: libmuon/backends/ApplicationBackend/Application.cpp:282 +msgctxt "@info license" +msgid "Unknown" +msgstr "Descoñecido" + +#: libmuon/backends/ApplicationBackend/Application.cpp:413 +#, kde-format +msgctxt "@info app size" +msgid "%1 to download, %2 on disk" +msgstr "%1 para descargar, %2 no disco" + +#: libmuon/backends/ApplicationBackend/Application.cpp:417 +#, kde-format +msgctxt "@info app size" +msgid "%1 on disk" +msgstr "%1 no disco" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Aplicativos" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Aplicativos" + +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Entrar no servizo de Ubuntu SSO" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "" + +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Todo" + +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "Este Muon ten \"super poderes de vaca\"" + +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" +msgid "Broken" +msgstr "Estragado" + +#: libmuon/resources/AbstractResource.cpp:82 +#, fuzzy +#| msgid "Available updates" +msgid "Available" +msgstr "Actualizacións dispoñíbeis" + +#: libmuon/resources/AbstractResource.cpp:83 +#, fuzzy +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "Instalado" + +#: libmuon/resources/AbstractResource.cpp:84 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Actualizable" + +#: libmuon/resources/ResourcesUpdatesModel.cpp:100 +#, kde-format +msgctxt "@item:intext Remaining time" +msgid "%1 remaining" +msgstr "" + +#: libmuon/settings/NotifySettingsPage.cpp:46 +msgid "Show notifications for:" +msgstr "Mostrar as notificacións para:" + +#: libmuon/settings/NotifySettingsPage.cpp:48 +msgid "Available updates" +msgstr "Actualizacións dispoñíbeis" + +#: libmuon/settings/NotifySettingsPage.cpp:49 +msgid "Show the number of available updates" +msgstr "Mostrar o número de actualizacións dispoñíbeis" + +#: libmuon/settings/NotifySettingsPage.cpp:50 +msgid "Distribution upgrades" +msgstr "Anovados da distribución" + +#: libmuon/settings/NotifySettingsPage.cpp:69 +msgid "Notification type:" +msgstr "Tipo de notificación:" + +#: libmuon/settings/NotifySettingsPage.cpp:72 +msgid "Use both popups and tray icons" +msgstr "Usar tanto as notificacións emerxentes como as iconas na bandexa" + +#: libmuon/settings/NotifySettingsPage.cpp:73 +msgid "Tray icons only" +msgstr "Só iconas na bandexa do sistema" + +#: libmuon/settings/NotifySettingsPage.cpp:74 +msgid "Popup notifications only" +msgstr "Só notificacións en despregables" + +#: libmuon/Transaction/TransactionListener.cpp:109 +msgctxt "@info:status" +msgid "Downloading" +msgstr "Descargando" + +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 +msgctxt "@info:status Progress text when done" +msgid "Done" +msgstr "Feito" + +#: libmuon/Transaction/TransactionListener.cpp:154 +msgctxt "@info:status Progress text when waiting" +msgid "Waiting" +msgstr "Agardando" + +#: libmuon/Transaction/TransactionListener.cpp:175 +msgctxt "@info:status" +msgid "Installing" +msgstr "Instalando" + +#: libmuon/Transaction/TransactionListener.cpp:179 +msgctxt "@info:status" +msgid "Changing Addons" +msgstr "Cambiando os engadidos" + +#: libmuon/Transaction/TransactionListener.cpp:183 +msgctxt "@info:status" +msgid "Removing" +msgstr "Eliminando" \ No newline at end of file diff -Nru muon-1.9.60/po/gl/muon-discover.po muon-2.0.0/po/gl/muon-discover.po --- muon-1.9.60/po/gl/muon-discover.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/gl/muon-discover.po 2013-04-01 20:32:51.000000000 +0000 @@ -0,0 +1,315 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Miguel Branco, 2012, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-01-12 12:42+0100\n" +"Last-Translator: Miguel Branco \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +#: discover/main.cpp:29 +msgid "An application discoverer" +msgstr "Un descubridor de aplicativos" + +#: discover/main.cpp:35 +msgid "Muon Discover" +msgstr "Descubridor do Muon" + +#: discover/main.cpp:36 +msgid "©2010-2012 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" + +#: discover/main.cpp:37 +msgid "Jonathan Thomas" +msgstr "Jonathan Thomas" + +#: discover/main.cpp:38 +msgid "Aleix Pol Gonzalez" +msgstr "Aleix Pol Gonzalez" + +#: discover/main.cpp:44 +msgid "Directly open the specified application by its package name." +msgstr "Abre directamente o aplicativo especificado polo seu nome de paquete." + +#: discover/main.cpp:45 +msgid "Open with a program that can deal with the given mimetype." +msgstr "Abrir un programa que poida xestionar o mimetype dado." + +#: discover/main.cpp:46 +msgid "Display a list of entries with a category." +msgstr "Mostra unha lista de entradas con unha categoría." + +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Buscar..." + +#: discover/MuonDiscoverMainWindow.cpp:109 +msgid "" +"Found some errors while setting up the GUI, the application can't proceed." +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:110 +msgid "Initialization error" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" + +#: discover/qml/AddonsView.qml:37 +#, kde-format +msgid "%1
%2" +msgstr "%1
%2" + +#: discover/qml/AddonsView.qml:63 +msgid "Apply" +msgstr "Aplicar" + +#: discover/qml/AddonsView.qml:68 +msgid "Discard" +msgstr "Descartar" + +#: discover/qml/ApplicationOverview.qml:64 +#, kde-format +msgid "%1 reviews" +msgstr "%1 críticas" + +#: discover/qml/ApplicationOverview.qml:70 +msgid "Homepage" +msgstr "Páxina web" + +#: discover/qml/ApplicationOverview.qml:79 +msgid "Launch" +msgstr "Iniciar" + +#: discover/qml/ApplicationOverview.qml:86 +msgid "Review" +msgstr "Revisión" + +#: discover/qml/ApplicationOverview.qml:91 +#, kde-format +msgid "Total Size: %1
" +msgstr "Tamaño total: %1
" + +#: discover/qml/ApplicationPage.qml:87 +msgid "Overview" +msgstr "Resumo" + +#: discover/qml/ApplicationPage.qml:91 +msgid "Add-ons" +msgstr "Complementos" + +#: discover/qml/ApplicationPage.qml:96 +msgid "Reviews" +msgstr "Revisións" + +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 +#: discover/qml/InstallApplicationButton.qml:38 +#: discover/qml/InstalledPage.qml:11 +msgid "Update" +msgstr "Actualizar" + +#: discover/qml/ApplicationsListPage.qml:111 +msgid "Name" +msgstr "Nome" + +#: discover/qml/ApplicationsListPage.qml:117 +msgid "Rating" +msgstr "Cualificación" + +#: discover/qml/ApplicationsListPage.qml:123 +msgid "Buzz" +msgstr "Zoáronche" + +#: discover/qml/ApplicationsListPage.qml:129 +msgid "Popularity" +msgstr "Popularidade" + +#: discover/qml/ApplicationsListPage.qml:135 +msgid "Origin" +msgstr "Orixe " + +#: discover/qml/CategoryPage.qml:34 +#, kde-format +msgid "Search in '%1'..." +msgstr "Procurar en «%1»..." + +#: discover/qml/CategoryPage.qml:139 +#, fuzzy +#| msgid "Popularity Contest" +msgid "Popularity Contest" +msgstr "Concurso de popularidade" + +#: discover/qml/CategoryPage.qml:140 +#, kde-format +msgid "points: %1" +msgstr "puntos: %1" + +#: discover/qml/CategoryPage.qml:151 +#, fuzzy +#| msgid "Best Ratings" +msgid "Best Ratings" +msgstr "As mellores cualificacións" + +#: discover/qml/DefaultBanner.qml:16 +#, fuzzy +#| msgid "Muon Discover" +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "Descubridor do Muon" + +#: discover/qml/FeaturedBanner.qml:88 +#, kde-format +msgid "%1
%2" +msgstr "%1
%2" + +#: discover/qml/InstallApplicationButton.qml:43 +msgid "Install" +msgstr "Instalar" + +#: discover/qml/InstallApplicationButton.qml:48 +msgid "Remove" +msgstr "Eliminar" + +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 +msgid "Installed" +msgstr "Instalado" + +#: discover/qml/InstalledPage.qml:31 +#, fuzzy +#| msgid "Update All!" +msgid "Update All" +msgstr "Actualizar todo!" + +#: discover/qml/Main.qml:41 +msgid "Loading..." +msgstr "Cargando..." + +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "" + +#: discover/qml/Main.qml:88 +msgid "Discover" +msgstr "Descubrir" + +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Instalado" +msgstr[1] "Instalado" + +#: discover/qml/Main.qml:100 +msgid "Sources" +msgstr "Fontes" + +#: discover/qml/ReviewDialog.qml:11 +#, kde-format +msgid "Reviewing %1" +msgstr "Revisando %1" + +#: discover/qml/ReviewDialog.qml:21 +msgid "Submit" +msgstr "Enviar" + +#: discover/qml/ReviewDialog.qml:30 +msgid "Close" +msgstr "Pechar" + +#: discover/qml/ReviewDialog.qml:43 +msgid "Rating:" +msgstr "Cualificación:" + +#: discover/qml/ReviewDialog.qml:49 +msgid "Summary:" +msgstr "Resumo:" + +#: discover/qml/ReviewsView.qml:21 +msgid "Reviews:" +msgstr "Críticas" + +#: discover/qml/ReviewsView.qml:30 +msgid "Tell us about this review!" +msgstr "Cóntanos algo desta crítica!" + +#: discover/qml/ReviewsView.qml:31 +#, kde-format +msgid "%1 out of %2 people found this review useful" +msgstr "A %1 de %2 persoas serviulles esta crítica para decidir" + +#: discover/qml/ReviewsView.qml:46 +#, kde-format +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" + +#: discover/qml/ReviewsView.qml:59 +msgid "Useful? Yes/No" +msgstr "Foiche útil? Si/Non" + +#: discover/qml/SourcesPage.qml:17 +msgid "Add Source" +msgstr "Engadir fonte" + +#: discover/qml/SourcesPage.qml:40 +msgid "Specify the new source" +msgstr "Especificar a nova fonte" + +#: discover/qml/SourcesPage.qml:44 +msgid "OK" +msgstr "" + +#: discover/qml/SourcesPage.qml:50 +msgid "Cancel" +msgstr "Cancelar" + +#: discover/qml/SourcesPage.qml:72 +msgid " - The apt repository source line to add. This is one of:\n" +msgstr "" +" - A liña de código do repositorio apt para engadir. Será unha " +"das seguintes:\n" + +#: discover/qml/SourcesPage.qml:136 +#, kde-format +msgid "%1 (Binary)" +msgstr "%1 (Binario)" + +#: discover/qml/SourcesPage.qml:162 +#, kde-format +msgid "%1. %2" +msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/gl/muon-installer.po muon-2.0.0/po/gl/muon-installer.po --- muon-1.9.60/po/gl/muon-installer.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/gl/muon-installer.po 2013-04-01 20:32:51.000000000 +0000 @@ -0,0 +1,298 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Miguel Branco, 2012, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2013-01-12 13:07+0100\n" +"Last-Translator: Miguel Branco \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Miguel Branco" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "mgl.branco@gmail.com" + +#: installer/ApplicationLauncher.cpp:43 +msgid "The following application was just installed, click on it to launch:" +msgid_plural "" +"The following applications were just installed, click on them to launch:" +msgstr[0] "" +"Acábase de instalar o seguinte aplicativo. Fai clic nel para inicialo:" +msgstr[1] "" +"Acábanse de instalar os seguintes aplicativos. Fai clic neles para inicialos:" + +#: installer/AvailableView.cpp:44 +msgid "Get Software" +msgstr "Obter software" + +#: installer/BreadcrumbWidget/BreadcrumbWidget.cpp:64 +msgctxt "@label Line edit click message" +msgid "Search" +msgstr "Buscar" + +#: installer/CategoryView/CategoryViewWidget.cpp:126 +msgctxt "@label" +msgid "Search Results" +msgstr "Resultados da busca" + +#: installer/main.cpp:31 +msgid "An application manager" +msgstr "Un xestor de aplicativos" + +#: installer/main.cpp:37 +msgid "Muon Software Center" +msgstr "Centro de software Muon" + +#: installer/main.cpp:38 +msgid "©2010-2012 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" + +#: installer/main.cpp:39 +msgid "Jonathan Thomas" +msgstr "Jonathan Thomas" + +#: installer/MainWindow.cpp:222 +msgctxt "@item:inlistbox" +msgid "Provided by Kubuntu" +msgstr "Fornecido por Kubuntu" + +#: installer/MainWindow.cpp:227 +msgctxt "@item:inlistbox" +msgid "Provided by Debian" +msgstr "Fornecido por Debian" + +#: installer/MainWindow.cpp:233 +msgctxt "" +"@item:inlistbox The name of the repository provided by Canonical, Ltd. " +msgid "Canonical Partners" +msgstr "Socios de Canonical" + +#: installer/MainWindow.cpp:242 +msgctxt "@item:inlistbox An independent software source" +msgid "Independent" +msgstr "Independente" + +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Obter software" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Software instalado" + +#: installer/MainWindow.cpp:318 +msgctxt "@item:inlistbox Item for showing the history view" +msgid "History" +msgstr "Historial" + +#: installer/MainWindow.cpp:397 +#, kde-format +msgctxt "@info" +msgid "%1 was successfully installed." +msgstr "%1 instalouse correctamente." + +#: installer/MainWindow.cpp:400 +msgctxt "@action" +msgid "Start" +msgstr "Comezar" + +#: installer/MainWindow.cpp:406 +msgctxt "@info" +msgid "Applications successfully installed." +msgstr "Instaláronse correctamente os aplicativos." + +#: installer/MainWindow.cpp:407 +msgctxt "@action" +msgid "Run New Applications..." +msgstr "Executar novos aplicativos..." + +#: installer/MainWindow.cpp:429 +msgctxt "@title:window" +msgid "Installation Complete" +msgstr "Instalación completada" + +#: installer/MainWindow.cpp:471 +msgctxt "@item:inlistbox Item for showing the progress view" +msgid "In Progress" +msgstr "En progreso" + +#: installer/ProgressView.cpp:37 +msgctxt "@info" +msgid "In Progress" +msgstr "En progreso" + +#: installer/ResourceDetailsView/AddonsWidget.cpp:59 +msgctxt "@title" +msgid "Addons" +msgstr "Engadidos" + +#: installer/ResourceDetailsView/AddonsWidget.cpp:86 +msgctxt "@action:button" +msgid "Revert" +msgstr "Reverter" + +#: installer/ResourceDetailsView/AddonsWidget.cpp:92 +msgctxt "@action:button" +msgid "Apply" +msgstr "Aplicar" + +#: installer/ResourceDetailsView/AddonsWidget.cpp:93 +msgctxt "@info:tooltip" +msgid "Apply changes to addons" +msgstr "Aplicar os cambios nos engadidos" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:148 +msgctxt "@info" +msgid "Find in the menu:" +msgstr "Buscar no menú:" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:237 +msgctxt "@label Label preceding the app size" +msgid "Total Size:" +msgstr "Tamaño total:" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:244 +msgctxt "@label/rich Label preceding the app version" +msgid "Version:" +msgstr "Versión:" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:251 +msgctxt "@label Label preceding the app license" +msgid "License:" +msgstr "Licenza:" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:258 +msgctxt "@label Label preceding the app support" +msgid "Support:" +msgstr "Soporte:" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:330 +#, kde-format +msgctxt "@label The number of ratings the app has" +msgid "%1 rating" +msgid_plural "%1 ratings" +msgstr[0] "%1 de cualificación" +msgstr[1] "%1 de cualificación" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:359 +msgctxt "@label visible text for an app's URL" +msgid "Website" +msgstr "Sitio Web" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:466 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:510 +msgctxt "@info:status Progress text when waiting" +msgid "Waiting" +msgstr "Agardando" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:541 +msgctxt "@action" +msgid "Install" +msgstr "Instalar" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 +msgctxt "@action" +msgid "Remove" +msgstr "Eliminar" + +#: installer/ResourceView/ResourceDelegate.cpp:63 +#: installer/ResourceView/ResourceExtender.cpp:56 +#: installer/ResourceView/ResourceExtender.cpp:122 +msgid "Install" +msgstr "Instalar" + +#: installer/ResourceView/ResourceDelegate.cpp:65 +#: installer/ResourceView/ResourceExtender.cpp:52 +#: installer/ResourceView/ResourceExtender.cpp:119 +msgid "Remove" +msgstr "Eliminar" + +#: installer/ResourceView/ResourceExtender.cpp:42 +msgid "More Info" +msgstr "Máis información" + +#: installer/ResourceView/ResourceViewWidget.cpp:66 +msgid "Show technical items" +msgstr "Mostrar os elementos técnicos" + +#: installer/ResourceView/ResourceViewWidget.cpp:72 +msgid "Sort:" +msgstr "Ordenar:" + +#: installer/ResourceView/ResourceViewWidget.cpp:74 +msgctxt "@item:inlistbox" +msgid "By Name" +msgstr "Polo nome" + +#: installer/ResourceView/ResourceViewWidget.cpp:75 +msgctxt "@item:inlistbox" +msgid "By Top Rated" +msgstr "Pola mellor puntuación" + +#: installer/ResourceView/ResourceViewWidget.cpp:76 +msgctxt "@item:inlistbox" +msgid "By Most Buzz" +msgstr "Polo que se fala deles" + +#: installer/ResourceView/ResourceViewWidget.cpp:214 +msgctxt "@item:inlistbox" +msgid "By Relevancy" +msgstr "Pola importancia" + +#: installer/ReviewsWidget/ReviewsWidget.cpp:57 +msgctxt "@title" +msgid "Reviews" +msgstr "Críticas" + +#: installer/ReviewsWidget/ReviewsWidget.cpp:73 +msgctxt "@info:status" +msgid "Loading reviews" +msgstr "Cargando as críticas" + +#: installer/ReviewsWidget/ReviewsWidget.cpp:79 +msgctxt "@action" +msgid "Check for more reviews" +msgstr "Buscar máis críticas" + +#: installer/ReviewsWidget/ReviewsWidget.cpp:103 +msgctxt "@info:status" +msgid "No reviews available" +msgstr "Non hai máis críticas" + +#: installer/ReviewsWidget/ReviewWidget.cpp:124 +#, kde-format +msgctxt "@label Formatted: username, date" +msgid "%1, %2" +msgstr "%1, %2" + +#: installer/ReviewsWidget/ReviewWidget.cpp:136 +#, kde-format +msgctxt "@label" +msgid "This review was written for an older version (Version: %1)" +msgstr "Esta crítica escribiuse para unha versión anterior (Versión: %1)" + +#: installer/ReviewsWidget/ReviewWidget.cpp:143 +#, kde-format +msgctxt "@label" +msgid "%1 out of %2 person found this review useful" +msgid_plural "%1 out of %2 people found this review useful" +msgstr[0] "A %1 de %2 persoas serviulles esta crítica para decidir" +msgstr[1] "A %1 de %2 persoas serviulles esta crítica para decidir" \ No newline at end of file diff -Nru muon-1.9.60/po/gl/muon-notifier.po muon-2.0.0/po/gl/muon-notifier.po --- muon-1.9.60/po/gl/muon-notifier.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/gl/muon-notifier.po 2013-04-01 20:32:51.000000000 +0000 @@ -0,0 +1,106 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Miguel Branco, 2012. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-12-06 12:09+0100\n" +"Last-Translator: Miguel Branco\n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Miguel Branco" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "mgl.branco@gmail.com" + +#: kded/distupgradeevent/distupgradeevent.cpp:35 +msgctxt "Notification when a new version of Kubuntu is available" +msgid "A new version of Kubuntu is available" +msgstr "Está dispoñíbel unha nova versión de Kubuntu" + +#: kded/distupgradeevent/distupgradeevent.cpp:37 +msgctxt "Start the upgrade" +msgid "Upgrade" +msgstr "Anovar" + +#: kded/distupgradeevent/distupgradeevent.cpp:38 +#: kded/UpdateEvent/UpdateEvent.cpp:95 +msgctxt "Button to dismiss this notification once" +msgid "Ignore for now" +msgstr "Ignorar polo de agora" + +#: kded/distupgradeevent/distupgradeevent.cpp:40 +#: kded/UpdateEvent/UpdateEvent.cpp:97 +msgctxt "Button to make this notification never show up again" +msgid "Never show again" +msgstr "Non mostralo nunca máis" + +#: kded/event.cpp:136 kded/event.cpp:143 kded/event.cpp:183 +msgid "System Notification" +msgstr "Notificacións do sistema" + +#: kded/event.cpp:156 +msgid "Hide" +msgstr "Agochar" + +#: kded/MuonNotifier.cpp:55 +msgid "Muon Notification Daemon" +msgstr "Daemon de notificacións de Muon" + +#: kded/MuonNotifier.cpp:56 +msgid "A Notification Daemon for Muon" +msgstr "Un daemon de notificacións para Muon" + +#: kded/MuonNotifier.cpp:58 +msgid "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" +msgstr "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" + +#: kded/UpdateEvent/UpdateEvent.cpp:57 +#, kde-format +msgctxt "Notification text" +msgid "%1 security update is available" +msgid_plural "%1 security updates are available" +msgstr[0] "Hai %1 actualización de seguridade dispoñíbel" +msgstr[1] "Hai %1 actualizacións de seguridade dispoñíbeis" + +#: kded/UpdateEvent/UpdateEvent.cpp:61 +msgctxt "Notification text" +msgid "A security update is available" +msgid_plural "Security updates are available" +msgstr[0] "Hai unha actualización de seguridade dispoñíbel" +msgstr[1] "Hai actualizacións de seguridade dispoñíbeis" + +#: kded/UpdateEvent/UpdateEvent.cpp:69 +#, kde-format +msgctxt "Notification text" +msgid "%1 software update is available" +msgid_plural "%1 software updates are available" +msgstr[0] "Hai %1 actualización de software dispoñíbel" +msgstr[1] "Hai %1 actualizacións de software dispoñíbeis" + +#: kded/UpdateEvent/UpdateEvent.cpp:73 +msgctxt "Notification text" +msgid "A software update is available" +msgid_plural "Software updates are available" +msgstr[0] "Hai unha actualización de software dispoñíbel" +msgstr[1] "Hai actualizacións de software dispoñíbeis" + +#: kded/UpdateEvent/UpdateEvent.cpp:94 +msgctxt "Start the update" +msgid "Update" +msgstr "Actualizar" \ No newline at end of file diff -Nru muon-1.9.60/po/gl/muon-updater.po muon-2.0.0/po/gl/muon-updater.po --- muon-1.9.60/po/gl/muon-updater.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/gl/muon-updater.po 2013-04-01 20:32:51.000000000 +0000 @@ -0,0 +1,362 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Miguel Branco, 2012, 2013. +# Marce Villarino , 2012. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-01-12 13:08+0100\n" +"Last-Translator: Miguel Branco \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Miguel Branco" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "mgl.branco@gmail.com" + +#: updater/ChangelogWidget.cpp:54 +msgctxt "@action:button" +msgid "Hide" +msgstr "Agochar" + +#: updater/ChangelogWidget.cpp:161 +#, kde-format +msgctxt "@info/rich" +msgid "" +"The list of changes is not yet available. Please use Launchpad instead." +msgstr "" +"A lista de cambios aínda non está dispoñíbel. Usa Launchpad para iso." + +#: updater/ChangelogWidget.cpp:165 +msgctxt "@info" +msgid "The list of changes is not yet available." +msgstr "A lista de cambios aínda non está dispoñíbel." + +#: updater/ChangelogWidget.cpp:203 +#, kde-format +msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" +msgid "Version %1:" +msgstr "Versión %1:" + +#: updater/ChangelogWidget.cpp:207 +#, kde-format +msgctxt "@info:label" +msgid "This update was issued on %1" +msgstr "A actualización foi liberada o %1" + +#: updater/config/UpdaterSettingsDialog.cpp:38 +msgctxt "@title:window" +msgid "Muon Preferences" +msgstr "Configuracións de Muon" + +#: updater/config/UpdaterSettingsDialog.cpp:46 +msgctxt "@title:group" +msgid "Notifications" +msgstr "Notificacións" + +#: updater/main.cpp:31 +msgid "An update manager" +msgstr "Un xestor de actualizacións" + +#: updater/main.cpp:37 +msgid "Muon Update Manager" +msgstr "Xestor de actualizacións de Muon" + +#: updater/main.cpp:38 +msgid "©2010-2012 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" + +#: updater/main.cpp:39 +msgid "Jonathan Thomas" +msgstr "Jonathan Thomas" + +#: updater/MainWindow.cpp:70 +msgctxt "@title:window" +msgid "Software Updates" +msgstr "Actualizacións de software" + +#: updater/MainWindow.cpp:77 +msgctxt "@info Warning to plug in laptop before updating" +msgid "It is safer to plug in the power adapter before updating." +msgstr "" +"O máis seguro é conectar o adaptador de enerxía antes de facer ningunha " +"actualización." + +#: updater/MainWindow.cpp:86 +msgctxt "Notification when a new version of Kubuntu is available" +msgid "A new version of Kubuntu is available." +msgstr "Está dispoñíbel unha nova versión de Kubuntu" + +#: updater/MainWindow.cpp:121 +msgctxt "@action Downloads and installs updates" +msgid "Install Updates" +msgstr "Instalar as actualizacións" + +#: updater/MainWindow.cpp:129 +msgctxt "@action::inmenu" +msgid "History..." +msgstr "Historial..." + +#: updater/MainWindow.cpp:133 +msgctxt "@action" +msgid "Upgrade" +msgstr "Anovar" + +#: updater/MainWindow.cpp:294 +msgctxt "@title:window" +msgid "Package History" +msgstr "Paquete de historial" + +#: updater/ProgressWidget.cpp:60 +msgctxt "@action:button Cancels the download" +msgid "Cancel" +msgstr "Cancelar" + +#: updater/ProgressWidget.cpp:127 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" +msgctxt "@info Status info, widget title" +msgid "Starting" +msgstr "Instalando as actualizacións" + +#: updater/ProgressWidget.cpp:132 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status info, widget title" +msgid "Waiting for Authentication" +msgstr "Actualizando as fontes de software" + +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" +msgctxt "@info Status information, widget title" +msgid "Waiting" +msgstr "Instalando as actualizacións" + +#: updater/ProgressWidget.cpp:139 +msgctxt "@info Status info" +msgid "Waiting for other transactions to finish" +msgstr "" + +#: updater/ProgressWidget.cpp:146 +msgctxt "@info Status info" +msgid "Waiting for other software managers to quit" +msgstr "" + +#: updater/ProgressWidget.cpp:153 +msgctxt "@info Status info" +msgid "Waiting for required medium" +msgstr "" + +#: updater/ProgressWidget.cpp:160 +msgctxt "@info Status info" +msgid "Waiting for configuration file" +msgstr "" + +#: updater/ProgressWidget.cpp:171 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status info" +msgid "Loading Software List" +msgstr "Actualizando as fontes de software" + +#: updater/ProgressWidget.cpp:178 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status information, widget title" +msgid "Updating software sources" +msgstr "Actualizando as fontes de software" + +#: updater/ProgressWidget.cpp:183 +#, fuzzy +#| msgctxt "@info" +#| msgid "Downloading Updates" +msgctxt "@info Status information, widget title" +msgid "Downloading Packages" +msgstr "Descargando as actualizacións" + +#: updater/ProgressWidget.cpp:192 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" +msgctxt "@info Status information, widget title" +msgid "Applying Changes" +msgstr "Instalando as actualizacións" + +#: updater/ProgressWidget.cpp:197 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" +msgctxt "@info Status information, widget title" +msgid "Finished" +msgstr "Instalando as actualizacións" + +#: updater/ProgressWidget.cpp:227 +msgctxt "@title:window" +msgid "Media Change Required" +msgstr "" + +#: updater/ProgressWidget.cpp:228 +#, kde-format +msgctxt "@label" +msgid "Please insert %1 into %2" +msgstr "" + +#: updater/ProgressWidget.cpp:237 +msgctxt "@title:window" +msgid "Warning - Unverified Software" +msgstr "" + +#: updater/ProgressWidget.cpp:239 +msgctxt "@label" +msgid "" +"The following piece of software cannot be verified. Installing " +"unverified software represents a security risk, as the presence of " +"unverifiable software can be a sign of tampering. Do you wish to " +"continue?" +msgid_plural "" +"The following pieces of software cannot be verified. Installing " +"unverified software represents a security risk, as the presence of " +"unverifiable software can be a sign of tampering. Do you wish to " +"continue?" +msgstr[0] "" +msgstr[1] "" + +#: updater/ProgressWidget.cpp:257 +msgctxt "@title:window" +msgid "Configuration File Changed" +msgstr "" + +#: updater/ProgressWidget.cpp:259 +#, kde-format +msgctxt "@label Notifies a config file change" +msgid "" +"A new version of the configuration file %1 is " +"available, but your version has been modified. Would you like to keep your " +"current version or install the new version?" +msgstr "" + +#: updater/ProgressWidget.cpp:264 +#, fuzzy +#| msgctxt "@label Column label" +#| msgid "Version" +msgctxt "@action Use the new config file" +msgid "Use New Version" +msgstr "Versión" + +#: updater/ProgressWidget.cpp:265 +#, fuzzy +#| msgctxt "@label Column label" +#| msgid "Version" +msgctxt "@action Keep the old config file" +msgid "Keep Old Version" +msgstr "Versión" + +#: updater/ProgressWidget.cpp:288 +#, kde-format +msgctxt "@label Download rate" +msgid "Download rate: %1/s" +msgstr "Taxa de descarga. %1/s" + +#: updater/ProgressWidget.cpp:300 +#, kde-format +msgctxt "@item:intext Remaining time" +msgid "%1 remaining" +msgstr "Faltan %1" + +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + +#: updater/UpdateModel/UpdateModel.cpp:104 +msgctxt "@label Column label" +msgid "Updates" +msgstr "Actualizacións" + +#: updater/UpdateModel/UpdateModel.cpp:106 +msgctxt "@label Column label" +msgid "Version" +msgstr "Versión" + +#: updater/UpdateModel/UpdateModel.cpp:108 +msgctxt "@label Column label" +msgid "Download Size" +msgstr "Tamaño de descarga" + +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "" + +#: updater/UpdaterWidget.cpp:164 +msgctxt "@item:inlistbox" +msgid "Important Security Updates" +msgstr "Actualizacións de seguranza importantes" + +#: updater/UpdaterWidget.cpp:167 +msgctxt "@item:inlistbox" +msgid "Application Updates" +msgstr "Actualizacións de aplicativos" + +#: updater/UpdaterWidget.cpp:170 +msgctxt "@item:inlistbox" +msgid "System Updates" +msgstr "Actualizacións do sistema" + +#: updater/UpdaterWidget.cpp:331 +msgctxt "@info" +msgid "It is unknown when the last check for updates was." +msgstr "Descoñecese cando se fixo a última comprobación de actualizacións." + +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 +msgctxt "@info" +msgid "Please click Check for Updates to check." +msgstr "" +"Fai clic en Comprobar actualizacións para buscalas." + +#: updater/UpdaterWidget.cpp:343 +msgctxt "@info" +msgid "The software on this computer is up to date." +msgstr "O software deste computador está ao día." + +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 +#, kde-format +msgctxt "@info" +msgid "Last checked %1 ago." +msgstr "Comprobouse hai %1." + +#: updater/UpdaterWidget.cpp:348 +msgctxt "@info" +msgid "No updates are available." +msgstr "Non hai actualizacións dispoñíbeis." \ No newline at end of file diff -Nru muon-1.9.60/po/gl/muon.po muon-2.0.0/po/gl/muon.po --- muon-1.9.60/po/gl/muon.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/gl/muon.po 2013-04-01 20:32:51.000000000 +0000 @@ -0,0 +1,782 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Miguel Branco, 2012, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-01-12 13:11+0100\n" +"Last-Translator: Miguel Branco \n" +"Language-Team: Galician \n" +"Language: gl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-Generator: Lokalize 1.5\n" +"X-Environment: kde\n" +"X-Accelerator-Marker: &\n" +"X-Text-Markup: kde4\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "Miguel Branco" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "mgl.branco@gmail.com" + +#: muon/config/GeneralSettingsPage.cpp:53 +msgid "Ask to confirm changes that affect other packages" +msgstr "Pedir a confirmación dos cambios que afecten outros paquetes" + +#: muon/config/GeneralSettingsPage.cpp:54 +msgid "Show foreign-architecture packages that are available natively" +msgstr "" +"Mostrar os paquetes de arquitectura diferente que están dispoñíbeis " +"nativamente." + +#: muon/config/GeneralSettingsPage.cpp:55 +msgid "Treat recommended packages as dependencies" +msgstr "Tratar os paquetes recomendados como dependencias" + +#: muon/config/GeneralSettingsPage.cpp:56 +msgid "Treat suggested packages as dependencies" +msgstr "Tratar os paquetes suxeridos como dependencias" + +#: muon/config/GeneralSettingsPage.cpp:57 +msgid "Allow the installation of untrusted packages" +msgstr "Permitir a instalación de paquetes nos que non se confía" + +#: muon/config/GeneralSettingsPage.cpp:68 +msgid "Delete obsolete cached packages every:" +msgstr "Eliminar a caché de paquetes obsoletos cada:" + +#: muon/config/GeneralSettingsPage.cpp:86 +msgid "Number of undo operations:" +msgstr "Número de operacións de desfacer:" + +#: muon/config/GeneralSettingsPage.cpp:162 +msgid " day" +msgid_plural " days" +msgstr[0] " día" +msgstr[1] " días" + +#: muon/config/ManagerSettingsDialog.cpp:41 +msgctxt "@title:window" +msgid "Muon Preferences" +msgstr "Configuracións de Muon" + +#: muon/config/ManagerSettingsDialog.cpp:49 +msgctxt "@title:group Title of the general group" +msgid "General" +msgstr "Xeral" + +#: muon/config/ManagerSettingsDialog.cpp:57 +msgctxt "@title:group" +msgid "Notifications" +msgstr "Notificacións" + +#: muon/DetailsTabs/ChangelogTab.cpp:42 +msgctxt "@title:tab" +msgid "Changes List" +msgstr "Lista de cambios" + +#: muon/DetailsTabs/ChangelogTab.cpp:87 +#, kde-format +msgctxt "@info/rich" +msgid "" +"The list of changes is not yet available. Please use Launchpad instead." +msgstr "" +"A lista de cambios aínda non está dispoñíbel. Usa Launchpad para iso." + +#: muon/DetailsTabs/ChangelogTab.cpp:91 +msgctxt "@info" +msgid "The list of changes is not yet available." +msgstr "A lista de cambios aínda non está dispoñíbel." + +#: muon/DetailsTabs/DependsTab.cpp:37 +msgctxt "@title:tab" +msgid "Dependencies" +msgstr "Dependencias" + +#: muon/DetailsTabs/DependsTab.cpp:40 +msgctxt "@item:inlistbox" +msgid "Dependencies of the Current Version" +msgstr "Dependencias da versión actual" + +#: muon/DetailsTabs/DependsTab.cpp:41 +msgctxt "@item:inlistbox" +msgid "Dependencies of the Latest Version" +msgstr "Dependencias da última das versións" + +#: muon/DetailsTabs/DependsTab.cpp:42 +msgctxt "@item:inlistbox" +msgid "Dependants (Reverse Dependencies)" +msgstr "Dependentes (dependencias inversas)" + +#: muon/DetailsTabs/DependsTab.cpp:43 +msgctxt "@item:inlistbox" +msgid "Virtual Packages Provided" +msgstr "Paquetes virtuais fornecidos" + +#: muon/DetailsTabs/DependsTab.cpp:71 muon/DetailsTabs/DependsTab.cpp:78 +msgctxt "@label" +msgid "This package does not have any dependencies" +msgstr "Este paquete non ten ningunha dependencia" + +#: muon/DetailsTabs/DependsTab.cpp:85 +msgctxt "@label" +msgid "This package has no dependents. (Nothing depends on it.)" +msgstr "Este paquete non ten dependentes. (Non hai nada que dependa del.)" + +#: muon/DetailsTabs/DependsTab.cpp:92 +msgctxt "@label" +msgid "This package does not provide any virtual packages" +msgstr "Este paquete non fornece ningún paquete virtual" + +#: muon/DetailsTabs/InstalledFilesTab.cpp:33 +msgctxt "@title:tab" +msgid "Installed Files" +msgstr "Ficheiros instalados" + +#: muon/DetailsTabs/MainTab.cpp:48 +msgctxt "@title:tab" +msgid "Details" +msgstr "Detalles" + +#: muon/DetailsTabs/MainTab.cpp:64 +msgctxt "@label" +msgid "Mark for:" +msgstr "Marcar para:" + +#: muon/DetailsTabs/MainTab.cpp:69 +msgctxt "@action:button" +msgid "Installation" +msgstr "Instalación" + +#: muon/DetailsTabs/MainTab.cpp:77 +msgctxt "@action:button" +msgid "Removal" +msgstr "Eliminación" + +#: muon/DetailsTabs/MainTab.cpp:83 +msgctxt "@action:button" +msgid "Upgrade" +msgstr "Anovar" + +#: muon/DetailsTabs/MainTab.cpp:89 +msgctxt "@action:button" +msgid "Reinstallation" +msgstr "Reinstalación" + +#: muon/DetailsTabs/MainTab.cpp:96 +msgctxt "@action:button" +msgid "Purge" +msgstr "Purgar" + +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 +msgctxt "@action:button" +msgid "Unmark" +msgstr "Desmarcar" + +#: muon/DetailsTabs/MainTab.cpp:178 +#, kde-format +msgctxt "@info Tells how long Canonical, Ltd. will support a package" +msgid "Canonical provides critical updates for %1 until %2." +msgstr "Canonical ofrece actualizacións críticas para %1 até o %2." + +#: muon/DetailsTabs/MainTab.cpp:182 +#, kde-format +msgctxt "@info Tells how long Canonical, Ltd. will support a package" +msgid "" +"Canonical does not provide updates for %1. Some updates may be provided by " +"the Ubuntu community." +msgstr "" +"Canonical non ofrece actualizacións para %1. Algunhas actualizacións " +"forneceraas a comunidade de Ubuntu." + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:45 +msgctxt "@title:tab" +msgid "Technical Details" +msgstr "Información técnica" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:61 +msgctxt "@label Label preceding the package maintainer" +msgid "Maintainer:" +msgstr "Mantedor" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:68 +msgctxt "@label Label preceding the package category" +msgid "Category:" +msgstr "Categoría:" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:76 +msgctxt "@label The parent package that this package comes from" +msgid "Source Package:" +msgstr "Paquete de orixe:" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:84 +msgctxt "@label The software source that this package comes from" +msgid "Origin:" +msgstr "Orixe:" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:92 +msgctxt "@label The package archive component that this package comes from" +msgid "Component:" +msgstr "Compoñente:" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:102 +msgctxt "@title:group" +msgid "Installed Version" +msgstr "Versión instalada" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:108 +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:130 +msgctxt "@label Label preceding the package version" +msgid "Version:" +msgstr "Versión:" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:114 +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:136 +msgctxt "@label Label preceding the package size" +msgid "Installed Size:" +msgstr "Tamaño instalado:" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:124 +msgctxt "@title:group" +msgid "Available Version" +msgstr "Versión dispoñíbel" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:142 +msgctxt "@label Label preceding the package's download size" +msgid "Download Size:" +msgstr "Tamaño de descarga:" + +#: muon/DetailsTabs/VersionTab.cpp:41 +msgctxt "@title:tab" +msgid "Versions" +msgstr "Versións" + +#: muon/DetailsTabs/VersionTab.cpp:44 +msgctxt "@label" +msgid "Available versions:" +msgstr "Versións dispoñíbeis" + +#: muon/DetailsTabs/VersionTab.cpp:62 +msgctxt "@label" +msgid "" +"Muon always selects the most applicable version available. If you force a " +"different version from the default one, errors in the dependency handling " +"can occur." +msgstr "" +"Muon sempre escolle a versión máis aplicable das dispoñíbeis. Se forzas unha " +"versión diferente da de por defecto pódense dar casos de erros na xestión de " +"dependencias." + +#: muon/DetailsTabs/VersionTab.cpp:70 +msgctxt "@action:button" +msgid "Force Version" +msgstr "Forzar a versión" + +#: muon/DownloadModel/DownloadDelegate.cpp:65 +msgctxt "@info:status Progress text when done" +msgid "Done" +msgstr "Feito" + +#: muon/DownloadModel/DownloadModel.cpp:61 +msgctxt "@title:column" +msgid "Package" +msgstr "Paquete" + +#: muon/DownloadModel/DownloadModel.cpp:63 +msgctxt "@title:column" +msgid "Location" +msgstr "Lugar" + +#: muon/DownloadModel/DownloadModel.cpp:65 +msgctxt "@title:column" +msgid "Size" +msgstr "Tamaño" + +#: muon/DownloadModel/DownloadModel.cpp:67 +msgctxt "@title:column" +msgid "Progress" +msgstr "Progreso" + +#: muon/FilterWidget/ArchitectureFilter.cpp:48 +#: muon/FilterWidget/CategoryFilter.cpp:58 +#: muon/FilterWidget/OriginFilter.cpp:43 muon/FilterWidget/StatusFilter.cpp:44 +#: muon/ManagerWidget.cpp:64 +msgctxt "@item:inlistbox Item that resets the filter to \"all\"" +msgid "All" +msgstr "Todo" + +#: muon/FilterWidget/FilterWidget.cpp:47 +msgctxt "@title:window" +msgid "Filter:" +msgstr "Filtro:" + +#: muon/FilterWidget/FilterWidget.cpp:56 +msgctxt "@title:tab" +msgid "By Category" +msgstr "Por categorías" + +#: muon/FilterWidget/FilterWidget.cpp:62 +msgctxt "@title:tab" +msgid "By Status" +msgstr "Por estado" + +#: muon/FilterWidget/FilterWidget.cpp:68 +msgctxt "@title:tab" +msgid "By Origin" +msgstr "Por orixe" + +#: muon/FilterWidget/FilterWidget.cpp:74 +msgctxt "@title:tab" +msgid "By Architecture" +msgstr "Por arquitectura" + +#: muon/main.cpp:30 +msgid "A package manager" +msgstr "Un xestor de paquetes" + +#: muon/main.cpp:36 +msgid "Muon Package Manager" +msgstr "Xestor de paquetes Muon" + +#: muon/main.cpp:37 +msgid "© 2009-2012 Jonathan Thomas" +msgstr "© 2009-2012 Jonathan Thomas" + +#: muon/main.cpp:38 +msgid "Jonathan Thomas" +msgstr "Jonathan Thomas" + +#: muon/MainWindow.cpp:180 +msgctxt "@action Marks upgradeable packages for upgrade" +msgid "Cautious Upgrade" +msgstr "Anovado cauteloso" + +#: muon/MainWindow.cpp:186 +msgctxt "" +"@action Marks upgradeable packages, including ones that install/remove new " +"things" +msgid "Full Upgrade" +msgstr "Anovar por completo" + +#: muon/MainWindow.cpp:192 +msgctxt "@action Marks packages no longer needed for removal" +msgid "Remove Unnecessary Packages" +msgstr "Eliminar os paquetes non necesarios" + +#: muon/MainWindow.cpp:197 +msgctxt "@action Takes the user to the preview page" +msgid "Preview Changes" +msgstr "Previsualizar os cambios" + +#: muon/MainWindow.cpp:202 +msgctxt "@action Applys the changes a user has made" +msgid "Apply Changes" +msgstr "Aplicar as modificacións" + +#: muon/MainWindow.cpp:209 +msgctxt "@action::inmenu" +msgid "History..." +msgstr "Historial..." + +#: muon/MainWindow.cpp:224 +msgctxt "@label" +msgid "" +"Unable to mark upgrades. The available upgrades may require new packages to " +"be installed or removed. You may wish to try a full upgrade by clicking the " +"Full Upgrade button." +msgstr "" +"Non foi posíbel marcar os anovados. As novas actualizacións poderían " +"requirir a instalación ou eliminación de novos paquetes. Poderías intentar " +"un anovado, actualización do sistema completa, facendo clic no botón de " +"Anovar por completo." + +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 +msgctxt "@title:window" +msgid "Unable to Mark Upgrades" +msgstr "Non foi posíbel marcar os anovados" + +#: muon/MainWindow.cpp:241 +msgctxt "@label" +msgid "" +"Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " +"at the moment, or may have been manually held back." +msgstr "" +"Non foi posíbel marcar os anovados. Algúns anovados poderían darse con " +"dependencias que non se poden cubrir neste momento ou que habería que " +"satisfacer manualmente." + +#: muon/MainWindow.cpp:317 +msgctxt "@action:intoolbar Return from the preview page" +msgid "Back" +msgstr "Atrás" + +#: muon/MainWindow.cpp:331 +msgctxt "@action" +msgid "Preview Changes" +msgstr "Previsualizar os cambios" + +#: muon/MainWindow.cpp:445 +msgctxt "@title:window" +msgid "Package History" +msgstr "Paquete de historial" + +#: muon/PackageModel/PackageModel.cpp:79 +msgid "Package" +msgstr "Paquete" + +#: muon/PackageModel/PackageModel.cpp:81 +msgid "Status" +msgstr "Estado" + +#: muon/PackageModel/PackageModel.cpp:83 +msgid "Requested" +msgstr "Solicitado" + +#: muon/PackageModel/PackageWidget.cpp:104 +msgctxt "@label Line edit click message" +msgid "Search" +msgstr "Procurar" + +#: muon/PackageModel/PackageWidget.cpp:157 +msgctxt "@action:inmenu" +msgid "Mark for Installation" +msgstr "Marcar para a instalación" + +#: muon/PackageModel/PackageWidget.cpp:162 +msgctxt "@action:button" +msgid "Mark for Removal" +msgstr "Marcar para eliminar" + +#: muon/PackageModel/PackageWidget.cpp:167 +msgctxt "@action:button" +msgid "Mark for Upgrade" +msgstr "Marcar para actualizar" + +#: muon/PackageModel/PackageWidget.cpp:172 +msgctxt "@action:button" +msgid "Mark for Reinstallation" +msgstr "Marcar para reinstalar" + +#: muon/PackageModel/PackageWidget.cpp:177 +msgctxt "@action:button" +msgid "Mark for Purge" +msgstr "Marcar para purgar" + +#: muon/PackageModel/PackageWidget.cpp:188 +msgctxt "@action:button" +msgid "Lock Package at Current Version" +msgstr "Bloquear o paquete na versión actual" + +#: muon/PackageModel/PackageWidget.cpp:322 +msgctxt "@action:button" +msgid "Unlock package" +msgstr "Desbloquear o paquete " + +#: muon/PackageModel/PackageWidget.cpp:326 +msgctxt "@action:button" +msgid "Lock at Current Version" +msgstr "Bloquear na versión actualización" + +#: muon/PackageModel/PackageWidget.cpp:374 +msgctxt "@label" +msgid "" +"Removing this package may break your system. Are you sure you want to remove " +"it?" +msgstr "" +"Eliminar este paquete podería supoñer quebrar o sistema. Seguro que queres " +"eliminalo?" + +#: muon/PackageModel/PackageWidget.cpp:375 +msgctxt "@label" +msgid "Warning - Removing Important Package" +msgstr "Advertencia - Eliminando paquetes importantes" + +#: muon/PackageModel/PackageWidget.cpp:561 +#, fuzzy +#| msgctxt "@title:window" +#| msgid "Unable to Mark Package" +msgctxt "@title:window" +msgid "Failed to Lock Package" +msgstr "Non foi posíbel marcar o paquete" + +#: muon/PackageModel/PackageWidget.cpp:562 +#, kde-format +msgctxt "@info Error text" +msgid "The package %1 could not be locked. Failed to write lock file." +msgstr "" + +#: muon/PackageModel/PackageWidget.cpp:611 +#, kde-format +msgctxt "@label" +msgid "The \"%1\" package could not be marked for installation or upgrade:" +msgstr "O paquete «%1» non se puido marcar para instalación ou anovado:" + +#: muon/PackageModel/PackageWidget.cpp:614 +msgctxt "@title:window" +msgid "Unable to Mark Package" +msgstr "Non foi posíbel marcar o paquete" + +#: muon/PackageModel/PackageWidget.cpp:631 +#, kde-format +msgctxt "@label" +msgid "" +"The \"%1\" package has no available version, but exists in the database.\n" +"\tThis typically means that the package was mentioned in a dependency and " +"never uploaded, has been obsoleted, or is not available from the currently-" +"enabled repositories." +msgstr "" +"O paquete «%1» non ten versións dispoñíbeis inda que está na base de datos.\n" +"\tDe xeito xeral isto é porque o paquete se mencionou nunha dependencia e " +"nunca se subiu, deixouse como obsoleto ou xa non está dispoñíbel nos " +"repositorios que están activados agora mesmo." + +#: muon/PackageModel/PackageWidget.cpp:638 +#, kde-format +msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" +msgid "%1: %2 %3, but %4 is to be installed" +msgstr "%1: %2 %3, mais %4 instalarase" + +#: muon/PackageModel/PackageWidget.cpp:644 +#, kde-format +msgctxt "@label Example: Depends: libqapt, but is not installable" +msgid "%1: %2, but it is not installable" +msgstr "%1: %2, mais non é instalábel" + +#: muon/PackageModel/PackageWidget.cpp:649 +#, kde-format +msgctxt "@label Example: Depends: libqapt, but it is a virtual package" +msgid "%1: %2, but it is a virtual package" +msgstr "%1: %2, mais é un paquete virtual" + +#: muon/ReviewWidget.cpp:30 +msgid "Review and Apply Changes" +msgstr "Revisar e aplicar os cambios" + +#: muon/StatusWidget.cpp:52 +msgctxt "@info:status" +msgid "Rebuilding Search Index" +msgstr "Reconstruíndo o índice de buscas" + +#: muon/StatusWidget.cpp:91 +#, kde-format +msgctxt "@info:status" +msgid "1 package available, " +msgid_plural "%1 packages available, " +msgstr[0] "1 paquete dispoñíbel, " +msgstr[1] "%1 paquetes dispoñíbeis, " + +#: muon/StatusWidget.cpp:92 +#, kde-format +msgctxt "@info:status" +msgid "%1 installed, " +msgstr "%1 Instalado," + +#: muon/StatusWidget.cpp:96 +#, kde-format +msgctxt "@info:status" +msgid "%1 upgradeable," +msgstr "%1 anovables," + +#: muon/StatusWidget.cpp:98 +#, kde-format +msgctxt "@info:status" +msgid "%1 upgradeable" +msgstr "%1 anovable" + +#: muon/StatusWidget.cpp:110 +#, kde-format +msgctxt "@info:status Part of the status label" +msgid " %1 to install/upgrade" +msgstr " %1 para instalar/anovar" + +#: muon/StatusWidget.cpp:115 +#, kde-format +msgctxt "" +"@info:status Label for the number of packages pending removal when packages " +"are also pending upgrade" +msgid ", %1 to remove" +msgstr ", %1 para eliminar" + +#: muon/StatusWidget.cpp:118 +#, kde-format +msgctxt "" +"@info:status Label for the number of packages pending removal when there are " +"only removals" +msgid " %1 to remove" +msgstr " %1 para eliminar" + +#: muon/StatusWidget.cpp:127 +#, kde-format +msgctxt "@label showing download and install size" +msgid "%1 to download, %2 of space to be freed" +msgstr "%1 para descargar, %2 de espazo a liberar" + +#: muon/StatusWidget.cpp:131 +#, kde-format +msgctxt "@label showing download and install size" +msgid "%1 to download, %2 of space to be used" +msgstr "%1 para descargar, %2 de espazo a usar" + +#: muon/TransactionWidget.cpp:104 +msgctxt "@action:button Cancels the download" +msgid "Cancel" +msgstr "Cancelar" + +#: muon/TransactionWidget.cpp:147 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" +msgctxt "@info Status information, widget title" +msgid "Starting" +msgstr "Enviando os cambios" + +#: muon/TransactionWidget.cpp:149 +msgctxt "@info Status info" +msgid "Waiting for service to start" +msgstr "" + +#: muon/TransactionWidget.cpp:154 +msgctxt "@info Status info" +msgid "Waiting for authentication" +msgstr "" + +#: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 +#: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" +msgctxt "@info Status information, widget title" +msgid "Waiting" +msgstr "Enviando os cambios" + +#: muon/TransactionWidget.cpp:160 +msgctxt "@info Status info" +msgid "Waiting for other transactions to finish" +msgstr "" + +#: muon/TransactionWidget.cpp:167 +msgctxt "@info Status info" +msgid "Waiting for other software managers to quit" +msgstr "" + +#: muon/TransactionWidget.cpp:174 +msgctxt "@info Status info" +msgid "Waiting for required medium" +msgstr "" + +#: muon/TransactionWidget.cpp:181 +msgctxt "@info Status info" +msgid "Waiting for configuration file" +msgstr "" + +#: muon/TransactionWidget.cpp:192 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status info" +msgid "Loading Software List" +msgstr "Actualizando as fontes de software" + +#: muon/TransactionWidget.cpp:200 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status information, widget title" +msgid "Updating software sources" +msgstr "Actualizando as fontes de software" + +#: muon/TransactionWidget.cpp:205 +#, fuzzy +#| msgctxt "@info" +#| msgid "Downloading Packages" +msgctxt "@info Status information, widget title" +msgid "Downloading Packages" +msgstr "Descargando os paquetes" + +#: muon/TransactionWidget.cpp:217 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" +msgctxt "@info Status information, widget title" +msgid "Committing Changes" +msgstr "Enviando os cambios" + +#: muon/TransactionWidget.cpp:224 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" +msgctxt "@info Status information, widget title" +msgid "Finished" +msgstr "Enviando os cambios" + +#: muon/TransactionWidget.cpp:253 +msgctxt "@title:window" +msgid "Media Change Required" +msgstr "" + +#: muon/TransactionWidget.cpp:254 +#, kde-format +msgctxt "@label" +msgid "Please insert %1 into %2" +msgstr "" + +#: muon/TransactionWidget.cpp:263 +msgctxt "@title:window" +msgid "Warning - Unverified Software" +msgstr "" + +#: muon/TransactionWidget.cpp:265 +msgctxt "@label" +msgid "" +"The following piece of software cannot be verified. Installing " +"unverified software represents a security risk, as the presence of " +"unverifiable software can be a sign of tampering. Do you wish to " +"continue?" +msgid_plural "" +"The following pieces of software cannot be verified. Installing " +"unverified software represents a security risk, as the presence of " +"unverifiable software can be a sign of tampering. Do you wish to " +"continue?" +msgstr[0] "" +msgstr[1] "" + +#: muon/TransactionWidget.cpp:283 +msgctxt "@title:window" +msgid "Configuration File Changed" +msgstr "" + +#: muon/TransactionWidget.cpp:285 +#, kde-format +msgctxt "@label Notifies a config file change" +msgid "" +"A new version of the configuration file %1 is " +"available, but your version has been modified. Would you like to keep your " +"current version or install the new version?" +msgstr "" + +#: muon/TransactionWidget.cpp:290 +#, fuzzy +#| msgctxt "@action:button" +#| msgid "Force Version" +msgctxt "@action Use the new config file" +msgid "Use New Version" +msgstr "Forzar a versión" + +#: muon/TransactionWidget.cpp:291 +#, fuzzy +#| msgctxt "@action:button" +#| msgid "Force Version" +msgctxt "@action Keep the old config file" +msgid "Keep Old Version" +msgstr "Forzar a versión" \ No newline at end of file diff -Nru muon-1.9.60/po/hu/libmuon.po muon-2.0.0/po/hu/libmuon.po --- muon-1.9.60/po/hu/libmuon.po 2012-10-29 18:34:23.000000000 +0000 +++ muon-2.0.0/po/hu/libmuon.po 2013-04-01 20:32:58.000000000 +0000 @@ -3,13 +3,13 @@ # # Kristóf Kiszel , 2010, 2011, 2012. # Kiszel Kristóf, 2011. -# Balázs Úr , 2012. +# Balázs Úr , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-08-09 10:45+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-29 11:28+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -17,1090 +17,120 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Alkalmazások" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Nyílt forrású" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Zárt" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Ismeretlen" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 letöltendő, %2 a lemezen" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 a lemezen" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Kellékek" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Akadálymentesítés" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Fejlesztőeszközök" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Hibakeresés" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Grafikus felhasználóifelület-tervezés" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "Integrált fejlesztőkörnyezetek" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Honosítás" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilozás" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Verziókezelés" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Webfejlesztés" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Oktatás" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Tudományos és műszaki" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Csillagászat" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biológia" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Kémia" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Számítógéptudomány és robotika" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Műszaki" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Földrajz" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geológia" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fizika" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Betűkészletek" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Játékok" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arcade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Táblajátékok" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Kártyajátékok" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Kirakósok" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Szerepjáték" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Szimuláció" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sportok" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Rajzolás" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Festés és szerkesztés" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fényképészet" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Kiadványszerkesztés" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Szkennelés és OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Megjelenítők" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Csevegés" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Fájlmegosztás" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Levelezés" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Webböngészők" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Iroda" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Rendszer és beállítások" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Képregény" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Plazma asztali grafikai elemek" - -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Összes" - -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "További változtatások megerősítése" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Jelöl meg további változtatásokat?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Ez a művelet egy másik csomag módosítását kéri:" -msgstr[1] "Ez a művelet más csomagok módosítását kéri:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Előzmények" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Keresés" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Minden változtatás" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Telepítések" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Frissítések" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Eltávolítások" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Dátum" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "telepítve" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "frissítve" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "visszaléptetve alacsonyabb verzióra" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "eltávolítva" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "teljesen eltávolítva" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "A(z) %1 %2 ekkor: %3" - -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "A Muon a Szupertehén erejével rendelkezik" - -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Rendszeradminisztráció" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Alaprendszer" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI infrastruktúra" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Kommunikáció" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Adatbázisok" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Fejlesztés" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentáció" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Hibakeresés" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Szerkesztők" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Beágyazott eszközök" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Betűkészletek" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Játék és szórakozás" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME asztali környezet" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R statisztikai rendszer" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep asztali környezet" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amatőr rádiózás" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell programozási nyelv" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Webkiszolgálók" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Értelmezett programozási nyelvek" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java programozási nyelv" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE Software Compilation" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel és modulok" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Fejlesztői függvénytárak" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Függvénytárak" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp programozási nyelv" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Honosítás" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-mail" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Egyéb - szöveg-alapú" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Hálózatkezelés" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Hírcsoportok" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCaml programozási nyelv" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Elavult függvénytárak" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Keresztplatform" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl programozási nyelv" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP programozási nyelv" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python programozási nyelv" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby programozási nyelv" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Tudomány" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Parancsértelmezők" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX-szerkesztés" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Szövegszerkesztés" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Segédprogramok" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Verziókezelő rendszerek" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Videoszoftverek" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Egyéb - grafikus" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce asztali környezet" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone-környezet" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Ismeretlen" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "RPM-ből átalakítva Aliennel" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Nemzetköziség és honosítás" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metacsomagok" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Exportkorlátozás alatti" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Nem szabad" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Külső" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Oktatás" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "GObject betekintési adatok" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Nem telepített" - -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Telepített" - -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Frissíthető" - -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Törött" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Beállításra vár" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Telepített (automatikusan eltávolítható)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Nincs változás" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Telepítésre" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Frissítésre" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Eltávolításra" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Teljes eltávolításra" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Újratelepítésre" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Visszalépés alacsonyabb verzióra" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "zárolt" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Általános" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32 bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64 bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "PowerPC" - -#: libmuon/MuonStrings.cpp:243 +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Inicializálási hiba" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "A csomagrendszer nem zárolható" +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Alkalmazások" -#: libmuon/MuonStrings.cpp:247 +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Kevés a lemezterület" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "A változtatások alkalmazása meghiúsult" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Hitelesítési hiba" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Váratlan hiba" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Nem megbízható csomagok" +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Alkalmazások" -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Ismeretlen" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Bejelentkezés az Ubuntu SSO szolgáltatásba" -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -"A csomagrendszer nem inicializálható, a beállítások valószínűleg sérültek." -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -"Úgy tűnik, hogy már fut egy másik csomagkezelő. Zárjon be minden egyéb " -"csomagkezelőt csomagok telepítéséhez vagy eltávolításához." -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -"Nincs elegendő szabad hely a művelet folytatásához a következő könyvtárban: " -"%1." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "A csomagok nem tölthetők le" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Hiba történt a változtatások alkalmazása során:" -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "A művelet megfelelő jogosultságok hiányában nem folytatható" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -"Úgy tűnik, hogy a QApt munkaszál összeomlott, vagy eltűnt. Jelentse a hibát " -"a QApt karbantartóinak" -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"A szerzők nem ellenőrizték a következő csomagot. A jelenlegi beállítások nem " -"engedélyezik a megbízhatatlan csomagok letöltését." -msgstr[1] "" -"A szerzők nem ellenőrizték a következő csomagokat. A jelenlegi beállítások " -"nem engedélyezik a megbízhatatlan csomagok letöltését." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Frissítések keresése" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "A jelölés megszüntetése" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Szoftverforrások beállítása" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Jelölések mentése másként" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Névtelen háttérprogram a muon előtétprogramok teszteléséhez" -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" msgstr "" -"A dokumentum nem menthető, nem sikerült írni a(z) %1 " -"fájlba.\n" -"\n" -"Ellenőrizze, hogy jogosult-e a fájl írására, vagy elérhető-e elég szabad " -"lemezterület." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Csomaglita mentése másként" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Letöltési lista mentése másként" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Fájl megnyitása" -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -"Nem jelölhetők ki a változtatások. Ellenőrizze, hogy a fájl egy, a Muon vagy " -"a Synaptic csomagkezelő által létrehozott jelölőfájl-e." -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Válasszon egy könyvtárat" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Összes" -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 csomag sikeresen hozzáadva a gyorsítótárhoz" -msgstr[1] "%1 csomag sikeresen hozzáadva a gyorsítótárhoz" +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "A Muon a Szupertehén erejével rendelkezik" -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Nem találhatók érvényes csomagok a könyvtárban. Ellenőrizze, hogy a csomagok " -"kompatibilisek-e a számítógépével, és hogy a legújabb verziójúak-e." +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" +msgid "Broken" +msgstr "Törött" + +#: libmuon/resources/AbstractResource.cpp:82 +#, fuzzy +#| msgid "Available updates" +msgid "Available" +msgstr "Elérhető frissítések" + +#: libmuon/resources/AbstractResource.cpp:83 +#, fuzzy +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "telepítve" -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "A csomagok nem találhatók" +#: libmuon/resources/AbstractResource.cpp:84 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Frissíthető" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1108,11 +138,6 @@ msgid "%1 remaining" msgstr "%1 van hátra" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Bejelentkezés az Ubuntu SSO szolgáltatásba" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Értesítés megjelenítése a következőkhöz:" @@ -1150,18 +175,18 @@ msgid "Downloading" msgstr "Letöltés" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Kész" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Várakozás" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Telepítés" diff -Nru muon-1.9.60/po/hu/muon-discover.po muon-2.0.0/po/hu/muon-discover.po --- muon-1.9.60/po/hu/muon-discover.po 2012-10-29 18:34:23.000000000 +0000 +++ muon-2.0.0/po/hu/muon-discover.po 2013-04-01 20:32:58.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-09-26 22:46+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-08-23 10:41+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" @@ -16,7 +16,7 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 1.4\n" #: discover/main.cpp:29 msgid "An application discoverer" @@ -50,24 +50,39 @@ msgid "Display a list of entries with a category." msgstr "Bejegyzések listájának megjelenítése kategóriával." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Keresés…" + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" -"Hibák történtek a grafikus felület beállításakor, az alkalmazás nem " -"folytatható." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" -msgstr "Inicializálási hiba" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Eredetek hozzáadása…" - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Eredetek eltávolítása…" +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -82,90 +97,98 @@ msgid "Discard" msgstr "Eldobás" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 vélemény" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Honlap" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Indítás" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Vélemény" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Teljes méret: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Áttekintés" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Bővítmények" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Vélemények" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Frissítés" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Név" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Értékelés" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Kulcsszó" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Népszerűség" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Eredet" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Keresés itt: „%1”…" -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Keresés…" - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 +#, fuzzy +#| msgid "Popularity Contest" msgid "Popularity Contest" -msgstr "Népszerűségi felmérés" +msgstr "Népszerűségi felmérés" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "pontok: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 +#, fuzzy +#| msgid "Best Ratings" msgid "Best Ratings" -msgstr "Legjobb értékelések" +msgstr "Legjobb értékelések" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +#, fuzzy +#| msgid "Muon Discover" +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "Muon Discover" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -178,25 +201,37 @@ msgid "Remove" msgstr "Eltávolítás" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Telepített" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 #, fuzzy #| msgid "Update All!" msgid "Update All" msgstr "Összes frissítése!" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Betöltés…" -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Felfedezés" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Telepített" +msgstr[1] "Telepített" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Források" @@ -221,55 +256,57 @@ msgid "Summary:" msgstr "Összegzés:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Vélemények:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Meséljen erről a véleményről!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 / %2 ember hasznosnak találta ezt a véleményt" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1, szerző: %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Hasznos? IgenNem" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Forrás hozzáadása" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Adja meg az új forrást" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "OK" +msgstr "" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Mégsem" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - A hozzáadandó apt tároló forrássora, az alábbiak egyike:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (bináris)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/hu/muon-installer.po muon-2.0.0/po/hu/muon-installer.po --- muon-1.9.60/po/hu/muon-installer.po 2012-10-29 18:34:23.000000000 +0000 +++ muon-2.0.0/po/hu/muon-installer.po 2013-04-01 20:32:58.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-08-23 10:41+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -26,7 +26,7 @@ msgid "Your emails" msgstr "ulysses@kubuntu.org" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ "Az alábbi alkalmazások kerültek telepítésre, kattintson rájuk az " "elindításukhoz:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Szoftverek letöltése" @@ -66,74 +66,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Szoftverek letöltése" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Telepített szoftverek" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Kubuntu által biztosított" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Debian által biztosított" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical partnerek" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Független" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Szoftverek letöltése" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Telepített szoftverek" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Előzmények" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 sikeresen telepítve." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Indítás" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Az alkalmazások telepítése sikeresen megtörtént." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Új alkalmazások futtatása…" -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "A telepítés befejeződött" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Folyamatban" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Folyamatban" @@ -207,18 +207,18 @@ msgid "Install" msgstr "Telepítés" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Eltávolítás" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Telepítés" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -276,19 +276,19 @@ msgid "No reviews available" msgstr "Nem érhetők el értékelések" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Ez az értékelés egy korábbi verzióhoz (%1) íródott." -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/hu/muon-notifier.po muon-2.0.0/po/hu/muon-notifier.po --- muon-1.9.60/po/hu/muon-notifier.po 2012-10-29 18:34:23.000000000 +0000 +++ muon-2.0.0/po/hu/muon-notifier.po 2013-04-01 20:32:58.000000000 +0000 @@ -2,13 +2,14 @@ # This file is distributed under the same license as the PACKAGE package. # # Kristóf Kiszel , 2010, 2011, 2012. +# Balázs Úr , 2012. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-06-12 00:46+0200\n" -"Last-Translator: Kristóf Kiszel \n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-07-23 15:17+0200\n" +"Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" @@ -89,7 +90,7 @@ msgctxt "Notification text" msgid "%1 software update is available" msgid_plural "%1 software updates are available" -msgstr[0] "%1 szoftverfrissítés érhető el" +msgstr[0] "%1 szofverfrissítés érhető el" msgstr[1] "%1 szofverfrissítés érhető el" #: kded/UpdateEvent/UpdateEvent.cpp:73 @@ -97,7 +98,7 @@ msgid "A software update is available" msgid_plural "Software updates are available" msgstr[0] "Egy szoftverfrissítés érhető el" -msgstr[1] "Szofverfrissítések érhető el" +msgstr[1] "%1 szoftverfrissítés érhető el" #: kded/UpdateEvent/UpdateEvent.cpp:94 msgctxt "Start the update" diff -Nru muon-1.9.60/po/hu/muon-updater.po muon-2.0.0/po/hu/muon-updater.po --- muon-1.9.60/po/hu/muon-updater.po 2012-10-29 18:34:23.000000000 +0000 +++ muon-2.0.0/po/hu/muon-updater.po 2013-04-01 20:32:58.000000000 +0000 @@ -2,20 +2,20 @@ # This file is distributed under the same license as the PACKAGE package. # # Kristóf Kiszel , 2010, 2011, 2012. -# Balázs Úr , 2012. +# Balázs Úr , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-08-23 10:41+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-29 11:29+0100\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" "Language: hu\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" msgctxt "NAME OF TRANSLATORS" @@ -26,12 +26,12 @@ msgid "Your emails" msgstr "ulysses@kubuntu.org" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Elrejtés" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -41,18 +41,18 @@ "A változások listája nem érhető el, használja inkább a Launchpadot." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "A változások listája nem érhető el." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "%1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -84,72 +84,47 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Szoftverfrissítések" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "A frissítés előtt csatlakoztassa a hálózati adaptert." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Új Kubuntu kiadás érhető el." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Letöltött csomagok listájának mentése másként…" - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Csomagok letöltése lista alapján…" - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Letöltött csomagok hozzáadása" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Frissítések telepítése" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Előzmények…" -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Frissítés" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Csomagelőzmények" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Mégsem" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -157,7 +132,7 @@ msgid "Starting" msgstr "Módosítások véglegesítése" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -165,8 +140,8 @@ msgid "Waiting for Authentication" msgstr "Módosítások véglegesítése" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -174,27 +149,27 @@ msgid "Waiting" msgstr "Módosítások véglegesítése" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -202,7 +177,7 @@ msgid "Loading Software List" msgstr "Szoftverforrások frissítése" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -210,7 +185,7 @@ msgid "Updating software sources" msgstr "Szoftverforrások frissítése" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 #, fuzzy #| msgctxt "@info" #| msgid "Downloading Updates" @@ -218,7 +193,7 @@ msgid "Downloading Packages" msgstr "Frissítések letöltése" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -226,7 +201,7 @@ msgid "Applying Changes" msgstr "Módosítások véglegesítése" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -234,23 +209,23 @@ msgid "Finished" msgstr "Módosítások véglegesítése" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -265,12 +240,12 @@ msgstr[0] "" msgstr[1] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -279,7 +254,7 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 #, fuzzy #| msgctxt "@label Column label" #| msgid "Version" @@ -287,7 +262,7 @@ msgid "Use New Version" msgstr "Verzió" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 #, fuzzy #| msgctxt "@label Column label" #| msgid "Version" @@ -295,18 +270,23 @@ msgid "Keep Old Version" msgstr "Verzió" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Letöltési sebesség: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "Hátralévő idő: %1" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -322,67 +302,57 @@ msgid "Download Size" msgstr "Letöltési méret" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Összes megjelölése" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Fontos biztonsági frissítések" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Alkalmazásfrissítések" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Rendszerfrissítések" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Nem minden csomag jelölhető ki frissítésre. Az elérhető frissítések új " -"csomagok telepítését vagy eltávolítását igénylik. Szeretné kijelölni azokat " -"a frissítéseket, amelyek további csomagok telepítését vagy eltávolítását " -"igénylik?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "A frissítések nem jelölhetők ki" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Frissítések kijelölése" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "A frissítések keresésének utolsó időpontja ismeretlen." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Kattintson a Frissítések keresése gombra az " "ellenőrzéshez." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "A számítógépen lévő szoftverek naprakészek." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Utolsó ellenőrzés ideje: %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Nincsenek elérhető frissítések." \ No newline at end of file diff -Nru muon-1.9.60/po/hu/muon.po muon-2.0.0/po/hu/muon.po --- muon-1.9.60/po/hu/muon.po 2012-10-29 18:34:23.000000000 +0000 +++ muon-2.0.0/po/hu/muon.po 2013-04-01 20:32:58.000000000 +0000 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2012-08-23 10:41+0200\n" "Last-Translator: Balázs Úr \n" "Language-Team: Hungarian \n" @@ -176,18 +176,18 @@ msgid "Purge" msgstr "Teljes eltávolításra" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "A jelölés megszüntetése" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "A Canonical %2-ig biztosít kritikus frissítéseket a következőhöz: %1." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -195,7 +195,7 @@ "the Ubuntu community." msgstr "" "A Canonical nem biztosít frissítéseket a következőhöz: %1. Néhány frissítést " -"az Ubuntu közösség biztosíthat" +"az Ubuntu közösség biztosíthat." #: muon/DetailsTabs/TechnicalDetailsTab.cpp:45 msgctxt "@title:tab" @@ -353,69 +353,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Jelölések olvasása…" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Jelölések mentése másként…" - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Letöltött csomagok listájának mentése…" - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Csomagok letöltése lista alapján…" - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Letöltött csomagok hozzáadása" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Telepített csomagok listájának mentése…" - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Biztonságos frissítés" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Teljes frissítés" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Felesleges csomagok eltávolítása" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Változtatások megtekintése" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Változtatások alkalmazása" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Előzmények…" -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -426,12 +396,12 @@ "csomagok telepítésére vagy eltávolítására lehet szükség. Választhatja a " "teljes frissítést a Teljes frissítés gombra kattintva." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "A frissítések nem jelölhetők ki" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -440,17 +410,17 @@ "A frissítések nem jelölhetők ki. Néhány frissítésnek pillanatnyilag " "teljesítetlen függőségei vannak, vagy kézzel vannak visszatartva." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Vissza" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Változtatások megtekintése" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Csomagelőzmények" @@ -465,54 +435,54 @@ #: muon/PackageModel/PackageModel.cpp:83 msgid "Requested" -msgstr "Kért" +msgstr "Szükséges" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Keresés" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Telepítésre" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Eltávolításra" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Frissítésre" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Újratelepítésre" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Teljes eltávolításra" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Jelenlegi csomagverzió zárolása" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Csomag feloldása" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Jelenlegi verzió zárolása" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -520,12 +490,12 @@ msgstr "" "Ezen csomag eltávolítása károsíthatja a rendszerét. Biztosan eltávolítja?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Figyelmeztetés - Fontos csomag eltávolítása" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 #, fuzzy #| msgctxt "@title:window" #| msgid "Unable to Mark Package" @@ -533,24 +503,24 @@ msgid "Failed to Lock Package" msgstr "A csomag nem jelölhető ki" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "A(z) „%1” csomag nem jelölhető ki telepítésre vagy frissítésre:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "A csomag nem jelölhető ki" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -564,42 +534,24 @@ "töltötték fel, elavult, vagy nem érhető el a jelenleg engedélyezett " "tárolókból." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2, %3, de %4 kerül telepítésre" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "vagy %1, %2, de %3 kerül telepítésre" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, de az nem telepíthető" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "vagy %1, de az nem telepíthető" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, de az egy virtuális csomag" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "vagy %1, de az egy virtuális csomag" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Változtatások áttekintése és alkalmazása" diff -Nru muon-1.9.60/po/is/muon.po muon-2.0.0/po/is/muon.po --- muon-1.9.60/po/is/muon.po 2012-10-29 18:34:28.000000000 +0000 +++ muon-2.0.0/po/is/muon.po 2013-04-01 20:33:02.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2010-07-15 14:08+0000\n" "Last-Translator: Sveinn í Felli \n" "Language-Team: Icelandic \n" @@ -158,8 +158,6 @@ #: muon/DetailsTabs/MainTab.cpp:69 #, fuzzy -#| msgctxt "@info:status Package state" -#| msgid "Installed" msgctxt "@action:button" msgid "Installation" msgstr "Uppsettir" @@ -171,16 +169,12 @@ #: muon/DetailsTabs/MainTab.cpp:83 #, fuzzy -#| msgctxt "@info:status Package state" -#| msgid "Upgradeable" msgctxt "@action:button" msgid "Upgrade" msgstr "Uppfæranlegir" #: muon/DetailsTabs/MainTab.cpp:89 #, fuzzy -#| msgctxt "@info:status Package state" -#| msgid "Installed" msgctxt "@action:button" msgid "Reinstallation" msgstr "Uppsettir" @@ -190,18 +184,18 @@ msgid "Purge" msgstr "" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "" -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -228,18 +222,12 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:76 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"metapackages\"" -#| msgid "Meta Packages" msgctxt "@label The parent package that this package comes from" msgid "Source Package:" msgstr "Upplýsingapakkar" #: muon/DetailsTabs/TechnicalDetailsTab.cpp:84 #, fuzzy -#| msgctxt "@title:tab" -#| msgid "By Origin" msgctxt "@label The software source that this package comes from" msgid "Origin:" msgstr "Eftir uppruna" @@ -277,8 +265,6 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:142 #, fuzzy -#| msgctxt "@info:status" -#| msgid "Downloading: %1" msgctxt "@label Label preceding the package's download size" msgid "Download Size:" msgstr "Næ í: %1" @@ -316,8 +302,6 @@ #: muon/DownloadModel/DownloadModel.cpp:61 #, fuzzy -#| msgctxt "@label Shows which package failed" -#| msgid "Package: %1" msgctxt "@title:column" msgid "Package" msgstr "Pakki: %1" @@ -385,7 +369,6 @@ #: muon/main.cpp:37 #, fuzzy -#| msgid "(C) 2009, 2010 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" msgstr "(C) 2009, 2010 Jonathan Thomas" @@ -393,75 +376,41 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "" - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 #, fuzzy -#| msgctxt "" -#| "@action Marks upgradeable packages, including ones that install/remove " -#| "new things" -#| msgid "Full Upgrade" msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Full uppfærsla" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Full uppfærsla" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Forskoða breytingar" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 #, fuzzy msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Virkja breytingar" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -469,45 +418,37 @@ "Full Upgrade button." msgstr "" -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"metapackages\"" -#| msgid "Meta Packages" msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Upplýsingapakkar" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " "at the moment, or may have been manually held back." msgstr "" -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Til baka" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Forskoða breytingar" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 #, fuzzy -#| msgctxt "@label Shows which package failed" -#| msgid "Package: %1" msgctxt "@title:window" msgid "Package History" msgstr "Pakki: %1" #: muon/PackageModel/PackageModel.cpp:79 #, fuzzy -#| msgctxt "@label Shows which package failed" -#| msgid "Package: %1" msgid "Package" msgstr "Pakki: %1" @@ -520,114 +461,94 @@ msgid "Requested" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 #, fuzzy msgctxt "@label Line edit click message" msgid "Search" msgstr "Leita" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 #, fuzzy -#| msgctxt "@info:status Package state" -#| msgid "Installed" msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Uppsettir" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 #, fuzzy -#| msgctxt "" -#| "@action Marks upgradeable packages, including ones that install/remove " -#| "new things" -#| msgid "Full Upgrade" msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Full uppfærsla" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 #, fuzzy -#| msgctxt "@info:status Package state" -#| msgid "Installed" msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Uppsettir" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"metapackages\"" -#| msgid "Meta Packages" msgctxt "@action:button" msgid "Unlock package" msgstr "Upplýsingapakkar" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 #, fuzzy msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Útgáfur" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"metapackages\"" -#| msgid "Meta Packages" msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "Upplýsingapakkar" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"metapackages\"" -#| msgid "Meta Packages" msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Upplýsingapakkar" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -637,54 +558,24 @@ "enabled repositories." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr " %1 til að setja upp/uppfæra" -#: muon/PackageModel/PackageWidget.cpp:658 +#: muon/PackageModel/PackageWidget.cpp:644 #, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr " %1 til að setja upp/uppfæra" - -#: muon/PackageModel/PackageWidget.cpp:677 -#, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr " %1 til að setja upp/uppfæra" -#: muon/PackageModel/PackageWidget.cpp:683 -#, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr " %1 til að setja upp/uppfæra" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr " %1 til að setja upp/uppfæra" -#: muon/PackageModel/PackageWidget.cpp:708 -#, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr " %1 til að setja upp/uppfæra" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Yfirfara og staðfesta breytingar" @@ -696,7 +587,6 @@ #: muon/StatusWidget.cpp:91 #, fuzzy, kde-format -#| msgid "%1 packages available, " msgctxt "@info:status" msgid "1 package available, " msgid_plural "%1 packages available, " @@ -705,39 +595,30 @@ #: muon/StatusWidget.cpp:92 #, fuzzy, kde-format -#| msgid "%1 installed, " msgctxt "@info:status" msgid "%1 installed, " msgstr "%1 uppsettir, " #: muon/StatusWidget.cpp:96 #, fuzzy, kde-format -#| msgid "%1 upgradeable," msgctxt "@info:status" msgid "%1 upgradeable," msgstr "%1 uppfæranlegir," #: muon/StatusWidget.cpp:98 #, fuzzy, kde-format -#| msgid "%1 upgradeable" msgctxt "@info:status" msgid "%1 upgradeable" msgstr "%1 uppfæranlegir" #: muon/StatusWidget.cpp:110 #, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" msgctxt "@info:status Part of the status label" msgid " %1 to install/upgrade" msgstr " %1 til að setja upp/uppfæra" #: muon/StatusWidget.cpp:115 #, fuzzy, kde-format -#| msgctxt "" -#| "Label for the number of packages pending removal when packages are also " -#| "pending upgrade" -#| msgid ", %1 to remove" msgctxt "" "@info:status Label for the number of packages pending removal when packages " "are also pending upgrade" @@ -746,10 +627,6 @@ #: muon/StatusWidget.cpp:118 #, fuzzy, kde-format -#| msgctxt "" -#| "Label for the number of packages pending removal when there are only " -#| "removals" -#| msgid " %1 to remove" msgctxt "" "@info:status Label for the number of packages pending removal when there are " "only removals" @@ -906,15 +783,11 @@ - - #, fuzzy - - #, fuzzy @@ -938,6 +811,7 @@ +#, fuzzy @@ -945,67 +819,53 @@ - - #, fuzzy - #, fuzzy - - #, fuzzy - - #, fuzzy - - #, fuzzy - - #, fuzzy - - #, fuzzy - - #, fuzzy +#, fuzzy +#, fuzzy -#, fuzzy -#, fuzzy +#, fuzzy @@ -1015,6 +875,7 @@ +#, fuzzy @@ -1036,8 +897,6 @@ - - #, fuzzy @@ -1051,10 +910,6 @@ - - - - #, fuzzy @@ -1485,10 +1340,6 @@ - - - - #, fuzzy @@ -1498,7 +1349,6 @@ - #, fuzzy @@ -1516,18 +1366,13 @@ - - #, fuzzy - - #, fuzzy - #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/it/libmuon.po muon-2.0.0/po/it/libmuon.po --- muon-1.9.60/po/it/libmuon.po 2012-10-29 18:34:30.000000000 +0000 +++ muon-2.0.0/po/it/libmuon.po 2013-04-01 20:33:05.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the libmuon package. # -# Valter Mura , 2010, 2011, 2012. +# Valter Mura , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-08-16 20:43+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-02-25 22:00+0100\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" "Language: it\n" @@ -17,1104 +17,110 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Applicazioni" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Open Source" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Proprietaria" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Sconosciuto" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 da scaricare, %2 sul disco" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 sul disco" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Accessori" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Accessibilità" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Strumenti di sviluppo" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Debug" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Progettazione interfaccia grafica" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Localizzazione" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilatura" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Controllo della versione" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Sviluppo web" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Istruzione" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Scienza e ingegneria" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomia" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologia" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Chimica" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Informatica e robotica" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elettronica" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Ingegneria" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografia" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologia" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematica" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fisica" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Caratteri" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Giochi" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arcade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Giochi da tavolo" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Giochi di carte" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Puzzle" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Giochi di ruolo" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulazione" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sport" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafica" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Disegno" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Pittura e pubblicazioni" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografia" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Editoria" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Scansione e OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Visualizzatori" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Chat" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Condivisione file" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Posta" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Browser web" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Ufficio" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Sistema e impostazioni" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Fumetti" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Oggetti desktop di Plasma" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Motore applicazioni" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Applicazioni nel tuo sistema" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Accedi al servizio Ubuntu SSO" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Motore Bodega" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Installa i dati di Bodega nel tuo sistema" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Inserisci le credenziali MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Motore fittizio" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Motore fittizio per provare le interfacce di Muon" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Motore KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Installa i dati KNewStuff nel tuo sistema" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Tutto" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Conferma modifiche aggiuntive" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Contrassegnare le modifiche aggiuntive?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Questa azione richiede la modifica di un altro pacchetto:" -msgstr[1] "Questa azione richiede modifiche di altri pacchetti:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Cronologia" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Cerca" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Tutte le modifiche" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Installazioni" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Aggiornamenti" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Rimozioni" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Data" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Installato" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Aggiornato" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Riportato alla vecchia versione" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Rimosso" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Eliminato" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 alle %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Questo Muon ha i poteri della super mucca" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Amministrazione di sistema" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Sistema di base" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infrastruttura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Comunicazione" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Database" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Sviluppo" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentazione" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Debug" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editor" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elettronica" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Dispositivi incorporati" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Caratteri" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Giochi e svago" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Ambiente desktop GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafica" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Sistema statistico GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Ambiente desktop Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Radio amatoriale" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Linguaggio di programmazione Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Server web" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Linguaggi computazionali interpretati" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Linguaggio di programmazione Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Raccolta di software KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel e moduli" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Librerie - Sviluppo" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Librerie" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Linguaggio di programmazione Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Localizzazione" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Posta elettronica" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematica" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Varie - Basato su testo" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Rete" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Gruppi di discussione" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Linguaggio di programmazione OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Librerie - Vecchie" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Multi-piattaforma" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Linguaggio di programmazione Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Linguaggio di programmazione PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Linguaggio di programmazione Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Linguaggio di programmazione Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Scienza" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Shell" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Authoring TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Elaborazione testi" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Accessori" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sistemi di controllo della versione" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Software video" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Varie - Grafica" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Ambiente desktop Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Ambiente Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Sconosciuto" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Danneggiato" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Convertito da RPM da Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internazionalizzazione e localizzazione" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Pacchetti aggiuntivi" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Limitato nell'esportazione" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Con restrizioni" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Istruzione" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Dati di introspezione GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Non installato" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Disponibile" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Installato" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Aggiornabile" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Danneggiato" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Configurazione residua" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Installato (rimovibile automaticamente)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Nessun cambiamento" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Installa" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Aggiorna" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Rimuovi" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Elimina" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinstalla" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Riporta alla vecchia versione" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Bloccato" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Comune" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Errore di inizializzazione" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Impossibile ottenere il blocco del sistema dei pacchetti" - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Poco spazio su disco" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Applicazione modifiche non riuscita" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Errore di autenticazione" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Errore inatteso" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Pacchetti non affidabili" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Sconosciuto" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Impossibile inizializzare il sistema dei pacchetti, la tua configurazione " -"potrebbe essere danneggiata" - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Sembra che il sistema dei pacchetti sia al momento utilizzato da un'altra " -"applicazione. Per poter installare o rimuovere pacchetti, devi chiudere " -"tutti gli altri gestori di pacchetti." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Per continuare questa operazione, non hai spazio su disco sufficiente nella " -"directory %1." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Impossibile scaricare i pacchetti" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Si è verificato un errore durante l'applicazione delle modifiche:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Impossibile continuare questa operazione poiché non è stata fornita la " -"corretta autorizzazione" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Sembra che l'esecutore QApt sia andato in crash o scomparso. Segnala " -"l'errore ai responsabili di QApt" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Il seguente pacchetto non è stato verificato dal suo autore. La tua attuale " -"configurazione non permette lo scaricamento di pacchetti non affidabili." -msgstr[1] "" -"I seguenti pacchetti non sono stati verificati dagli autori. La tua attuale " -"configurazione non permette lo scaricamento di pacchetti non affidabili." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Controlla aggiornamenti" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Deseleziona tutto" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configura le fonti software" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Salva contrassegni come" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Impossibile salvare il documento perché non è stato possibile scrivere su " -"%1\n" -"\n" -"Controlla di avere accesso in scrittura al file e che lo spazio su disco sia " -"sufficiente." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Salva elenco pacchetti installati come" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Salva elenco scaricati come" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Apri file" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Impossibile selezionare le modifiche. Assicurati che il file sia un file di " -"contrassegni creato dal gestore di pacchetti Muon o Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Scegli una cartella" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 pacchetto è stato correttamente aggiunto alla cache" -msgstr[1] "%1 pacchetti sono stati aggiunti correttamente alla cache" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Non esistono pacchetti validi in questa cartella. Assicurati che i pacchetti " -"siano compatibili col computer e siano all'ultima versione." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Impossibile trovare i pacchetti" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 rimanente" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Accedi al servizio Ubuntu SSO" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Mostra notifiche per:" @@ -1152,18 +158,21 @@ msgid "Downloading" msgstr "Scaricamento..." -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Fatto" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 +#, fuzzy +#| msgctxt "@info Status information, widget title" +#| msgid "Waiting" msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "In attesa" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Installazione..." @@ -1271,37 +280,31 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1632,11 +635,627 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + +#, fuzzy + + + + + +#, fuzzy + + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/it/muon-discover.po muon-2.0.0/po/it/muon-discover.po --- muon-1.9.60/po/it/muon-discover.po 2012-10-29 18:34:30.000000000 +0000 +++ muon-2.0.0/po/it/muon-discover.po 2013-04-01 20:33:05.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Valter Mura , 2012. +# Valter Mura , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-16 20:48+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-02-25 22:12+0100\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" "Language: it\n" @@ -26,10 +26,8 @@ msgstr "Muon Discover" #: discover/main.cpp:36 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010, 2012 Jonathan Thomas" #: discover/main.cpp:37 msgid "Jonathan Thomas" @@ -51,24 +49,43 @@ msgid "Display a list of entries with a category." msgstr "Mostra un elenco di voci con una categoria." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Apri Muon Discover in uno dei modi indicati. I modi corrispondono ai " +"pulsanti della barra degli strumenti." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Elenca tutti i modi disponibili e li mostra nello stdout." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Modi disponibili:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Cerca..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Sono stati riscontrati errori durante la configurazione dell'interfaccia, " "l'applicazione non può continuare." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Errore di inizializzazione" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Aggiunta delle origini..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Rimozione delle origini..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menu" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Configura e impara a usare Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -83,94 +100,94 @@ msgid "Discard" msgstr "Scarta" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 recensioni" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Pagina principale" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Avvia" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Rivedi" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Dimensione totale: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Panoramica" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Complementari" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Recensioni" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Aggiorna" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nome" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Valutazione" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Segnalazioni" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popolarità" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Origine" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Cerca in «%1»..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Cerca..." - -#: discover/qml/CategoryPage.qml:127 -#, fuzzy -#| msgid "Popularity Contest" +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" -msgstr "Contesto popolarità" +msgstr "Gara di popolarità" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "punti: %1" -#: discover/qml/CategoryPage.qml:139 -#, fuzzy -#| msgid "Best Ratings" +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" -msgstr "Migliore valutazione" +msgstr "Migliore valutazione" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Benvenuti in\n" +"Muon Discover!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -183,25 +200,34 @@ msgid "Remove" msgstr "Rimuovi" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Installato" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "Aggiorna tutto!" +msgstr "Aggiorna tutto" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Caricamento in corso..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Indietro" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Scopri" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Installato (%1 aggiornamento)" +msgstr[1] "Installato (%1 aggiornamenti)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Fonti" @@ -226,56 +252,60 @@ msgid "Summary:" msgstr "Riepilogo:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Recensioni:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Fai un commento su questa recensione!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 persone su %2 hanno trovato utile questa recensione" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 di %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 di %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Utile? Sì/No" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Aggiungi fonte" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Specifica la nuova fonte" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "" +msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Annulla" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - La riga da aggiungere della fonte del deposito apt. Questa è " "una di:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Binario)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" -msgstr "" \ No newline at end of file +msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/it/muon-installer.po muon-2.0.0/po/it/muon-installer.po --- muon-1.9.60/po/it/muon-installer.po 2012-10-29 18:34:30.000000000 +0000 +++ muon-2.0.0/po/it/muon-installer.po 2013-04-01 20:33:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-08-31 10:52+0200\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" @@ -25,7 +25,7 @@ msgid "Your emails" msgstr "valtermura@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ "Sono state appena installate le seguenti applicazioni, facci clic sopra per " "avviarle:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Scarica il software" @@ -66,74 +66,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Scarica il software" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Software installato" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Fornito da Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Fornito da Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partner di Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Indipendente" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Scarica il software" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Software installato" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Cronologia" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 è stato installato correttamente." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Avvia" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Applicazioni installate correttamente." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Avvia le nuove applicazioni..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Installazione completata" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "In corso" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "In corso" @@ -207,18 +207,18 @@ msgid "Install" msgstr "Installa" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Rimuovi" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Installa" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -276,20 +276,20 @@ msgid "No reviews available" msgstr "Nessuna recensione disponibile" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "" "Questa recensione è stata scritta per una versione più vecchia (versione: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/it/muon-notifier.po muon-2.0.0/po/it/muon-notifier.po --- muon-1.9.60/po/it/muon-notifier.po 2012-10-29 18:34:30.000000000 +0000 +++ muon-2.0.0/po/it/muon-notifier.po 2013-04-01 20:33:05.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2012-06-14 21:22+0200\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" diff -Nru muon-1.9.60/po/it/muon-updater.po muon-2.0.0/po/it/muon-updater.po --- muon-1.9.60/po/it/muon-updater.po 2012-10-29 18:34:30.000000000 +0000 +++ muon-2.0.0/po/it/muon-updater.po 2013-04-01 20:33:05.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the muon-updater package. # -# Valter Mura , 2010, 2011, 2012. +# Valter Mura , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-08-31 10:52+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-02-25 22:15+0100\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" "Language: it\n" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "valtermura@gmail.com" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Nascondi" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -40,18 +40,18 @@ "L'elenco delle modifiche non è ancora disponibile. Usa invece Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "L'elenco delle modifiche non è ancora disponibile." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versione %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -83,173 +83,124 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Aggiornamenti software" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "È più sicuro collegare l'alimentatore prima di aggiornare." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "È disponibile una nuova versione di Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Salva elenco dei pacchetti scaricati..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Scarica pacchetti dall'elenco..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Aggiungi pacchetti scaricati" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Installa gli aggiornamenti" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Cronologia..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Aggiorna" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Cronologia dei pacchetti" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Annulla" -#: updater/ProgressWidget.cpp:128 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Invio delle modifiche" +msgstr "Avvio" -#: updater/ProgressWidget.cpp:133 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Invio delle modifiche" +msgstr "In attesa di autenticazione" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Invio delle modifiche" +msgstr "Attesa" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "In attesa della fine di altre transazioni" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "In attesa dell'uscita di altri gestori software" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "In attesa del dispositivo richiesto" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "In attesa del file di configurazione" -#: updater/ProgressWidget.cpp:172 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Aggiornamento delle fonti software" +msgstr "Caricamento dell'elenco software" -#: updater/ProgressWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Aggiornamento delle fonti software" -#: updater/ProgressWidget.cpp:184 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Updates" +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Scaricamento degli aggiornamenti" +msgstr "Scaricamento dei pacchetti" -#: updater/ProgressWidget.cpp:193 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Invio delle modifiche" +msgstr "Applicazione delle modifiche" -#: updater/ProgressWidget.cpp:198 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Invio delle modifiche" +msgstr "Terminato" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "È richiesto il cambio del dispositivo" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "Inserisci %1 in %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Attenzione - Software non verificato" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -262,14 +213,22 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"La seguente parte di software non può essere verificata. " +"L'installazione di software non verificato rappresenta un rischio " +"per la sicurezza, dato che la sua presenza può essere un segno di " +"manomissione. Vuoi continuare?" msgstr[1] "" +"Le seguenti parti di software non possono essere verificate. " +"L'installazione di software non verificato rappresenta un rischio " +"per la sicurezza, dato che la sua presenza può essere un segno di " +"manomissione. Vuoi continuare?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "File di configurazione modificato" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -277,35 +236,37 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"È disponibile una nuova versione del file di configurazione %1, ma la tua versione è stata modificata. Vuoi mantenere l'attuale " +"versione o installare quella nuova?" -#: updater/ProgressWidget.cpp:265 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Versione" +msgstr "Usa la nuova versione" -#: updater/ProgressWidget.cpp:266 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Versione" +msgstr "Mantieni la vecchia versione" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" -msgstr "Velocità scaricamento: %1/s" +msgstr "Velocità di scaricamento: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 rimanente" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -319,67 +280,60 @@ #: updater/UpdateModel/UpdateModel.cpp:108 msgctxt "@label Column label" msgid "Download Size" -msgstr "Dimensione scaricamento" +msgstr "Dimensione dello scaricamento" + +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Alcuni pacchetti non sono stati contrassegnati per l'aggiornamento.

Il loro aggiornamento prevede l'installazione o la rimozione di altri " +"pacchetti.

Vuoi aggiornare anche quelli?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Contrassegna tutti" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Aggiornamenti di sicurezza importanti" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Aggiornamenti applicazioni" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Aggiornamenti di sistema" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Non tutti i pacchetti possono essere selezionati per l'aggiornamento. Gli " -"aggiornamenti disponibili possono richiedere l'installazione o la rimozione " -"di nuovi pacchetti. Vuoi selezionare aggiornamenti che potrebbero richiedere " -"l'installazione o la rimozione di pacchetti aggiuntivi?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Impossibile selezionare gli aggiornamenti" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Seleziona gli aggiornamenti" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "La data dell'ultimo controllo aggiornamenti è sconosciuta." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "Premi Controlla aggiornamenti per verificare." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Il software di questo computer è aggiornato." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Ultimo controllo %1 fa." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Non sono disponibili aggiornamenti." \ No newline at end of file diff -Nru muon-1.9.60/po/it/muon.po muon-2.0.0/po/it/muon.po --- muon-1.9.60/po/it/muon.po 2012-10-29 18:34:30.000000000 +0000 +++ muon-2.0.0/po/it/muon.po 2013-04-01 20:33:05.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-08-31 10:59+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-11-14 22:03+0100\n" "Last-Translator: Valter Mura \n" "Language-Team: Italian \n" "Language: it\n" @@ -175,18 +175,18 @@ msgid "Purge" msgstr "Eliminazione" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Deseleziona" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical fornisce aggiornamenti critici per %1 fino al %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -353,69 +353,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Leggi i contrassegni..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Salva contrassegni come..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Salva elenco di scaricamento pacchetti..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Scarica i pacchetti dall'elenco..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Aggiungi i pacchetti scaricati" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Salva elenco dei pacchetti installati..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Aggiornamento prudente" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Aggiornamento completo" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Rimuovi i pacchetti non necessari" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Anteprima delle modifiche" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Applica le modifiche" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Cronologia..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -427,12 +397,12 @@ "ad eseguire un aggiornamento completo facendo clic sul pulsante " "Aggiornamento completo." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Impossibile selezionare gli aggiornamenti" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -442,17 +412,17 @@ "avere dipendenze non soddisfatte, al momento, o essere state manualmente " "trattenute." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Indietro" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Anteprima delle modifiche" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Cronologia dei pacchetti" @@ -469,52 +439,52 @@ msgid "Requested" msgstr "Richiesto" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Cerca" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Seleziona per l'installazione" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Seleziona per la rimozione" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Seleziona per l'aggiornamento" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Seleziona per la re-installazione" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Seleziona per la pulizia" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Blocca il pacchetto alla versione attuale" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Sblocca il pacchetto" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Blocca alla versione attuale" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -523,26 +493,25 @@ "La rimozione di questo pacchetto può alterare il tuo sistema. Vuoi davvero " "rimuoverlo?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Attenzione - Rimozione di un pacchetto importante" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Impossibile selezionare il pacchetto" +msgstr "Blocco del pacchetto non riuscito" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" +"Il pacchetto %1 non può essere bloccato. Scrittura del file di blocco non " +"riuscita." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" @@ -550,12 +519,12 @@ "Il pacchetto «%1» non può essere selezionato per l'installazione o " "l'aggiornamento:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Impossibile selezionare il pacchetto" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -570,42 +539,24 @@ "dipendenza e mai caricato, è stato reso obsoleto o non è disponibile nei " "depositi attualmente abilitati." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, ma %4 è da installare" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "oppure %1 %2, ma %3 è da installare" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, ma non è installabile" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "oppure %1, ma non è installabile" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, ma è un pacchetto virtuale" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "oppure %1, ma è un pacchetto virtuale" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Ricontrolla e applica le modifiche" @@ -681,91 +632,70 @@ msgstr "Annulla" #: muon/TransactionWidget.cpp:147 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Invio delle modifiche" +msgstr "Avvio" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "In attesa di avvio del servizio" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "In attesa di autenticazione" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Invio delle modifiche" +msgstr "In attesa" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "In attesa della fine di altre transazioni" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "In attesa dell'uscita di altri gestori software" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "In attesa del dispositivo richiesto" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "In attesa del file di configurazione" #: muon/TransactionWidget.cpp:192 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Aggiornamento delle fonti software" +msgstr "Caricamento dell'elenco software" #: muon/TransactionWidget.cpp:200 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Aggiornamento delle fonti software" #: muon/TransactionWidget.cpp:205 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Scaricamento dei pacchetti" #: muon/TransactionWidget.cpp:217 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" msgstr "Invio delle modifiche" #: muon/TransactionWidget.cpp:224 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Invio delle modifiche" +msgstr "Terminato" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" @@ -773,12 +703,10 @@ msgstr "È necessario un cambio di supporto" #: muon/TransactionWidget.cpp:254 -#, fuzzy, kde-format -#| msgctxt "@label Asks for a CD change" -#| msgid "Please insert %1 into %2" +#, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "Inserire %1 in %2" +msgstr "Inserisci %1 in %2" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" @@ -786,18 +714,6 @@ msgstr "Attenzione - Software non verificato" #: muon/TransactionWidget.cpp:265 -#, fuzzy -#| msgctxt "@label" -#| msgid "" -#| "The following piece of software cannot be verified. Installing " -#| "unverified software represents a security risk, as the presence of " -#| "unverifiable software can be a sign of tampering. Do you wish " -#| "to continue?" -#| msgid_plural "" -#| "The following pieces of software cannot be authenticated. " -#| "Installing unverified software represents a security risk, as " -#| "the presence of unverifiable software can be a sign of tampering. Do you wish to continue?" msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -810,20 +726,20 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"Impossibile verificare la seguente parte di software. " +"La seguente parte di software non può essere verificata. " "L'installazione di software non verificato rappresenta un rischio " -"per la sicurezza, dato che la sua presenza può essere indice di manomissione." -" Vuoi continuare?" +"per la sicurezza, dato che la sua presenza può essere un segno di " +"manomissione. Vuoi continuare?" msgstr[1] "" -"Impossibile autenticare le seguenti parti di software. " +"Le seguenti parti di software non possono essere verificate. " "L'installazione di software non verificato rappresenta un rischio " -"per la sicurezza, dato che la sua presenza può essere indice di manomissione." -" Vuoi continuare?" +"per la sicurezza, dato che la sua presenza può essere un segno di " +"manomissione. Vuoi continuare?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "File di configurazione modificato" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -833,19 +749,16 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"È disponibile una nuova versione del file di configurazione %1, ma la tua versione è stata modificata. Vuoi mantenere l'attuale " +"versione o installare quella nuova?" #: muon/TransactionWidget.cpp:290 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Forza versione" +msgstr "Usa la nuova versione" #: muon/TransactionWidget.cpp:291 -#, fuzzy -#| msgctxt "@action:button" -#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Forza versione" \ No newline at end of file +msgstr "Mantieni la vecchia versione" \ No newline at end of file diff -Nru muon-1.9.60/po/ja/libmuon.po muon-2.0.0/po/ja/libmuon.po --- muon-1.9.60/po/ja/libmuon.po 2012-10-29 18:34:33.000000000 +0000 +++ muon-2.0.0/po/ja/libmuon.po 2013-04-01 20:33:07.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" "PO-Revision-Date: 2010-06-20 00:46-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -14,1064 +14,110 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" msgstr "" -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" msgstr "" -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" msgstr "" -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" msgstr "" -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -#: libmuon/Category/Category.cpp:64 +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "" -msgstr[1] "" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" msgstr "" -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" msgstr "" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -msgstr[1] "" - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "" -msgstr[1] "" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "" @@ -1109,18 +155,18 @@ msgid "Downloading" msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "" diff -Nru muon-1.9.60/po/ja/muon-installer.po muon-2.0.0/po/ja/muon-installer.po --- muon-1.9.60/po/ja/muon-installer.po 2012-10-29 18:34:33.000000000 +0000 +++ muon-2.0.0/po/ja/muon-installer.po 2013-04-01 20:33:07.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2010-06-20 00:46-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -22,14 +22,14 @@ msgid "Your emails" msgstr "" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" msgstr[0] "" msgstr[1] "" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "" @@ -59,74 +59,74 @@ msgid "Jonathan Thomas" msgstr "" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "" -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "" -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "" -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "" @@ -200,18 +200,18 @@ msgid "Install" msgstr "" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -269,19 +269,19 @@ msgid "No reviews available" msgstr "" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/ja/muon-notifier.po muon-2.0.0/po/ja/muon-notifier.po --- muon-1.9.60/po/ja/muon-notifier.po 2012-10-29 18:34:33.000000000 +0000 +++ muon-2.0.0/po/ja/muon-notifier.po 2013-04-01 20:33:07.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2010-06-20 00:46-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" diff -Nru muon-1.9.60/po/ja/muon-updater.po muon-2.0.0/po/ja/muon-updater.po --- muon-1.9.60/po/ja/muon-updater.po 2012-10-29 18:34:33.000000000 +0000 +++ muon-2.0.0/po/ja/muon-updater.po 2013-04-01 20:33:07.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2010-06-20 00:46-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -22,12 +22,12 @@ msgid "Your emails" msgstr "" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -35,18 +35,18 @@ "url='%1'>Launchpad instead." msgstr "" -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "" -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -78,149 +78,124 @@ msgid "Jonathan Thomas" msgstr "" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "" -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" msgstr "" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" msgstr "" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -235,12 +210,12 @@ msgstr[0] "" msgstr[1] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -249,28 +224,33 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -286,61 +266,55 @@ msgid "Download Size" msgstr "" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "" -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "" -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "" \ No newline at end of file diff -Nru muon-1.9.60/po/ja/muon.po muon-2.0.0/po/ja/muon.po --- muon-1.9.60/po/ja/muon.po 2012-10-29 18:34:33.000000000 +0000 +++ muon-2.0.0/po/ja/muon.po 2013-04-01 20:33:07.000000000 +0000 @@ -2,7 +2,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2010-06-20 00:46-0700\n" "Last-Translator: Japanese KDE translation team \n" "Language-Team: Japanese \n" @@ -169,18 +169,18 @@ msgid "Purge" msgstr "" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "" -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -342,69 +342,39 @@ msgid "Jonathan Thomas" msgstr "" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "" - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -412,29 +382,29 @@ "Full Upgrade button." msgstr "" -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " "at the moment, or may have been manually held back." msgstr "" -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "" @@ -451,86 +421,86 @@ msgid "Requested" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -540,42 +510,24 @@ "enabled repositories." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "" diff -Nru muon-1.9.60/po/kk/libmuon.po muon-2.0.0/po/kk/libmuon.po --- muon-1.9.60/po/kk/libmuon.po 2012-10-29 18:34:36.000000000 +0000 +++ muon-2.0.0/po/kk/libmuon.po 2013-04-01 20:33:10.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sairan Kikkarin , 2012. +# Sairan Kikkarin , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-08 04:21+0600\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-11 02:51+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" "Language: \n" @@ -17,1093 +17,109 @@ "Plural-Forms: nplurals=1; plural=0;\n" "X-Generator: Lokalize 1.2\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Қолданбалар" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Коды ашық" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Меншікті" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Беймәлім" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 жүктейтіні, %2 дискіде" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 дискіде" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Әбзелдер" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Арнайы мүмкіндіктер" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Құрастырушы құралдар" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Жөндеу" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Графикалық интерфейсін жобалау" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Тәржімелеу" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Профильдеу" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Нұсқаларды қадағалау" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Веб жобалау" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Оқу-ағарту" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Ғылым & Инженерлік іс" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Астрономия" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Биология" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Химия" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Компьютерлік ғылым & Робототехника" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Электроника" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Инженерлік іс" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "География" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Геология" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Математика" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Физика" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Қаріптер" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Ойындар" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Аркад ойындар" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Тақта ойындар" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Карта ойындар" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Басқатырғыш" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Рөл ойындар" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Иммитация" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Спорт" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Графика" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "ҰшӨлшемді" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Сурет" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Кескіндеу & Өңдеу" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Фотография" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Басып шығару" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Сканерлеу & Тану" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Қарау құралдар" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Интернет" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Чат-әңгіме" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Файл ортақтастыру" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Пошта" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Веб-шолғыш" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Мультимедиа" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Офис" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Жүйе параметрлері" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Қолданбалар тетігі" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Жүйеңізге арналған қолданбалар" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Ubuntu SSO қызметіне кіру" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Bodega тетігі" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Жүйеңізге Bodega деректерін орнату" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "MakePlayLive тіркеу деректерін келтіру" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Сынақ тетігі" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Muon бағдарламаларын сынауға арналған тетігі" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "KNewStuff тетігі" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Жүйеңізге KNewStuff деректерін орнату" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Бүкіл" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Қосымша өзгерістерін құптау" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Қосымша өзгерістері белгіленсін бе?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Бұл амал басқа дестелерде өзгеріст(ерд)і қажет етеді:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Журнал" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Іздеу" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Бүкіл өзгерістер" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Орнатылымдар" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Жаңартулар" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Өшірілгендер" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Кезі" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Орнатылған" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Жаңартылған" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Жүктеп алынған" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Өшірілген" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Тазаланған" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %3 %2" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Бұл Muon ең мықты сиырдай күшті" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Жүйелік әкімшілік ету" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Негізгі жүйе" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI инфрақұрылымы" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Байланыс" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Деректер қорлары" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Құрастыру" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Құжатама" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Жөндеу" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Өңдегіштер" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Электроника" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Құрамындағы құрылғылар" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Қаріптер" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Ойын-сауық" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME графикалық орта" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Графика" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R статистикалық жүйе" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep графикалық орта" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Әуесқой радио" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell программалау тілі" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Веб серверлер" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Компьютерлік интерпретатор тілдері" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java программалау тілі" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE SC графикалық орта" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Өзек пен модульдер" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Жиын файлдар - Құрастыру" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Жиын файлдар" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp программалау тілі" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Тәржімелеу" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Эл.пошта" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Математика" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Түрлі басқа - Мәтінді интерфейсті" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Желіде істеу" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Жаңалық топтары" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCami программалау тілі" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Жиын файлдар - Ескі" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Кросс-платформалық" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl программалау тілі" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP программалау тілі" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python программалау тілі" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby программалау тілі" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Ғылым" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Командалық орталар" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Мультимедиа" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX-ті қолдану" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Мәтінді өңдеу" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Утилиталар" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Нұсқаларды қадағалау жүйелері" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Видео бағдарламалар" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Интернет" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Түрлі басқа - Графикалық" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce графикалық орта" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone ортасы" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Беймәлім" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Бүлінген" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Allen көмегімен RPM файлдан аударылған" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Тәржімелеу мен жерсіндіру" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Метадестелер" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Экспорттауы шектелген" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Еркін емес" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Қосылған үлестер" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Оқу-ағарту" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "GObject интроспекция деректері" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Орнатылмаған" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Бар" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Орнатылған" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" -msgstr "Жаңартылмақ" - -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Бүлінген" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Қалған баптауы" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Орнатылған (автоөшірлетін)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Өзгеріс жоқ" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Орнату" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Жаңарту" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Өшіру" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Кетіру" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Қайта орнату" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Жаңартудан қайту" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Бұғатталған" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Ортақ" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-биттік" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-биттік" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Инициализациялау қатесі" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Десте жүйесі бұғатталмады" - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Дискіде орын тапшылығы" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Өзгерістерді іске асыру жаңылысы" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Аутентификация қатесі" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Күтпеген қате" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Сенім артылмаған дестелер" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Беймәлім" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "Десте жүйесі бастайтын күйіне келтірілмеді. Баптауыңыз бүлінген." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Десте жүйесін басқа бір қолданба пайдалануда. Кез-келген дестелерді орнату " -"не өшіру үшін басқа десте менеджерлерін жабу керек." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "Бұл амалды жалғастыру үшін %1 қапшығында дискі орыны жетіспейді." - -#: libmuon/MuonStrings.cpp:285 -#, fuzzy -#| msgctxt "@label" -#| msgid "Unable to download the following packages:" -msgctxt "@label" -msgid "Could not download packages" -msgstr "Келесі дестелер жүктеп алынбады:" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Өзгерістерді іске асырғанда пайда болған қате(лер):" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "Бұл амал жалғастырылмайды, өйткені керек авторизацясы етілмегн" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"QApt жұмыс бағдарламасы қирады не жоқ болып кетті. QApt жетілдірушісіне " -"қатені хабарлаңыз." - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Келесі дестелерде авторлардың растауы жоқ, қолданыстағы баптауы бойынша " -"сенімсіз дестелері жүктелмейді." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Жаңартуы бар ма тексеру" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Бүкіл белгілеуін кетіру" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Бағдарламалар көзін баптау" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Белгілеулерді былай сақтау" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Құжат сақталмаған, себебі - %1 дегенге жазу мүмкін " -"емес\n" -"\n" -"Файлға жазуға рұқсатыңыз жетпейді, немесе дискіде орын аз." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Орнатылған дестелер тізімін былай сақтау" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Жүктеу тізімін былай сақтау" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Файлды ашу" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Өзгерістер белгіленбеді. Файл Muon десте менеджері не Synaptic десте " -"менеджері құрған белгілеу файлы екеніне көз жеткізіңіз." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Қапшығын таңдау" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "Кэшке %1 десте сәтті қосылды" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Бұл қапшықта жарамды дестелер табылған жоқ. Дестелер компьютеріңізбен " -"үйлесімділігіне және нұсқасы ең жаңа екеніне көз жеткізіңіз." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Дестелер табылған жоқ" +msgstr "гЖаңартылмақ" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" -msgstr "" - -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Ubuntu SSO қызметіне кіру" +msgstr "%1 қалды" #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" @@ -1119,7 +135,7 @@ #: libmuon/settings/NotifySettingsPage.cpp:50 msgid "Distribution upgrades" -msgstr "Дистриибутивтің жаңартулары" +msgstr "Дистрибутивтің жаңартулары" #: libmuon/settings/NotifySettingsPage.cpp:69 msgid "Notification type:" @@ -1142,18 +158,18 @@ msgid "Downloading" msgstr "Жүктелу" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Дайын" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Күту" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Орнату" diff -Nru muon-1.9.60/po/kk/muon-discover.po muon-2.0.0/po/kk/muon-discover.po --- muon-1.9.60/po/kk/muon-discover.po 2012-10-29 18:34:36.000000000 +0000 +++ muon-2.0.0/po/kk/muon-discover.po 2013-04-01 20:33:10.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sairan Kikkarin , 2012. +# Sairan Kikkarin , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-24 05:55+0600\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-11 03:15+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" "Language: \n" @@ -49,22 +49,42 @@ msgid "Display a list of entries with a category." msgstr "Бір санатына жататын аталым тізімінін қорсету." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Muon тапқышын аталған режімде ашу. Режім атаулары аспаптар батырмаларына " +"сәйкесті." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Қол жеткізетін режімдерді stdout-қа тізімдеу." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Бар режімдері:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Іздеу..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" +"Графикалық интерфейс параметрлерінің қателері табылды, бағдарлама істемейді." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" -msgstr "" +msgstr "Инициализация қатесі" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Қайнар көзін қосу..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Қайнар көзін өшіру..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Мәзір" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Muon тапқышын баптау және оның мүмкіндіктерімен танысу" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -79,94 +99,94 @@ msgid "Discard" msgstr "Тастау" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 пікір" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Мекен-парағы" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Жегу" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Пікір" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Жалпы өлшемі: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Шолу" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Қосымшалар" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Пікірлер" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Жаңарту" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Атауы" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Ұпайы" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Атының шуы" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Әйгілігі" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Қайдан" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "'%1' дегенде іздеу..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Іздеу..." - -#: discover/qml/CategoryPage.qml:127 -#, fuzzy -#| msgid "Popularity Contest" +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Әйгілік додасы" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "ұпайы: %1" -#: discover/qml/CategoryPage.qml:139 -#, fuzzy -#| msgid "Best Ratings" +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" -msgstr "Жоғары бағалары" +msgstr "Жоғары бағалары" + +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Muon тапқышы:\n" +"Қош келдіңіз!" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -179,25 +199,33 @@ msgid "Remove" msgstr "Өшіру" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Орнатылған" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "Бүкілін жаңарту!" +msgstr "Бүкілін жаңарту" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Жүктеу..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Артқа" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Табу" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Орнатылған (%1 жаңарту)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Көздері" @@ -222,54 +250,58 @@ msgid "Summary:" msgstr "Тұжырымы:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Пікірлер" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Осы пікірге көзқарасыңызды білдіріңіз!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%2 адамдан %1 бұл пікірді пайдалы деп тапты" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 жазғаны: %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 by %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Пайдалы ма? Иә/Жоқ" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Көзін қосу" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Жаңа көзін келтіру" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" -msgstr "" +msgstr "ОК" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Қайту" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr " - қосатын apt қойма көзінің жолы. Мынаның біреуі:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Бинарлы)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/kk/muon-installer.po muon-2.0.0/po/kk/muon-installer.po --- muon-1.9.60/po/kk/muon-installer.po 2012-10-29 18:34:36.000000000 +0000 +++ muon-2.0.0/po/kk/muon-installer.po 2013-04-01 20:33:10.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-24 06:13+0600\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-10-25 04:47+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" "Language: \n" @@ -27,13 +27,13 @@ msgid "Your emails" msgstr "sairan@computer.org" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" msgstr[0] "Мына қолданба жаңа орнатылған, жегу үшін түртіңіз:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Бағдарламаларды табу" @@ -63,74 +63,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Бағдарламаларды табу" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Орнатылған бадарламалар" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Kubuntu қамтамасыз еткені" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Debian қамтамасыз еткені" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical әріптестері" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Жеке көздері" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Бағдарламаларды табу" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Орнатылған бадарламалар" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Тарихы" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 сәтті орнатылды." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Бастау" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Қолданбалар сәтті орнатылды" -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Жаңа қолданбаларды жегу..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Орнату бітті" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Барысында" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Барысында" @@ -203,18 +203,18 @@ msgid "Install" msgstr "Орнату" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Өшіру" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Орнату" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -272,19 +272,19 @@ msgid "No reviews available" msgstr "Шолулар жоқ" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Бұл пікір ескі нұсқасына жазылған (%1-нұсқасы)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/kk/muon-notifier.po muon-2.0.0/po/kk/muon-notifier.po --- muon-1.9.60/po/kk/muon-notifier.po 2012-10-29 18:34:36.000000000 +0000 +++ muon-2.0.0/po/kk/muon-notifier.po 2013-04-01 20:33:10.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2012-10-24 06:32+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" diff -Nru muon-1.9.60/po/kk/muon-updater.po muon-2.0.0/po/kk/muon-updater.po --- muon-1.9.60/po/kk/muon-updater.po 2012-10-29 18:34:36.000000000 +0000 +++ muon-2.0.0/po/kk/muon-updater.po 2013-04-01 20:33:10.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sairan Kikkarin , 2012. +# Sairan Kikkarin , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-25 04:53+0600\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-11 05:12+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" "Language: \n" @@ -27,12 +27,12 @@ msgid "Your emails" msgstr "sairan@computer.org" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Жасыру" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -42,18 +42,18 @@ "Өзгерістер тізімі әлі қол жеткізбейді. Оның орына Launchpad дегенді қолданыңыз." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Өзгерістер тізімі әлі қол жеткізбейді." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "%1 нұсқасы:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -85,173 +85,124 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Бағдарлама жаңартулары" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Жаңарудын алдында қуатандыру адаптерін қосуы қауіпсіз болар." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Жаңа Kubuntu нұсқасы бар." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Жүктеу тізімін сақтау..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Тізімдегі дестелерді жүктеп алу..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Жүктелген дестелерді қосу" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Жаңартуларды орнату" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Тарихы..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Жаңарту" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Десте тарихы" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Қайту" -#: updater/ProgressWidget.cpp:128 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Жаңартуларды орнату" +msgstr "Бастау" -#: updater/ProgressWidget.cpp:133 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Бағдарламалар көздерін жаңарту" +msgstr "Аутентификацияны күтіп тұр" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Жаңартуларды орнату" +msgstr "Күту" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Басқа амалдар бітуін күту" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Басқа десте менеджерінен шығуды күтіп тұр" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Керек тасушысын күтіп тұр" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Баптау файлын күтіп тұр" -#: updater/ProgressWidget.cpp:172 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Бағдарламалар көздерін жаңарту" +msgstr "Бағдарламалар тізімін жүктеу" -#: updater/ProgressWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Бағдарламалар көздерін жаңарту" -#: updater/ProgressWidget.cpp:184 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Updates" +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "Жаңартуларды жүктеп алу" +msgstr "Дестелерді жүктеп алу" -#: updater/ProgressWidget.cpp:193 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Жаңартуларды орнату" +msgstr "Өзгерістерді іске асыру" -#: updater/ProgressWidget.cpp:198 -#, fuzzy -#| msgctxt "@info" -#| msgid "Installing Updates" +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Жаңартуларды орнату" +msgstr "Аяқталды" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Тасушыны ауыстыру керек" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "%2 дегенге %1 салыңыз" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Ескерту - расталмаған бағдарламалар" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -264,13 +215,15 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Келесі бағдарлама бөлшектері расталмаған. Расталмаған бағдарламаны " +"қолданғаны жүйеңізді тәуекел етеді. Жалғастыра берейік пе?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Баптау файлы өзгертілген" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -278,35 +231,37 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"%1 баптау файлының жаңа нұсқасы бар, бірақ Сіздікіне " +"өзгерістер енгізілген . Қазіргісін қалдырмақсыз ба, әлде жаңасын орнатпақсыз " +"ба?" -#: updater/ProgressWidget.cpp:265 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Нұсқасы" +msgstr "Жаңасын қолдану" -#: updater/ProgressWidget.cpp:266 -#, fuzzy -#| msgctxt "@label Column label" -#| msgid "Version" +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Нұсқасы" +msgstr "Ескісін қалдыру" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Жүктеп алу қарқыны: %1/сек" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "Қалғаны: %1" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -322,64 +277,58 @@ msgid "Download Size" msgstr "Жүктеу өлшемі" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Кейбір дестелер жаңартуға белгіленбеген.

Оларды жаңарту үшін " +"басқаларын орнату не өшіру керек.

Бүкілін жаңартуды қалайсыз ба?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Бүкілін белгілеу" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Маңызды қауіпсіздік жаңартулары" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Қолданба жаңартулары" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Жүйе жаңартулары" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Жаңартуға белгіленбеген дестелер бар. Жаңартулары жаңарту дестелерді орнату " -"не өшіруді қажет ету ықтимал. Ондай дестелер бегіленсін бе? " - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Жаңартулар белгілеуге келмеді" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Жаңартуларды белгілеу" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Жаңартуы бар ма тексеру қашан болғаны беймәлім." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Тексеру үшін Жаңартуы бар ма тексеру дегенді түртіңіз." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Бұл компьютердегі бағдарламалар жаңа" -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Соңғы тексеріс %1 бұрын болған." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Жаңартулары жоқ." \ No newline at end of file diff -Nru muon-1.9.60/po/kk/muon.po muon-2.0.0/po/kk/muon.po --- muon-1.9.60/po/kk/muon.po 2012-10-29 18:34:36.000000000 +0000 +++ muon-2.0.0/po/kk/muon.po 2013-04-01 20:33:10.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sairan Kikkarin , 2012. +# Sairan Kikkarin , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-25 05:48+0600\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-11 05:20+0600\n" "Last-Translator: Sairan Kikkarin \n" "Language-Team: Kazakh \n" "Language: \n" @@ -175,19 +175,19 @@ msgid "Purge" msgstr "Кетіру" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Белгілеуін кетіру" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "" "Canonical %1 дегеннің маңызды жаңартуларын %2 дейін қамтамасыз етеді. " -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -353,69 +353,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Белгілеулерді оқу" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Белгілеулерді былай сақтау..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Жүктеу тізімін сақтау..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Тізімдегі дестелерді жүктеп алу..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Жүктелген дестелерді қосу" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Орнатылған дестелер тізімін сақтау..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Абайлап жаңарту" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Толық жаңарту" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Қажетсіз дестелерін өшіру" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Өзгерістерді қарап-шығу" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Өзгерістерді іске асыру" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Тарихы..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -426,12 +396,12 @@ "орнату не өшіруді қажет етуі мүмкін. Толық жаңарту " "дегенді басып толығымен жаңартуды өткізуді қалауыңыз болады." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Жаңартулар белгілеуге келмеді" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -439,17 +409,17 @@ msgstr "" "Жаңартулары белгіленбеген. Кейбір жаңартуларда қанағатсыз ілеспелері бар" -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Артқа" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Өзгерістерді қарап-шығу" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Десте тарихы" @@ -466,89 +436,86 @@ msgid "Requested" msgstr "Талап етілген" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Іздеу" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Орнатуға белгілеу" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Өшіруге белгілеу" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Жаңартуға белгілеу" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Қайта орнатуға белгілеу" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Тазалауға белгілеу" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Дестенің назардағы нұсқасын бекіту" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Дестені бекітілгеннен шығару" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Назардағы нұсқасын бекіту" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "Бұл дестені өшіргені жүйеңізді зақым ету мүмкін. Өшірмексіз бе?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Ескерту - Маңызды десте өшірілуде" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Десте белгілеуге келмеді" +msgstr "Десте бұғатталмады" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." -msgstr "" +msgstr "%1 десте бұғатталмайды. Бұғаттау файлын жазу жаңылысы." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "\"%1\" дестесі орнататуға не жаңартуға белгіленбейді:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Десте белгілеуге келмеді" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -561,42 +528,24 @@ "\tБұл десте ілеспелер тізіміне легіп ешқашан жүктеп берілмеген, не ескірген, " "не жәй бұл қоймада жоқ." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, бірақ орнатылатыны: %4" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "немесе %1 %2, бірақ орнатылатыны %3" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, бірақ ол орнатылмайтын" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "немесе %1, бірақ ол орнатылмайтын" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, бірақ бұл виртуалды десте" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "немесе %1, бірақ бұл виртуалды десте" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Өзгерістерді шолып іске асыру" @@ -671,107 +620,86 @@ msgstr "Айну" #: muon/TransactionWidget.cpp:147 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Өзгерістерді жіберу" +msgstr "Бастау" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "Қызметтің бастауын күту" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "Аутентификацияны күтіп тұр" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Өзгерістерді жіберу" +msgstr "Күту" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Басқа амалдар бітуін күту" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Басқа десте менеджерінен шығуды күтіп тұр" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Керек тасушысын күтіп тұр" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Баптау файлын күтіп тұр" #: muon/TransactionWidget.cpp:192 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status info" msgid "Loading Software List" -msgstr "Бағдарламалар көздерін жаңарту" +msgstr "Бағдарламалар тізімін жүктеу" #: muon/TransactionWidget.cpp:200 -#, fuzzy -#| msgctxt "@info" -#| msgid "Updating software sources" msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Бағдарламалар көздерін жаңарту" #: muon/TransactionWidget.cpp:205 -#, fuzzy -#| msgctxt "@info" -#| msgid "Downloading Packages" msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Дестелерді жүктеп алу" #: muon/TransactionWidget.cpp:217 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Committing Changes" -msgstr "Өзгерістерді жіберу" +msgstr "Өзгерістерді тапсыру" #: muon/TransactionWidget.cpp:224 -#, fuzzy -#| msgctxt "@info" -#| msgid "Committing Changes" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Өзгерістерді жіберу" +msgstr "Аяқталды" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" msgid "Media Change Required" -msgstr "" +msgstr "Тасушыны ауыстыру керек" #: muon/TransactionWidget.cpp:254 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "" +msgstr "%2 дегенге %1 салыңыз" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" msgid "Warning - Unverified Software" -msgstr "" +msgstr "Ескерту - расталмаған бағдарламалар" #: muon/TransactionWidget.cpp:265 msgctxt "@label" @@ -786,11 +714,13 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Келесі бағдарлама бөлшектері расталмаған. Расталмаған бағдарламаны " +"қолданғаны жүйеңізді тәуекел етеді. Жалғастыра берейік пе?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" msgid "Configuration File Changed" -msgstr "" +msgstr "Баптау файлы өзгертілген" #: muon/TransactionWidget.cpp:285 #, kde-format @@ -800,13 +730,16 @@ "available, but your version has been modified. Would you like to keep your " "current version or install the new version?" msgstr "" +"%1 баптау файлының жаңа нұсқасы бар, бірақ қазіргісіне " +"өзгерістер енгізілген. Жаңасын орнатпақсыз ба, әлде қазіргісін қалдырмақсыз " +"ба?" #: muon/TransactionWidget.cpp:290 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "" +msgstr "Жаңасын қолдану" #: muon/TransactionWidget.cpp:291 msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "" \ No newline at end of file +msgstr "Ескісін қалдыру" \ No newline at end of file diff -Nru muon-1.9.60/po/lt/libmuon.po muon-2.0.0/po/lt/libmuon.po --- muon-1.9.60/po/lt/libmuon.po 2012-10-29 18:34:46.000000000 +0000 +++ muon-2.0.0/po/lt/libmuon.po 2013-04-01 20:33:16.000000000 +0000 @@ -10,7 +10,7 @@ msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" "PO-Revision-Date: 2012-04-28 22:01+0300\n" "Last-Translator: Liudas Ališauskas \n" "Language-Team: Lithuanian \n" @@ -22,1098 +22,118 @@ "%100>=20) ? 1 : n%10==0 || (n%100>10 && n%100<20) ? 2 : 3);\n" "X-Generator: Lokalize 1.4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Programos" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Atviras kodas" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Nuosavybinė" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Nežinoma" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 atsiųsti, %2 diske" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 diske" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Priedai" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Pasiekiamumas" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Programuotojo įrankiai" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Derinimas" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Grafinės sąsajos dizainas" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Programos" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Programos" + +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Prisijungiama prie Ubuntu SSO tarnybos" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Lokalizavimas" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profiliavimas" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Versijų kontrolė" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Žiniatinklio programavimas" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Išsilavinimas" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Mokslas ir Inžinerija" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomija" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologija" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Chemija" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Kompiuterių mokslas ir robotų technika" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Inžinerija" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografija" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologija" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fizika" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Šriftai" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Žaidimai" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arkada" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Stalo žaidimai" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Kortų žaidimai" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Dėlionės" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Rolių žaidimai" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simuliacija" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sportas" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Piešimas" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Piešimas ir redagavimas" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografija" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Publikavimas" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Skenavimas ir OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Stebėtojai" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internetas" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Pokalbis" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Failų dalinimas" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Paštas" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Žiniatinklio naršyklės" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedija" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Biuras" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Sistema ir nustatymai" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Visi" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Patvirtinti papildomus pakeitimus" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Pažymėti papildomus pakeitimus?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Šis veiksmas reikalauja pakeisti kitą paketą:" -msgstr[1] "Šis veiksmas reikalauja pakeisti kitus paketus:" -msgstr[2] "Šis veiksmas reikalauja pakeisti kitus paketus:" -msgstr[3] "Šis veiksmas reikalauja pakeisti kitus paketus:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Istorija" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Ieškoti" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Visi pakeitimai" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Įdiegimai" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Atnaujinimai" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Pašalinimai" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Data" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "įdiegtas" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "" -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Atnaujinta versija" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Gražinta" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "pašalintas" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Išvalyta" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 %3" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "" -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Visi" + +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Muon turi super karvės galių" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Sistemos administravimas" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Bazinė sistema" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI Infrastruktūra" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Bendravimas" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Duomenų bazės" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Programavimas" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentacija" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Derinimas" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Redaktoriai" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Įterpti įrenginiai" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Šriftai" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Žaidimai ir pramogos" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME darbastalio aplinka" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R statistinė sistema" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep darbastalio aplinka" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Jaunimo radijas" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell programavimo kalba" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Serveriai" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpretuotos kompiuterinės kalbos" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java programavimo kalba" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE programinės įrangos kompiliacija" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Branduolys ir moduliai" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Bibliotekos - Programavimas" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Bibliotekos" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp programavimo kalba" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokalizavimas" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "El. paštas" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Įvairūs - Teksto pagrindu" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Tinklas" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Naujienų grupės" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCaml programavimo kalba" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Bibliotekos - Senos" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Kryžminė platforma" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl programavimo kalba" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP programavimo kalba" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python programavimo kalba" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby programavimo kalba" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Mokslas" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Aplankai" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedija" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX tvarkymas" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Teksto apdorojimas" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Pagalbininkai" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Versijų kontrolės sistemos" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video programinė įranga" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internetas" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Įvairūs - Grafikos" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce darbastalio aplinka" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone aplinka" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Nežinoma" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Konvertuota iš RPM su Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internacionalizavimas ir lokalizavimas" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta paketai" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Apribotas eksportuojant" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Nelaisvos programos" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Prisidėti" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Išsilavinimas" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Neįdiegta" - -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Įdiegta" - -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Galima atnaujinti versiją" - -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" msgid "Broken" msgstr "Sugadinti" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Likusi konfigūracija" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Įdiegti (automatiškai pašalinami)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Nieko" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Įdiegti" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Atnaujinti versiją" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Pašalinti" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Išvalyti" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Įdiegti iš naujo" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Gražinti seną" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Užrakinti" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Bendra" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Inicializacijos klaida" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Nepavyko gauti paketų sistemos užrakto" - -#: libmuon/MuonStrings.cpp:247 +#: libmuon/resources/AbstractResource.cpp:82 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Mažai vietos diske" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Nepavyko pritaikyti pakeitimų" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Tapatumo nustatymo klaida" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Netikėta klaida" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Nepatikimi paketai" +#| msgid "Available updates" +msgid "Available" +msgstr "Galimi atnaujinimai" -#: libmuon/MuonStrings.cpp:259 +#: libmuon/resources/AbstractResource.cpp:83 #, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Nežinoma" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Paketų sistema negalėjo būti inicializuota, Jūsų konfigūracija gali būti " -"sugadinta." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Kita programa naudoja paketų sistemą šiuo metu. Jūs privalote uždaryti visas " -"kitas paketų tvarkykles, kad galėtumėte įdiegti ar šalinti paketus." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Jūs neturite pakankamai disko vietos aplanke %1, kad tęsti šią operaciją." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Nepavyksta atsisiųsti paketų" +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "įdiegtas" -#: libmuon/MuonStrings.cpp:288 +#: libmuon/resources/AbstractResource.cpp:84 #, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Įvyko klaida vykdant pakeitimus:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "Ši operacija negali tęstis, nes reikiamos leidimas nebuvo suteiktas" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Rodosi kad QApt darbuotojas žuvo ar dingo. Prašome pranešti apie spragą QApt " -"savininkams." - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Šis paketas nėra patvirtintas savo autoriaus. Nepatikimų paketų atsiuntimas " -"yra uždraustas jūsų esamos konfigūracijos." -msgstr[1] "" -"Šie paketai nėra patvirtinti savo autoriaus. Nepatikimų paketų atsiuntimas " -"yra uždraustas jūsų esamos konfigūracijos." -msgstr[2] "" -"Šie paketai nėra patvirtinti savo autoriaus. Nepatikimų paketų atsiuntimas " -"yra uždraustas jūsų esamos konfigūracijos." -msgstr[3] "" -"Šie paketai nėra patvirtinti savo autoriaus. Nepatikimų paketų atsiuntimas " -"yra uždraustas jūsų esamos konfigūracijos." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Tikrinti, ar yra atnaujinimų" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Atžymėti viską" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Konfigūruoti programinės įrangos šaltinius" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Išsaugoti žymėjimus kaip" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Nepavyko išsaugoti dokumento, nes nėra galima rašyti į %1\n" -"\n" -"Patikrinkite ar turite prieigos teisę prie šio failo ir ar pakankamai " -"laisvos vietos yra diske." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Įrašyti įdiegtų paketų sąrašą kaip" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Įrašyti atsiuntimų sąrašą kaip" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Atverti failą" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Nepavyko pažymėti pakeitimų. Prašome Įsitikinti, kad failas yra žymių failas " -"yra sukurtas su Muon ar Synaptic paketų tvarkykle." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Pasirinkite aplanką" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 paketas sėkmingai pridėtas į atmintinę" -msgstr[1] "%1 paketai sėkmingai pridėti į atmintinę" -msgstr[2] "%1 paketų sėkmingai pridėta į atmintinę" -msgstr[3] "%1 paketas sėkmingai pridėtas į atmintinę" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Nerasta tinkamų paketų šiame aplanke. Prašome patikrinti ar\n" -"paketai yra suderinami su Jūsų kompiuteriu ir naujausios versijos." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Nepavyko rasti paketų" +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Galima atnaujinti versiją" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1121,11 +141,6 @@ msgid "%1 remaining" msgstr "" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Prisijungiama prie Ubuntu SSO tarnybos" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Rodyti pranešimus:" @@ -1163,18 +178,18 @@ msgid "Downloading" msgstr "Atsiuntimas" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Atlikta" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Laukiama" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Įdiegiama" @@ -1289,7 +304,350 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -Nru muon-1.9.60/po/lt/muon-discover.po muon-2.0.0/po/lt/muon-discover.po --- muon-1.9.60/po/lt/muon-discover.po 2012-10-29 18:34:46.000000000 +0000 +++ muon-2.0.0/po/lt/muon-discover.po 2013-04-01 20:33:16.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: l 10n\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" "PO-Revision-Date: 2012-07-01 23:03+0300\n" "Last-Translator: Donatas G. \n" "Language-Team: Lithuanian \n" @@ -31,7 +31,6 @@ #: discover/main.cpp:36 #, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" msgstr "©2010, 2011 Jonathan Thomas" @@ -55,22 +54,39 @@ msgid "Display a list of entries with a category." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Ieškoti..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Pridedamos kilmės..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Šalinamos kilmės..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -85,94 +101,98 @@ msgid "Discard" msgstr "Atmesti" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 įvertinimai" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Namų puslapis" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Paleisti" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Peržiūra" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Bendras dydis: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Apžvalga" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Priedai" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Įvertinimai" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Atnaujinti" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Pavadinimas" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Įvertinimas" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Kumštelėjimas" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Populiarumas" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Kilmė" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Ieškoti „%1“..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Ieškoti..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 #, fuzzy #| msgid "Popularity Contest" msgid "Popularity Contest" msgstr "Populiarumo varžybos" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "taškai: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 #, fuzzy #| msgid "Best Ratings" msgid "Best Ratings" msgstr "Geriasi reitingai" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +#, fuzzy +#| msgid "Muon Discover" +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "Muon atradėjas" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -185,25 +205,39 @@ msgid "Remove" msgstr "Pašalinti" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Įdiegta" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 #, fuzzy #| msgid "Update All!" msgid "Update All" msgstr "Atnaujinti visus!" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "" -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Aptikti" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Įdiegta" +msgstr[1] "Įdiegta" +msgstr[2] "Įdiegta" +msgstr[3] "Įdiegta" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Šaltiniai" @@ -228,55 +262,57 @@ msgid "Summary:" msgstr "Santrauka:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Apžvalgos:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Praneškite mums apie šį įvertinimą!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 iš %2 asmenys mano, kad ši apžvalga naudinga" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 iš %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Naudinga? TAip/Ne" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Pridėti šaltinį" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Nurodyti naują šaltinį" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Atšaukti" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - pridėtina apt saugyklos šaltinio eilutė. Tai viena iš:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Dvejetainis)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "" \ No newline at end of file diff -Nru muon-1.9.60/po/lt/muon-installer.po muon-2.0.0/po/lt/muon-installer.po --- muon-1.9.60/po/lt/muon-installer.po 2012-10-29 18:34:46.000000000 +0000 +++ muon-2.0.0/po/lt/muon-installer.po 2013-04-01 20:33:16.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-07-01 23:18+0300\n" "Last-Translator: Donatas G. \n" "Language-Team: Lithuanian \n" @@ -31,7 +31,7 @@ msgid "Your emails" msgstr "liudas@akmc.lt" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -44,7 +44,7 @@ msgstr[3] "" "Ką tik buvo įdiegtos šios programos, norėdami jas paleisti, spustelėkite:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Gauti programų" @@ -68,7 +68,6 @@ #: installer/main.cpp:38 #, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" msgstr "©2010, 2011 Jonathan Thomas" @@ -76,74 +75,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Gauti programų" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Įdiegtos programos" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Pateikta Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Pateikta Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical partneriai" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Nepriklausomas" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Gauti programų" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Įdiegtos programos" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Istorija" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 buvo sėkmingai įdiegta." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Pradėti" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Programos sėkmingai įdiegtos." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Paleisti naujas programas..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Įdiegimas baigtas" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Vykdoma" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Vykdoma" @@ -219,18 +218,18 @@ msgid "Install" msgstr "Įdiegti" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Pašalinti" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Įdiegti" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -288,19 +287,19 @@ msgid "No reviews available" msgstr "Nėra apžvalgų" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Šis apžvalga buvo parašyta senesnei versijai (versijai %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/lt/muon-notifier.po muon-2.0.0/po/lt/muon-notifier.po --- muon-1.9.60/po/lt/muon-notifier.po 2012-10-29 18:34:46.000000000 +0000 +++ muon-2.0.0/po/lt/muon-notifier.po 2013-04-01 20:33:16.000000000 +0000 @@ -11,7 +11,7 @@ msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2012-07-01 23:07+0300\n" "Last-Translator: Donatas G. \n" "Language-Team: Lithuanian \n" diff -Nru muon-1.9.60/po/lt/muon-updater.po muon-2.0.0/po/lt/muon-updater.po --- muon-1.9.60/po/lt/muon-updater.po 2012-10-29 18:34:46.000000000 +0000 +++ muon-2.0.0/po/lt/muon-updater.po 2013-04-01 20:33:16.000000000 +0000 @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2012-07-01 22:59+0300\n" "Last-Translator: Donatas G. \n" "Language-Team: Lithuanian \n" @@ -29,12 +29,12 @@ msgid "Your emails" msgstr "liudas@akmc.lt" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Slėpti" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -44,18 +44,18 @@ "Pakeitimų sąrašas dar neprieinamas. Prašome naudoti Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Pakeitimų sąrašas dar neprieinamas." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versija %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -81,7 +81,6 @@ #: updater/main.cpp:38 #, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" msgstr "©2010, 2011 Jonathan Thomas" @@ -89,119 +88,94 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Programų atnaujinimai" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "Prieš atnaujinant programinę įrangą saugumo sumetimais patartina prijungti " "išorinį maitinimą." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Yra pasiekiama nauja Kubuntu versija." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Išsaugoti atsisiuntimui pažymėtų paketų sąrašą..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Atsiųsti paketus iš sąrašo..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Pridėti atsisiųstus paketus" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Įdiegti atnaujinimus" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Istorija..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Atnaujinti" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Paketo istorija" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Atšaukti" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 #, fuzzy #| msgctxt "@info" -#| msgid "Committing Changes" +#| msgid "Installing Updates" msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Taikomi pakeitimai" +msgstr "Diegiami atnaujinimai" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 #, fuzzy #| msgctxt "@info" -#| msgid "Committing Changes" +#| msgid "Updating software sources" msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "Taikomi pakeitimai" +msgstr "Atnaujinami programinės įrangos šaltiniai" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 #, fuzzy #| msgctxt "@info" -#| msgid "Committing Changes" +#| msgid "Installing Updates" msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "Taikomi pakeitimai" +msgstr "Diegiami atnaujinimai" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -209,7 +183,7 @@ msgid "Loading Software List" msgstr "Atnaujinami programinės įrangos šaltiniai" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -217,7 +191,7 @@ msgid "Updating software sources" msgstr "Atnaujinami programinės įrangos šaltiniai" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 #, fuzzy #| msgctxt "@info" #| msgid "Downloading Updates" @@ -225,39 +199,39 @@ msgid "Downloading Packages" msgstr "Atsiunčiami atnaujinimai" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 #, fuzzy #| msgctxt "@info" -#| msgid "Committing Changes" +#| msgid "Installing Updates" msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "Taikomi pakeitimai" +msgstr "Diegiami atnaujinimai" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 #, fuzzy #| msgctxt "@info" -#| msgid "Committing Changes" +#| msgid "Installing Updates" msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Taikomi pakeitimai" +msgstr "Diegiami atnaujinimai" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -274,12 +248,12 @@ msgstr[2] "" msgstr[3] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -288,34 +262,35 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Versija %1:" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Versija %1:" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Atsiuntimo greitis: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 liko" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -323,8 +298,6 @@ #: updater/UpdateModel/UpdateModel.cpp:106 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@label Column label" msgid "Version" msgstr "Versija %1:" @@ -334,67 +307,57 @@ msgid "Download Size" msgstr "Atsiuntimo dydis" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Svarbūs saugumo atnaujinimai" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Programų atnaujinimai" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Sistemos atnaujinimai" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Ne visi paketai galėjo būti pažymėti atnaujinimui. Atnaujinimai, kuriuos " -"galima įdiegti, gali reikalauti įdiegti naujus paketus, arba – kai kuriuos " -"paketus pašalinti. Ar norite pažymėti atnaujinimus, kurie gali reikalauti " -"papildomų operacijų?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Nepavyksta pažymėti atnaujinimų" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Pažymėti atnaujinimus" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Nėra žinoma, kada buvo paskutinis patikrinamas dėl atnaujinimų." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Prašome spustelėti Ieškoti atnaujinimųjei norite tai " "patikrinti." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Programinė įranga šiame kompiuteryje yra naujausia." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Paskutinį kartą tikrinta prieš %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Atnaujinimų nėra." \ No newline at end of file diff -Nru muon-1.9.60/po/lt/muon.po muon-2.0.0/po/lt/muon.po --- muon-1.9.60/po/lt/muon.po 2012-10-29 18:34:46.000000000 +0000 +++ muon-2.0.0/po/lt/muon.po 2013-04-01 20:33:16.000000000 +0000 @@ -12,7 +12,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2012-07-01 23:38+0300\n" "Last-Translator: Donatas G. \n" "Language-Team: Lithuanian \n" @@ -183,18 +183,18 @@ msgid "Purge" msgstr "Išvalyti" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Panaikinti pažymėjimą" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical teikia kritinius atnaujinimus %1 iki %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -355,7 +355,6 @@ #: muon/main.cpp:37 #, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" msgstr "© 2009-2011 Jonathan Thomas" @@ -363,69 +362,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Skaityti žymes..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Įrašyti žymes kaip..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Išsaugoti atsiųstinų paketų sąrašą..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Atsiųsti paketus pagal sąrašą..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Pridėti atsiųstus paketus" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Išsaugoti įdiegtų paketų sąrašą..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Atsargus atnaujinimas" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Pilnas versijos atnaujinimas" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Šalinti nebereikalingus paketus" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Peržiūrėti pakeitimus" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Pritaikyti pakeitimus" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Istorija..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -437,12 +406,12 @@ "galite pamėginti atlikti pilną versijos atnaujinimą spausdami " "Pilnas versijos atnaujinimas mygtuką." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Nepavyksta pažymėti versijos atnaujinimų" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -451,17 +420,17 @@ "Nepavyksta pažymėti atnaujinimų. Keletas atnaujinimų turi nepatenkintų " "priklausomybių šiuo metu, arba buvo sustabdytos rankiniu būdu." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Atgal" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Peržiūrėti pakeitimus" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Paketo istorija" @@ -478,52 +447,52 @@ msgid "Requested" msgstr "Pareikalauta" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Ieškoti" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Pažymėti diegimui" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Pažymėti šalinimui" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Pažymėti versijos atnaujinimui" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Pažymėti pakartotiniam diegimui" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Pažymėti išvalymui" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Fiksuoti šią paketo versiją" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Panaikinti paketo versijos fiksavimą" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Fiksuoti šią paketo versiją" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -532,12 +501,12 @@ "Šio paketo pašalinimas gali sugadinti Jūsų sistemą. Ar Jūs tikrai norite " "pašalinti jį?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Svarbu – šalinamas svarbus paketas" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 #, fuzzy #| msgctxt "@title:window" #| msgid "Unable to Mark Package" @@ -545,24 +514,24 @@ msgid "Failed to Lock Package" msgstr "Nepavyksta pažymėti paketo" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Nepavyko pažymėti paketo „%1“ įdiegimui ar versijos atnaujinimui:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Nepavyksta pažymėti paketo" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -576,42 +545,24 @@ "niekada neįkeltas, yra nebepalaikomas, arba nepasiekiamas šiuo metu " "įgalintose saugyklose." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, bet %4 bus įdiegtas" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "arba %1 %2, bet %3 bus įdiegtas" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, bet jis nebus įdiegtas" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "arba %1, bet yra neįdiegiamas" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, bet yra virtualus paketas" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "arba %1, bet jis yra virtualus paketas" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Peržiūrėti ir pritaikyti pakeitimus" diff -Nru muon-1.9.60/po/mai/muon.po muon-2.0.0/po/mai/muon.po --- muon-1.9.60/po/mai/muon.po 2012-10-29 18:34:51.000000000 +0000 +++ muon-2.0.0/po/mai/muon.po 2013-04-01 20:33:19.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2010-09-24 20:33+0530\n" "Last-Translator: Rajesh Ranjan \n" "Language-Team: Maithili \n" @@ -73,10 +73,6 @@ #: muon/config/ManagerSettingsDialog.cpp:57 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"admin" -#| "\"" -#| msgid "System Administration" msgctxt "@title:group" msgid "Notifications" msgstr "सिस्टम प्रशासन" @@ -106,8 +102,6 @@ #: muon/DetailsTabs/DependsTab.cpp:40 #, fuzzy -#| msgctxt "@item:inlistbox" -#| msgid "Dependencies of the Latest Version" msgctxt "@item:inlistbox" msgid "Dependencies of the Current Version" msgstr "नवीनतम संस्करण क' निर्भरता" @@ -164,7 +158,6 @@ #: muon/DetailsTabs/MainTab.cpp:77 #, fuzzy -#| msgid "Remove" msgctxt "@action:button" msgid "Removal" msgstr "हटाबू" @@ -176,8 +169,6 @@ #: muon/DetailsTabs/MainTab.cpp:89 #, fuzzy -#| msgctxt "@action:button" -#| msgid "Installation" msgctxt "@action:button" msgid "Reinstallation" msgstr "संस्थापन" @@ -187,18 +178,18 @@ msgid "Purge" msgstr "" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "अचिह्नित" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "" -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -250,8 +241,6 @@ #: muon/DetailsTabs/TechnicalDetailsTab.cpp:114 #: muon/DetailsTabs/TechnicalDetailsTab.cpp:136 #, fuzzy -#| msgctxt "@title:tab" -#| msgid "Installed Files" msgctxt "@label Label preceding the package size" msgid "Installed Size:" msgstr "संस्थापित फाइल" @@ -286,44 +275,36 @@ #: muon/DetailsTabs/VersionTab.cpp:70 #, fuzzy -#| msgctxt "@label Label preceding the package version" -#| msgid "Version:" msgctxt "@action:button" msgid "Force Version" msgstr "संस्करण:" #: muon/DownloadModel/DownloadDelegate.cpp:65 #, fuzzy -#| msgctxt "@info:status" -#| msgid "Done" msgctxt "@info:status Progress text when done" msgid "Done" msgstr "सम्पन्न" #: muon/DownloadModel/DownloadModel.cpp:61 #, fuzzy -#| msgid "Package" msgctxt "@title:column" msgid "Package" msgstr "संकुल" #: muon/DownloadModel/DownloadModel.cpp:63 #, fuzzy -#| msgid "Location" msgctxt "@title:column" msgid "Location" msgstr "स्थान" #: muon/DownloadModel/DownloadModel.cpp:65 #, fuzzy -#| msgid "Size" msgctxt "@title:column" msgid "Size" msgstr "आकार" #: muon/DownloadModel/DownloadModel.cpp:67 #, fuzzy -#| msgid "Progress" msgctxt "@title:column" msgid "Progress" msgstr "प्रगति" @@ -377,69 +358,39 @@ msgid "Jonathan Thomas" msgstr "" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "" - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -447,38 +398,36 @@ "Full Upgrade button." msgstr "" -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " "at the moment, or may have been manually held back." msgstr "" -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "पाछाँ" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 #, fuzzy -#| msgid "Package" msgctxt "@title:window" msgid "Package History" msgstr "संकुल" #: muon/PackageModel/PackageModel.cpp:79 #, fuzzy -#| msgid "Package" msgid "Package" msgstr "संकुल" @@ -490,95 +439,89 @@ msgid "Requested" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "खोजू" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 #, fuzzy -#| msgctxt "@action:button" -#| msgid "Installation" msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "संस्थापन" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 #, fuzzy -#| msgctxt "@action:button" -#| msgid "Upgrade" msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "उन्नत बनाबू" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 #, fuzzy -#| msgctxt "@action:button" -#| msgid "Installation" msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "संस्थापन" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -588,42 +531,24 @@ "enabled repositories." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "" @@ -643,7 +568,6 @@ #: muon/StatusWidget.cpp:92 #, fuzzy, kde-format -#| msgid "Not installed" msgctxt "@info:status" msgid "%1 installed, " msgstr "संस्थापित नहि" @@ -812,16 +736,12 @@ #: muon/TransactionWidget.cpp:290 #, fuzzy -#| msgctxt "@label Label preceding the package version" -#| msgid "Version:" msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "संस्करण:" #: muon/TransactionWidget.cpp:291 #, fuzzy -#| msgctxt "@label Label preceding the package version" -#| msgid "Version:" msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "संस्करण:" @@ -1076,22 +996,14 @@ - - #, fuzzy - - - - #, fuzzy - - #, fuzzy @@ -1105,20 +1017,14 @@ - - - - #, fuzzy - #, fuzzy - #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/mr/CMakeLists.txt muon-2.0.0/po/mr/CMakeLists.txt --- muon-1.9.60/po/mr/CMakeLists.txt 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/mr/CMakeLists.txt 2013-04-01 20:33:22.000000000 +0000 @@ -0,0 +1,2 @@ +file(GLOB _po_files *.po) +GETTEXT_PROCESS_PO_FILES(mr ALL INSTALL_DESTINATION ${LOCALE_INSTALL_DIR} ${_po_files} ) diff -Nru muon-1.9.60/po/mr/libmuon.po muon-2.0.0/po/mr/libmuon.po --- muon-1.9.60/po/mr/libmuon.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/mr/libmuon.po 2013-04-01 20:33:22.000000000 +0000 @@ -0,0 +1,200 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Chetan Khona , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-02-24 11:44+0530\n" +"Last-Translator: Chetan Khona \n" +"Language-Team: Marathi \n" +"Language: mr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Lokalize 1.5\n" + +#: libmuon/backends/ApplicationBackend/Application.cpp:177 +msgid "Applications" +msgstr "अनुप्रयोग" + +#: libmuon/backends/ApplicationBackend/Application.cpp:278 +msgctxt "@info license" +msgid "Open Source" +msgstr "ओपन सोर्स" + +#: libmuon/backends/ApplicationBackend/Application.cpp:280 +msgctxt "@info license" +msgid "Proprietary" +msgstr "विशिष्ठ मालकीचे" + +#: libmuon/backends/ApplicationBackend/Application.cpp:282 +msgctxt "@info license" +msgid "Unknown" +msgstr "अपरिचीत" + +#: libmuon/backends/ApplicationBackend/Application.cpp:413 +#, kde-format +msgctxt "@info app size" +msgid "%1 to download, %2 on disk" +msgstr "%1 डाउनलोड करायचे आहे, %2 डिस्कवर आहे" + +#: libmuon/backends/ApplicationBackend/Application.cpp:417 +#, kde-format +msgctxt "@info app size" +msgid "%1 on disk" +msgstr "%1 डिस्कवर आहे" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "अनुप्रयोग" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "अनुप्रयोग" + +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "उबूंटू SSO सेवेत प्रवेश करा" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "" + +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "सर्व" + +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "या म्युओन कडे सुपर काऊ शक्ती आहे" + +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" +msgid "Broken" +msgstr "तुटलेले" + +#: libmuon/resources/AbstractResource.cpp:82 +#, fuzzy +#| msgid "Available updates" +msgid "Available" +msgstr "उपलब्ध अद्ययावत सॉफ़्टवेअर" + +#: libmuon/resources/AbstractResource.cpp:83 +#, fuzzy +#| msgctxt "@info:status Requested action" +#| msgid "Install" +msgid "Installed" +msgstr "प्रतिष्ठापीत करा" + +#: libmuon/resources/AbstractResource.cpp:84 +#, fuzzy +#| msgctxt "@info:status Requested action" +#| msgid "Upgrade" +msgid "Upgradeable" +msgstr "अद्ययावत करा" + +#: libmuon/resources/ResourcesUpdatesModel.cpp:100 +#, kde-format +msgctxt "@item:intext Remaining time" +msgid "%1 remaining" +msgstr "" + +#: libmuon/settings/NotifySettingsPage.cpp:46 +msgid "Show notifications for:" +msgstr "याकरिता सूचना दर्शवा :" + +#: libmuon/settings/NotifySettingsPage.cpp:48 +msgid "Available updates" +msgstr "उपलब्ध अद्ययावत सॉफ़्टवेअर" + +#: libmuon/settings/NotifySettingsPage.cpp:49 +msgid "Show the number of available updates" +msgstr "उपलब्ध अद्ययावत सॉफ़्टवेअरची संख्या दर्शवा" + +#: libmuon/settings/NotifySettingsPage.cpp:50 +msgid "Distribution upgrades" +msgstr "वितरण अद्ययावतता" + +#: libmuon/settings/NotifySettingsPage.cpp:69 +msgid "Notification type:" +msgstr "सूचना प्रकार :" + +#: libmuon/settings/NotifySettingsPage.cpp:72 +msgid "Use both popups and tray icons" +msgstr "पॉपअप व ट्रे चिन्हे दोन्ही वापरा" + +#: libmuon/settings/NotifySettingsPage.cpp:73 +msgid "Tray icons only" +msgstr "फक्त ट्रे चिन्हे" + +#: libmuon/settings/NotifySettingsPage.cpp:74 +msgid "Popup notifications only" +msgstr "फक्त पॉपअप सूचना" + +#: libmuon/Transaction/TransactionListener.cpp:109 +msgctxt "@info:status" +msgid "Downloading" +msgstr "डाउनलोड करत आहे" + +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 +msgctxt "@info:status Progress text when done" +msgid "Done" +msgstr "झाले" + +#: libmuon/Transaction/TransactionListener.cpp:154 +msgctxt "@info:status Progress text when waiting" +msgid "Waiting" +msgstr "वाट पाहत आहे" + +#: libmuon/Transaction/TransactionListener.cpp:175 +msgctxt "@info:status" +msgid "Installing" +msgstr "प्रतिष्ठापन करत आहे" + +#: libmuon/Transaction/TransactionListener.cpp:179 +msgctxt "@info:status" +msgid "Changing Addons" +msgstr "एडोन्स बदलत आहे" + +#: libmuon/Transaction/TransactionListener.cpp:183 +msgctxt "@info:status" +msgid "Removing" +msgstr "काढून टाकत आहे" \ No newline at end of file diff -Nru muon-1.9.60/po/mr/muon-discover.po muon-2.0.0/po/mr/muon-discover.po --- muon-1.9.60/po/mr/muon-discover.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/mr/muon-discover.po 2013-04-01 20:33:22.000000000 +0000 @@ -0,0 +1,310 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Chetan Khona , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-02-24 12:19+0530\n" +"Last-Translator: Chetan Khona \n" +"Language-Team: Marathi \n" +"Language: mr\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Lokalize 1.5\n" + +#: discover/main.cpp:29 +msgid "An application discoverer" +msgstr "अनुप्रयोग शोधक" + +#: discover/main.cpp:35 +msgid "Muon Discover" +msgstr "म्युओन डिस्कव्हर" + +#: discover/main.cpp:36 +msgid "©2010-2012 Jonathan Thomas" +msgstr "©2010-2012 जोनाथन थोमस" + +#: discover/main.cpp:37 +msgid "Jonathan Thomas" +msgstr "जोनाथन थोमस" + +#: discover/main.cpp:38 +msgid "Aleix Pol Gonzalez" +msgstr "एलैक्स पोल गोन्झालेझ" + +#: discover/main.cpp:44 +msgid "Directly open the specified application by its package name." +msgstr "निर्देशीत अनुप्रयोग त्याच्या पॅकेज नावाने उघडा." + +#: discover/main.cpp:45 +msgid "Open with a program that can deal with the given mimetype." +msgstr "दिलेल्या माइम प्रकाराशी चालू शकेल अशा कार्यक्रमात उघडा." + +#: discover/main.cpp:46 +msgid "Display a list of entries with a category." +msgstr "नोंदींची यादी विभागासहित दर्शवा." + +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "शोधा..." + +#: discover/MuonDiscoverMainWindow.cpp:109 +msgid "" +"Found some errors while setting up the GUI, the application can't proceed." +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:110 +msgid "Initialization error" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" + +#: discover/qml/AddonsView.qml:37 +#, kde-format +msgid "%1
%2" +msgstr "%1
%2" + +#: discover/qml/AddonsView.qml:63 +msgid "Apply" +msgstr "लागू करा" + +#: discover/qml/AddonsView.qml:68 +msgid "Discard" +msgstr "सोडून द्या" + +#: discover/qml/ApplicationOverview.qml:64 +#, kde-format +msgid "%1 reviews" +msgstr "%1 प्रतिक्रिया" + +#: discover/qml/ApplicationOverview.qml:70 +msgid "Homepage" +msgstr "मुख्यपान" + +#: discover/qml/ApplicationOverview.qml:79 +msgid "Launch" +msgstr "प्रक्षेपण करा" + +#: discover/qml/ApplicationOverview.qml:86 +msgid "Review" +msgstr "समीक्षा" + +#: discover/qml/ApplicationOverview.qml:91 +#, kde-format +msgid "Total Size: %1
" +msgstr "एकूण आकार : %1
" + +#: discover/qml/ApplicationPage.qml:87 +msgid "Overview" +msgstr "पूर्वावलोकन" + +#: discover/qml/ApplicationPage.qml:91 +msgid "Add-ons" +msgstr "एडोन्स" + +#: discover/qml/ApplicationPage.qml:96 +msgid "Reviews" +msgstr "प्रतिक्रिया" + +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 +#: discover/qml/InstallApplicationButton.qml:38 +#: discover/qml/InstalledPage.qml:11 +msgid "Update" +msgstr "अद्ययावत करा" + +#: discover/qml/ApplicationsListPage.qml:111 +msgid "Name" +msgstr "नाव" + +#: discover/qml/ApplicationsListPage.qml:117 +msgid "Rating" +msgstr "गुणवत्ताश्रेणी" + +#: discover/qml/ApplicationsListPage.qml:123 +msgid "Buzz" +msgstr "बोलले जाणारे" + +#: discover/qml/ApplicationsListPage.qml:129 +msgid "Popularity" +msgstr "लोकप्रियता" + +#: discover/qml/ApplicationsListPage.qml:135 +msgid "Origin" +msgstr "मूळ" + +#: discover/qml/CategoryPage.qml:34 +#, kde-format +msgid "Search in '%1'..." +msgstr "यामध्ये शोधा '%1'..." + +#: discover/qml/CategoryPage.qml:139 +#, fuzzy +#| msgid "Popularity" +msgid "Popularity Contest" +msgstr "लोकप्रियता" + +#: discover/qml/CategoryPage.qml:140 +#, kde-format +msgid "points: %1" +msgstr "गुण : %1" + +#: discover/qml/CategoryPage.qml:151 +#, fuzzy +#| msgid "Rating" +msgid "Best Ratings" +msgstr "गुणवत्ताश्रेणी" + +#: discover/qml/DefaultBanner.qml:16 +#, fuzzy +#| msgid "Muon Discover" +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "म्युओन डिस्कव्हर" + +#: discover/qml/FeaturedBanner.qml:88 +#, kde-format +msgid "%1
%2" +msgstr "%1
%2" + +#: discover/qml/InstallApplicationButton.qml:43 +msgid "Install" +msgstr "प्रतिष्ठापीत करा" + +#: discover/qml/InstallApplicationButton.qml:48 +msgid "Remove" +msgstr "काढून टाका" + +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 +msgid "Installed" +msgstr "प्रतिष्ठापीत केलेले" + +#: discover/qml/InstalledPage.qml:31 +#, fuzzy +#| msgid "Update" +msgid "Update All" +msgstr "अद्ययावत करा" + +#: discover/qml/Main.qml:41 +msgid "Loading..." +msgstr "दाखल करत आहे..." + +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "" + +#: discover/qml/Main.qml:88 +msgid "Discover" +msgstr "शोधा" + +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "प्रतिष्ठापीत केलेले" +msgstr[1] "प्रतिष्ठापीत केलेले" + +#: discover/qml/Main.qml:100 +msgid "Sources" +msgstr "स्रोत" + +#: discover/qml/ReviewDialog.qml:11 +#, kde-format +msgid "Reviewing %1" +msgstr "समीक्षा करत आहे %1" + +#: discover/qml/ReviewDialog.qml:21 +msgid "Submit" +msgstr "सादर करा" + +#: discover/qml/ReviewDialog.qml:30 +msgid "Close" +msgstr "बंद करा" + +#: discover/qml/ReviewDialog.qml:43 +msgid "Rating:" +msgstr "गुणवत्ताश्रेणी :" + +#: discover/qml/ReviewDialog.qml:49 +msgid "Summary:" +msgstr "सारांश :" + +#: discover/qml/ReviewsView.qml:21 +msgid "Reviews:" +msgstr "प्रतिक्रिया :" + +#: discover/qml/ReviewsView.qml:30 +msgid "Tell us about this review!" +msgstr "या प्रतिक्रियेबद्दल आम्हाला सांगा !" + +#: discover/qml/ReviewsView.qml:31 +#, kde-format +msgid "%1 out of %2 people found this review useful" +msgstr "%2 पैकी %1 व्यक्तिंना हि प्रतिक्रिया उपयोगी वाटली" + +#: discover/qml/ReviewsView.qml:46 +#, kde-format +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" + +#: discover/qml/ReviewsView.qml:59 +msgid "Useful? Yes/No" +msgstr "उपयोगी आहे का? होय/नाही" + +#: discover/qml/SourcesPage.qml:17 +msgid "Add Source" +msgstr "स्रोत जोडा" + +#: discover/qml/SourcesPage.qml:40 +msgid "Specify the new source" +msgstr "नवीन स्रोत निर्देशीत करा" + +#: discover/qml/SourcesPage.qml:44 +msgid "OK" +msgstr "" + +#: discover/qml/SourcesPage.qml:50 +msgid "Cancel" +msgstr "रद्द करा" + +#: discover/qml/SourcesPage.qml:72 +msgid " - The apt repository source line to add. This is one of:\n" +msgstr " - जोडण्याकरिता एप्ट रीपोझिटरी स्रोत ओळ. हि पुढील पैकी एक :\n" + +#: discover/qml/SourcesPage.qml:136 +#, kde-format +msgid "%1 (Binary)" +msgstr "%1 (बायनरी)" + +#: discover/qml/SourcesPage.qml:162 +#, kde-format +msgid "%1. %2" +msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/mr/muon-installer.po muon-2.0.0/po/mr/muon-installer.po --- muon-1.9.60/po/mr/muon-installer.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/mr/muon-installer.po 2013-04-01 20:33:22.000000000 +0000 @@ -0,0 +1,295 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Chetan Khona , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2013-02-24 12:11+0530\n" +"Last-Translator: Chetan Khona \n" +"Language-Team: American English \n" +"Language: en_US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "चेतन खोना" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "chetan@kompkin.com" + +#: installer/ApplicationLauncher.cpp:43 +msgid "The following application was just installed, click on it to launch:" +msgid_plural "" +"The following applications were just installed, click on them to launch:" +msgstr[0] "" +"पुढील अनुप्रयोग आताच प्रतिष्ठापीत केला. प्रक्षेपण करण्याकरिता त्यावर क्लिक करा :" +msgstr[1] "" +"पुढील अनुप्रयोग आताच प्रतिष्ठापीत केले. प्रक्षेपण करण्याकरिता त्यांच्यावर क्लिक करा :" + +#: installer/AvailableView.cpp:44 +msgid "Get Software" +msgstr "सॉफ़्टवेअर प्राप्त करा" + +#: installer/BreadcrumbWidget/BreadcrumbWidget.cpp:64 +msgctxt "@label Line edit click message" +msgid "Search" +msgstr "शोध" + +#: installer/CategoryView/CategoryViewWidget.cpp:126 +msgctxt "@label" +msgid "Search Results" +msgstr "शोध निकाल" + +#: installer/main.cpp:31 +msgid "An application manager" +msgstr "अनुप्रयोग व्यवस्थापक" + +#: installer/main.cpp:37 +msgid "Muon Software Center" +msgstr "म्युओन सॉफ़्टवेअर केंद्र" + +#: installer/main.cpp:38 +msgid "©2010-2012 Jonathan Thomas" +msgstr "©2010-2012 जोनाथन थोमस" + +#: installer/main.cpp:39 +msgid "Jonathan Thomas" +msgstr "जोनाथन थोमस" + +#: installer/MainWindow.cpp:222 +msgctxt "@item:inlistbox" +msgid "Provided by Kubuntu" +msgstr "कुबुन्टुने पुरविलेले" + +#: installer/MainWindow.cpp:227 +msgctxt "@item:inlistbox" +msgid "Provided by Debian" +msgstr "डेबियनने पुरविलेले" + +#: installer/MainWindow.cpp:233 +msgctxt "" +"@item:inlistbox The name of the repository provided by Canonical, Ltd. " +msgid "Canonical Partners" +msgstr "केनोनिकल भागिदार" + +#: installer/MainWindow.cpp:242 +msgctxt "@item:inlistbox An independent software source" +msgid "Independent" +msgstr "स्वतंत्र" + +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "सॉफ़्टवेअर प्राप्त करा" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "प्रतिष्ठापीत सॉफ़्टवेअर" + +#: installer/MainWindow.cpp:318 +msgctxt "@item:inlistbox Item for showing the history view" +msgid "History" +msgstr "इतिहास" + +#: installer/MainWindow.cpp:397 +#, kde-format +msgctxt "@info" +msgid "%1 was successfully installed." +msgstr "%1 यशस्वीरित्या प्रतिष्ठापीत केला." + +#: installer/MainWindow.cpp:400 +msgctxt "@action" +msgid "Start" +msgstr "सुरु करा" + +#: installer/MainWindow.cpp:406 +msgctxt "@info" +msgid "Applications successfully installed." +msgstr "अनुप्रयोग यशस्वीरित्या प्रतिष्ठापीत केला" + +#: installer/MainWindow.cpp:407 +msgctxt "@action" +msgid "Run New Applications..." +msgstr "नवीन अनुप्रयोग चालवा..." + +#: installer/MainWindow.cpp:429 +msgctxt "@title:window" +msgid "Installation Complete" +msgstr "प्रतिष्ठापन पूर्ण" + +#: installer/MainWindow.cpp:471 +msgctxt "@item:inlistbox Item for showing the progress view" +msgid "In Progress" +msgstr "प्रगतीपथावर आहे" + +#: installer/ProgressView.cpp:37 +msgctxt "@info" +msgid "In Progress" +msgstr "प्रगतीपथावर आहे" + +#: installer/ResourceDetailsView/AddonsWidget.cpp:59 +msgctxt "@title" +msgid "Addons" +msgstr "एडोन्स" + +#: installer/ResourceDetailsView/AddonsWidget.cpp:86 +msgctxt "@action:button" +msgid "Revert" +msgstr "पूर्वस्थितीकडे जा" + +#: installer/ResourceDetailsView/AddonsWidget.cpp:92 +msgctxt "@action:button" +msgid "Apply" +msgstr "लागू करा" + +#: installer/ResourceDetailsView/AddonsWidget.cpp:93 +msgctxt "@info:tooltip" +msgid "Apply changes to addons" +msgstr "एडोन्सला बदल लागू करा" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:148 +msgctxt "@info" +msgid "Find in the menu:" +msgstr "मेन्यूत शोधा :" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:237 +msgctxt "@label Label preceding the app size" +msgid "Total Size:" +msgstr "एकूण आकार :" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:244 +msgctxt "@label/rich Label preceding the app version" +msgid "Version:" +msgstr "आवृत्ती :" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:251 +msgctxt "@label Label preceding the app license" +msgid "License:" +msgstr "परवाना :" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:258 +msgctxt "@label Label preceding the app support" +msgid "Support:" +msgstr "समर्थन :" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:330 +#, kde-format +msgctxt "@label The number of ratings the app has" +msgid "%1 rating" +msgid_plural "%1 ratings" +msgstr[0] "%1 गुणवत्ताश्रेणी" +msgstr[1] "%1 गुणवत्ताश्रेणी" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:359 +msgctxt "@label visible text for an app's URL" +msgid "Website" +msgstr "वेबसाईट" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:466 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:510 +msgctxt "@info:status Progress text when waiting" +msgid "Waiting" +msgstr "वाट पाहत आहे" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:541 +msgctxt "@action" +msgid "Install" +msgstr "प्रतिष्ठापीत करा" + +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 +msgctxt "@action" +msgid "Remove" +msgstr "काढून टाका" + +#: installer/ResourceView/ResourceDelegate.cpp:63 +#: installer/ResourceView/ResourceExtender.cpp:56 +#: installer/ResourceView/ResourceExtender.cpp:122 +msgid "Install" +msgstr "प्रतिष्ठापीत करा" + +#: installer/ResourceView/ResourceDelegate.cpp:65 +#: installer/ResourceView/ResourceExtender.cpp:52 +#: installer/ResourceView/ResourceExtender.cpp:119 +msgid "Remove" +msgstr "काढून टाका" + +#: installer/ResourceView/ResourceExtender.cpp:42 +msgid "More Info" +msgstr "अधिक माहिती" + +#: installer/ResourceView/ResourceViewWidget.cpp:66 +msgid "Show technical items" +msgstr "तांत्रीक घटक दर्शवा" + +#: installer/ResourceView/ResourceViewWidget.cpp:72 +msgid "Sort:" +msgstr "क्रमबद्ध करा" + +#: installer/ResourceView/ResourceViewWidget.cpp:74 +msgctxt "@item:inlistbox" +msgid "By Name" +msgstr "नावा प्रमाणे" + +#: installer/ResourceView/ResourceViewWidget.cpp:75 +msgctxt "@item:inlistbox" +msgid "By Top Rated" +msgstr "उच्च गुणवत्ताश्रेणी प्रमाणे" + +#: installer/ResourceView/ResourceViewWidget.cpp:76 +msgctxt "@item:inlistbox" +msgid "By Most Buzz" +msgstr "सर्वात बोलले जाणाऱ्या प्रमाणे" + +#: installer/ResourceView/ResourceViewWidget.cpp:214 +msgctxt "@item:inlistbox" +msgid "By Relevancy" +msgstr "प्रासंगिकता प्रमाणे" + +#: installer/ReviewsWidget/ReviewsWidget.cpp:57 +msgctxt "@title" +msgid "Reviews" +msgstr "प्रतिक्रिया" + +#: installer/ReviewsWidget/ReviewsWidget.cpp:73 +msgctxt "@info:status" +msgid "Loading reviews" +msgstr "प्रतिक्रिया दाखल करत आहे" + +#: installer/ReviewsWidget/ReviewsWidget.cpp:79 +msgctxt "@action" +msgid "Check for more reviews" +msgstr "अधिक प्रतिक्रिया बघा" + +#: installer/ReviewsWidget/ReviewsWidget.cpp:103 +msgctxt "@info:status" +msgid "No reviews available" +msgstr "काहीही प्रतिक्रिया उपलब्ध नाहीत" + +#: installer/ReviewsWidget/ReviewWidget.cpp:124 +#, kde-format +msgctxt "@label Formatted: username, date" +msgid "%1, %2" +msgstr "%1, %2" + +#: installer/ReviewsWidget/ReviewWidget.cpp:136 +#, kde-format +msgctxt "@label" +msgid "This review was written for an older version (Version: %1)" +msgstr "प्रतिक्रिया जुन्या आवृत्ती करिता लिहिलेली आहे (आवृत्ती : %1)" + +#: installer/ReviewsWidget/ReviewWidget.cpp:143 +#, kde-format +msgctxt "@label" +msgid "%1 out of %2 person found this review useful" +msgid_plural "%1 out of %2 people found this review useful" +msgstr[0] "%2 पैकी %1 व्यक्तिला हि प्रतिक्रिया उपयोगी वाटली" +msgstr[1] "%2 पैकी %1 व्यक्तिंना हि प्रतिक्रिया उपयोगी वाटली" \ No newline at end of file diff -Nru muon-1.9.60/po/mr/muon-notifier.po muon-2.0.0/po/mr/muon-notifier.po --- muon-1.9.60/po/mr/muon-notifier.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/mr/muon-notifier.po 2013-04-01 20:33:22.000000000 +0000 @@ -0,0 +1,103 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Chetan Khona , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2013-02-05 12:53+0530\n" +"Last-Translator: Chetan Khona \n" +"Language-Team: American English \n" +"Language: en_US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "चेतन खोना" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "chetan@kompkin.com" + +#: kded/distupgradeevent/distupgradeevent.cpp:35 +msgctxt "Notification when a new version of Kubuntu is available" +msgid "A new version of Kubuntu is available" +msgstr "कुबुन्टुची नवीन आवृत्ती उपलब्ध आहे" + +#: kded/distupgradeevent/distupgradeevent.cpp:37 +msgctxt "Start the upgrade" +msgid "Upgrade" +msgstr "अद्ययावत करा" + +#: kded/distupgradeevent/distupgradeevent.cpp:38 +#: kded/UpdateEvent/UpdateEvent.cpp:95 +msgctxt "Button to dismiss this notification once" +msgid "Ignore for now" +msgstr "आता दुर्लक्ष करा" + +#: kded/distupgradeevent/distupgradeevent.cpp:40 +#: kded/UpdateEvent/UpdateEvent.cpp:97 +msgctxt "Button to make this notification never show up again" +msgid "Never show again" +msgstr "पुन्हा दर्शवू नका" + +#: kded/event.cpp:136 kded/event.cpp:143 kded/event.cpp:183 +msgid "System Notification" +msgstr "प्रणाली सूचना" + +#: kded/event.cpp:156 +msgid "Hide" +msgstr "लपवा" + +#: kded/MuonNotifier.cpp:55 +msgid "Muon Notification Daemon" +msgstr "म्युओन सूचना डिमन" + +#: kded/MuonNotifier.cpp:56 +msgid "A Notification Daemon for Muon" +msgstr "म्युओन करिताचा सूचना डिमन" + +#: kded/MuonNotifier.cpp:58 +msgid "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" +msgstr "(C) 2009-2012 जोनाथन थोमस, (C) 2009 हेराल्ड सिट्टर" + +#: kded/UpdateEvent/UpdateEvent.cpp:57 +#, kde-format +msgctxt "Notification text" +msgid "%1 security update is available" +msgid_plural "%1 security updates are available" +msgstr[0] "%1 अद्ययावत सुरक्षा सॉफ़्टवेअर उपलब्ध आहे" +msgstr[1] "%1 अद्ययावत सुरक्षा सॉफ़्टवेअर उपलब्ध आहे" + +#: kded/UpdateEvent/UpdateEvent.cpp:61 +msgctxt "Notification text" +msgid "A security update is available" +msgid_plural "Security updates are available" +msgstr[0] "एक अद्ययावत सुरक्षा सॉफ़्टवेअर उपलब्ध आहे" +msgstr[1] "अद्ययावत सुरक्षा सॉफ़्टवेअर उपलब्ध आहे" + +#: kded/UpdateEvent/UpdateEvent.cpp:69 +#, kde-format +msgctxt "Notification text" +msgid "%1 software update is available" +msgid_plural "%1 software updates are available" +msgstr[0] "%1 अद्ययावत सॉफ़्टवेअर उपलब्ध आहे" +msgstr[1] "%1 अद्ययावत सॉफ़्टवेअर उपलब्ध आहे" + +#: kded/UpdateEvent/UpdateEvent.cpp:73 +msgctxt "Notification text" +msgid "A software update is available" +msgid_plural "Software updates are available" +msgstr[0] "एक अद्ययावत सॉफ़्टवेअर उपलब्ध आहे" +msgstr[1] "अद्ययावत सॉफ़्टवेअर उपलब्ध आहे" + +#: kded/UpdateEvent/UpdateEvent.cpp:94 +msgctxt "Start the update" +msgid "Update" +msgstr "अद्ययावत करा" \ No newline at end of file diff -Nru muon-1.9.60/po/mr/muon-updater.po muon-2.0.0/po/mr/muon-updater.po --- muon-1.9.60/po/mr/muon-updater.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/mr/muon-updater.po 2013-04-01 20:33:22.000000000 +0000 @@ -0,0 +1,350 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Chetan Khona , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-02-23 18:12+0530\n" +"Last-Translator: Chetan Khona \n" +"Language-Team: American English \n" +"Language: en_US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "चेतन खोना" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "chetan@kompkin.com" + +#: updater/ChangelogWidget.cpp:54 +msgctxt "@action:button" +msgid "Hide" +msgstr "लपवा" + +#: updater/ChangelogWidget.cpp:161 +#, kde-format +msgctxt "@info/rich" +msgid "" +"The list of changes is not yet available. Please use Launchpad instead." +msgstr "" + +#: updater/ChangelogWidget.cpp:165 +msgctxt "@info" +msgid "The list of changes is not yet available." +msgstr "" + +#: updater/ChangelogWidget.cpp:203 +#, kde-format +msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" +msgid "Version %1:" +msgstr "आवृत्ती %1 :" + +#: updater/ChangelogWidget.cpp:207 +#, kde-format +msgctxt "@info:label" +msgid "This update was issued on %1" +msgstr "" + +#: updater/config/UpdaterSettingsDialog.cpp:38 +msgctxt "@title:window" +msgid "Muon Preferences" +msgstr "म्युओन प्राधान्ये" + +#: updater/config/UpdaterSettingsDialog.cpp:46 +msgctxt "@title:group" +msgid "Notifications" +msgstr "सूचना" + +#: updater/main.cpp:31 +msgid "An update manager" +msgstr "अद्ययावत व्यवस्थापक" + +#: updater/main.cpp:37 +msgid "Muon Update Manager" +msgstr "म्युओन अद्ययावत व्यवस्थापक" + +#: updater/main.cpp:38 +msgid "©2010-2012 Jonathan Thomas" +msgstr "©2010-2012 जोनाथन थोमस" + +#: updater/main.cpp:39 +msgid "Jonathan Thomas" +msgstr "जोनाथन थोमस" + +#: updater/MainWindow.cpp:70 +msgctxt "@title:window" +msgid "Software Updates" +msgstr "अद्ययावत सॉफ़्टवेअर" + +#: updater/MainWindow.cpp:77 +msgctxt "@info Warning to plug in laptop before updating" +msgid "It is safer to plug in the power adapter before updating." +msgstr "अद्ययावत करण्या अगोदर वीजेचा प्लग जोडणे सुरक्षित आहे." + +#: updater/MainWindow.cpp:86 +msgctxt "Notification when a new version of Kubuntu is available" +msgid "A new version of Kubuntu is available." +msgstr "कुबुन्टुची नवीन आवृत्ती उपलब्ध आहे." + +#: updater/MainWindow.cpp:121 +msgctxt "@action Downloads and installs updates" +msgid "Install Updates" +msgstr "अद्ययावत प्रतिष्ठापीत करा" + +#: updater/MainWindow.cpp:129 +msgctxt "@action::inmenu" +msgid "History..." +msgstr "" + +#: updater/MainWindow.cpp:133 +msgctxt "@action" +msgid "Upgrade" +msgstr "" + +#: updater/MainWindow.cpp:294 +msgctxt "@title:window" +msgid "Package History" +msgstr "" + +#: updater/ProgressWidget.cpp:60 +msgctxt "@action:button Cancels the download" +msgid "Cancel" +msgstr "रद्द करा" + +#: updater/ProgressWidget.cpp:127 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" +msgctxt "@info Status info, widget title" +msgid "Starting" +msgstr "अद्ययावत सॉफ़्टवेअर प्रतिष्ठापीत करत आहे" + +#: updater/ProgressWidget.cpp:132 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status info, widget title" +msgid "Waiting for Authentication" +msgstr "सॉफ़्टवेअर स्रोत अद्ययावत करत आहे" + +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" +msgctxt "@info Status information, widget title" +msgid "Waiting" +msgstr "अद्ययावत सॉफ़्टवेअर प्रतिष्ठापीत करत आहे" + +#: updater/ProgressWidget.cpp:139 +msgctxt "@info Status info" +msgid "Waiting for other transactions to finish" +msgstr "" + +#: updater/ProgressWidget.cpp:146 +msgctxt "@info Status info" +msgid "Waiting for other software managers to quit" +msgstr "" + +#: updater/ProgressWidget.cpp:153 +msgctxt "@info Status info" +msgid "Waiting for required medium" +msgstr "" + +#: updater/ProgressWidget.cpp:160 +msgctxt "@info Status info" +msgid "Waiting for configuration file" +msgstr "" + +#: updater/ProgressWidget.cpp:171 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status info" +msgid "Loading Software List" +msgstr "सॉफ़्टवेअर स्रोत अद्ययावत करत आहे" + +#: updater/ProgressWidget.cpp:178 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status information, widget title" +msgid "Updating software sources" +msgstr "सॉफ़्टवेअर स्रोत अद्ययावत करत आहे" + +#: updater/ProgressWidget.cpp:183 +#, fuzzy +#| msgctxt "@info" +#| msgid "Downloading Updates" +msgctxt "@info Status information, widget title" +msgid "Downloading Packages" +msgstr "अद्ययावत सॉफ़्टवेअर डाउनलोड करत आहे" + +#: updater/ProgressWidget.cpp:192 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" +msgctxt "@info Status information, widget title" +msgid "Applying Changes" +msgstr "अद्ययावत सॉफ़्टवेअर प्रतिष्ठापीत करत आहे" + +#: updater/ProgressWidget.cpp:197 +#, fuzzy +#| msgctxt "@info" +#| msgid "Installing Updates" +msgctxt "@info Status information, widget title" +msgid "Finished" +msgstr "अद्ययावत सॉफ़्टवेअर प्रतिष्ठापीत करत आहे" + +#: updater/ProgressWidget.cpp:227 +msgctxt "@title:window" +msgid "Media Change Required" +msgstr "" + +#: updater/ProgressWidget.cpp:228 +#, kde-format +msgctxt "@label" +msgid "Please insert %1 into %2" +msgstr "" + +#: updater/ProgressWidget.cpp:237 +msgctxt "@title:window" +msgid "Warning - Unverified Software" +msgstr "" + +#: updater/ProgressWidget.cpp:239 +msgctxt "@label" +msgid "" +"The following piece of software cannot be verified. Installing " +"unverified software represents a security risk, as the presence of " +"unverifiable software can be a sign of tampering. Do you wish to " +"continue?" +msgid_plural "" +"The following pieces of software cannot be verified. Installing " +"unverified software represents a security risk, as the presence of " +"unverifiable software can be a sign of tampering. Do you wish to " +"continue?" +msgstr[0] "" +msgstr[1] "" + +#: updater/ProgressWidget.cpp:257 +msgctxt "@title:window" +msgid "Configuration File Changed" +msgstr "संयोजना फाईल बदलली आहे" + +#: updater/ProgressWidget.cpp:259 +#, kde-format +msgctxt "@label Notifies a config file change" +msgid "" +"A new version of the configuration file %1 is " +"available, but your version has been modified. Would you like to keep your " +"current version or install the new version?" +msgstr "" + +#: updater/ProgressWidget.cpp:264 +msgctxt "@action Use the new config file" +msgid "Use New Version" +msgstr "नविन आवृत्ती वापरा" + +#: updater/ProgressWidget.cpp:265 +#, fuzzy +#| msgctxt "@action Use the new config file" +#| msgid "Use New Version" +msgctxt "@action Keep the old config file" +msgid "Keep Old Version" +msgstr "नविन आवृत्ती वापरा" + +#: updater/ProgressWidget.cpp:288 +#, kde-format +msgctxt "@label Download rate" +msgid "Download rate: %1/s" +msgstr "डाउनलोड दर : %1/s" + +#: updater/ProgressWidget.cpp:300 +#, kde-format +msgctxt "@item:intext Remaining time" +msgid "%1 remaining" +msgstr "%1 शिल्लक" + +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + +#: updater/UpdateModel/UpdateModel.cpp:104 +msgctxt "@label Column label" +msgid "Updates" +msgstr "अद्ययावत" + +#: updater/UpdateModel/UpdateModel.cpp:106 +msgctxt "@label Column label" +msgid "Version" +msgstr "आवृत्ती" + +#: updater/UpdateModel/UpdateModel.cpp:108 +msgctxt "@label Column label" +msgid "Download Size" +msgstr "डाउनलोड आकार" + +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "" + +#: updater/UpdaterWidget.cpp:164 +msgctxt "@item:inlistbox" +msgid "Important Security Updates" +msgstr "महत्वपूर्ण अद्ययावत सुरक्षा सॉफ़्टवेअर" + +#: updater/UpdaterWidget.cpp:167 +msgctxt "@item:inlistbox" +msgid "Application Updates" +msgstr "अद्ययावत अनुप्रयोग" + +#: updater/UpdaterWidget.cpp:170 +msgctxt "@item:inlistbox" +msgid "System Updates" +msgstr "अद्ययावत प्रणाली" + +#: updater/UpdaterWidget.cpp:331 +msgctxt "@info" +msgid "It is unknown when the last check for updates was." +msgstr "शेवटचे अद्ययावत कधी तपासले ते कळत नाही." + +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 +msgctxt "@info" +msgid "Please click Check for Updates to check." +msgstr "तपासण्याकरिता अद्ययावत तपासा वर क्लिक करा." + +#: updater/UpdaterWidget.cpp:343 +msgctxt "@info" +msgid "The software on this computer is up to date." +msgstr "या संगणकावरील सॉफ़्टवेअर अद्ययावत आहे." + +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 +#, kde-format +msgctxt "@info" +msgid "Last checked %1 ago." +msgstr "%1 पूर्वी शेवटचे तपासले." + +#: updater/UpdaterWidget.cpp:348 +msgctxt "@info" +msgid "No updates are available." +msgstr "कोणतेही अद्ययावत सॉफ़्टवेअर उपलब्ध नाही." \ No newline at end of file diff -Nru muon-1.9.60/po/mr/muon.po muon-2.0.0/po/mr/muon.po --- muon-1.9.60/po/mr/muon.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/mr/muon.po 2013-04-01 20:33:22.000000000 +0000 @@ -0,0 +1,769 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Chetan Khona , 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-23 14:41+0530\n" +"Last-Translator: Chetan Khona \n" +"Language-Team: American English \n" +"Language: en_US\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n!=1);\n" +"X-Generator: Lokalize 1.5\n" + +msgctxt "NAME OF TRANSLATORS" +msgid "Your names" +msgstr "चेतन खोना" + +msgctxt "EMAIL OF TRANSLATORS" +msgid "Your emails" +msgstr "chetan@kompkin.com" + +#: muon/config/GeneralSettingsPage.cpp:53 +msgid "Ask to confirm changes that affect other packages" +msgstr "इतर पॅकेजेस वर परिणाम करणारे बदल खात्री करून लागू करा" + +#: muon/config/GeneralSettingsPage.cpp:54 +msgid "Show foreign-architecture packages that are available natively" +msgstr "स्थानिक उपलब्ध परकीय-रचनेचे पॅकेजेस दर्शवा" + +#: muon/config/GeneralSettingsPage.cpp:55 +msgid "Treat recommended packages as dependencies" +msgstr "शिफारिस केलेले पॅकेजेस अवलंबीत म्हणून वागवा" + +#: muon/config/GeneralSettingsPage.cpp:56 +msgid "Treat suggested packages as dependencies" +msgstr "सूचविलेले पॅकेजेस अवलंबीत म्हणून वागवा" + +#: muon/config/GeneralSettingsPage.cpp:57 +msgid "Allow the installation of untrusted packages" +msgstr "अविश्वासर्ह पॅकेजेसचे प्रतिष्ठापन करण्याची परवानगी द्या" + +#: muon/config/GeneralSettingsPage.cpp:68 +msgid "Delete obsolete cached packages every:" +msgstr "कालबाह्य कॅशे केलेले पॅकेजेस काढून टाका. प्रत्येक :" + +#: muon/config/GeneralSettingsPage.cpp:86 +msgid "Number of undo operations:" +msgstr "पूर्ववत करण्याच्या क्रियांची संख्या :" + +#: muon/config/GeneralSettingsPage.cpp:162 +msgid " day" +msgid_plural " days" +msgstr[0] " दिवस" +msgstr[1] " दिवस" + +#: muon/config/ManagerSettingsDialog.cpp:41 +msgctxt "@title:window" +msgid "Muon Preferences" +msgstr "म्युओन प्राधान्ये" + +#: muon/config/ManagerSettingsDialog.cpp:49 +msgctxt "@title:group Title of the general group" +msgid "General" +msgstr "सामान्य" + +#: muon/config/ManagerSettingsDialog.cpp:57 +msgctxt "@title:group" +msgid "Notifications" +msgstr "सूचना" + +#: muon/DetailsTabs/ChangelogTab.cpp:42 +msgctxt "@title:tab" +msgid "Changes List" +msgstr "बदलांची यादी" + +#: muon/DetailsTabs/ChangelogTab.cpp:87 +#, kde-format +msgctxt "@info/rich" +msgid "" +"The list of changes is not yet available. Please use Launchpad instead." +msgstr "" +"बदलांची यादी अजुन उपलब्ध नाही. कृपया याऐवजी लाँचपॅड वापरा." + +#: muon/DetailsTabs/ChangelogTab.cpp:91 +msgctxt "@info" +msgid "The list of changes is not yet available." +msgstr "बदलांची यादी अजुन उपलब्ध नाही." + +#: muon/DetailsTabs/DependsTab.cpp:37 +msgctxt "@title:tab" +msgid "Dependencies" +msgstr "अवलंबन" + +#: muon/DetailsTabs/DependsTab.cpp:40 +msgctxt "@item:inlistbox" +msgid "Dependencies of the Current Version" +msgstr "वर्तमान आवृत्तीचे अवलंबन" + +#: muon/DetailsTabs/DependsTab.cpp:41 +msgctxt "@item:inlistbox" +msgid "Dependencies of the Latest Version" +msgstr "सर्वात नवीन आवृत्तीचे अवलंबन" + +#: muon/DetailsTabs/DependsTab.cpp:42 +msgctxt "@item:inlistbox" +msgid "Dependants (Reverse Dependencies)" +msgstr "अवलंबीत (उलट अवलंबन)" + +#: muon/DetailsTabs/DependsTab.cpp:43 +msgctxt "@item:inlistbox" +msgid "Virtual Packages Provided" +msgstr "आभासी पॅकेज पुरविलेले" + +#: muon/DetailsTabs/DependsTab.cpp:71 muon/DetailsTabs/DependsTab.cpp:78 +msgctxt "@label" +msgid "This package does not have any dependencies" +msgstr "या पॅकेजला काही अवलंबन नाही" + +#: muon/DetailsTabs/DependsTab.cpp:85 +msgctxt "@label" +msgid "This package has no dependents. (Nothing depends on it.)" +msgstr "या पॅकेजवर काही अवलंबीत नाही. (याच्यावर काही अवलंबून नाही.)" + +#: muon/DetailsTabs/DependsTab.cpp:92 +msgctxt "@label" +msgid "This package does not provide any virtual packages" +msgstr "हे पॅकेज कोणतेही आभासी पॅकेज पुरवित नाही" + +#: muon/DetailsTabs/InstalledFilesTab.cpp:33 +msgctxt "@title:tab" +msgid "Installed Files" +msgstr "प्रतिष्ठापीत फाईल्स" + +#: muon/DetailsTabs/MainTab.cpp:48 +msgctxt "@title:tab" +msgid "Details" +msgstr "तपशील" + +#: muon/DetailsTabs/MainTab.cpp:64 +msgctxt "@label" +msgid "Mark for:" +msgstr "निवडा :" + +#: muon/DetailsTabs/MainTab.cpp:69 +msgctxt "@action:button" +msgid "Installation" +msgstr "प्रतिष्ठापन" + +#: muon/DetailsTabs/MainTab.cpp:77 +msgctxt "@action:button" +msgid "Removal" +msgstr "काढून टाकणे" + +#: muon/DetailsTabs/MainTab.cpp:83 +msgctxt "@action:button" +msgid "Upgrade" +msgstr "अद्ययावत करा" + +#: muon/DetailsTabs/MainTab.cpp:89 +msgctxt "@action:button" +msgid "Reinstallation" +msgstr "पुन्हा प्रतिष्ठापीत करणे" + +#: muon/DetailsTabs/MainTab.cpp:96 +msgctxt "@action:button" +msgid "Purge" +msgstr "साफ करा" + +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 +msgctxt "@action:button" +msgid "Unmark" +msgstr "निवड काढा" + +#: muon/DetailsTabs/MainTab.cpp:178 +#, kde-format +msgctxt "@info Tells how long Canonical, Ltd. will support a package" +msgid "Canonical provides critical updates for %1 until %2." +msgstr "%1 याकरिता केनोनिकल अद्ययावत %2 पर्यंत पुरवितो." + +#: muon/DetailsTabs/MainTab.cpp:182 +#, kde-format +msgctxt "@info Tells how long Canonical, Ltd. will support a package" +msgid "" +"Canonical does not provide updates for %1. Some updates may be provided by " +"the Ubuntu community." +msgstr "%1 याकरिता केनोनिकल अद्ययावत पुरवित नाही. काही अद्ययावत उबूंटू समुदाय पुरवितो." + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:45 +msgctxt "@title:tab" +msgid "Technical Details" +msgstr "तांत्रीक तपशील :" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:61 +msgctxt "@label Label preceding the package maintainer" +msgid "Maintainer:" +msgstr "पालक :" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:68 +msgctxt "@label Label preceding the package category" +msgid "Category:" +msgstr "विभाग :" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:76 +msgctxt "@label The parent package that this package comes from" +msgid "Source Package:" +msgstr "स्रोत पॅकेज :" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:84 +msgctxt "@label The software source that this package comes from" +msgid "Origin:" +msgstr "मूळ :" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:92 +msgctxt "@label The package archive component that this package comes from" +msgid "Component:" +msgstr "घटक :" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:102 +msgctxt "@title:group" +msgid "Installed Version" +msgstr "प्रतिष्ठापीत केलेली आवृत्ती" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:108 +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:130 +msgctxt "@label Label preceding the package version" +msgid "Version:" +msgstr "आवृत्ती :" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:114 +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:136 +msgctxt "@label Label preceding the package size" +msgid "Installed Size:" +msgstr "प्रतिष्ठापीत केलेला आकार :" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:124 +msgctxt "@title:group" +msgid "Available Version" +msgstr "उपलब्ध आवृत्ती" + +#: muon/DetailsTabs/TechnicalDetailsTab.cpp:142 +msgctxt "@label Label preceding the package's download size" +msgid "Download Size:" +msgstr "डाउनलोड आकार :" + +#: muon/DetailsTabs/VersionTab.cpp:41 +msgctxt "@title:tab" +msgid "Versions" +msgstr "आवृत्ती" + +#: muon/DetailsTabs/VersionTab.cpp:44 +msgctxt "@label" +msgid "Available versions:" +msgstr "उपलब्ध आवृत्ती :" + +#: muon/DetailsTabs/VersionTab.cpp:62 +msgctxt "@label" +msgid "" +"Muon always selects the most applicable version available. If you force a " +"different version from the default one, errors in the dependency handling " +"can occur." +msgstr "" +"म्युओन नेहमी सर्वात योग्य उपलब्ध आवृत्ती निवडतो. जर तुम्ही बळपूर्वक वेगळी आवृत्ती निवडली तर " +"अवलंबनाची त्रुटी निर्माण होऊ शकते." + +#: muon/DetailsTabs/VersionTab.cpp:70 +msgctxt "@action:button" +msgid "Force Version" +msgstr "बळपूर्वक आवृत्ती लागू करा" + +#: muon/DownloadModel/DownloadDelegate.cpp:65 +msgctxt "@info:status Progress text when done" +msgid "Done" +msgstr "झाले" + +#: muon/DownloadModel/DownloadModel.cpp:61 +msgctxt "@title:column" +msgid "Package" +msgstr "पॅकेज" + +#: muon/DownloadModel/DownloadModel.cpp:63 +msgctxt "@title:column" +msgid "Location" +msgstr "स्थान" + +#: muon/DownloadModel/DownloadModel.cpp:65 +msgctxt "@title:column" +msgid "Size" +msgstr "आकार" + +#: muon/DownloadModel/DownloadModel.cpp:67 +msgctxt "@title:column" +msgid "Progress" +msgstr "प्रगती" + +#: muon/FilterWidget/ArchitectureFilter.cpp:48 +#: muon/FilterWidget/CategoryFilter.cpp:58 +#: muon/FilterWidget/OriginFilter.cpp:43 muon/FilterWidget/StatusFilter.cpp:44 +#: muon/ManagerWidget.cpp:64 +msgctxt "@item:inlistbox Item that resets the filter to \"all\"" +msgid "All" +msgstr "सर्व" + +#: muon/FilterWidget/FilterWidget.cpp:47 +msgctxt "@title:window" +msgid "Filter:" +msgstr "गाळणी :" + +#: muon/FilterWidget/FilterWidget.cpp:56 +msgctxt "@title:tab" +msgid "By Category" +msgstr "विभागा प्रमाणे" + +#: muon/FilterWidget/FilterWidget.cpp:62 +msgctxt "@title:tab" +msgid "By Status" +msgstr "स्थिती प्रमाणे" + +#: muon/FilterWidget/FilterWidget.cpp:68 +msgctxt "@title:tab" +msgid "By Origin" +msgstr "मूळ प्रमाणे" + +#: muon/FilterWidget/FilterWidget.cpp:74 +msgctxt "@title:tab" +msgid "By Architecture" +msgstr "रचने प्रमाणे" + +#: muon/main.cpp:30 +msgid "A package manager" +msgstr "पॅकेज व्यवस्थापक" + +#: muon/main.cpp:36 +msgid "Muon Package Manager" +msgstr "म्युओन पॅकेज व्यवस्थापक" + +#: muon/main.cpp:37 +msgid "© 2009-2012 Jonathan Thomas" +msgstr "© 2009-2012 जोनाथन थोमस" + +#: muon/main.cpp:38 +msgid "Jonathan Thomas" +msgstr "जोनाथन थोमस" + +#: muon/MainWindow.cpp:180 +msgctxt "@action Marks upgradeable packages for upgrade" +msgid "Cautious Upgrade" +msgstr "सावधानीने अद्ययावत" + +#: muon/MainWindow.cpp:186 +msgctxt "" +"@action Marks upgradeable packages, including ones that install/remove new " +"things" +msgid "Full Upgrade" +msgstr "पूर्ण अद्ययावत" + +#: muon/MainWindow.cpp:192 +msgctxt "@action Marks packages no longer needed for removal" +msgid "Remove Unnecessary Packages" +msgstr "गरज नसलेले पॅकेजेस काढून टाका" + +#: muon/MainWindow.cpp:197 +msgctxt "@action Takes the user to the preview page" +msgid "Preview Changes" +msgstr "बदलांचे पूर्वावलोकन" + +#: muon/MainWindow.cpp:202 +msgctxt "@action Applys the changes a user has made" +msgid "Apply Changes" +msgstr "बदल लागू करा" + +#: muon/MainWindow.cpp:209 +msgctxt "@action::inmenu" +msgid "History..." +msgstr "" + +#: muon/MainWindow.cpp:224 +msgctxt "@label" +msgid "" +"Unable to mark upgrades. The available upgrades may require new packages to " +"be installed or removed. You may wish to try a full upgrade by clicking the " +"Full Upgrade button." +msgstr "" +"अद्ययावत निवडू शकत नाही. उपलब्ध अद्ययावत करिता नवीन पॅकेजेस प्रतिष्ठापीत करणे किंवा " +"काढून टाकणे गरजेचे आहे. तुम्ही पूर्ण अद्ययावत करण्याचा प्रयत्न पूर्ण अद्ययावत हे बटन दाबून करू शकता." + +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 +msgctxt "@title:window" +msgid "Unable to Mark Upgrades" +msgstr "अद्ययावत निवडू शकत नाही" + +#: muon/MainWindow.cpp:241 +msgctxt "@label" +msgid "" +"Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " +"at the moment, or may have been manually held back." +msgstr "" +"अद्ययावत निवडू शकत नाही. काही अद्ययावत करिता असमाधानी अवलंबीत आहेत किंवा स्वहस्ते मागे " +"ठेवलेले आहेत." + +#: muon/MainWindow.cpp:317 +msgctxt "@action:intoolbar Return from the preview page" +msgid "Back" +msgstr "मागे" + +#: muon/MainWindow.cpp:331 +msgctxt "@action" +msgid "Preview Changes" +msgstr "बदलांचे पूर्वावलोकन" + +#: muon/MainWindow.cpp:445 +msgctxt "@title:window" +msgid "Package History" +msgstr "" + +#: muon/PackageModel/PackageModel.cpp:79 +msgid "Package" +msgstr "पॅकेज" + +#: muon/PackageModel/PackageModel.cpp:81 +msgid "Status" +msgstr "स्थिती" + +#: muon/PackageModel/PackageModel.cpp:83 +msgid "Requested" +msgstr "विनंतीकृत" + +#: muon/PackageModel/PackageWidget.cpp:104 +msgctxt "@label Line edit click message" +msgid "Search" +msgstr "शोध" + +#: muon/PackageModel/PackageWidget.cpp:157 +msgctxt "@action:inmenu" +msgid "Mark for Installation" +msgstr "प्रतिष्ठापन करण्याकरिता निवडा" + +#: muon/PackageModel/PackageWidget.cpp:162 +msgctxt "@action:button" +msgid "Mark for Removal" +msgstr "काढून टाकण्याकरिता निवडा" + +#: muon/PackageModel/PackageWidget.cpp:167 +msgctxt "@action:button" +msgid "Mark for Upgrade" +msgstr "अद्ययावत करण्याकरिता निवडा" + +#: muon/PackageModel/PackageWidget.cpp:172 +msgctxt "@action:button" +msgid "Mark for Reinstallation" +msgstr "पुन्हा प्रतिष्ठापन करण्याकरिता निवडा" + +#: muon/PackageModel/PackageWidget.cpp:177 +msgctxt "@action:button" +msgid "Mark for Purge" +msgstr "साफ करण्याकरिता निवडा" + +#: muon/PackageModel/PackageWidget.cpp:188 +msgctxt "@action:button" +msgid "Lock Package at Current Version" +msgstr "वर्तमान आवृत्ती करिता पॅकेज कुलूपबंद करा" + +#: muon/PackageModel/PackageWidget.cpp:322 +msgctxt "@action:button" +msgid "Unlock package" +msgstr "पॅकेजचे कुलूप काढून टाका" + +#: muon/PackageModel/PackageWidget.cpp:326 +msgctxt "@action:button" +msgid "Lock at Current Version" +msgstr "वर्तमान आवृत्ती कुलूपबंद करा" + +#: muon/PackageModel/PackageWidget.cpp:374 +msgctxt "@label" +msgid "" +"Removing this package may break your system. Are you sure you want to remove " +"it?" +msgstr "" +"हे पॅकेज काढून टाकल्याने तुमची प्रणाली तुटु शकते. हे तुम्हाला नक्की काढून टाकायचे आहे का?" + +#: muon/PackageModel/PackageWidget.cpp:375 +msgctxt "@label" +msgid "Warning - Removing Important Package" +msgstr "इशारा - महत्वपूर्ण पॅकेज काढून टाकत आहे" + +#: muon/PackageModel/PackageWidget.cpp:561 +#, fuzzy +#| msgctxt "@title:window" +#| msgid "Unable to Mark Package" +msgctxt "@title:window" +msgid "Failed to Lock Package" +msgstr "पॅकेज निवडू शकत नाही" + +#: muon/PackageModel/PackageWidget.cpp:562 +#, kde-format +msgctxt "@info Error text" +msgid "The package %1 could not be locked. Failed to write lock file." +msgstr "" + +#: muon/PackageModel/PackageWidget.cpp:611 +#, kde-format +msgctxt "@label" +msgid "The \"%1\" package could not be marked for installation or upgrade:" +msgstr "\"%1\" हे पॅकेज प्रतिष्ठापन किंवा अद्ययावत करण्याकरिता निवडू शकत नाही :" + +#: muon/PackageModel/PackageWidget.cpp:614 +msgctxt "@title:window" +msgid "Unable to Mark Package" +msgstr "पॅकेज निवडू शकत नाही" + +#: muon/PackageModel/PackageWidget.cpp:631 +#, kde-format +msgctxt "@label" +msgid "" +"The \"%1\" package has no available version, but exists in the database.\n" +"\tThis typically means that the package was mentioned in a dependency and " +"never uploaded, has been obsoleted, or is not available from the currently-" +"enabled repositories." +msgstr "" +"\"%1\" या पॅकेजला उपलब्ध आवृत्ती नाही, पण डेटाबेस मध्ये अस्तित्वात आहे.\n" +"\tयाचा अर्थ ते पॅकेज अवलंबीत ठरवले होते पण अपलोड झाले नाही, कालबाह्य झाले आहे, किंवा " +"वर्तमान कार्यान्वित रीपोझिटरीज वर उपलब्ध नाही." + +#: muon/PackageModel/PackageWidget.cpp:638 +#, kde-format +msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" +msgid "%1: %2 %3, but %4 is to be installed" +msgstr "%1: %2 %3, पण %4 हे प्रतिष्ठापीत करत आहे" + +#: muon/PackageModel/PackageWidget.cpp:644 +#, kde-format +msgctxt "@label Example: Depends: libqapt, but is not installable" +msgid "%1: %2, but it is not installable" +msgstr "%1: %2, पण ते प्रतिष्ठापीत करण्यायोग्य नाही" + +#: muon/PackageModel/PackageWidget.cpp:649 +#, kde-format +msgctxt "@label Example: Depends: libqapt, but it is a virtual package" +msgid "%1: %2, but it is a virtual package" +msgstr "%1: %2, पण ते आभासी पॅकेज आहे" + +#: muon/ReviewWidget.cpp:30 +msgid "Review and Apply Changes" +msgstr "अवलोकन करून बदल लागू करा" + +#: muon/StatusWidget.cpp:52 +msgctxt "@info:status" +msgid "Rebuilding Search Index" +msgstr "शोध अनुक्रमणिका पुन्हा तयार करत आहे" + +#: muon/StatusWidget.cpp:91 +#, kde-format +msgctxt "@info:status" +msgid "1 package available, " +msgid_plural "%1 packages available, " +msgstr[0] "1 पॅकेज उपलब्ध, " +msgstr[1] "%1 पॅकेजेस उपलब्ध, " + +#: muon/StatusWidget.cpp:92 +#, kde-format +msgctxt "@info:status" +msgid "%1 installed, " +msgstr "%1 प्रतिष्ठापीत केलेले, " + +#: muon/StatusWidget.cpp:96 +#, kde-format +msgctxt "@info:status" +msgid "%1 upgradeable," +msgstr "%1 अद्ययावत करण्यायोग्य," + +#: muon/StatusWidget.cpp:98 +#, kde-format +msgctxt "@info:status" +msgid "%1 upgradeable" +msgstr "%1 अद्ययावत करण्यायोग्य" + +#: muon/StatusWidget.cpp:110 +#, kde-format +msgctxt "@info:status Part of the status label" +msgid " %1 to install/upgrade" +msgstr " %1 प्रतिष्ठापन/अद्ययावत करण्याकरिता" + +#: muon/StatusWidget.cpp:115 +#, kde-format +msgctxt "" +"@info:status Label for the number of packages pending removal when packages " +"are also pending upgrade" +msgid ", %1 to remove" +msgstr ", %1 काढून टाकण्याकरिता" + +#: muon/StatusWidget.cpp:118 +#, kde-format +msgctxt "" +"@info:status Label for the number of packages pending removal when there are " +"only removals" +msgid " %1 to remove" +msgstr " %1 काढून टाकण्याकरिता" + +#: muon/StatusWidget.cpp:127 +#, kde-format +msgctxt "@label showing download and install size" +msgid "%1 to download, %2 of space to be freed" +msgstr "%1 डाउनलोड करायचे आहे, %2 जागा रिकामी होईल" + +#: muon/StatusWidget.cpp:131 +#, kde-format +msgctxt "@label showing download and install size" +msgid "%1 to download, %2 of space to be used" +msgstr "%1 डाउनलोड करायचे आहे, %2 जागा वापरली जाईल" + +#: muon/TransactionWidget.cpp:104 +msgctxt "@action:button Cancels the download" +msgid "Cancel" +msgstr "रद्द करा" + +#: muon/TransactionWidget.cpp:147 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" +msgctxt "@info Status information, widget title" +msgid "Starting" +msgstr "बदल लागू करत आहे" + +#: muon/TransactionWidget.cpp:149 +msgctxt "@info Status info" +msgid "Waiting for service to start" +msgstr "" + +#: muon/TransactionWidget.cpp:154 +msgctxt "@info Status info" +msgid "Waiting for authentication" +msgstr "" + +#: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 +#: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" +msgctxt "@info Status information, widget title" +msgid "Waiting" +msgstr "बदल लागू करत आहे" + +#: muon/TransactionWidget.cpp:160 +msgctxt "@info Status info" +msgid "Waiting for other transactions to finish" +msgstr "" + +#: muon/TransactionWidget.cpp:167 +msgctxt "@info Status info" +msgid "Waiting for other software managers to quit" +msgstr "" + +#: muon/TransactionWidget.cpp:174 +msgctxt "@info Status info" +msgid "Waiting for required medium" +msgstr "" + +#: muon/TransactionWidget.cpp:181 +msgctxt "@info Status info" +msgid "Waiting for configuration file" +msgstr "" + +#: muon/TransactionWidget.cpp:192 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status info" +msgid "Loading Software List" +msgstr "सॉफ़्टवेअर स्रोत अद्ययावत करत आहे" + +#: muon/TransactionWidget.cpp:200 +#, fuzzy +#| msgctxt "@info" +#| msgid "Updating software sources" +msgctxt "@info Status information, widget title" +msgid "Updating software sources" +msgstr "सॉफ़्टवेअर स्रोत अद्ययावत करत आहे" + +#: muon/TransactionWidget.cpp:205 +#, fuzzy +#| msgctxt "@info" +#| msgid "Downloading Packages" +msgctxt "@info Status information, widget title" +msgid "Downloading Packages" +msgstr "पॅकेजेस डाउनलोड करत आहे" + +#: muon/TransactionWidget.cpp:217 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" +msgctxt "@info Status information, widget title" +msgid "Committing Changes" +msgstr "बदल लागू करत आहे" + +#: muon/TransactionWidget.cpp:224 +#, fuzzy +#| msgctxt "@info" +#| msgid "Committing Changes" +msgctxt "@info Status information, widget title" +msgid "Finished" +msgstr "बदल लागू करत आहे" + +#: muon/TransactionWidget.cpp:253 +msgctxt "@title:window" +msgid "Media Change Required" +msgstr "" + +#: muon/TransactionWidget.cpp:254 +#, kde-format +msgctxt "@label" +msgid "Please insert %1 into %2" +msgstr "" + +#: muon/TransactionWidget.cpp:263 +msgctxt "@title:window" +msgid "Warning - Unverified Software" +msgstr "" + +#: muon/TransactionWidget.cpp:265 +msgctxt "@label" +msgid "" +"The following piece of software cannot be verified. Installing " +"unverified software represents a security risk, as the presence of " +"unverifiable software can be a sign of tampering. Do you wish to " +"continue?" +msgid_plural "" +"The following pieces of software cannot be verified. Installing " +"unverified software represents a security risk, as the presence of " +"unverifiable software can be a sign of tampering. Do you wish to " +"continue?" +msgstr[0] "" +msgstr[1] "" + +#: muon/TransactionWidget.cpp:283 +msgctxt "@title:window" +msgid "Configuration File Changed" +msgstr "" + +#: muon/TransactionWidget.cpp:285 +#, kde-format +msgctxt "@label Notifies a config file change" +msgid "" +"A new version of the configuration file %1 is " +"available, but your version has been modified. Would you like to keep your " +"current version or install the new version?" +msgstr "" + +#: muon/TransactionWidget.cpp:290 +#, fuzzy +#| msgctxt "@action:button" +#| msgid "Force Version" +msgctxt "@action Use the new config file" +msgid "Use New Version" +msgstr "बळपूर्वक आवृत्ती लागू करा" + +#: muon/TransactionWidget.cpp:291 +#, fuzzy +#| msgctxt "@action:button" +#| msgid "Force Version" +msgctxt "@action Keep the old config file" +msgid "Keep Old Version" +msgstr "बळपूर्वक आवृत्ती लागू करा" \ No newline at end of file diff -Nru muon-1.9.60/po/nb/libmuon.po muon-2.0.0/po/nb/libmuon.po --- muon-1.9.60/po/nb/libmuon.po 2012-10-29 18:35:00.000000000 +0000 +++ muon-2.0.0/po/nb/libmuon.po 2013-04-01 20:33:26.000000000 +0000 @@ -1,12 +1,12 @@ # Translation of libmuon to Norwegian Bokmål # -# Bjørn Steensrud , 2010, 2011, 2012. +# Bjørn Steensrud , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-13 18:49+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-01-06 20:33+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" "Language: nb\n" @@ -19,1076 +19,103 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Programmer" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Åpen kildekode" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Godseid" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Ukjent" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 å laste ned, %2 på disk" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 på disk" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Tilbehør" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Tilgjengelighet" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Utviklerverktøy" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Feilsøking" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Grensesnittdesign" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE-er" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Lokalisering" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilering" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Versjonskontroll" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Vevutvikling" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Opplæring" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Teknikk og vitenskap" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomi" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologi" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Kjemi" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Datamatikk og robot-teknikk" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronikk" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Teknikk" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografi" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologi" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematikk" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fysikk" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Skrifter" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Spill" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arkade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Brettspill" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Kortspill" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Puslespill" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Rollespill" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulering" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sport" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafikk" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Tegning" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Maling og redigering" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografering" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Forlagsvirksomhet" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Skanning og OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Framvisning" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internett" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Prat" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Fildeling" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "E-post" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Nettlesere" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Kontor" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "System og innstillinger" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Tegneserier" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Plasma skrivebordselementer" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Program-bakgrunnsmotor" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Programmer på systemet ditt" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Alt" - -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Bekreft tilleggsendringer" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Marker flere endringer?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Denne handlingen krever en endring i en annen pakke:" -msgstr[1] "Denne handlingen krever endringer i andre pakker:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historie" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Søk" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Alle endringer" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Installeringer" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Oppdateringer" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Fjerninger" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Dato" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Installert" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Oppgradert" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Nedgradert" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Fjernet" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Slettet og ryddet bort" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 på %3" - -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "Denne Muon har superku-krefter" - -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Systemadministrasjon" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Grunnsystem" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-" -"mono\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI Infrastruktur" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Kommunikasjon" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"database\"" -msgid "Databases" -msgstr "Databaser" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Utvikling" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentasjon" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Feilsøk" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"editors\"" -msgid "Editors" -msgstr "Redigeringer" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronikk" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"embedded\"" -msgid "Embedded Devices" -msgstr "Enheter med innebygget system" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Skrifter" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Spill og underholdning" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Gnome skrivebordsmiljø" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"graphics\"" -msgid "Graphics" -msgstr "Grafikk" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R Statistikksystem" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"gnustep\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep skrivebordsmiljø" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"hamradio\"" -msgid "Amateur Radio" -msgstr "Amatørradio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"haskell\"" -msgid "Haskell Programming Language" -msgstr "Haskell programmeringsspråk" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Vevtjenere" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpreterte programmeringsspråk" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Programmeringsspråket Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE programvaresamling" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kjerne og moduler" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"libdevel\"" -msgid "Libraries - Development" -msgstr "Biblioteker – utvikling" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Biblioteker" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Programmeringsspråket Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokalisering" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-post" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematikk" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Diverse – tekstbasert" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Nettverk" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Njusgrupper" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Programmeringsspråket OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"oldlibs\"" -msgid "Libraries - Old" -msgstr "Biblioteker – gamle" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Tverrplattform" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Programmeringsspråket Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Programmeringsspråket PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Programmeringsspråket Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Programmeringsspråket Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"science\"" -msgid "Science" -msgstr "Vitenskap" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Skall" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX-skriving" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Tekstbehandling" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Verktøy" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Versjonskontrollsystemer" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video-programvare" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internett" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Diverse – grafisk" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce skrivebordsmiljø" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone-miljø" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"unknown\"" -msgid "Unknown" -msgstr "Ukjent" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Konvertert fra RPM med Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internasjonalisering og lokalisering" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapakker" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Begrenset for eksport" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-" -"free\"" -msgid "Non-free" -msgstr "Ikke-frie" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"contrib\"" -msgid "Contrib" -msgstr "Bidrag" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Opplæring" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "GObject selvanalyse-data" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Ikke installert" - -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Installert" - -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Oppgraderbare" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Logg inn til Ubuntus SSO-tjeneste" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Brutte" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Bodega bakgrunnsmotor" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Resterende oppsett" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Installert (kan auto-fjernes)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Ingen endring" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Installer" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Oppgrader" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Fjern" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Slett og rydd" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Installer på nytt" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Nedgrader" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Låst" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Felles" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Installer Bodegadata i systemet" -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Skriv inn akkreditiver for MakePlayLive" -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Klarte ikke å ta i bruk endringene" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Autentiseringsfeil" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Uventet feil" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Ikke tiltrodde pakker" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" msgstr "" -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Det gikk ikke å klargøre pakkesystemet, kanskje oppsettet ditt er feil." +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "KNewstuff bakgrunnsmotor" -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Det ser ut til at et annet program bruker pakkesystemet akkurat nå. Du må " -"lukke alle andre pakkebehandlere før du vil kunne installere eller fjerne " -"noen pakker." +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Installer KNewstuff data i systemet" -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Det er ikke nok diskplass i mappa %1 til å kunne fortsette med denne " -"handlingen." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Kunne ikke laste ned pakker" - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Det oppsto en feil da endringer ble tatt i bruk:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Denne handlingen kan ikke fortsette siden det ikke ble oppgitt riktig " -"autorisering" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Det ser ut til at QApt-arbeideren har enten krasjet eller forsvunnet. Meld " -"inn en fail til QApt-vedlikeholderne" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Følgende pakke er ikke verifisert av forfatteren. Det gjeldende oppsettet " -"tillater ikke å laste ned ikke tiltrodde pakker." -msgstr[1] "" -"Følgende pakker er ikke verifisert av forfatteren Det gjeldende oppsettet " -"tillater ikke å laste ned ikke tiltrodde pakker." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Se etter oppdateringer" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Ta vekk alle merker" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Sett opp programvarekilder" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Lagre markeringer som" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dokumentet kunne ikke lagres, fordi det ikke var mulig å skrive til " -"%1\n" -"\n" -"Kontroller at du har skrivetilgang til denne fila og at det er nok diskplass " -"tilgjengelig." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Lagre liste over installerte pakker som" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Lagre nedlastingsliste som" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Åpne fil" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Alt" -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Kunne ikke markere endringer. Se etter at fila er en markeringsfil opprettet " -"enten av Muon pakkebehandler eller Synaptic pakkebehandler." +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "Denne Muon har superku-krefter" -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Velg en mappe" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Ødelagt" -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 pakke vellykket lagt til mellomlageret" -msgstr[1] "%1 pakker vellykket lagt til mellomlageret" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Tilgjengelig" -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Kunne ikke finne noen gyldige pakker i denne mappa. Pass på at pakkene er " -"kompatible med maskinen din og er siste pakkeversjon." +#: libmuon/resources/AbstractResource.cpp:83 +msgid "Installed" +msgstr "Installert" -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Kunne ikke finne pakker" +#: libmuon/resources/AbstractResource.cpp:84 +msgid "Upgradeable" +msgstr "Oppgraderbar" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1096,11 +123,6 @@ msgid "%1 remaining" msgstr "%1 gjenstår" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Logg inn til Ubuntus SSO-tjeneste" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Vis varslinger for:" @@ -1138,18 +160,18 @@ msgid "Downloading" msgstr "Laster ned" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Ferdig" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Venter" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Installerer" diff -Nru muon-1.9.60/po/nb/muon-discover.po muon-2.0.0/po/nb/muon-discover.po --- muon-1.9.60/po/nb/muon-discover.po 2012-10-29 18:35:00.000000000 +0000 +++ muon-2.0.0/po/nb/muon-discover.po 2013-04-01 20:33:26.000000000 +0000 @@ -1,12 +1,12 @@ # Translation of muon-discover to Norwegian Bokmål # -# Bjørn Steensrud , 2012. +# Bjørn Steensrud , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-13 19:56+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-01-23 15:48+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" "Language: nb\n" @@ -51,23 +51,42 @@ msgid "Display a list of entries with a category." msgstr "Vis en liste over oppføringer med en kategori." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Åpne Muon Discover i en oppgitt modus. Moduser samsvarer med knappene på " +"verktøylinja." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "List alle tilgjengelige moduser og skriv dem ut på stdout." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Tilgjengelige moduser:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Søk …" + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Fant noen feil mens GUI-et ble satt opp, programmet kan ikke fortsette." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Klargjøringsfeil" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Legger til kilder …" - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Fjerner kilder …" +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Meny" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -82,90 +101,94 @@ msgid "Discard" msgstr "Forkast" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 anmeldelser" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Nettside" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Start" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Gjennomgå" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Total størrelse: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Oversikt" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Tillegg" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Anmeldelser" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Oppdater" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Navn" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Karakter" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Omtale" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularitet" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Kilde" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Søk i «%1» …" -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Søk …" - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Popularitetskonkurranse" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "poeng: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Beste karakterer" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Dette er\n" +"Muon Discover!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -178,23 +201,34 @@ msgid "Remove" msgstr "Fjern" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Installert" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "" +msgstr "Oppdater alle" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Laster …" -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Tilbake" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Oppdag" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "" +msgstr[1] "" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Kilder" @@ -219,55 +253,59 @@ msgid "Summary:" msgstr "Sammendrag:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Anmeldelser:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Fortell oss om anmeldelsen!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 av %2 syntes denne anmeldelsen var nyttig" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 av %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 av %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Nyttig?Ja/Nei" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Legg til kilde" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Oppgi den nye kilden" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Avbryt" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " – apt-lagerets kildelinje som skal legges inn. Dette er en av:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Binær)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/nb/muon-installer.po muon-2.0.0/po/nb/muon-installer.po --- muon-1.9.60/po/nb/muon-installer.po 2012-10-29 18:35:00.000000000 +0000 +++ muon-2.0.0/po/nb/muon-installer.po 2013-04-01 20:33:26.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-10-13 19:03+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" @@ -27,7 +27,7 @@ msgid "Your emails" msgstr "bjornst@skogkatt.homelinux.org" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ msgstr[1] "" "Følgende programmer ble nettopp installert, trykk på dem for å starte dem:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Hent programvare" @@ -66,74 +66,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Hent programvare" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Installert programvare" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Levert av Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Levert av Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical-partnere" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Uavhengig" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Hent programvare" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Installert programvare" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historie" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 ble vellykket installert." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Start" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Programmer vellykket installert." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Kjør nye programmer …" -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Installasjonen fullført" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Pågår" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Pågår" @@ -207,18 +207,18 @@ msgid "Install" msgstr "Installer" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Fjern" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Installer" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -276,19 +276,19 @@ msgid "No reviews available" msgstr "Ingen anmeldelser tilgjengelige" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Denne gjennomgangen ble skrevet for en eldre versjon (Versjon: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/nb/muon-notifier.po muon-2.0.0/po/nb/muon-notifier.po --- muon-1.9.60/po/nb/muon-notifier.po 2012-10-29 18:35:00.000000000 +0000 +++ muon-2.0.0/po/nb/muon-notifier.po 2013-04-01 20:33:26.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2012-10-13 19:04+0200\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" diff -Nru muon-1.9.60/po/nb/muon-updater.po muon-2.0.0/po/nb/muon-updater.po --- muon-1.9.60/po/nb/muon-updater.po 2012-10-29 18:35:00.000000000 +0000 +++ muon-2.0.0/po/nb/muon-updater.po 2013-04-01 20:33:26.000000000 +0000 @@ -1,12 +1,12 @@ # Translation of muon-updater to Norwegian Bokmål # -# Bjørn Steensrud , 2010, 2011, 2012. +# Bjørn Steensrud , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-13 19:06+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-01-06 20:35+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" "Language: nb\n" @@ -27,12 +27,12 @@ msgid "Your emails" msgstr "bjornst@skogkatt.homelinux.org" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Skjul" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -42,18 +42,18 @@ "Lista over endringer er ennå ikke tilgjengelig. Bruk Launchpad i stedet." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Lista over endringer er ennå ikke tilgjengelig." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versjon %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -85,149 +85,124 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Programoppdateringer" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Det er tryggere å koble til strømadapteret før oppdatering." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "En ny versjon av Kubuntu er tilgjengelig." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Les markeringer …" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Lagre markeringer som …" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Lagre liste over pakker som er lastet ned …" - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Last ned pakker fra lista …" - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Legg til pakker som er lastet ned" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Installer oppdateringer" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historie …" -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Oppgrader" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Pakkehistorie" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Avbryt" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "" +msgstr "Starter" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" -msgstr "" +msgstr "Venter på autentisering" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "" +msgstr "Venter" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Venter på at andre oppgaver skal bli ferdige" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Venter på at andre pakkebehandlere skal avslutte" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Venter på nødvendige media" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Venter på oppsettsfil" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "" +msgstr "Laster programvareliste" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" -msgstr "" +msgstr "Oppdaterer programvarekilder" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "" +msgstr "Laster ned pakker" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" -msgstr "" +msgstr "Legger inn endringer" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "" +msgstr "Fullført" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "Må bytte medium" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Sett inn %1 i %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "Advarsel – uverifisert programvare" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -240,14 +215,20 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Følgende program kan ikke verifiseres. Det er en sikkerhetsrisiko å " +"installere programvare som ikke er verifisert, for det kan være et tegn på " +"at den er klusset med. Vil du fortsette?" msgstr[1] "" +"Følgende programmer kan ikke verifiseres. Det er en " +"sikkerhetsrisiko å installere programvare som ikke er verifisert, for det " +"kan være et tegn på at den er klusset med. Vil du fortsette?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "Oppsettsfila er endret" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -259,28 +240,33 @@ "din versjon er endret etter installasjonen Vil du beholde den nåværende " "versjonen, eller installere den nye versjonen?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Bruk ny versjon" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Behold gammel versjon" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Nedlastingsfart: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 gjenstår" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -296,65 +282,58 @@ msgid "Download Size" msgstr "Nedlastingsstørrelse" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Noen pakker ble ikke merket for oppdatering.

Andre pakker må " +"installeres eller fjernes for at disse kan oppdateres.

Vil du oppdatere " +"disse også?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Merk alle" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Viktige sikkerhetsoppdateringer" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Programoppdateringer" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Systemoppdateringer" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Ikke alle pakkene kunne markeres for oppgradering. Det kan være at " -"oppgraderinger krever at nye pakker må installeres eller fjernes. Vil du " -"markere oppgraderinger som kan kreve at flere pakker installeres eller " -"fjernes?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Klarte ikke å markere oppgraderinger" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Merk oppgraderinger" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Det er ikke kjent når siste sjekk etter oppdateringer ble gjort." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "Trykk på Se etter oppdateringer for å sjekke." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Programvaren på denne maskinen er oppdatert." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Sist sjekket for %1 siden." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Ingen oppdateringer er tilgjengelige" \ No newline at end of file diff -Nru muon-1.9.60/po/nb/muon.po muon-2.0.0/po/nb/muon.po --- muon-1.9.60/po/nb/muon.po 2012-10-29 18:35:00.000000000 +0000 +++ muon-2.0.0/po/nb/muon.po 2013-04-01 20:33:26.000000000 +0000 @@ -5,8 +5,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-13 19:07+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-12-08 18:25+0100\n" "Last-Translator: Bjørn Steensrud \n" "Language-Team: Norwegian Bokmål \n" "Language: nb\n" @@ -176,18 +176,18 @@ msgid "Purge" msgstr "Slett og rydd" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:184 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Avmarker" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical leverer kritiske oppdateringer for %1 til %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -354,69 +354,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Les markeringer …" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Lagre markeringer som …" - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Lagre liste over pakker som er lastet ned …" - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Last ned pakker fra lista …" - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Legg til pakker som er lastet ned" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Lagre liste over installerte pakker …" - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Forsiktig oppgradering" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Full oppgradering" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Fjern unødvendige pakker" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Forhåndsvis endringer" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Bruk endringene" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historie …" -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -428,12 +398,12 @@ "oppgradering ved å trykke på Full oppgradering-" "knappen." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Klarte ikke å markere oppgraderinger" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -442,17 +412,17 @@ "Klarte ikke å markere oppgraderinger. Noen oppgraderinger har kanskje " "avhengigheter som ikke kan løses nå, eller kan være holdt tilbake manuelt." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Tilbake" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Forhåndsvis endringer" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Pakkehistorie" @@ -469,52 +439,52 @@ msgid "Requested" msgstr "Ønsket" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Søk" -#: muon/PackageModel/PackageWidget.cpp:159 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Merk for installering" -#: muon/PackageModel/PackageWidget.cpp:164 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Merk for fjerning" -#: muon/PackageModel/PackageWidget.cpp:169 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Merk for oppgradering" -#: muon/PackageModel/PackageWidget.cpp:174 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Merk for reinstallering" -#: muon/PackageModel/PackageWidget.cpp:179 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Merk for sletting og rydding" -#: muon/PackageModel/PackageWidget.cpp:190 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Lås pakke ved gjeldende versjon" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Lås opp pakke" -#: muon/PackageModel/PackageWidget.cpp:328 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Lås ved gjeldende versjon" -#: muon/PackageModel/PackageWidget.cpp:376 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -523,34 +493,34 @@ "Hvis denne pakka fjernes kan systemet bli ubrukelig. Er du sikker på at du " "vil fjerne den?" -#: muon/PackageModel/PackageWidget.cpp:377 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Advarsel – fjerner viktig pakke" -#: muon/PackageModel/PackageWidget.cpp:563 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "" +msgstr "Klarte ikke å låse pakke" -#: muon/PackageModel/PackageWidget.cpp:564 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." -msgstr "" +msgstr "Pakka %1 kunne ikke låses. Klarte ikke å skrive låsefil." -#: muon/PackageModel/PackageWidget.cpp:614 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Pakka «%1» kunne ikke merkes for installering eller oppgradering:" -#: muon/PackageModel/PackageWidget.cpp:617 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Klarte ikke å merke pakke" -#: muon/PackageModel/PackageWidget.cpp:639 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -564,42 +534,24 @@ "opp, er utgått, eller ikke er tilgjengelige i de pakkebrønnene som er satt " "opp." -#: muon/PackageModel/PackageWidget.cpp:656 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, men %4 skal installeres" -#: muon/PackageModel/PackageWidget.cpp:662 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "eller %1 %2, men %3 skal installeres" - -#: muon/PackageModel/PackageWidget.cpp:681 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, men den er ikke installerbar" -#: muon/PackageModel/PackageWidget.cpp:687 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "eller %1, men er ikke installerbar" - -#: muon/PackageModel/PackageWidget.cpp:706 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, men det er en virtuell pakke" -#: muon/PackageModel/PackageWidget.cpp:712 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "eller %1, men det er en virtuell pakke" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Se igjennom endringer og bruk dem" @@ -677,68 +629,68 @@ #: muon/TransactionWidget.cpp:147 msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "" +msgstr "Starter" #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" msgid "Waiting for service to start" -msgstr "" +msgstr "Venter på at tjeneste skal starte" #: muon/TransactionWidget.cpp:154 msgctxt "@info Status info" msgid "Waiting for authentication" -msgstr "" +msgstr "Venter på autentisering" #: muon/TransactionWidget.cpp:158 muon/TransactionWidget.cpp:165 #: muon/TransactionWidget.cpp:172 muon/TransactionWidget.cpp:179 msgctxt "@info Status information, widget title" msgid "Waiting" -msgstr "" +msgstr "Venter" #: muon/TransactionWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" -msgstr "" +msgstr "Venter på at andre oppgaver skal bli ferdige" #: muon/TransactionWidget.cpp:167 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "" +msgstr "Venter på at andre pakkebehandlere skal avslutte" #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "" +msgstr "Venter på nødvendige media" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" msgid "Waiting for configuration file" -msgstr "" +msgstr "Venter på oppsettsfil" #: muon/TransactionWidget.cpp:192 msgctxt "@info Status info" msgid "Loading Software List" -msgstr "" +msgstr "Laster programvareliste" #: muon/TransactionWidget.cpp:200 msgctxt "@info Status information, widget title" msgid "Updating software sources" -msgstr "" +msgstr "Oppdaterer programvarekilder" #: muon/TransactionWidget.cpp:205 msgctxt "@info Status information, widget title" msgid "Downloading Packages" -msgstr "" +msgstr "Laster ned pakker" #: muon/TransactionWidget.cpp:217 msgctxt "@info Status information, widget title" msgid "Committing Changes" -msgstr "" +msgstr "Legger inn endringer" #: muon/TransactionWidget.cpp:224 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "" +msgstr "Fullført" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" @@ -769,7 +721,13 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" +"Følgende program kan ikke verifiseres. Det er en sikkerhetsrisiko å " +"installere programvare som ikke er verifisert, for det kan være et tegn på " +"at den er klusset med. Vil du fortsette?" msgstr[1] "" +"Følgende programmer kan ikke verifiseres. Det er en " +"sikkerhetsrisiko å installere programvare som ikke er verifisert, for det " +"kan være et tegn på at den er klusset med. Vil du fortsette?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" diff -Nru muon-1.9.60/po/nds/libmuon.po muon-2.0.0/po/nds/libmuon.po --- muon-1.9.60/po/nds/libmuon.po 2012-10-29 18:35:03.000000000 +0000 +++ muon-2.0.0/po/nds/libmuon.po 2013-04-01 20:33:28.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" "PO-Revision-Date: 2011-09-09 20:05+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -18,1255 +18,301 @@ "X-Generator: Lokalize 1.0\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" msgctxt "@info license" msgid "Unknown" msgstr "Nich begäng" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, fuzzy, kde-format -#| msgctxt "@label showing download and install size" -#| msgid "%1 to download, %2 of space to be used" msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 warrt daallaadt, %2 op de Fastplaat warrt bruukt" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" msgstr "" -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" msgstr "" -#: libmuon/categories.xml:27 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Developer Tools" -msgstr "Utwickeln" - -#: libmuon/categories.xml:42 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"debug" -#| "\"" -#| msgid "Debug" -msgctxt "Category" -msgid "Debugging" -msgstr "Fehlersöök" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" msgstr "" -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -#: libmuon/categories.xml:98 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"localization\"" -#| msgid "Localization" -msgctxt "Category" -msgid "Localization" -msgstr "Översetten" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" msgstr "" -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" msgstr "" -#: libmuon/categories.xml:144 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -#| msgid "Version Control Systems" -msgctxt "Category" -msgid "Version Control" -msgstr "Verschoonkuntrull-Systemen" - -#: libmuon/categories.xml:158 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"devel" -#| "\"" -#| msgid "Development" -msgctxt "Category" -msgid "Web Development" -msgstr "Utwickeln" - -#: libmuon/categories.xml:171 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Education" -msgstr "Steed" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" msgstr "" -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "" +#: libmuon/MuonMainWindow.cpp:66 +msgctxt "@label Easter Egg" +msgid "This Muon has super cow powers" +msgstr "Dit Muon hett Superkauh-Knööv" -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Schaadhaftig" -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "" +#: libmuon/resources/AbstractResource.cpp:82 +#, fuzzy +#| msgid "Available updates" +msgid "Available" +msgstr "Verföögbor Opfrischen" -#: libmuon/categories.xml:232 +#: libmuon/resources/AbstractResource.cpp:83 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"electronics\"" -#| msgid "Electronics" -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronik" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "" +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "Installeert" -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "" +#: libmuon/resources/AbstractResource.cpp:84 +msgid "Upgradeable" +msgstr "Opgradeerbor" -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "" +#: libmuon/resources/ResourcesUpdatesModel.cpp:100 +#, kde-format +msgctxt "@item:intext Remaining time" +msgid "%1 remaining" +msgstr "%1 nablieven" -#: libmuon/categories.xml:269 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"math" -#| "\"" -#| msgid "Mathematics" -msgctxt "Category" -msgid "Mathematics" -msgstr "Mathematik" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:46 +msgid "Show notifications for:" +msgstr "Bescheden wiesen för:" + +#: libmuon/settings/NotifySettingsPage.cpp:48 +msgid "Available updates" +msgstr "Verföögbor Opfrischen" -#: libmuon/categories.xml:299 +#: libmuon/settings/NotifySettingsPage.cpp:49 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"fonts" -#| "\"" -#| msgid "Fonts" -msgctxt "Category" -msgid "Fonts" -msgstr "Schriftoorden" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "" +msgid "Show the number of available updates" +msgstr "Verföögbor Opfrischen" -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:50 +msgid "Distribution upgrades" +msgstr "Distributschoon-Opfrischen" -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:69 +msgid "Notification type:" +msgstr "Beschedentyp:" -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:72 +msgid "Use both popups and tray icons" +msgstr "Opdukers un Systeemafsnitt-Lüttbiller bruken" -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:73 +msgid "Tray icons only" +msgstr "Bloots Systeemafsnitt-Lüttbiller" -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" +#: libmuon/settings/NotifySettingsPage.cpp:74 +msgid "Popup notifications only" +msgstr "Bloots Bescheden-Opdukers" -#: libmuon/categories.xml:369 +#: libmuon/Transaction/TransactionListener.cpp:109 #, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "Category" -msgid "Simulation" -msgstr "Steed" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" +msgctxt "@info:status" +msgid "Downloading" +msgstr "Daalladengrött:" + +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 +msgctxt "@info:status Progress text when done" +msgid "Done" +msgstr "Afslaten" + +#: libmuon/Transaction/TransactionListener.cpp:154 +msgctxt "@info:status Progress text when waiting" +msgid "Waiting" msgstr "" -#: libmuon/categories.xml:391 +#: libmuon/Transaction/TransactionListener.cpp:175 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"graphics\"" -#| msgid "Graphics" -msgctxt "Category" -msgid "Graphics" -msgstr "Grafikprogrammen" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "" +msgctxt "@info:status" +msgid "Installing" +msgstr "Installeren" -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" +#: libmuon/Transaction/TransactionListener.cpp:179 +msgctxt "@info:status" +msgid "Changing Addons" msgstr "" -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "" +#: libmuon/Transaction/TransactionListener.cpp:183 +#, fuzzy +msgctxt "@info:status" +msgid "Removing" +msgstr "Wegmaken" -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "" +#, fuzzy -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "" -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "" -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "" -#: libmuon/categories.xml:473 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"web\"" -#| msgid "Internet" -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "" -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "" -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "" -#: libmuon/categories.xml:509 + #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"httpd" -#| "\"" -#| msgid "Web Servers" -msgctxt "Category" -msgid "Web Browsers" -msgstr "Nettservers" - -#: libmuon/categories.xml:521 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"sound" -#| "\"" -#| msgid "Multimedia" -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "" -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "" -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "" +#, fuzzy -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "" -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "" -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "" -msgstr[1] "" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Vörgeschicht" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Söök" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "All Ännern" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Installatschonen" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Opfrischen" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Wegmaakt" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Datum" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Installeert" +#, fuzzy -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Opgradeert" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Daalgradeert" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Wegmaakt" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Oprüümt" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 Klock %3" -#: libmuon/MuonMainWindow.cpp:67 -msgctxt "@label Easter Egg" -msgid "This Muon has super cow powers" -msgstr "Dit Muon hett Superkauh-Knööv" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Systeempleeg" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Grundsysteem" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono- oder CLI-Ünnerbuu" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Snacken" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Datenbanken" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Utwickeln" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokmentatschoon" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Fehlersöök" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editoren" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronik" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Inbett Reedschappen" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Schriftoorden" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Spelen un Tietverdrief" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME-Schriefdisch-Ümgeven" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafikprogrammen" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "\"GNU R\"-Statistiksysteem" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep-Schriefdischümgeven" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amateurfunk" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Programmspraak \"Haskell\"" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Nettservers" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpreters för Programmspraken" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Programmspraak \"Java\"" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE-Programmsammeln" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel un Modulen" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Bibliotheken - Utwickeln" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Bibliotheken" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Programmspraak \"Lisp\"" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Översetten" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Nettpost" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Mathematik" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Anner Saken - Textbaseert" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Nettwark" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Narichtenkrinken" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Programmspraak \"OCaml\"" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Bibliotheken - Oolt" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Anner Systeemümgeven" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Programmspraak \"Perl\"" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Programmspraak \"PHP\"" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Programmspraak \"Python\"" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Programmspraak \"Ruby\"" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Wetenschap" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Konsolen" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Textsatzsysteem \"TeX\"" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Textverarbeiden" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Warktüüch" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Verschoonkuntrull-Systemen" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video-Programmen" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Anner Saken - Grafik" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce-Schriefdisch-Ümgeven" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope-/Plone-Ümgeven" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Nich begäng" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Vun \"Alien\" ut en RPM wannelt" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Översetten" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta-Paketen" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Bloots för Export" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Nich-fre'e Programmen" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Vun Bidregers opstellt" - -#: libmuon/MuonStrings.cpp:165 -#, fuzzy -#| msgctxt "@title:column" -#| msgid "Location" -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Steed" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" +#, fuzzy -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Nich installeert" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Installeert" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Opgradeerbor" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Schaadhaftig" +#, fuzzy -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Övrigbleven Instellen" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Installeert (autom. wegmaakbor)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Keen Ännern" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Installeren" -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Opgraderen" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Wegmaken" -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Oprümen" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Nochmaal installeren" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Daalgraderen" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Afslaten" -#: libmuon/MuonStrings.cpp:221 #, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section \"comm" -#| "\"" -#| msgid "Communication" -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Snacken" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "" -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "" -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "" -#: libmuon/MuonStrings.cpp:243 + #, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Fehler bi't Torechtmaken" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Dat Paketsystem lett sik nich afsluten." - -#: libmuon/MuonStrings.cpp:247 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "To minn free Ruum op de Fastplaat" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "" -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Identiteetprööv fehlslaan" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Nich verwacht Fehler" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Nich troot Paketen" - -#: libmuon/MuonStrings.cpp:259 -#, fuzzy -#| msgctxt "" -#| "@item:inlistbox Human-readable name for the Debian package section " -#| "\"unknown\"" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Nich begäng" -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Dat Paketsysteem lett sik nich torechtmaken. Villicht sünd Dien Instellen " -"leeg." -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"As't lett warrt dat Paketsystem jüst vun en anner Programm bruukt. Du muttst " -"toeerst all anner Paketplegers tomaken, ehr Du Paketen installeren oder " -"wegmaken kannst." -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "Binnen Orner \"%1\" gifft dat nich noog free Ruum för't Wiedermaken." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Paketen laat sik nich daalladen." - -#: libmuon/MuonStrings.cpp:288 -#, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Bi't Övernehmen vun Ännern geev dat en Fehler:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Wiedermaken nich mööglich, wiel keen propper Identiteetprööv anbaden warrt." +#, fuzzy -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"As't lett is dat QApt-Arbeitprogramm afstört oder wegkamen. Bitte stüer de " -"QApt-Plegers en Fehlerbericht to." -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"De Schriever hett dit Paket nich beglöövt. Dat Daalladen vun nich beglöövt " -"Paketen is op Dien Systeem nich tolaten." -msgstr[1] "" -"De Schriever hett disse Paketen nich beglöövt. Dat Daalladen vun nich " -"beglöövt Paketen is op Dien Systeem nich tolaten." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Na Opfrischen kieken" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "All afkören" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Programm-Borns instellen" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Markeren sekern as" -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dat Dokment lett sik nich sekern, dat is nich mööglich, na %1 to schrieven.\n" -"\n" -"Bitte prööv, wat Du Schriefverlöven för de Datei hest un wat dat noog fre'en " -"Platz op de Fastplaat gifft." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "List vun installeert Paketen sekern as" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Daalladen-List sekern as" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Datei opmaken" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Ännern laat sik nich markeren. Beseker, de Datei is een vun de Paketplegers " -"Muon oder Synaptics praatstellt Markeren-Datei." -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Söök en Orner ut." +#, fuzzy -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 Paket wöör den Twischenspieker mit Spood toföögt." -msgstr[1] "%1 Paketen wöörn den Twischenspieker mit Spood toföögt." - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Disse Orner bargt keen gellen Paketdateien. De Paketen mööt to Dien Reekner " -"passen un op Stand wesen." -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Paketen laat sik nich finnen." -#: libmuon/resources/ResourcesUpdatesModel.cpp:100 -#, kde-format -msgctxt "@item:intext Remaining time" -msgid "%1 remaining" -msgstr "%1 nablieven" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" +#, fuzzy + -#: libmuon/settings/NotifySettingsPage.cpp:46 -msgid "Show notifications for:" -msgstr "Bescheden wiesen för:" -#: libmuon/settings/NotifySettingsPage.cpp:48 -msgid "Available updates" -msgstr "Verföögbor Opfrischen" -#: libmuon/settings/NotifySettingsPage.cpp:49 #, fuzzy -#| msgid "Available updates" -msgid "Show the number of available updates" -msgstr "Verföögbor Opfrischen" -#: libmuon/settings/NotifySettingsPage.cpp:50 -msgid "Distribution upgrades" -msgstr "Distributschoon-Opfrischen" -#: libmuon/settings/NotifySettingsPage.cpp:69 -msgid "Notification type:" -msgstr "Beschedentyp:" -#: libmuon/settings/NotifySettingsPage.cpp:72 -msgid "Use both popups and tray icons" -msgstr "Opdukers un Systeemafsnitt-Lüttbiller bruken" -#: libmuon/settings/NotifySettingsPage.cpp:73 -msgid "Tray icons only" -msgstr "Bloots Systeemafsnitt-Lüttbiller" +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -#: libmuon/settings/NotifySettingsPage.cpp:74 -msgid "Popup notifications only" -msgstr "Bloots Bescheden-Opdukers" -#: libmuon/Transaction/TransactionListener.cpp:109 -#, fuzzy -#| msgctxt "@label Label preceding the package's download size" -#| msgid "Download Size:" -msgctxt "@info:status" -msgid "Downloading" -msgstr "Daalladengrött:" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 -msgctxt "@info:status Progress text when done" -msgid "Done" -msgstr "Afslaten" -#: libmuon/Transaction/TransactionListener.cpp:153 -msgctxt "@info:status Progress text when waiting" -msgid "Waiting" -msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:174 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Install" -msgctxt "@info:status" -msgid "Installing" -msgstr "Installeren" -#: libmuon/Transaction/TransactionListener.cpp:179 -msgctxt "@info:status" -msgid "Changing Addons" -msgstr "" -#: libmuon/Transaction/TransactionListener.cpp:183 -#, fuzzy -#| msgctxt "@info:status Requested action" -#| msgid "Remove" -msgctxt "@info:status" -msgid "Removing" -msgstr "Wegmaken" @@ -1350,25 +396,21 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1698,14 +740,12 @@ -#, fuzzy -#, fuzzy @@ -1728,16 +768,566 @@ -#, fuzzy -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + +#, fuzzy + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/nds/muon-installer.po muon-2.0.0/po/nds/muon-installer.po --- muon-1.9.60/po/nds/muon-installer.po 2012-10-29 18:35:03.000000000 +0000 +++ muon-2.0.0/po/nds/muon-installer.po 2013-04-01 20:33:28.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2011-09-10 07:27+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -26,7 +26,7 @@ msgid "Your emails" msgstr "m.j.wiese@web.de" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -35,7 +35,7 @@ msgstr[1] "" "Disse Paketen wöörn jüst installeert un laat sik dör Anklicken starten." -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Programmen halen" @@ -67,77 +67,75 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Programmen halen" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Installeert Programmen" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Vun Kubuntu praatstellt" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Vun Debian praatstellt" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 #, fuzzy -#| msgctxt "@item:inlistbox " -#| msgid "Canonical Partners" msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Canonical-Maten" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Nich-afhangig" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Programmen halen" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Installeert Programmen" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Vörgeschicht" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 mit Spood installeert" -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Start" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Programmen mit Spood installeert" -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Niege Programmen utföhren..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Installatschoon afslaten" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "" @@ -211,18 +209,18 @@ msgid "Install" msgstr "Installeren" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Wegmaken" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Installeren" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -238,8 +236,6 @@ #: installer/ResourceView/ResourceViewWidget.cpp:72 #, fuzzy -#| msgctxt "@label Label preceding the app support" -#| msgid "Support:" msgid "Sort:" msgstr "Ünnerstütten:" @@ -283,19 +279,19 @@ msgid "No reviews available" msgstr "Keen Nakieken funnen" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Disse Nakiek wöör för en öller Verschoon (%1) schreven." -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/nds/muon-notifier.po muon-2.0.0/po/nds/muon-notifier.po --- muon-1.9.60/po/nds/muon-notifier.po 2012-10-29 18:35:03.000000000 +0000 +++ muon-2.0.0/po/nds/muon-notifier.po 2013-04-01 20:33:28.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2011-03-15 08:29+0100\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -66,7 +66,6 @@ #: kded/MuonNotifier.cpp:58 #, fuzzy -#| msgid "(C) 2009-2011 Jonathan Thomas, (C) 2009 Harald Sitter" msgid "(C) 2009-2012 Jonathan Thomas, (C) 2009 Harald Sitter" msgstr "© 2009 - 2011: Jonathan Thomas, © 2009: Harald Sitter" @@ -80,9 +79,6 @@ #: kded/UpdateEvent/UpdateEvent.cpp:61 #, fuzzy -#| msgctxt "Notification text" -#| msgid "%1 security update is available" -#| msgid_plural "%1 security updates are available" msgctxt "Notification text" msgid "A security update is available" msgid_plural "Security updates are available" @@ -99,9 +95,6 @@ #: kded/UpdateEvent/UpdateEvent.cpp:73 #, fuzzy -#| msgctxt "Notification text" -#| msgid "%1 software update is available" -#| msgid_plural "%1 software updates are available" msgctxt "Notification text" msgid "A software update is available" msgid_plural "Software updates are available" diff -Nru muon-1.9.60/po/nds/muon-updater.po muon-2.0.0/po/nds/muon-updater.po --- muon-1.9.60/po/nds/muon-updater.po 2012-10-29 18:35:03.000000000 +0000 +++ muon-2.0.0/po/nds/muon-updater.po 2013-04-01 20:33:28.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2011-09-09 20:11+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -26,12 +26,12 @@ msgid "Your emails" msgstr "m.j.wiese@web.de" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Versteken" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -41,18 +41,18 @@ "De Ännernlist is noch nich verföögbor. Bitte bruuk Launchpad ansteed." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "De Ännernlist is noch nich verföögbor." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Verschoon %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -86,72 +86,47 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Programm-Opfrischen" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "" -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "List vun daallaadt Paketen sekern…" - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Paketen ut List daalladen…" - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Daallaadt Paketen tofögen" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Opfrischen installeren" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "" -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Afbreken" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -159,7 +134,7 @@ msgid "Starting" msgstr "Ännern warrt inspeelt." -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -167,8 +142,8 @@ msgid "Waiting for Authentication" msgstr "Ännern warrt inspeelt." -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -176,27 +151,27 @@ msgid "Waiting" msgstr "Ännern warrt inspeelt." -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -204,7 +179,7 @@ msgid "Loading Software List" msgstr "Programm-Borns warrt opfrischt." -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -212,7 +187,7 @@ msgid "Updating software sources" msgstr "Programm-Borns warrt opfrischt." -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 #, fuzzy #| msgctxt "@info" #| msgid "Downloading Updates" @@ -220,7 +195,7 @@ msgid "Downloading Packages" msgstr "Opfrischen warrt daallaadt" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -228,7 +203,7 @@ msgid "Applying Changes" msgstr "Ännern warrt inspeelt." -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -236,23 +211,23 @@ msgid "Finished" msgstr "Ännern warrt inspeelt." -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -267,12 +242,12 @@ msgstr[0] "" msgstr[1] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -281,34 +256,35 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Verschoon %1:" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Verschoon %1:" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Daalladengauigkeit: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 nablieven" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -316,8 +292,6 @@ #: updater/UpdateModel/UpdateModel.cpp:106 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@label Column label" msgid "Version" msgstr "Verschoon %1:" @@ -327,64 +301,59 @@ msgid "Download Size" msgstr "Daalladengrött" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +#, fuzzy +#| msgctxt "@action Reverts all potential changes to the cache" +#| msgid "Unmark All" +msgid "Mark All" +msgstr "All afkören" + +#: updater/UpdaterWidget.cpp:164 #, fuzzy -#| msgctxt "@item:inlistbox" -#| msgid "Security Updates" msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Sekerheit-Opfrischen" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Programm-Opfrischen" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Systeem-Opfrischen" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Opgraderen laat sik nich markeren." - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "" -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "" -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "" \ No newline at end of file diff -Nru muon-1.9.60/po/nds/muon.po muon-2.0.0/po/nds/muon.po --- muon-1.9.60/po/nds/muon.po 2012-10-29 18:35:03.000000000 +0000 +++ muon-2.0.0/po/nds/muon.po 2013-04-01 20:33:28.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" "PO-Revision-Date: 2011-06-16 15:19+0200\n" "Last-Translator: Manfred Wiese \n" "Language-Team: Low Saxon \n" @@ -82,10 +82,6 @@ #: muon/DetailsTabs/ChangelogTab.cpp:87 #, fuzzy, kde-format -#| msgctxt "@info/rich" -#| msgid "" -#| "The list of changes is not available yet. Please use Launchpad instead." msgctxt "@info/rich" msgid "" "The list of changes is not yet available. Please use Allens Opgraderen." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Opgraderen laat sik nich markeren." -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -464,25 +417,23 @@ "Opgraderen laat sik nich markeren. Villicht sünd en poor Afhangigkeiten nich " "oplööst oder warrt vun Hand torüchhollen." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Torüch" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Ännern vörankieken" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Paket-Vörgeschicht" #: muon/PackageModel/PackageModel.cpp:79 #, fuzzy -#| msgctxt "@label Shows which package failed" -#| msgid "Package: %1" msgid "Package" msgstr "Paket: %1" @@ -494,76 +445,60 @@ msgid "Requested" msgstr "Anföddert" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Söök" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 #, fuzzy -#| msgctxt "@action:button" -#| msgid "Installation" msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Installeren" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 #, fuzzy -#| msgctxt "@label" -#| msgid "Mark for:" msgctxt "@action:button" msgid "Mark for Removal" msgstr "Markeren för't:" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 #, fuzzy -#| msgctxt "@label" -#| msgid "Mark for:" msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Markeren för't:" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 #, fuzzy -#| msgctxt "@action:button" -#| msgid "Reinstallation" msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Nieg installeren" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 #, fuzzy -#| msgctxt "@label" -#| msgid "Mark for:" msgctxt "@action:button" msgid "Mark for Purge" msgstr "Markeren för't:" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 #, fuzzy -#| msgctxt "@item:inlistbox" -#| msgid "Dependencies of the Current Version" msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Afhangigkeiten vun de aktuelle Verschoon" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" msgctxt "@action:button" msgid "Unlock package" msgstr "Paket lett sik nich markeren." -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 #, fuzzy -#| msgctxt "@item:inlistbox" -#| msgid "Dependencies of the Current Version" msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Afhangigkeiten vun de aktuelle Verschoon" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -572,12 +507,12 @@ "Deist Du dit Paket weg, löppt villicht Dien Systeem nich mehr. Wullt Du dat " "redig wegmaken?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Wohrschoen - Wichtig Paket warrt wegdaan" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 #, fuzzy #| msgctxt "@title:window" #| msgid "Unable to Mark Package" @@ -585,25 +520,25 @@ msgid "Failed to Lock Package" msgstr "Paket lett sik nich markeren." -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" "Markeren vun Paket \"%1\" för't Installeren oder Opgraderen nich mööglich:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Paket lett sik nich markeren." -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -618,58 +553,36 @@ "nienich hoochlaadt, dat is överhaalt, oder de anmaakt Archiven stellt dat " "nich praat." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, man %4 warrt installeert." -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "oder %1 %2, man %3 warrt installeert." - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, man lett sik nich installeren." -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "oder %1, man lett sik nich installeren." - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, man dat is en virtuell Paket." -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "oder %1, man dat is en virtuell Paket." - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Ännern ankieken un annehmen" #: muon/StatusWidget.cpp:52 #, fuzzy -#| msgctxt "@status" -#| msgid "Rebuilding Search Index" msgctxt "@info:status" msgid "Rebuilding Search Index" msgstr "Söök-Index warrt nieg opstellt." #: muon/StatusWidget.cpp:91 #, fuzzy, kde-format -#| msgid "1 package available, " -#| msgid_plural "%1 packages available, " msgctxt "@info:status" msgid "1 package available, " msgid_plural "%1 packages available, " @@ -678,39 +591,30 @@ #: muon/StatusWidget.cpp:92 #, fuzzy, kde-format -#| msgid "%1 installed, " msgctxt "@info:status" msgid "%1 installed, " msgstr "%1 installeert, " #: muon/StatusWidget.cpp:96 #, fuzzy, kde-format -#| msgid "%1 upgradeable," msgctxt "@info:status" msgid "%1 upgradeable," msgstr "%1 opgradeerbor," #: muon/StatusWidget.cpp:98 #, fuzzy, kde-format -#| msgid "%1 upgradeable" msgctxt "@info:status" msgid "%1 upgradeable" msgstr "%1 opgradeerbor" #: muon/StatusWidget.cpp:110 #, fuzzy, kde-format -#| msgctxt "Part of the status label" -#| msgid " %1 to install/upgrade" msgctxt "@info:status Part of the status label" msgid " %1 to install/upgrade" msgstr " %1 warrt installeert/opgradeert" #: muon/StatusWidget.cpp:115 #, fuzzy, kde-format -#| msgctxt "" -#| "Label for the number of packages pending removal when packages are also " -#| "pending upgrade" -#| msgid ", %1 to remove" msgctxt "" "@info:status Label for the number of packages pending removal when packages " "are also pending upgrade" @@ -719,10 +623,6 @@ #: muon/StatusWidget.cpp:118 #, fuzzy, kde-format -#| msgctxt "" -#| "Label for the number of packages pending removal when there are only " -#| "removals" -#| msgid " %1 to remove" msgctxt "" "@info:status Label for the number of packages pending removal when there are " "only removals" @@ -923,9 +823,20 @@ +#, fuzzy + + + + + + + + + + + -#, fuzzy @@ -1548,28 +1459,23 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1579,18 +1485,24 @@ +#, fuzzy + +#, fuzzy +#, fuzzy +#, fuzzy +#, fuzzy @@ -1608,7 +1520,6 @@ -#, fuzzy @@ -1624,6 +1535,7 @@ +#, fuzzy @@ -1653,7 +1565,6 @@ -#, fuzzy @@ -1674,4 +1585,15 @@ + + + + +#, fuzzy + + + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/nl/libmuon.po muon-2.0.0/po/nl/libmuon.po --- muon-1.9.60/po/nl/libmuon.po 2012-10-29 18:35:06.000000000 +0000 +++ muon-2.0.0/po/nl/libmuon.po 2013-04-01 20:33:32.000000000 +0000 @@ -2,13 +2,13 @@ # This file is distributed under the same license as the PACKAGE package. # # Freek de Kruijf , 2010, 2011, 2012. -# Freek de Kruijf , 2010, 2011. +# Freek de Kruijf , 2010, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-26 15:32+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-09 21:49+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -18,1089 +18,110 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Toepassingen" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Opensource" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Bedrijfseigendom" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Onbekend" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 te downloaden, %2 op schijf" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 op schijf" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Accessoires" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Toegankelijkheid" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Hulpmiddelen voor ontwikkelaars" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Debuggen" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Ontwerpen van grafisch interface" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE's" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Aanpassen aan taalregio" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profileren" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Versiebeheer" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Webontwikkeling" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Onderwijs" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Wetenschap en techniek" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomie" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologie" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Scheikunde" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Computerwetenschap en robotica" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Electronics" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Techniek" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografie" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologie" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Wiskunde" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Natuurkunde" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Lettertypen" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Spellen" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arcade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Bordspellen" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Kaartspellen" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Puzzels" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Rollen spelen" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulatie" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sport" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafisch" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Tekenen" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Schilderen en bewerken" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografie" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Uitgeven" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Scannen en optische tekstherkenning" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Viewers" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Chat" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Bestanden delen" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "E-mail" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Webbrowsers" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Kantoor" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Systeem en systeeminstellingen" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Stripverhalen" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Plasma-bureaubladwidgets" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Backend van toepassing" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Toepassingen in uw systeem" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Aanmelden aan de Ubuntu SSO-service" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Bodega-backend" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Installeer Bodega-gegevens in uw systeem" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Voer de credentials van MakePlayLive in" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Dummy backend" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Dummy backend om muon-frontends te testen" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Backend van KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Installeer KNewStuff-gegevens in uw systeem" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Allen" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Extra wijzigingen bevestigen" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Extra wijzigingen markeren?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Deze actie vereist een wijziging in een ander pakket:" -msgstr[1] "Deze actie vereist wijzigingen in andere pakketten:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Geschiedenis" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Zoeken" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Alle wijzigen" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Installaties" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Opwaarderingen" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Verwijderingen" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Datum" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Geïnstalleerd" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Opgewaardeerd" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Omlaag gewaardeerd" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Verwijderd" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Opgeruimd" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 bij %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Deze Muon heeft superkoeienkracht" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Systeemadministratie" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Basis systeem" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI infrastructuur" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Communicatie" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Databases" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Ontwikkeling" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentatie" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Debug" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editors" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Electronics" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Ingebedde apparaten" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Lettertypen" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Spellen en amusement" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME bureaubladomgeving" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafisch" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R statistisch systeem" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep bureaubladomgeving" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amateur radio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell programmeertaal" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Web-servers" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Geïnterpreteerde computertalen" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java programmeertaal" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE software compilatie" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel en modulen" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Bibliotheken - ontwikkeling" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Bibliotheken" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp programmeertaal" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Aanpassen aan taalregio" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-mail" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Wiskunde" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Diversen - tekst gebaseerd" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Netwerken" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Nieuwsgroepen" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCaml programmeertaal" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Bibliotheken - oud" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Cross-platform" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl programmeertaal" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP programmeertaal" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python programmeertaal" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby programmeertaal" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Wetenschappelijk" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Shells" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX-auteur" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Tekstverwerking" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Hulpmiddelen" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Versiebeheersysteem" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video-software" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Diversen - grafisch" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce-bureaubladomgeving" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone-omgeving" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Onbekend" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Verbroken" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Uit RPM geconverteerd door Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internationalisatie en lokalisatie" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta-pakketten" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Beperkt bij exporteren" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Niet-vrij" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Onderwijs" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "GObject Introspectiegegevens" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Niet geïnstalleerd" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Beschikbaar" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Geïnstalleerd" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Kan worden opgewaardeerd" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Verbroken" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Resterende configuratie" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Geïnstalleerd (automatisch te verwijderen)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Geen wijziging" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Installeren" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Opwaarderen" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Verwijderen" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Opruimen" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Herinstalleren" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Afwaarderen" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Vergrendeld" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Algemeen" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Initialisatiefout" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Vergrendelen van het pakketsysteem lukt niet" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Schijf bijna vol" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Wijzigingen toepassen is mislukt" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Authenticatiefout" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Onverwachte fout" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Niet vertrouwde pakketten" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Onbekende fout" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Het pakketsysteem kon niet worden geïnitialiseerd, uw configuratie kan niet " -"in orde zijn." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Een andere toepassing lijkt op dit moment het pakketsysteem te gebruiken. U " -"moet alle andere pakketbeheerders sluiten voordat u in staat bent om " -"pakketten te installeren of te verwijderen." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"U hebt niet genoeg vrije schijfruimte in de map op %1 om door te gaan met " -"deze bewerking." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Kon geen pakketten downloaden" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Er is een fout opgetreden tijdens het aanbrengen van wijzigingen:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Deze bewerking kan niet verder gaan omdat de juiste autorisatie niet is " -"aangeleverd" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Het lijkt er op dat het QApt-programma ofwel is gecrashed of verdwenen. " -"Rapporteer een bug aan de onderhoudewrs van QApt" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Het volgende pakket is niet geverifieerd door zijn auteur. Downloaden van " -"niet vertrouwde pakketten is niet toegestaan in uw huidige instellingen." -msgstr[1] "" -"De volgende pakketten is niet geverifieerd door hun auteurs. Downloaden van " -"niet vertrouwde pakketten is niet toegestaan in uw huidige instellingen." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Controleren op opwaarderingen" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Alles deselecteren" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Softwarebronnen instellen" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Markeringen opslaan als..." - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Het document kon niet worden opgeslagen. Het was namelijk niet mogelijk om " -"te schrijven naar %1\n" -"\n" -"Controleer of u schrijftoegang hebt tot dit bestand of dat er voldoende " -"schijfruimte aanwezig is." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Lijst met geïnstalleerde pakketten opslaan als" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Lijst met gedownloade pakketten opslaan als" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Bestand openen" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Kan wijzigingen niet markeren. Wees er zeker van dat het bestand een " -"markeerbaar bestand is, gemaakt door of de Muon-pakketbeheerder of de " -"Synaptic-pakketbeheerder." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Kies een map" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 pakket is met succes aan de cache toegevoegd" -msgstr[1] "%1 pakketten zijn met succes aan de cache toegevoegd" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Er zijn geen geldige pakketten in deze map gevonden. Controleer of de " -"pakketten compatibel zijn met uw computer en de laatste versie bezitten." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Pakketten zijn niet gevonden" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 resterend" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Aanmelden aan de Ubuntu SSO-service" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Meldingen tonen voor:" @@ -1138,18 +159,18 @@ msgid "Downloading" msgstr "Downloaden" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Gereed" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Wachtende" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Installeren" diff -Nru muon-1.9.60/po/nl/muon-discover.po muon-2.0.0/po/nl/muon-discover.po --- muon-1.9.60/po/nl/muon-discover.po 2012-10-29 18:35:06.000000000 +0000 +++ muon-2.0.0/po/nl/muon-discover.po 2013-04-01 20:33:32.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Freek de Kruijf , 2012. +# Freek de Kruijf , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-25 17:19+0200\n" -"Last-Translator: Freek de Kruijf \n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-09 21:49+0100\n" +"Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -49,24 +49,43 @@ msgid "Display a list of entries with a category." msgstr "Toon een lijst met items met een categorie." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Muon Discover openen in de aangegeven modus. Modi komen overeen met de " +"werkbalkknoppen." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Maak een lijst met de beschikbare modi en stuur deze naar stdout." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Beschikbare modi:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Zoeken..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Er zijn enige fouten gevonden bij het opzetten van de GUI, de toepassing kan " "verder gaan." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Initialisatiefout" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Originelen toevoegen..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Originelen verwijderen..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menu" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Instellen van en informatie krijgen over Muon-zoeken" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -81,90 +100,94 @@ msgid "Discard" msgstr "Verwerpen" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 recensies" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Homepagina" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Opstarten" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Nalezen" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Totale grootte: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Overzicht" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Add-ons" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Recensies" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Bijwerken" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Naam" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Waardering" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Buzzen" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Populariteit" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Oorsprong" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Zoeken in '%1'..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Zoeken..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Populariteitswedstrijd" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "punten: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Beste waarderingen" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Welkom bij\n" +"Muon-zoeken!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -177,23 +200,34 @@ msgid "Remove" msgstr "Verwijderen" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Geïnstalleerd" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 msgid "Update All" msgstr "Alles bijwerken" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Bezig met laden..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Terug" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Ontdekken" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Geïnstalleerd (%1 element bijgewerkt)" +msgstr[1] "Geïnstalleerd (%1 elementen bijgewerkt)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Bronnen" @@ -218,56 +252,60 @@ msgid "Summary:" msgstr "Samenvatting:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Recensies:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Vertel ons over deze recensie!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 van %2 personen vonden deze recensie bruikbaar" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 door %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 door %2

" +"%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Bruikbaar? Ja/Nee" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Bron toevoegen" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "De nieuwe bron specificeren" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Annuleren" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - De toe te voegen tekstregel voor de apt-opslagruimte. Dit is " "er één van:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (binair)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/nl/muon-installer.po muon-2.0.0/po/nl/muon-installer.po --- muon-1.9.60/po/nl/muon-installer.po 2012-10-29 18:35:06.000000000 +0000 +++ muon-2.0.0/po/nl/muon-installer.po 2013-04-01 20:33:32.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-24 20:29+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-08-17 06:26-0300\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -19,13 +19,13 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Freek de Kruijf - 2012" +msgstr "Freek de Kruijf 2011-2012" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "freekdekruijf@kde.nl" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ "De volgende toepassingen zijn zojuist geïnstalleerd, klik op hen om ze te " "starten:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Software ophalen" @@ -66,74 +66,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Software ophalen" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Geïnstalleerde software" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Door Kubuntu geleverd" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Door Debian geleverd" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partners van Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Onafhankelijk" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Software ophalen" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Geïnstalleerde software" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Geschiedenis" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 is met succes geïnstalleerd." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Begin" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Toepassingen met succes geïnstalleerd." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Nieuwe toepassingen uitvoeren..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Installatie is gereed" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Voortgang" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Voortgang" @@ -207,18 +207,18 @@ msgid "Install" msgstr "Installeren" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Verwijderen" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Installeren" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -276,19 +276,19 @@ msgid "No reviews available" msgstr "Geen recensies beschikbaar" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Dit overzicht is geschreven voor een oudere versie (Versie: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/nl/muon-notifier.po muon-2.0.0/po/nl/muon-notifier.po --- muon-1.9.60/po/nl/muon-notifier.po 2012-10-29 18:35:06.000000000 +0000 +++ muon-2.0.0/po/nl/muon-notifier.po 2013-04-01 20:33:32.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-05-14 10:48+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-08-17 06:26-0300\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -15,11 +15,11 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Freek de Kruijf" +msgstr "Freek de Kruijf 2011-2012" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" @@ -72,14 +72,14 @@ msgctxt "Notification text" msgid "%1 security update is available" msgid_plural "%1 security updates are available" -msgstr[0] "van %1 software-pakket is de beveiliging bijwerken beschikbaar" -msgstr[1] "van %1 software-pakketten is de beveiliging bijwerken beschikbaar" +msgstr[0] "de beveiliging bijwerken van %1 software-pakket is beschikbaar" +msgstr[1] "de beveiliging bijwerken van %1 software-pakketten is beschikbaar" #: kded/UpdateEvent/UpdateEvent.cpp:61 msgctxt "Notification text" msgid "A security update is available" msgid_plural "Security updates are available" -msgstr[0] "Een pakket voor het bijwerken van de beveiliging is beschikbaar" +msgstr[0] "Pakket voor het bijwerken van de beveiliging is beschikbaar" msgstr[1] "Pakketten voor het bijwerken van de beveiliging zijn beschikbaar" #: kded/UpdateEvent/UpdateEvent.cpp:69 @@ -94,7 +94,7 @@ msgctxt "Notification text" msgid "A software update is available" msgid_plural "Software updates are available" -msgstr[0] "Een pakket voor software bijwerken is beschikbaar" +msgstr[0] "%1 software-pakket bijwerken is beschikbaar" msgstr[1] "Pakketten voor software bijwerken zijn beschikbaar" #: kded/UpdateEvent/UpdateEvent.cpp:94 diff -Nru muon-1.9.60/po/nl/muon-updater.po muon-2.0.0/po/nl/muon-updater.po --- muon-1.9.60/po/nl/muon-updater.po 2012-10-29 18:35:06.000000000 +0000 +++ muon-2.0.0/po/nl/muon-updater.po 2013-04-01 20:33:32.000000000 +0000 @@ -1,14 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Freek de Kruijf , 2010, 2011, 2012. -# Freek de Kruijf , 2011. +# Freek de Kruijf , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-21 23:14+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-09 21:52+0100\n" "Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" @@ -20,18 +19,18 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Freek de Kruijf" +msgstr "Freek de Kruijf 2011-2013" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" msgstr "freekdekruijf@kde.nl" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Verbergen" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -41,18 +40,18 @@ "De lijst met wijzigingen is nog niet beschikbaar. Gaarne in plaats hiervan " "Launchpad gebruiken." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "De lijst met wijzigingen is nog niet beschikbaar." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versie %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -84,150 +83,125 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Software-opwaarderingen" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "Het is veiliger om de netstroomadapter aan te sluiten alvorens bij te werken." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Er is een nieuwe versie van Kubuntu beschikbaar." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Markeringen lezen..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Markeringen opslaan als..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Lijst met gedownloade pakketten opslaan als..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Pakketten uit de lijst downloaden..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Gedownloade pakketten toevoegen" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Bijwerken" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Geschiedenis..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Opwaarderen" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Pakketgeschiedenis" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Annuleren" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" msgstr "Bezig met starten" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "Wachten op authenticatie" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "Wachtende" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "Er wordt gewacht totdat een andere transactie klaar is" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "Wacht op andere softwarebeheerders op te stoppen" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "Wacht op het vereiste medium" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "Wachten op configuratiebestand" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "Softwarelijst aan het laden" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Bijwerken van softwarebronnen" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Pakketten aan het downloaden" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "Wijzigingen toepassen" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Voltooid" +msgstr "Gereed" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "Wijziging van medium vereist" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Gaarne %1 invoeren in %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "Waarschuwing - niet geverifieerde software" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -250,12 +224,12 @@ "beveiligingsrisico, omdat de aanwezigheid van niet te verifiëren software " "een teken kan zijn dat er geknoeid is. Wilt u doorgaan?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "Configuratiebestand is gewijzigd" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -267,28 +241,33 @@ "beschikbaar, maar uw versie is gewijzigd. Wilt u uw huidige versie behouden " "of de nieuwe versie installeren?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Nieuw versie gebruiken" +msgstr "Nieuwe versie gebruiken" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Oude versie behouden" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Downloadsnelheid: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 resterend" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -304,67 +283,60 @@ msgid "Download Size" msgstr "Downloadgrootte" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Sommige pakketten zijn niet gemarkeerd voor bijwerken.

Het " +"bijwerken van deze pakketten heeft het nodig dat anderen worden " +"geïnstalleerd of verwijderd.

Wilt u deze ook bijwerken?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Alles markeren" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Belangrijke zaken voor het bijwerken van de beveiliging" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Bijwerken van toepassingen" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Bijwerken van systeem" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Niet alle pakketten konden worden gemarkeerd voor opwaarderen. De " -"beschikbare opwaarderingen kunnen nieuwe te installeren of te verwijderen " -"pakketten vereisen. Wilt u opwaarderingen markeren die de installatie of " -"verwijdering van extra pakketten vereisen?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Markeren van opwaarderingen lukt niet" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Opwaarderen markeren" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Het tijdstip van de laatste controle op bijwerken is onbekend." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Activeer door te klikken op Op zaken voor bijwerken controleren." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "De software op deze computer is bij de tijd." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Laatst gecontroleerd %1 geleden." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Geen zaken voor bijwerken beschikbaar." \ No newline at end of file diff -Nru muon-1.9.60/po/nl/muon.po muon-2.0.0/po/nl/muon.po --- muon-1.9.60/po/nl/muon.po 2012-10-29 18:35:06.000000000 +0000 +++ muon-2.0.0/po/nl/muon.po 2013-04-01 20:33:32.000000000 +0000 @@ -1,15 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Freek de Kruijf , 2010, 2011, 2012. -# Freek de Kruijf , 2011. +# Freek de Kruijf , 2010, 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-25 17:19+0200\n" -"Last-Translator: Freek de Kruijf \n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-09 21:53+0100\n" +"Last-Translator: Freek de Kruijf \n" "Language-Team: Dutch \n" "Language: nl\n" "MIME-Version: 1.0\n" @@ -20,7 +19,7 @@ msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Freek de Kruijf - 2012" +msgstr "Freek de Kruijf 2011-2013" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" @@ -174,20 +173,20 @@ #: muon/DetailsTabs/MainTab.cpp:96 msgctxt "@action:button" msgid "Purge" -msgstr "Opruimen" +msgstr "Verwijderen" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Markering verwijderen" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical levert kritieke bijdragen voor bijwerken voor %1 tot %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -354,69 +353,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Markeringen lezen..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Markeringen opslaan als..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Lijst met gedownloade pakketten opslaan..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Pakketten uit de lijst downloaden..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Gedownloade pakketten toevoegen" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Lijst met geïnstalleerde pakketten opslaan..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Voorzichtige opwaardering" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Volledige opwaardering" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Onnodige pakketten verwijderen" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Wijzigingen vooraf bekijken" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Wijzigingen toepassen" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Geschiedenis..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -428,12 +397,12 @@ "mogelijk om een volledige opwaardering te proberen door het selecteren van " "de knop Volledig opwaarderen." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Markeren van opwaarderingen lukt niet" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -442,17 +411,17 @@ "Kan opwaarderingen niet markeren. Enkele opwaarderingen kunnen op dit moment " "onvoldoende afhankelijkheden hebben, of of handmatig tegengehouden worden." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Terug" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Wijzigingen vooraf bekijken" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Pakketgeschiedenis" @@ -469,52 +438,52 @@ msgid "Requested" msgstr "Gevraagd" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Zoeken" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Markeren voor installatie" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Markeren voor verwijdering:" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Markeren voor opwaarderen:" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Markeren voor herinstallatie" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" -msgstr "Markeren voor opruimen:" +msgstr "Markeren voor opschonen" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Pakket vergrendelen op de huidige versie" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Pakket ontgrendelen" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Vergrendelen op huidige versie" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -523,17 +492,17 @@ "Verwijdering van dit pakket breekt mogelijk uw systeem. Wilt u het " "verwijderen?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Waarschuwing - Verwijderen van belangrijk pakket" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "Vergrendelen van pakket is mislukt" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." @@ -541,19 +510,19 @@ "Het pakket %1 kon niet worden vergrendeld. Schrijven in het " "vergrendelbestand is mislukt." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" "Het pakket \"%1\" kon niet worden gemarkeerd voor installatie of opwaarderen:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Markeren van pakket lukt niet" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -568,42 +537,24 @@ "nooit geüpload is, overbodig is geworden, of in de huidige ingeschakelde " "bron niet beschikbaar is." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, maar %4 moet worden geïnstalleerd" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "of %1 %2, maar %3 moet worden geïnstalleerd" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, maar het kan niet worden geïnstalleerd" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "of %1, is echter niet te installeren" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, is echter een virtueel pakket" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "of %1, is echter een virtueel pakket" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Bekijk en pas wijzigingen toe" @@ -681,7 +632,7 @@ #: muon/TransactionWidget.cpp:147 msgctxt "@info Status information, widget title" msgid "Starting" -msgstr "Bezig met starten" +msgstr "Bezig met starten..." #: muon/TransactionWidget.cpp:149 msgctxt "@info Status info" @@ -742,7 +693,7 @@ #: muon/TransactionWidget.cpp:224 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Voltooid" +msgstr "Gereed" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" diff -Nru muon-1.9.60/po/pa/libmuon.po muon-2.0.0/po/pa/libmuon.po --- muon-1.9.60/po/pa/libmuon.po 2012-10-29 18:35:14.000000000 +0000 +++ muon-2.0.0/po/pa/libmuon.po 2013-04-01 20:33:37.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" "PO-Revision-Date: 2012-05-08 14:01+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" @@ -17,1065 +17,118 @@ "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-Generator: Lokalize 1.4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "ਐਪਲੀਕੇਸ਼ਨ" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "ਓਪਨ ਸੋਰਸ" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "ਪਰੋਪ੍ਰੈਟਰੀ" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "ਅਣਜਾਣ" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "ਡਿਸਕ ਉੱਤੇੇ %1" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "ਸਹਾਇਕ" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "ਸੁਲੱਭਤਾ" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "ਡਿਵੈਲਪਰ ਟੂਲ" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "ਡੀਬੱਗ" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "ਗਰਾਫਿਕਸ ਇੰਟਰਫੇਸ ਡਿਜ਼ਾਇਨ" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "ਜਾਵਾ" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "ਲੋਕਲਾਈਜ਼ੇਸ਼ਨ" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "ਪਰਲ" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "ਪਰੋਫਾਇਲਿੰਗ" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "ਪਾਈਥਨ" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "ਵਰਜਨ ਕੰਟਰੋਲ" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "ਵੈੱਬ ਡਿਵੈਲਪਮੈਂਟ" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "ਸਿੱਖਿਆ" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "ਵਿਗਿਆਨ ਤੇ ਇੰਜਨਅਰਿੰਗ" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "ਗਰੈਹ ਵਿਦਿਆ" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "ਬਾਇਓਲੋਜੀ" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "ਰਸਾਇਣ-ਵਿਗਿਆਨ" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "ਕੰਪਿਊਟਰ ਵਿਗਿਆ ਤੇ ਰੋਬੋਟ" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "ਇਲੈਕਟਰੋਨਿਕਸ" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "ਇੰਜਨੀਅਰਗ" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "ਭੂਗੋਲ" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "ਜਿਓਲੋਜੀ" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "ਗਣਿਤ" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "ਭੌਤਿਕ" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "ਫੋਂਟ" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "ਖੇਡਾਂ" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "ਅਰਕਾਡੀ" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "ਬੋਰਡ ਖੇਡਾਂ" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "ਤਾਸ਼ ਖੇਡਾਂ" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "ਐਪਲੀਕੇਸ਼ਨ" -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "ਐਪਲੀਕੇਸ਼ਨ" -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" msgstr "" -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "ਖੇਡਾਂ" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "ਗਰਾਫਿਕਸ" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "ਡਰਾਇੰਗ" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "ਫੋਟੋਗਰਾਫ਼ੀ" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "ਪਰਕਾਸ਼ਨ" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "ਸਕੈਨ ਅਤੇ ਓਸੀਆਰ" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "ਦਰਸ਼ਕ" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "ਇੰਟਰਨੈੱਟ" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "ਗੱਲਬਾਤ" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "ਫਾਇਲ ਸਾਂਝ" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "ਮੇਲ" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "ਵੈੱਬ ਬਰਾਊਜ਼ਰ" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "ਮਲਟੀਮੀਡਿਆ" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "ਦਫਤਰ" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "ਸਿਸਟਮ ਅਤੇ ਸੈਟਿੰਗ" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "ਸਭ" - -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" msgstr "" -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "" -msgstr[1] "" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "ਅਤੀਤ" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "ਖੋਜ" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "ਸਭ ਬਦਲਾਅ" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "ਇੰਸਟਾਲੇਸ਼ਨ" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "ਅੱਪਡੇਟ" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "ਹਟਾਏ" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "ਮਿਤੀ" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "ਇੰਸਟਾਲ ਹੋਇਆ" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "" -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "ਅੱਪਗਰੇਡ ਕੀਤੇ" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "ਡਾਊਨਗਰੇਡ ਕੀਤੇ" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "ਹਟਾਏ" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" msgstr "" -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 %3 ਉੱਤੇ" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "ਸਭ" -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "ਸਿਸਟਮ ਪਰਸ਼ਾਸ਼ਨ" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "ਬੇਸ ਸਿਸਟਮ" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "ਸੰਚਾਰ" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "ਡਾਟਾਬੇਸ" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "ਡਿਵੈਲਪਮੈਂਟ" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "ਡੌਕੂਮੈਂਟੇਸ਼ਨ" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "ਡੀਬੱਗ" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "ਐਡੀਟਰ" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "ਇਲੈਕਟਰੋਨਿਕਸ" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "ਇੰਬੈੱਡ ਜੰਤਰ" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "ਫੋਂਟ" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "ਖੇਡਾਂ ਅਤੇ ਮਨੋਰੰਜਨ" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "ਗਨੋਮ ਡੈਸਕਟਾਪ ਇੰਵਾਇਰਨਮੈਂਟ" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "ਗਰਾਫਿਕਸ" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "ਵੈੱਬ ਸਰਵਰ" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "ਜਾਵਾ ਪਰੋਮਰਾਮਿੰਗ ਭਾਸ਼ਾ" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "ਕੇਡੀਈ ਸਾਫਟਵੇਅਰ ਕੰਪਲੀਮੇਸ਼ਨ" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "ਕਰਨਲ ਅਤੇ ਮੋਡੀਊਲ" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "ਲਾਇਬਰੇਰੀਆਂ - ਡਿਵੈਲਪਮੈਂਟ" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "ਲਾਇਬਰੇਰੀਆਂ" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "ਲੋਕਲਾਈਜ਼ੇਸ਼ਨ" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "ਈ-ਮੇਲ" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "ਗਣਿਤ" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "ਫੁਟਕਲ - ਟੈਕਸਟ ਅਧਾਰਿਤ" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "ਨੈੱਟਵਰਕਿੰਗ" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "ਖਬਰਸਾਰ ਸਮੂਹ" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "ਲਾਇਬਰੇਰੀਆਂ - ਪੁਰਾਣੀਆਂ" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "ਵਿਗਿਆਨ" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "ਸ਼ੈੱਲ" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "ਮਲਟੀਮੀਡਿਆ" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX ਲੇਖਣ" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "ਸਹੂਲਤਾਂ" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "ਵਰਜਨ ਕੰਟਰੋਲ ਸਿਸਟਮ" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "ਵਿਡੀਓ ਸਾਫਟਵੇਅਰ" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "ਇੰਟਰਨੈੱਟ" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "ਫੁਟਕਲ - ਗਰਾਫਿਕਸ" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce ਡੈਸਕਟਾਪ ਇੰਵਾਇਰਨਮੈਂਟ" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "ਅਣਜਾਣ" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "ਅੰਤਰਰਾਸ਼ਟਰੀਕਰਨ ਅਤੇ ਲੋਕਾਲਾਈਜ਼ੇਸ਼ਨ" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "ਮੇਟਾ ਪੈਕੇਜ" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "ਗ਼ੈਰ-ਮੁਫਤ" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "ਯੋਗਦਾਨ" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "ਸਿੱਖਿਆ" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "ਇੰਸਟਾਲ ਨਹੀਂ" - -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "ਇੰਸਟਾਲ ਹੋਇਆ" - -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "ਅੱਪਗਰੇਡਯੋਗ" - -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" msgid "Broken" msgstr "ਟੁੱਟਾ" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "ਕੋਈ ਤਬਦੀਲੀ ਨਹੀਂ" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "ਇੰਸਟਾਲ" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "ਅੱਪਗਰੇਡ" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "ਹਟਾਓ" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "ਖਤਮ" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "ਮੁੜ-ਇੰਸਟਾਲ" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "ਡਾਊਨਗਰੇਡ" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "ਲਾਕ ਕੀਤਾ" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "ਆਮ" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-ਬਿੱਟ" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-ਬਿੱਟ" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "ਪਾਵਰ ਪੀਸੀ" - -#: libmuon/MuonStrings.cpp:243 +#: libmuon/resources/AbstractResource.cpp:82 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Authentication error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "ਪਰਮਾਣਕਿਤਾ ਗਲਤੀ" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "" +#| msgid "Available updates" +msgid "Available" +msgstr "ਉਪਲੱਬਧ ਅੱਪਡੇਟ" -#: libmuon/MuonStrings.cpp:247 +#: libmuon/resources/AbstractResource.cpp:83 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "ਘੱਟ ਡਿਸਕ ਥਾਂ" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "ਪਰਮਾਣਕਿਤਾ ਗਲਤੀ" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "" +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "ਇੰਸਟਾਲ ਹੋਇਆ" -#: libmuon/MuonStrings.cpp:259 +#: libmuon/resources/AbstractResource.cpp:84 #, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "ਅਣਜਾਣ" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -msgstr[1] "" - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "ਅੱਪਡੇਟ ਲਈ ਚੈੱਕ ਕਰੋ" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"ਡੌਕੂਮੈਂਟ ਨੂੰ ਸੰਭਾਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ ਹੈ, ਕਿਉਕਿ %1 ਨੂੰ ਲਿਖਣਾ ਸੰਭਵ ਨਹੀਂ " -"ਹੈ।\n" -"\n" -"ਜਾਂਚ ਕਰੋ ਕਿ ਤੁਹਾਨੂੰ ਇਸ ਫਾਇਲ ਨੂੰ ਲਿਖਣ ਅਧਿਕਾਰ ਹਨ ਜਾਂ ਡਿਸਕ ਉੱਤੇ ਲੋੜੀਦੀ ਥਾਂ ਉਪਲੱਬਧ ਹੈ।" - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "ਫਾਇਲ ਖੋਲ੍ਹੋ" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "ਡਾਇਰੈਕਟਰੀ ਚੁਣੋ" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "" -msgstr[1] "" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "ਪੈਕੇਜ ਲੱਭਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ" +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "ਅੱਪਗਰੇਡਯੋਗ" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1083,11 +136,6 @@ msgid "%1 remaining" msgstr "" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "" @@ -1125,18 +173,18 @@ msgid "Downloading" msgstr "ਡਾਊਨਲੋਡ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "ਸਮਾਪਤ" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "ਉਡੀਕ ਜਾਰੀ" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਜਾ ਰਿਹਾ ਹੈ" diff -Nru muon-1.9.60/po/pa/muon-discover.po muon-2.0.0/po/pa/muon-discover.po --- muon-1.9.60/po/pa/muon-discover.po 2012-10-29 18:35:14.000000000 +0000 +++ muon-2.0.0/po/pa/muon-discover.po 2013-04-01 20:33:37.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" "PO-Revision-Date: 2012-07-05 07:02+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" @@ -51,21 +51,38 @@ msgid "Display a list of entries with a category." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "ਖੋਜ..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" msgstr "" -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" msgstr "" #: discover/qml/AddonsView.qml:37 @@ -81,92 +98,94 @@ msgid "Discard" msgstr "ਰੱਦ ਕਰੋ" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 ਰੀਵਿਊ" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "ਮੁੱਖ ਪੇਜ਼" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "ਚਲਾਓ" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "ਰੀਵਿਊ" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "ਕੁੱਲ ਸਾਈਜ਼: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "ਸੰਖੇਪ" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "ਐਡ-ਆਨ" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "ਪੜਤਾਲ" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "ਅੱਪਡੇਟ" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "ਨਾਂ" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "ਰੇਟਿੰਗ" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "ਬੱਜ਼" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "ਸਰੋਤ" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "" -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "ਖੋਜ..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "ਅੰਕ: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 #, fuzzy #| msgid "Best Ratings" msgid "Best Ratings" msgstr "ਸਭ ਤੋਂ ਵਧੀਆ ਰੇਟਿੰਗ" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -179,25 +198,37 @@ msgid "Remove" msgstr "ਹਟਾਓ" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "ਇੰਸਟਾਲ ਹੋਇਆ" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 #, fuzzy #| msgid "Update All!" msgid "Update All" msgstr "ਸਭ ਅੱਪਡੇਟ ਕਰੋ!" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "" -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "ਖੋਜ" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "ਇੰਸਟਾਲ ਹੋਇਆ" +msgstr[1] "ਇੰਸਟਾਲ ਹੋਇਆ" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "ਸਰੋਤ" @@ -222,54 +253,56 @@ msgid "Summary:" msgstr "ਸੰਖੇਪ:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "ਰੀਵਿਊ:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "ਇਹ ਰੀਵਿਊ ਬਾਰੇ ਸਾਨੂੰ ਦੱਸੋ!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%2

%3
%4 ਵਲੋਂ %1" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "ਸਰੋਤ ਸ਼ਾਮਿਲ" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "ਰੱਦ ਕਰੋ" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (ਬਾਈਨਰੀ)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "" \ No newline at end of file diff -Nru muon-1.9.60/po/pa/muon-installer.po muon-2.0.0/po/pa/muon-installer.po --- muon-1.9.60/po/pa/muon-installer.po 2012-10-29 18:35:14.000000000 +0000 +++ muon-2.0.0/po/pa/muon-installer.po 2013-04-01 20:33:37.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-05-08 13:55+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" @@ -25,7 +25,7 @@ msgid "Your emails" msgstr "aalam@users.sf.net" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -33,7 +33,7 @@ msgstr[1] "" "ਅੱਗੇ ਦਿੱਤੀਆਂ ਗਈਆਂ ਐਪਲੀਕੇਸ਼ਨ ਹੁਣੇ ਹੀ ਇੰਸਟਾਲ ਕੀਤੀਆਂ ਗਈਆਂ ਹਨ। ਉਨ੍ਹਾਂ ਨੂੰ ਚਲਾਉਣ ਲਈ ਕਲਿੱਕ ਕਰੋ:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "ਸਾਫਟਵੇਅਰ ਲਵੋ" @@ -65,74 +65,74 @@ msgid "Jonathan Thomas" msgstr "ਜਾਨਥਨ ਥਾਮਸ" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "ਸਾਫਟਵੇਅਰ ਵਲੋ" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "ਇੰਸਟਾਲ ਹੋਏ ਸਾਫਟਵੇਅਰ" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "ਕਬਤੂੰ ਵਲੋਂ ਦਿੱਤਾ" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "ਡੇਬੀਅਨ ਵਲੋਂ ਦਿੱਤਾ" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "ਕਨੋਨੀਕਲ ਹਿੱਸੇਦਾਰ" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "ਆਜ਼ਾਦ" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "ਸਾਫਟਵੇਅਰ ਵਲੋ" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "ਇੰਸਟਾਲ ਹੋਏ ਸਾਫਟਵੇਅਰ" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "ਅਤੀਤ" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਕੀਤਾ ਗਿਆ।" -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "ਸ਼ੁਰੂ" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "ਐਪਲੀਕੇਸ਼ਨ ਠੀਕ ਤਰ੍ਹਾਂ ਇੰਸਟਾਲ ਕੀਤੀ ਗਈ।" -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "...ਨਵੇਂ ਐਪਲੀਕੇਸ਼ਨ ਚਲਾਓ" -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਸਮਾਪਤ ਹੋਈ" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "ਜਾਰੀ ਹੈ" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "ਜਾਰੀ ਹੈ" @@ -206,18 +206,18 @@ msgid "Install" msgstr "ਇੰਸਟਾਲ" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "ਹਟਾਓ" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "ਇੰਸਟਾਲ" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -275,19 +275,19 @@ msgid "No reviews available" msgstr "ਕੋਈ ਰੀਵਿਊ ਉਪਲੱਬਧ ਨਹੀਂ" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/pa/muon-updater.po muon-2.0.0/po/pa/muon-updater.po --- muon-1.9.60/po/pa/muon-updater.po 2012-10-29 18:35:14.000000000 +0000 +++ muon-2.0.0/po/pa/muon-updater.po 2013-04-01 20:33:37.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-01-09 07:04+0530\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-02-25 08:37+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" "Language: \n" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "aalam@users.sf.net" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "ਓਹਲੇ" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -38,22 +38,22 @@ "url='%1'>Launchpad instead." msgstr "" -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "" -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "ਵਰਜਨ: %1" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" -msgstr "" +msgstr "ਇਹ ਅੱਪਡੇਟ %1 ਨੂੰ ਜਾਰੀ ਕੀਤਾ ਗਿਆ ਸੀ।" #: updater/config/UpdaterSettingsDialog.cpp:38 msgctxt "@title:window" @@ -83,72 +83,47 @@ msgid "Jonathan Thomas" msgstr "ਜਾਨਥਨ ਥਾਮਸ" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "ਸਾਫਟਵੇਅਰ ਅੱਪਡੇਟ" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." -msgstr "" +msgstr "ਅੱਪਡੇਟ ਕਰਨ ਤੋਂ ਪਹਿਲਾਂ ਪਾਵਰ ਅਡੈਪਟਰ ਦਾ ਪਲੱਗ ਲਗਾਉਣਾ ਸੁਰੱਖਿਅਤ ਰਹੇਗਾ।" -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." -msgstr "" - -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" +msgstr "ਕੂਬਤੂੰ ਦਾ ਨਵਾਂ ਵਰਜਨ ਉਪਲੱਬਧ ਹੈ।" -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "ਡਾਊਨਲੋਡ ਕੀਤੇ ਪੈਕੇਜ ਜੋੜੋ" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕਰੋ" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "ਅਤੀਤ..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" -msgstr "" +msgstr "ਅੱਪਗਰੇਡ" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "ਪੈਕੇਜ ਅਤੀਤ" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "ਰੱਦ ਕਰੋ" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 #, fuzzy #| msgctxt "@info" #| msgid "Installing Updates" @@ -156,7 +131,7 @@ msgid "Starting" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -164,8 +139,8 @@ msgid "Waiting for Authentication" msgstr "ਸਾਫਟਵੇਅਰ ਸਰੋਤ ਅੱਪਡੇਟ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 #, fuzzy #| msgctxt "@info" #| msgid "Installing Updates" @@ -173,27 +148,27 @@ msgid "Waiting" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -201,7 +176,7 @@ msgid "Loading Software List" msgstr "ਸਾਫਟਵੇਅਰ ਸਰੋਤ ਅੱਪਡੇਟ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -209,7 +184,7 @@ msgid "Updating software sources" msgstr "ਸਾਫਟਵੇਅਰ ਸਰੋਤ ਅੱਪਡੇਟ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 #, fuzzy #| msgctxt "@info" #| msgid "Downloading Updates" @@ -217,7 +192,7 @@ msgid "Downloading Packages" msgstr "ਅੱਪਡੇਟ ਡਾਊਨਲੋਡ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 #, fuzzy #| msgctxt "@info" #| msgid "Installing Updates" @@ -225,7 +200,7 @@ msgid "Applying Changes" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 #, fuzzy #| msgctxt "@info" #| msgid "Installing Updates" @@ -233,23 +208,23 @@ msgid "Finished" msgstr "ਅੱਪਡੇਟ ਇੰਸਟਾਲ ਕੀਤੇ ਜਾ ਰਹੇ ਹਨ" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -264,12 +239,12 @@ msgstr[0] "" msgstr[1] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -278,34 +253,35 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "ਵਰਜਨ: %1" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "ਵਰਜਨ: %1" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "ਡਾਊਨਲੋਡ ਰੇਟ: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 ਬਾਕੀ" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -313,8 +289,6 @@ #: updater/UpdateModel/UpdateModel.cpp:106 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@label Column label" msgid "Version" msgstr "ਵਰਜਨ: %1" @@ -324,61 +298,55 @@ msgid "Download Size" msgstr "ਡਾਊਨਲੋਡ ਸਾਈਜ਼" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "ਖਾਸ ਸੁਰੱਖਿਆ ਅੱਪਡੇਟ" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "ਐਪਲੀਕੇਸ਼ਨ ਅੱਪਡੇਟ" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "ਸਿਸਟਮ ਅੱਪਡੇਟ" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "ਇਹ ਕੰਪਿਊਟਰ ਉੱਤੇ ਸਾਫਟਵੇਅਰ ਅੱਪ ਟੂ ਡੇਟ ਹਨ।" -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "ਆਖਰੀ ਵਾਰ ਚੈੱਕ ਕੀਤਾ %1 ਪਹਿਲਾਂ।" -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "ਕੋਈ ਅੱਪਡੇਟ ਉਪਲੱਬਧ ਨਹੀਂ ਹੈ।" \ No newline at end of file diff -Nru muon-1.9.60/po/pa/muon.po muon-2.0.0/po/pa/muon.po --- muon-1.9.60/po/pa/muon.po 2012-10-29 18:35:14.000000000 +0000 +++ muon-2.0.0/po/pa/muon.po 2013-04-01 20:33:37.000000000 +0000 @@ -6,8 +6,8 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-01-09 07:08+0530\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-02-25 08:34+0530\n" "Last-Translator: A S Alam \n" "Language-Team: Punjabi/Panjabi \n" "Language: \n" @@ -27,7 +27,7 @@ #: muon/config/GeneralSettingsPage.cpp:53 msgid "Ask to confirm changes that affect other packages" -msgstr "" +msgstr "ਤਬਦੀਲੀਆਂ ਲਈ ਪੁੱਛੋ, ਜੋ ਕਿ ਹੋਰ ਪੈਕੇਜਾਂ ਨੂੰ ਪਰਭਾਵਿਤ ਕਰਨ" #: muon/config/GeneralSettingsPage.cpp:54 msgid "Show foreign-architecture packages that are available natively" @@ -170,20 +170,20 @@ #: muon/DetailsTabs/MainTab.cpp:96 msgctxt "@action:button" msgid "Purge" -msgstr "" +msgstr "ਖਤਮ" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "" -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -256,7 +256,7 @@ #: muon/DetailsTabs/VersionTab.cpp:44 msgctxt "@label" msgid "Available versions:" -msgstr "" +msgstr "ਉਪਲੱਬਧ ਵਰਜਨ:" #: muon/DetailsTabs/VersionTab.cpp:62 msgctxt "@label" @@ -269,7 +269,7 @@ #: muon/DetailsTabs/VersionTab.cpp:70 msgctxt "@action:button" msgid "Force Version" -msgstr "" +msgstr "ਵਰਜਨ ਫੋਰਸ" #: muon/DownloadModel/DownloadDelegate.cpp:65 msgctxt "@info:status Progress text when done" @@ -331,86 +331,55 @@ #: muon/main.cpp:30 msgid "A package manager" -msgstr "" +msgstr "ਪੈਕੇਜ ਮੈਨੇਜਰ" #: muon/main.cpp:36 -#, fuzzy msgid "Muon Package Manager" msgstr "ਮੂਉਨ ਪੈਕੇਜ ਮੈਨੇਜਰ" #: muon/main.cpp:37 #, fuzzy +#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "© 2009-2011 Jonathan Thomas" #: muon/main.cpp:38 -#, fuzzy msgid "Jonathan Thomas" msgstr "ਜਾਨਥਨ ਥਾਮਸ" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "" - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "" - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "ਡਾਊਨਲੋਡ ਕੀਤੇ ਪੈਕੇਜ ਜੋੜੋ" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "" - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" -msgstr "" +msgstr "ਪੂਰਾ ਅੱਪਗਰੇਡ" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" -msgstr "" +msgstr "ਬੇਲੋੜੇ ਪੈਕੇਜ ਹਟਾਓ" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" -msgstr "" +msgstr "ਬਦਲਾਅ ਦੀ ਝਲਕ" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "ਬਦਲਾਅ ਲਾਗੂ ਕਰੋ" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "ਅਤੀਤ..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -418,29 +387,29 @@ "Full Upgrade button." msgstr "" -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " "at the moment, or may have been manually held back." msgstr "" -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "ਪਿੱਛੇ" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" -msgstr "" +msgstr "ਬਦਲਾਅ ਦੀ ਝਲਕ" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "ਪੈਕੇਜ ਅਤੀਤ" @@ -457,86 +426,89 @@ msgid "Requested" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "ਖੋਜ" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" -msgstr "" +msgstr "ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਨਿਸ਼ਾਨ ਲਗਾਓ" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" -msgstr "" +msgstr "ਹਟਾਉਣ ਲਈ ਨਿਸ਼ਾਨੀ ਲਗਾਓ" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" -msgstr "" +msgstr "ਅੱਪਗਰੇਡ ਲਈ ਨਿਸ਼ਾਨੀ ਲਗਾਓ" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" -msgstr "" +msgstr "ਮੁੜ-ਇੰਸਟਾਲੇਸ਼ਨ ਲਈ ਨਿਸ਼ਾਨੀ ਲਗਾਓ" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" -msgstr "" +msgstr "ਖਤਮ ਕਰਨ ਲਈ ਨਿਸ਼ਾਨੀ ਲਗਾਓ" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" -msgstr "" +msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਉੱਤੇ ਲਾਕ ਪੈਕੇਜ" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" -msgstr "" +msgstr "ਪੈਕੇਜ ਅਣ-ਲਾਕ" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" -msgstr "" +msgstr "ਮੌਜੂਦਾ ਵਰਜਨ ਉੱਤੇ ਲਾਕ" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" -msgstr "" +msgstr "ਸਾਵਧਾਨ - ਖਾਸ ਪੈਕੇਜ ਹਟਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 +#, fuzzy +#| msgctxt "@title:window" +#| msgid "Unable to Mark Package" msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "" +msgstr "ਪੈਕੇਜ ਮਾਰਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" -msgstr "" +msgstr "ਪੈਕੇਜ ਮਾਰਕ ਕਰਨ ਲਈ ਅਸਮਰੱਥ" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -546,104 +518,86 @@ "enabled repositories." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" -msgstr "" +msgstr "%1: %2, ਇਹ ਇੰਸਟਾਲ ਹੋਣਯੋਗ ਨਹੀਂ ਹੈ" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" -msgstr "" +msgstr "ਬਦਲਾਅ ਪੜਤਾਲ ਕਰੋ ਅਤੇ ਲਾਗੂ ਕਰੋ" #: muon/StatusWidget.cpp:52 msgctxt "@info:status" msgid "Rebuilding Search Index" -msgstr "" +msgstr "ਖੋਜ ਇੰਡੈਕਸ ਮੁੜ-ਬਣਾਇਆ ਜਾ ਰਿਹਾ ਹੈ" #: muon/StatusWidget.cpp:91 #, kde-format msgctxt "@info:status" msgid "1 package available, " msgid_plural "%1 packages available, " -msgstr[0] "" -msgstr[1] "" +msgstr[0] "1 ਪੈਕੇਜ ਉਪਲੱਬਧ, " +msgstr[1] "%1 ਪੈਕੇਜ ਉਪਲੱਬਧ, " #: muon/StatusWidget.cpp:92 -#, fuzzy, kde-format +#, kde-format msgctxt "@info:status" msgid "%1 installed, " -msgstr "ਇੰਸਟਾਲ ਹੋਇਆ" +msgstr "%1 ਇੰਸਟਾਲ ਹੋਏ, " #: muon/StatusWidget.cpp:96 #, kde-format msgctxt "@info:status" msgid "%1 upgradeable," -msgstr "" +msgstr "%1 ਅੱਪਗਰੇਡਯੋਗ, " #: muon/StatusWidget.cpp:98 #, kde-format msgctxt "@info:status" msgid "%1 upgradeable" -msgstr "" +msgstr "%1 ਅੱਪਗਰੇਡਯੋਗ" #: muon/StatusWidget.cpp:110 #, kde-format msgctxt "@info:status Part of the status label" msgid " %1 to install/upgrade" -msgstr "" +msgstr "ਇੰਸਟਾਲ/ਅੱਪਗਰੇਡ ਲਈ %1" #: muon/StatusWidget.cpp:115 -#, fuzzy, kde-format +#, kde-format msgctxt "" "@info:status Label for the number of packages pending removal when packages " "are also pending upgrade" msgid ", %1 to remove" -msgstr "ਹਟਾਓ" +msgstr ", %1 ਹਟਾਉਣੇ" #: muon/StatusWidget.cpp:118 -#, fuzzy, kde-format +#, kde-format msgctxt "" "@info:status Label for the number of packages pending removal when there are " "only removals" msgid " %1 to remove" -msgstr "ਹਟਾਓ" +msgstr " %1 ਹਟਾਉਣੇ" #: muon/StatusWidget.cpp:127 #, kde-format msgctxt "@label showing download and install size" msgid "%1 to download, %2 of space to be freed" -msgstr "" +msgstr "ਡਾਊਨਲੋਡ ਕਰਨ ਲਈ %1, %2 ਥਾਂ ਖਾਲੀ ਹੋਵੇਗੀ" #: muon/StatusWidget.cpp:131 #, kde-format @@ -790,16 +744,16 @@ #: muon/TransactionWidget.cpp:290 #, fuzzy -#| msgctxt "@title:group" -#| msgid "Installed Version" +#| msgctxt "@action:button" +#| msgid "Force Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਵਰਜਨ" +msgstr "ਵਰਜਨ ਫੋਰਸ" #: muon/TransactionWidget.cpp:291 #, fuzzy -#| msgctxt "@title:group" -#| msgid "Installed Version" +#| msgctxt "@action:button" +#| msgid "Force Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "ਇੰਸਟਾਲ ਕੀਤਾ ਵਰਜਨ" \ No newline at end of file +msgstr "ਵਰਜਨ ਫੋਰਸ" \ No newline at end of file diff -Nru muon-1.9.60/po/pl/libmuon.po muon-2.0.0/po/pl/libmuon.po --- muon-1.9.60/po/pl/libmuon.po 2012-10-29 18:35:17.000000000 +0000 +++ muon-2.0.0/po/pl/libmuon.po 2013-04-01 20:33:39.000000000 +0000 @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-04-28 09:08+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-08-12 20:55+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -19,1099 +19,118 @@ "|| n%100>=20) ? 1 : 2);\n" "X-Generator: Lokalize 1.4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Programy" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Otwarto-źródłowe" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Własnościowe" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" -msgstr "Nieznane" +msgstr "Nieznana" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 do pobrania, %2 na dysku" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 na dysku" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Akcesoria" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Dostępność" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Narzędzia programistyczne" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Debugowanie" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Projektowanie interfejsu graficznego" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Lokalizacja" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilowanie" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Kontrola wersji" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Programowanie sieci" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Edukacja" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Nauka i inżynieria" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomia" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologia" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Chemia" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Informatyka i robotyka" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Inżynieria" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografia" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologia" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematyka" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fizyka" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Czcionki" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Gry" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Gry zręcznościowe" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Gry planszowe" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Gry karciane" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Puzzle" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Gry RPG" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Symulacja" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sporty" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Rysowanie" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Malowanie i edycja" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografia" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Publikowanie" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Skanowanie i OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Przeglądarki" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Rozmowa" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Współdzielenie plików" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Poczta" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Przeglądarki sieciowe" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Biuro" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "System i ustawienia" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Programy" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Programy" + +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Logowanie do usługi Ubuntu SSO" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Wszystkie" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Potwierdź dodatkowe zmiany" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Czy oznaczyć dodatkowe zmiany?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Działanie wymaga zmiany w innym pakiecie:" -msgstr[1] "Działanie wymaga zmiany w innych pakietach:" -msgstr[2] "Działanie wymaga zmiany w innych pakietach:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Historia" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Znajdź" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Wszystkie zmiany" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instalacje" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Aktualizacje" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Usunięcia" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Data" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Zainstalowane" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "" -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Zaktualizowane" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Cofnięte do poprzedniej wersji" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Usunięte" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Wyczyszczone" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 od %3" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "" + +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Wszystkie" -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Ten Muon ma moc superkrowy" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administracja systemu" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "System podstawowy" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infrastruktura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Komunikacja" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Bazy danych" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Narzędzia programistów" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentacja" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Debugowanie" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Edytory" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Urządzenia wbudowane" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Czcionki" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Gry i Rozrywka" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Środowisko pulpitu GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "System statystyczny GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Środowisko pulpitu Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Krótkofalarstwo" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Język programowania Haskell " - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Serwery sieciowe" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpretowane języki komputerowe" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Język programowania Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Zestawienie oprogramowania KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Jądro i moduły" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Biblioteki - programistyczne" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Biblioteki" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Język programowania Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokalizacja" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-mail" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematyka" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Różne - tryb tekstowy" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Sieciowe" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Grupy dyskusyjne" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Język programowania OCalm" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Biblioteki - stare" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Między-platformowe" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Język programowania Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Język programowania PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Język programowania Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Język programowania Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Nauka" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Powłoki" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Skład tekstu TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Przetwarzanie tekstu" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Narzędzia" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Systemy kontroli wersji" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Oprogramowanie wideo" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Różne - graficzne" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Środowisko pulpitu Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Środowisko Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Nieznane" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Konwertowane z RPM przy użyciu Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Tłumaczenia i lokalizacja" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapakiety" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Ograniczone do eksportu" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Nie-wolne" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Edukacja" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Dane introspekcyjne GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Niezainstalowane " - -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Zainstalowane" - -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Do aktualizacji" - -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" msgid "Broken" msgstr "Uszkodzone" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Pozostała konfiguracja" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Zainstalowane (automatycznie usuwalne)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Bez zmian" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Instaluj" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Aktualizuj" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Usuń" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Wyczyść" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Zainstaluj ponownie" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Przywróć starszą wersję" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Zablokowane" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Wspólne" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Błąd inicjalizacji" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "" -"Nie można uzyskać dostępu do systemu pakietów ze względu na jego blokadę" - -#: libmuon/MuonStrings.cpp:247 +#: libmuon/resources/AbstractResource.cpp:82 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Mało miejsca na dysku" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Nieudane zastosowanie zmian" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Błąd uwierzytelnienia" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Niespodziewany błąd" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Niezaufane pakiety" +#| msgid "Available updates" +msgid "Available" +msgstr "Dostępne aktualizacje" -#: libmuon/MuonStrings.cpp:259 +#: libmuon/resources/AbstractResource.cpp:83 #, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Nieznane" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"System pakietów nie może być zainicjowany, Twoja konfiguracja może być " -"niewłaściwa." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Wygląda na to, że inny program używa w tym momencie systemu pakietów. Musisz " -"zamknąć wszystkie inne menedżery pakietów zanim przystąpisz do instalacji " -"lub usuwania jakichkolwiek pakietów." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Nie posiadasz wystarczającej ilości wolnego miejsca w katalogu na %1 aby " -"kontynuować tę operację." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Nie można pobrać pakietów" +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "Zainstalowane" -#: libmuon/MuonStrings.cpp:288 +#: libmuon/resources/AbstractResource.cpp:84 #, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Wystąpił błąd podczas zatwierdzania zmian:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Operacja nie może być kontynuowana do momentu przeprowadzenia poprawnej " -"autoryzacji" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Wygląda na to, że system roboczy QApt uległ awarii lub zniknął. Proszę " -"zgłosić ten błąd opiekunom QApt" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Następujący pakiet nie został zweryfikowany przez jego autora. Pobieranie " -"niezaufanych pakietów zostało wyłączone w bieżącej konfiguracji." -msgstr[1] "" -"Następujące pakiety nie zostały zweryfikowane przez ich autora. Pobieranie " -"niezaufanych pakietów zostało wyłączone w bieżącej konfiguracji." -msgstr[2] "" -"Następujące pakiety nie zostały zweryfikowane przez ich autora. Pobieranie " -"niezaufanych pakietów zostało wyłączone w bieżącej konfiguracji." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Sprawdź aktualizacje" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Odznacz wszystko" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Konfiguruj źródła oprogramowania" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Zapisz oznaczone jako" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dokument nie mógł zostać zapisany, ponieważ nie można zapisywać do" -"%1\n" -"\n" -"Sprawdź, czy posiadasz prawa zapisu dla tego pliku oraz czy jest " -"wystarczająco dużo miejsca na dysku." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Zapisz listę zainstalowanych pakietów jako" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Zapisz listę pobieranych jako" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Otwórz plik" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Nie można oznaczyć zmian. Upewnij się, czy wybrany plik jest plikiem " -"oznaczeń utworzonym przez menedżera pakietów Muon lub menedżera pakietów " -"Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Wybierz katalog" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 pakiet został pomyślnie dodany do pamięci podręcznej" -msgstr[1] "%1 pakiety zostały pomyślnie dodane do pamięci podręcznej" -msgstr[2] "%1 pakietów zostało pomyślnie dodanych do pamięci podręcznej" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Nie można znaleźć prawidłowych pakietów w tym katalogu. Proszę sie upewnić, " -"że pakiety są kompatybilne z twoim komputerem i że są w najnowszej wersji." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Nie można znaleźć pakietów" +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Do aktualizacji" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1119,11 +138,6 @@ msgid "%1 remaining" msgstr "Pozostało %1" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Logowanie do usługi Ubuntu SSO" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Pokaż powiadomienia dla:" @@ -1161,18 +175,18 @@ msgid "Downloading" msgstr "Pobieranie" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Gotowe" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Oczekiwanie" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Instalowanie" @@ -1422,7 +436,6 @@ -#, fuzzy @@ -1625,11 +638,852 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/pl/muon-discover.po muon-2.0.0/po/pl/muon-discover.po --- muon-1.9.60/po/pl/muon-discover.po 2012-10-29 18:35:17.000000000 +0000 +++ muon-2.0.0/po/pl/muon-discover.po 2013-04-01 20:33:39.000000000 +0000 @@ -6,10 +6,10 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-06-07 19:23+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2012-09-05 16:31+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,10 +27,8 @@ msgstr "Odkrywca Muon" #: discover/main.cpp:36 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: discover/main.cpp:37 msgid "Jonathan Thomas" @@ -46,28 +44,45 @@ #: discover/main.cpp:45 msgid "Open with a program that can deal with the given mimetype." -msgstr "" +msgstr "Otwórz w programie, który radzi sobie z podanym typem mime." #: discover/main.cpp:46 msgid "Display a list of entries with a category." +msgstr "Wyświetl listę wpisów z kategorią." + +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Znajdź..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Dodawanie źródeł..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Usuwanie źródeł..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -82,94 +97,98 @@ msgid "Discard" msgstr "Odrzuć" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 opinii" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Strona domowa" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Uruchom" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Zaopiniuj" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Całkowity rozmiar: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Przegląd" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Dodatki" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Opinie" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Uaktualnienie" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nazwa" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Ocena" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Buzz" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularność" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Pochodzenie" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Znajdź w '%1'..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Znajdź..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 #, fuzzy #| msgid "Popularity Contest" msgid "Popularity Contest" msgstr "Rywalizacja w popularności" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "punkty: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 #, fuzzy #| msgid "Best Ratings" msgid "Best Ratings" msgstr "Najlepsze oceny" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +#, fuzzy +#| msgid "Muon Discover" +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "Odkrywca Muon" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -182,25 +201,38 @@ msgid "Remove" msgstr "Usuń" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Zainstalowane" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 #, fuzzy -#| msgid "Upgrade All!" +#| msgid "Update All!" msgid "Update All" msgstr "Uaktualnij wszystko!" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." +msgstr "Wczytywanie..." + +#: discover/qml/Main.qml:79 +msgid "Back" msgstr "" -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Odkryj" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Zainstalowane" +msgstr[1] "Zainstalowane" +msgstr[2] "Zainstalowane" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Źródła" @@ -225,56 +257,58 @@ msgid "Summary:" msgstr "Podsumowanie:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Opinie:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Opowiedz nam o tej opinii!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 z %2 osób uznało tą opinię za użyteczną" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 napisana przez %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Użyteczna? Tak/Nie" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Dodaj źródło" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Podaj nowe źródło" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Anuluj" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - Wiersz repozytorium źródła apt do dodania. Jest to jeden z " "tych:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Binarny)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" -msgstr "" \ No newline at end of file +msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/pl/muon-installer.po muon-2.0.0/po/pl/muon-installer.po --- muon-1.9.60/po/pl/muon-installer.po 2012-10-29 18:35:17.000000000 +0000 +++ muon-2.0.0/po/pl/muon-installer.po 2013-04-01 20:33:39.000000000 +0000 @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-04-28 09:08+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-09-05 16:31+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -27,7 +27,7 @@ msgid "Your emails" msgstr "eugenewolfe@o2.pl, lukasz.wojnilowicz@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -38,7 +38,7 @@ msgstr[2] "" "Następujące programy zostały właśnie zainstalowane. Kliknij aby je uruchomić:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Pobierz oprogramowanie" @@ -61,83 +61,81 @@ msgstr "Centrum oprogramowania Muon" #: installer/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: installer/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Pobierz oprogramowanie" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Zainstalowane oprogramowanie" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Dostarczane przez Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Dostarczane przez Debiana" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partnerzy Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Niezależni" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Pobierz oprogramowanie" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Zainstalowane oprogramowanie" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Historia" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "Pomyślnie zainstalowano %1." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Start" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Pomyślnie zainstalowano programy." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Uruchom nowe programy..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instalacja zakończona" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "W toku" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "W toku" @@ -212,18 +210,18 @@ msgid "Install" msgstr "Instaluj" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Usuń" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Instaluj" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -239,7 +237,7 @@ #: installer/ResourceView/ResourceViewWidget.cpp:72 msgid "Sort:" -msgstr "Sortuj:" +msgstr "Sortowanie:" #: installer/ResourceView/ResourceViewWidget.cpp:74 msgctxt "@item:inlistbox" @@ -281,19 +279,19 @@ msgid "No reviews available" msgstr "Brak dostępnych opinii" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Opinia ta została napisana dla starszej wersji (Wersja: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/pl/muon-notifier.po muon-2.0.0/po/pl/muon-notifier.po --- muon-1.9.60/po/pl/muon-notifier.po 2012-10-29 18:35:17.000000000 +0000 +++ muon-2.0.0/po/pl/muon-notifier.po 2013-04-01 20:33:39.000000000 +0000 @@ -7,10 +7,10 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-05-18 16:20+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-08-12 20:56+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -83,27 +83,27 @@ msgid "A security update is available" msgid_plural "Security updates are available" msgstr[0] "Dostępne jest uaktualnienie bezpieczeństwa" -msgstr[1] "Dostępne są uaktualnienia bezpieczeństwa" -msgstr[2] "Dostępne są uaktualnienia bezpieczeństwa" +msgstr[1] "%1 aktualizacje bezpieczeństwa są dostępne" +msgstr[2] "%1 aktualizacji bezpieczeństwa jest dostępnych" #: kded/UpdateEvent/UpdateEvent.cpp:69 #, kde-format msgctxt "Notification text" msgid "%1 software update is available" msgid_plural "%1 software updates are available" -msgstr[0] "%1 uaktualnienie oprogramowania jest dostępne" -msgstr[1] "%1 uaktualnienia bezpieczeństwa są dostępne" -msgstr[2] "%1 uaktualnień bezpieczeństwa jest dostępnych" +msgstr[0] "%1 aktualizacja oprogramowania jest dostępna" +msgstr[1] "%1 aktualizacje bezpieczeństwa są dostępne" +msgstr[2] "%1 aktualizacji bezpieczeństwa jest dostępnych" #: kded/UpdateEvent/UpdateEvent.cpp:73 msgctxt "Notification text" msgid "A software update is available" msgid_plural "Software updates are available" msgstr[0] "Uaktualnienie oprogramowania jest dostępne" -msgstr[1] "Uaktualnienia oprogramowania są dostępne" -msgstr[2] "Uaktualnienia oprogramowania są dostępne" +msgstr[1] "%1 aktualizacje bezpieczeństwa są dostępne" +msgstr[2] "%1 aktualizacji bezpieczeństwa jest dostępnych" #: kded/UpdateEvent/UpdateEvent.cpp:94 msgctxt "Start the update" msgid "Update" -msgstr "Uaktualnij" \ No newline at end of file +msgstr "Aktualizacja" \ No newline at end of file diff -Nru muon-1.9.60/po/pl/muon-updater.po muon-2.0.0/po/pl/muon-updater.po --- muon-1.9.60/po/pl/muon-updater.po 2012-10-29 18:35:17.000000000 +0000 +++ muon-2.0.0/po/pl/muon-updater.po 2013-04-01 20:33:39.000000000 +0000 @@ -7,32 +7,32 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-02-11 09:43+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-09-05 16:31+0200\n" "Last-Translator: Łukasz Wojniłowicz \n" -"Language-Team: Polish \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Artur Chłond, Łukasz Wojniłowicz" +msgstr "Artur Chłond" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "eugenewolfe@o2.pl, lukasz.wojnilowicz@gmail.com" +msgstr "eugenewolfe@o2.pl" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Ukryj" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -42,18 +42,18 @@ "Lista zmian nie jest jeszcze dostępna. W zamian proszę użyć Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Lista zmian nie jest jeszcze dostępna." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Wersja %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -78,81 +78,54 @@ msgstr "Muon menedżer aktualizacji " #: updater/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: updater/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Aktualizacje oprogramowania" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Bezpieczniej jest podłączyć zasilacz przed procesem uaktualniania." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Nowa wersja Kubuntu jest dostępna." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Zapisz listę pobierania pakietów..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Pobierz pakiety z listy..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Dodaj pobrane pakiety" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Instaluj aktualizacje" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Historia..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Aktualizuj" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Historia pakietu" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Anuluj" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -160,7 +133,7 @@ msgid "Starting" msgstr "Zatwierdzanie zmian" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -168,8 +141,8 @@ msgid "Waiting for Authentication" msgstr "Zatwierdzanie zmian" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -177,27 +150,27 @@ msgid "Waiting" msgstr "Zatwierdzanie zmian" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -205,7 +178,7 @@ msgid "Loading Software List" msgstr "Aktualizacja źródeł oprogramowania" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -213,7 +186,7 @@ msgid "Updating software sources" msgstr "Aktualizacja źródeł oprogramowania" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 #, fuzzy #| msgctxt "@info" #| msgid "Downloading Updates" @@ -221,7 +194,7 @@ msgid "Downloading Packages" msgstr "Pobieranie uaktualnień" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -229,7 +202,7 @@ msgid "Applying Changes" msgstr "Zatwierdzanie zmian" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -237,23 +210,23 @@ msgid "Finished" msgstr "Zatwierdzanie zmian" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -269,12 +242,12 @@ msgstr[1] "" msgstr[2] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -283,112 +256,107 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Wersja %1:" +msgstr "Wersja" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Wersja %1:" +msgstr "Wersja" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Szybkość pobierania: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "Pozostało %1" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" msgstr "Uaktualnienia" #: updater/UpdateModel/UpdateModel.cpp:106 -#, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@label Column label" msgid "Version" -msgstr "Wersja %1:" +msgstr "Wersja" #: updater/UpdateModel/UpdateModel.cpp:108 msgctxt "@label Column label" msgid "Download Size" msgstr "Rozmiar pobierania" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +#, fuzzy +#| msgctxt "@action Reverts all potential changes to the cache" +#| msgid "Unmark All" +msgid "Mark All" +msgstr "Odznacz wszystko" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Ważne uaktualnienia bezpieczeństwa" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Uaktualnienia programów" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Uaktualnienia systemu" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Nie wszystkie pakiety mogły być oznaczone do aktualizacji. Dostępne " -"aktualizacje mogą wymagać instalacji nowych pakietów lub usunięcia już " -"zainstalowanych. Czy chcesz zaznaczyć aktualizacje, które mogą wymagać " -"instalacji lub usunięcia dodatkowych pakietów?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Nie można zaznaczyć aktualizacji" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Zaznacz aktualizacje" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Nie wiadomo kiedy po raz ostatni sprawdzano uaktualnienia." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Proszę kliknąć Sprawdź uaktualnienia, aby sprawdzić." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Oprogramowanie na tym komputerze jest aktualne." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Ostatnio sprawdzano %1 temu." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Brak dostępnych uaktualnień." \ No newline at end of file diff -Nru muon-1.9.60/po/pl/muon.po muon-2.0.0/po/pl/muon.po --- muon-1.9.60/po/pl/muon.po 2012-10-29 18:35:17.000000000 +0000 +++ muon-2.0.0/po/pl/muon.po 2013-04-01 20:33:39.000000000 +0000 @@ -3,30 +3,29 @@ # # Artur Chłond , 2010. # Łukasz Wojniłowicz , 2011, 2012. -# Marta Rybczyńska , 2012. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-06-24 21:52+0200\n" -"Last-Translator: Marta Rybczyńska \n" -"Language-Team: Polish \n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2012-09-05 16:31+0200\n" +"Last-Translator: Łukasz Wojniłowicz \n" +"Language-Team: Polish \n" "Language: pl\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 " "|| n%100>=20) ? 1 : 2);\n" -"X-Generator: Lokalize 1.2\n" +"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" -msgstr "Artur Chłond, Łukasz Wojniłowicz" +msgstr "Artur Chłond" msgctxt "EMAIL OF TRANSLATORS" msgid "Your emails" -msgstr "eugenewolfe@o2.pl,lukasz.wojnilowicz@gmail.com" +msgstr "eugenewolfe@o2.pl" #: muon/config/GeneralSettingsPage.cpp:53 msgid "Ask to confirm changes that affect other packages" @@ -178,18 +177,18 @@ msgid "Purge" msgstr "Wyczyść" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Odznacz" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical dostarcza aktualizacje krytyczne dla %1 do %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -348,78 +347,46 @@ msgstr "Menedżer pakietów Muon" #: muon/main.cpp:37 -#, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "© 2009-2011 Jonathan Thomas" +msgstr "© 2009-2012 Jonathan Thomas" #: muon/main.cpp:38 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Wczytaj oznaczenia..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Zapisz oznaczenia jako..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Zapisz listę pobierania pakietów..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Pobierz pakiety z listy..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Dodaj pobrane pakiety" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Zapisz zainstalowaną listę pakietów..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Ostrożna aktualizacja" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Pełna aktualizacja" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Usuń niepotrzebne pakiety" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Podgląd zmian" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Zastosuj zmiany" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Historia..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -431,12 +398,12 @@ "pełnej aktualizacji, klikając na przycisk Pełna aktualizacja." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Nie można oznaczyć aktualizacji" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -445,17 +412,17 @@ "Nie można oznaczyć aktualizacji. Niektóre z nich, na tę chwilę, mogą " "posiadać niespełnione zależności lub mogą być wstrzymywane ręcznie. " -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Wstecz" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Podgląd zmian" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Historia pakietów" @@ -470,54 +437,54 @@ #: muon/PackageModel/PackageModel.cpp:83 msgid "Requested" -msgstr "Zażądany" +msgstr "Żądane" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Znajdź" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Oznacz do instalacji" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Oznacz do usunięcia" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Oznacz do uaktualnienia" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Oznacz do ponownej instalacji" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Oznacz do wyczyszczenia" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Zablokuj pakiet na bieżącej wersji" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Odblokuj pakiet" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Zablokuj na bieżącej wersji" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -526,12 +493,12 @@ "Usunięcie tego pakietu może uszkodzić Twój system. Czy masz pewność, że " "chcesz go usunąć?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Ostrzeżenie - usuwanie ważnego pakietu" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 #, fuzzy #| msgctxt "@title:window" #| msgid "Unable to Mark Package" @@ -539,24 +506,24 @@ msgid "Failed to Lock Package" msgstr "Nie można oznaczyć pakietu" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Pakiet \"%1\" nie może być zaznaczony do instalacji lub aktualizacji:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Nie można oznaczyć pakietu" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -571,42 +538,24 @@ "nigdy nie zamieszczony na serwerze, został zastąpiony innym pakietem lub nie " "jest dostępny w obecnie wykorzystywanych repozytoriach." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, jednak %4 ma zostać zainstalowany" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "lub %1 %2, jednak %3 ma zostać zainstalowany" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, jednak nie można go zainstalować" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "lub %1, jednak nie można go zainstalować" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, jednak jest on pakietem wirtualnym" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "lub %1, jednak jest on pakietem wirtualnym" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Przejrzyj i zastosuj zmiany" @@ -614,7 +563,7 @@ #: muon/StatusWidget.cpp:52 msgctxt "@info:status" msgid "Rebuilding Search Index" -msgstr "Przebudowywanie indeksu wyszukiwania" +msgstr "Przebudowywanie indeksu znajdywania" #: muon/StatusWidget.cpp:91 #, kde-format diff -Nru muon-1.9.60/po/pt/libmuon.po muon-2.0.0/po/pt/libmuon.po --- muon-1.9.60/po/pt/libmuon.po 2012-10-29 18:35:20.000000000 +0000 +++ muon-2.0.0/po/pt/libmuon.po 2013-04-01 20:33:42.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-17 19:32+0100\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-10 13:40+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -13,1090 +13,113 @@ "X-POFile-SpellExtra: Muon QApt Jonathan CLI Lisp OCaml Gnustep Alien\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" "X-POFile-SpellExtra: Haskell Ubuntu Zope Xfce Plone Launchpad Synaptic\n" -"X-POFile-SpellExtra: Kubuntu Sitter Harald GObject SSO Power\n" +"X-POFile-SpellExtra: Kubuntu Sitter Harald GObject SSO Power KNewStuff\n" +"X-POFile-SpellExtra: MakePlayLive\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Aplicações" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Software Livre" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Proprietário" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Desconhecida" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 a transferir, %2 no disco" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 no disco" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Acessórios" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Acessibilidade" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Ferramentas de Desenvolvimento" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Depuração" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Desenho de Interfaces Gráficas" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE's" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Localização" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Performance" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Controlo de Versões" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Desenvolvimento Web" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Educação" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Ciência & Engenharia" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomia" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologia" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Química" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Informática & Robótica" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Electrónica" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Engenharia" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografia" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologia" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matemática" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Física" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Tipos de Letra" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Jogos" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Jogos de Arcada" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Jogos de Tabuleiro" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Jogos de Cartas" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "'Puzzles'" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Jogos de Personagens" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulação" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Desporto" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Gráficos" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Desenho" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Pintura & Edição" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografia" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Publicações" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Digitalização & OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Visualizadores" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Conversa" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Partilha de Ficheiros" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Correio" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Navegadores Web" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Escritório" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Sistema & Configuração" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Banda Desenhada" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Elementos do Ambiente Plasma" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Infra-Estrutura de Aplicações" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Aplicações no seu sistema" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Autenticar-se no serviço SSO da Ubuntu" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Infra-Estrutura do Bodega" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Instalar os dados do Bodega no seu sistema" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Indicar as credenciais do MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Infra-Estrutura de Testes" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Infra-estrutura de testes das interfaces do Muon" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Infra-Estrutura do KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Instalar os dados do KNewStuff no seu sistema" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Todos" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Confirmar as Alterações Adicionais" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Marcar as alterações adicionais?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Esta acção necessita de uma mudança noutro pacote:" -msgstr[1] "Esta acção necessita de mudanças noutros pacotes:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Histórico" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Procurar" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Todas as alterações" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instalações" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Actualizações" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Remoções" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Data" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Instalado" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Actualizado" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Versão Anterior" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Removido" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Eliminado" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 às %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Este Muon tem super-poderes" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administração do Sistema" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Sistema de Base" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infra-Estrutura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Comunicações" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Bases de Dados" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Desenvolvimento" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentação" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Depuração" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editores" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Electrónica" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Dispositivos Embebidos" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Tipos de Letra" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Jogos e Entretenimento" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Ambiente de Trabalho GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Gráficos" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Sistema Estatístico R da GNU" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Ambiente de Trabalho Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Rádio Amador" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Linguagem de Programação Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Servidores Web" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Linguagens de Computador Interpretadas" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Linguagem de Programação Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Compilação de 'Software' KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "'Kernel' e Módulos" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Bibliotecas - Desenvolvimento" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Bibliotecas" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Linguagem de Programação Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Localização" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-Mail" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matemática" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Diversos - Aplicações de Consola" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Rede" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Grupos de Notícias" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Linguagem de Programação OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Bibliotecas - Antigas" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Multi-Plataformas" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Linguagem de Programação Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Linguagem de Programação PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Linguagem de Programação Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Linguagem de Programação Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Ciências" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Linhas de Comando" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Publicação em TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Processamento de Texto" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utilitários" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sistemas de Controlo de Versões" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "'Software' de Vídeo" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Diversos - Gráficos" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Ambiente de Trabalho Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Ambiente Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Desconhecido" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Quebrada" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Convertido a partir de RPM pelo Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internacionalização e Localização" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta-Pacotes" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Restritos para Exportação" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Não-Livres" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contribuições" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Educação" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Dados de Introspecção do GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Não Instalado" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Disponível" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Instalado" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Actualizável" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Com Problemas" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Configuração Residual" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Instalado (auto-removível)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Sem Alterações" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Instalar" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Actualizar" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Remover" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Eliminar" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinstalar" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Recuar a Versão" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Bloqueado" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Comum" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bits" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bits" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Erro de Inicialização" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Não Foi Possível Obter o Bloqueio do Sistema de Pacotes" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Espaço em Disco Baixo" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Impossível Aplicar as Alterações" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Erro de autenticação" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Erro Inesperado" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Pacotes Não-Fidedignos" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Erro Desconhecido" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Não foi possível inicializar o sistema de pacotes; a sua configuração poderá " -"estar inválida." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Outra aplicação já parece estar a usar o sistema de pacotes nesta altura. " -"Terá de fechar todos os outros gestores de pacotes antes de poder instalar " -"ou remover qualquer pacote." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Não tem espaço em disco suficiente na pasta em %1 para continuar com esta " -"operação." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Não foi possível obter os pacotes" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Ocorreu um erro ao aplicar as alterações:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Esta operação não pode continuar, dado não ter sido dada qualquer " -"autorização adequada" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Parece que o utilitário do QApt estoirou ou desapareceu. Por favor comunique " -"um erro aos programadores do QApt" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"O seguinte pacote não foi verificado pelo seu autor. A obtenção de pacotes " -"não-fidedignos está proibida pela sua configuração actual." -msgstr[1] "" -"Os seguintes pacotes não foram verificados pelos seus autores. A obtenção de " -"pacotes não-fidedignos está proibida pela sua configuração actual." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Procurar Actualizações" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Desmarcar Tudo" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configurar as Fontes de Aplicações" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Gravar as Marcações Como" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Não foi possível gravar o documento, dado não ter sido possível escrever em " -"%1\n" -"\n" -"Certifique-se que tem acesso de escrita a este ficheiro, ou que tem espaço " -"em disco suficiente." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Gravar a Lista de Pacotes Instalados Como" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Gravar a Lista de Transferências Como" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Abrir um Ficheiro" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Não foi possível marcar as alterações. Certifique-se que o ficheiro contém " -"marcações criadas pelo Gestor de Pacotes Muon ou pelo Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Escolher uma Pasta" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "Foi adicionado %1 pacote com sucesso à 'cache'" -msgstr[1] "Foram adicionados %1 pacotes com sucesso à 'cache'" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Não foram encontrados pacotes válidos nesta pasta. Certifique-se por favor " -"que os pacotes são compatíveis com o seu computador e são a última versão." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Não Foi Possível Encontrar os Pacotes" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "falta %1" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Autenticar-se no serviço SSO da Ubuntu" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Mostrar as notificações para:" @@ -1134,18 +157,18 @@ msgid "Downloading" msgstr "A Transferir" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Pronto" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" -msgstr "À espera" +msgstr "À Espera" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "A Instalar" diff -Nru muon-1.9.60/po/pt/muon-discover.po muon-2.0.0/po/pt/muon-discover.po --- muon-1.9.60/po/pt/muon-discover.po 2012-10-29 18:35:20.000000000 +0000 +++ muon-2.0.0/po/pt/muon-discover.po 2013-04-01 20:33:42.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-22 13:15+0100\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-10 13:44+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: \n" @@ -18,6 +18,7 @@ "X-POFile-IgnoreConsistency: Launch\n" "X-POFile-SpellExtra: Gonzalez Muon Discover Aleix Pol APT Buzz Jonathan\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" +"X-POFile-SpellExtra: stdout\n" #: discover/main.cpp:29 msgid "An application discoverer" @@ -52,24 +53,43 @@ msgid "Display a list of entries with a category." msgstr "Mostrar uma lista de elementos com uma dada categoria." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Abre o Muon Discover num modo seguro. Os modos correspondem aos botões da " +"barra de ferramentas." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Mostra todos os modos disponíveis no 'stdout'." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Modos disponíveis:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Procurar..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Descobriram-se alguns erros ao configurar a GUI; a aplicação não pode " "prosseguir." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Erro de inicialização" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "A Adicionar as Fontes..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "A Remover as Fontes..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menu" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Configure e aprenda sobre o Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -84,90 +104,94 @@ msgid "Discard" msgstr "Apagar" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 revisões" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Página Web" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Lançar" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Revisão" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Tamanho Total: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Introdução" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Extensões" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Revisões" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Actualizar" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nome" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Classificação" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Buzz" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularidade" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Origem" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Procurar em '%1'..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Procurar..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Concurso de Popularidade" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "pontos: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Melhores Classificações" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Bem-vindo ao\n" +"Muon Discover!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -180,23 +204,34 @@ msgid "Remove" msgstr "Remover" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Instalado" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 msgid "Update All" msgstr "Actualizar Tudo" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "A carregar..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Recuar" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Descobrir" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Instalado (%1 actualização)" +msgstr[1] "Instalado (%1 actualizações)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Fontes" @@ -221,56 +256,60 @@ msgid "Summary:" msgstr "Resumo:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Revisões:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Diga-nos algo sobre esta revisão!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 em %2 pessoas acharam útil esta revisão" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 por %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 de %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Útil? Sim/Não" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Adicionar uma Fonte" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Indique a nova fonte" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Cancelar" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - A linha de código do repositório APT a adicionar. Será uma " "das seguintes:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Binário)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/pt/muon-installer.po muon-2.0.0/po/pt/muon-installer.po --- muon-1.9.60/po/pt/muon-installer.po 2012-10-29 18:35:20.000000000 +0000 +++ muon-2.0.0/po/pt/muon-installer.po 2013-04-01 20:33:42.000000000 +0000 @@ -2,17 +2,16 @@ msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-22 13:15+0100\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-08-17 16:19+0100\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: pt\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-POFile-SpellExtra: Muon Jonathan Kubuntu Ubuntu Amarok Haskell Gonzalez\n" +"X-POFile-SpellExtra: Muon Jonathan Kubuntu Ubuntu Amarok Haskell\n" "Plural-Forms: nplurals=2; plural=n != 1;\n" -"X-POFile-SpellExtra: Pol Aleix\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -22,7 +21,7 @@ msgid "Your emails" msgstr "zepires@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -32,7 +31,7 @@ "As seguintes aplicações acabaram de ser instaladas; carregue nelas para as " "lançar:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Obter a Aplicação" @@ -62,74 +61,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Obter a Aplicação" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Aplicações Instaladas" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Fornecido pelo Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Fornecido pela Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Parceiros da Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Independente" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Obter a Aplicação" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Aplicações Instaladas" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Histórico" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "O %1 foi instalado com sucesso." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Iniciar" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "As aplicações foram instaladas com sucesso." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Executar as Aplicações Novas..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instalação completa" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Em Curso" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Em Curso" @@ -196,25 +195,25 @@ #: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:510 msgctxt "@info:status Progress text when waiting" msgid "Waiting" -msgstr "À espera" +msgstr "À Espera" #: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:541 msgctxt "@action" msgid "Install" msgstr "Instalar" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Remover" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Instalar" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -272,19 +271,19 @@ msgid "No reviews available" msgstr "Não estão disponíveis quaisquer revisões" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Esta revisão foi feita para uma versão mais antiga (Versão: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/pt/muon-notifier.po muon-2.0.0/po/pt/muon-notifier.po --- muon-1.9.60/po/pt/muon-notifier.po 2012-10-29 18:35:20.000000000 +0000 +++ muon-2.0.0/po/pt/muon-notifier.po 2013-04-01 20:33:42.000000000 +0000 @@ -7,8 +7,8 @@ msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-05-14 16:09+0100\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-02-22 12:28+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: pt\n" diff -Nru muon-1.9.60/po/pt/muon-updater.po muon-2.0.0/po/pt/muon-updater.po --- muon-1.9.60/po/pt/muon-updater.po 2012-10-29 18:35:20.000000000 +0000 +++ muon-2.0.0/po/pt/muon-updater.po 2013-04-01 20:33:42.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-21 12:51+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-13 20:58+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -23,12 +23,12 @@ msgid "Your emails" msgstr "zepires@gmail.com" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Esconder" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -38,18 +38,18 @@ "A lista de alterações ainda não está disponível. Use por favor o Launchpad em alternativa." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "A lista de alterações ainda não está disponível." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versão %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -81,149 +81,124 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Actualizações das Aplicações" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "É mais seguro ligar a ficha à corrente antes de actualizar." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Está disponível uma nova versão do Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Ler as Marcações..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Gravar as Marcações Como..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Gravar a Lista de Pacotes Transferidos..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Obter os Pacotes da Lista..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Adicionar os Pacotes Transferidos" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Instalar as Actualizações" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Histórico..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Actualizar" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" -msgstr "Histórico de Pacotes" +msgstr "Histórico do Pacote" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Cancelar" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" msgstr "A Iniciar" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "À Espera da Autenticação" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "À Espera" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "À espera que as outras transacções terminem" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "À espera que os outros gestores de pacotes terminem" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "À espera do disco necessário" +msgstr "À espera do disco pedido" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "À espera do ficheiro de configuração" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "A Carregar a Lista de Aplicações" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "A actualizar as fontes de aplicações" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "A Obter os Pacotes" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "A Aplicar as Alterações" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" msgstr "Terminado" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "Mudança de Disco Necessária" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Introduza por favor o %1 em %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "Atenção - Aplicações Não-Verificadas" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -236,22 +211,22 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"A seguinte aplicação não pode ser verificada. A instalação de " -"aplicações não-verificadas como fidedignas representa um risco de segurança, " -"dado que a presença de aplicações não-fidedignas pode ser um sinal de " -"intromissão. Deseja continuar?" +"A seguinte aplicação não pode ser verificada.A instalação de " +"aplicações não verificadas representa um risco de segurança, dado que a " +"presença deste tipo de conteúdos poderá ser um sinal de intromissão. Deseja continuar?" msgstr[1] "" -"As seguintes aplicações não podem ser verificadas. A instalação de " -"aplicações não-verificadas como fidedignas representa um risco de segurança, " -"dado que a presença de aplicações não-fidedignas pode ser um sinal de " -"intromissão. Deseja continuar?" +"As seguintes aplicações não podem ser verificadas.A instalação de " +"aplicações não verificadas representa um risco de segurança, dado que a " +"presença deste tipo de conteúdos poderá ser um sinal de intromissão. Deseja continuar?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "Ficheiro de Configuração Modificado" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -263,28 +238,33 @@ "filename>, mas a sua versão foi modificada. Deseja manter a sua versão " "actual ou instalar a nova?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Usar a Versão Nova" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Manter a Versão Antiga" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Taxa de transferência: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "falta %1" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -300,67 +280,60 @@ msgid "Download Size" msgstr "Tamanho da Transferência" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Alguns pacotes não foram marcados para actualização.

A " +"actualização destes pacotes necessita que instale ou remova outros.

Deseja também actualizá-los?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Marcar Tudo" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Actualizações Importantes de Segurança" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Actualizações das Aplicações" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Actualizações do Sistema" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Não foi possível marcar todos os pacotes para actualização. As actualizações " -"disponíveis poderão necessitar de instalar ou remover alguns pacotes. Deseja " -"marcar as actualizações que possam necessitar da instalação ou remoção de " -"pacotes adicionais?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Não É Possível Marcar as Actualizações" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Marcar as Actualizações" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Desconhece-se quando foi a última pesquisa por actualizações." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Por favor, carregue em Procurar Actualizações para " "verificar." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "As aplicações neste computador estão actualizadas." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Foi verificado há %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Não estão disponíveis actualizações." \ No newline at end of file diff -Nru muon-1.9.60/po/pt/muon.po muon-2.0.0/po/pt/muon.po --- muon-1.9.60/po/pt/muon.po 2012-10-29 18:35:20.000000000 +0000 +++ muon-2.0.0/po/pt/muon.po 2013-04-01 20:33:42.000000000 +0000 @@ -2,8 +2,8 @@ msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-24 14:33+0100\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-10 13:41+0000\n" "Last-Translator: José Nuno Coelho Pires \n" "Language-Team: Portuguese \n" "Language: pt\n" @@ -172,18 +172,18 @@ msgid "Purge" msgstr "Eliminação" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Desmarcar" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "A Canonical oferece actualizações críticas para o %1 até %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -350,69 +350,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Ler as Marcações..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Gravar as Marcações Como..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Gravar a Lista de Pacotes Transferidos..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Obter os Pacotes da Lista..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Adicionar os Pacotes Transferidos" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Gravar a Lista de Pacotes Instalados..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Actualização Cuidadosa" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Actualização Completa" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Remover os Pacotes Desnecessários" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Antever as Alterações" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Aplicar as Alterações" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Histórico..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -423,12 +393,12 @@ "instalação ou remoção de pacotes. Poderá tentar uma actualização completa se " "carregar no botão Actualização Completa." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Não É Possível Marcar as Actualizações" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -437,20 +407,20 @@ "Não é possível marcar as actualizações. Algumas delas têm dependências " "impossíveis de satisfazer de momento ou terão sido deixadas manualmente." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Recuar" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Antever as Alterações" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" -msgstr "Histórico de Pacotes" +msgstr "Histórico do Pacote" #: muon/PackageModel/PackageModel.cpp:79 msgid "Package" @@ -464,52 +434,52 @@ msgid "Requested" msgstr "Pedido" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Procurar" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Marcar para Instalação" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Marcar para Remoção" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Marcar para Actualização" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Marcar para Reinstalação" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Marcar para Eliminação" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Bloquear o Pacote na Versão Actual" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Desbloquear o pacote" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Bloquear na Versão Actual" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -518,17 +488,17 @@ "A remoção deste pacote poderá danificar o seu sistema. Tem a certeza que o " "deseja remover?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Atenção - Remoção de um Pacote Importante" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "Não Foi Possível Bloquear o Pacote" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." @@ -536,7 +506,7 @@ "Não foi possível bloquear o pacote %1. O ficheiro de bloqueio não pôde ser " "criado." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" @@ -544,12 +514,12 @@ "Não foi possível marcar o pacote \"%1\" para a sua instalação ou " "actualização:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Não É Possível Marcar o Pacote" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -564,42 +534,24 @@ "nunca foi enviado, tornou-se obsoleto ou não está disponível nos " "repositórios activos de momento." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, mas será instalada a versão %4" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "ou %1 %2, mas será instalada a versão %3" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, mas não é possível instalar o pacote" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "ou %1, mas não é possível instalar o pacote" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, mas é um pacote virtual" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "ou %1, mas é um pacote virtual" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Rever e Aplicar as Alterações" @@ -708,7 +660,7 @@ #: muon/TransactionWidget.cpp:174 msgctxt "@info Status info" msgid "Waiting for required medium" -msgstr "À espera do disco necessário" +msgstr "À espera do disco pedido" #: muon/TransactionWidget.cpp:181 msgctxt "@info Status info" @@ -769,15 +721,15 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"A seguinte aplicação não pode ser verificada. A instalação de " -"aplicações não-verificadas como fidedignas representa um risco de segurança, " -"dado que a presença de aplicações não-fidedignas pode ser um sinal de " -"intromissão. Deseja continuar?" +"A seguinte aplicação não pode ser verificada.A instalação de " +"aplicações não verificadas representa um risco de segurança, dado que a " +"presença deste tipo de conteúdos poderá ser um sinal de intromissão. Deseja continuar?" msgstr[1] "" -"As seguintes aplicações não podem ser verificadas. A instalação de " -"aplicações não-verificadas como fidedignas representa um risco de segurança, " -"dado que a presença de aplicações não-fidedignas pode ser um sinal de " -"intromissão. Deseja continuar?" +"As seguintes aplicações não podem ser verificadas.A instalação de " +"aplicações não verificadas representa um risco de segurança, dado que a " +"presença deste tipo de conteúdos poderá ser um sinal de intromissão. Deseja continuar?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" diff -Nru muon-1.9.60/po/pt_BR/libmuon.po muon-2.0.0/po/pt_BR/libmuon.po --- muon-1.9.60/po/pt_BR/libmuon.po 2012-10-29 18:35:23.000000000 +0000 +++ muon-2.0.0/po/pt_BR/libmuon.po 2013-04-01 20:33:45.000000000 +0000 @@ -1,17 +1,17 @@ -# Copyright (C) 2010-2012 This_file_is_part_of_KDE +# Tradução do libmuon.po para Brazilian Portuguese +# Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Translation of libmuon.po to Brazilian Portuguese # # Marcus Vinícius de Andrade Gama , 2010. -# André Marcelo Alvarenga , 2010, 2011, 2012. +# André Marcelo Alvarenga , 2010, 2011. # Marcus Gama , 2011, 2012. -# Luiz Fernando Ranghetti , 2012. +# André Marcelo Alvarenga , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-18 09:52-0300\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-11 08:23-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -21,1088 +21,110 @@ "Plural-Forms: nplurals=2; plural=(n > 1);\n" "X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Aplicativos" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Código aberto" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Proprietário" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Desconhecida" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 para baixar, %2 no disco" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 no disco" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Acessórios" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Acessibilidade" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Ferramentas de desenvolvimento" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Depuração" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Desenho da interface" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDEs" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Localização" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Auditoria" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Controle de versão" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Desenvolvimento Web" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Educação" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Ciência & Engenharia" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomia" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologia" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Química" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Ciência da computação & Robótica" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Eletrônica" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Engenharia" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografia" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologia" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matemática" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Física" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Fontes" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Jogos" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arcade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Jogos de tabuleiro" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Jogos de cartas" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Quebra-cabeças" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Desempenho de papel" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulação" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Esportes" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Gráficos" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Desenho" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Pintura & Edição" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografia" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Editoração" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Digitalização & OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Visualizadores" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Bate-papo" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Compartilhamento de arquivos" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Correio" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Navegadores Web" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimídia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Escritório" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Sistema & Configurações" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Quadrinhos" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Widgets de área de trabalho do Plasma" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Infraestrutura de aplicativos" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Aplicativos no seu sistema" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Autenticar-se no serviço SSO do Ubuntu" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Infraestrutura do Bodega" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Instalar os dados do Bodega no seu sistema" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Digite as credenciais do MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Infraestrutura de testes" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Infraestrutura para teste das interfaces do Muon" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Infraestrutura do KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Instalar os dados do KNewStuff no seu sistema" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Todos" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Confirmar as alterações adicionais" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Marcar as alterações adicionais?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Esta ação necessita de uma alteração em outro pacote:" -msgstr[1] "Esta ação necessita de alterações em outros pacotes:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Histórico" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Procurar" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Todas as alterações" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instalações" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Atualizações" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Remoções" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Data" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Instalado" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Atualizado" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Versão recuada" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Removido" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Eliminado" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 às %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Este Muon tem super poderes" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administração do sistema" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Sistema base" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infraestrutura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Comunicação" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Bancos de dados" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Desenvolvimento" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentação" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Depuração" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editores" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Eletrônica" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Dispositivos embutidos" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Fontes" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Jogos e entretenimento" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Ambiente de trabalho GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Gráficos" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Sistema estatístico R da GNU" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Ambiente de trabalho Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Rádio amador" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Linguagem de programação Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Servidores Web" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Linguagens de computador interpretadas" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Linguagem de programação Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Compilação de Software KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel e módulos" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Bibliotecas - Desenvolvimento" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Bibliotecas" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Linguagem de programação Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Localização" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-mail" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matemática" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Diversos - Aplicativos de console" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Rede" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Grupos de notícias" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Linguagem de programação OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Bibliotecas - Antigas" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Multiplataforma" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Linguagem de programação Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Linguagem de programação PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Linguagem de programação Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Linguagem de programação Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Ciências" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Linhas de comando" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimídia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Publicação em TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Processamento de texto" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utilitários" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sistemas de controle de versões" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Software de vídeo" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Diversos - Gráficos" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Ambiente de trabalho Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Ambiente Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Desconhecido" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Quebrado" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Convertido a partir do RPM pelo Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internacionalização e localização" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta-pacotes" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Restritos para exportação" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Não-livres" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contribuições" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Educação" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Dados de introspecção do GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Não instalado" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Disponível" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Instalado" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Atualizável" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Quebrados" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Configuração residual" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Instalado (auto-removível)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Sem alterações" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Instalar" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Atualizar" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Remover" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Eliminar" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinstalar" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Recuar versão" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Bloqueado" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Comum" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Erro de inicialização" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Não foi possível obter o bloqueio do sistema de pacotes" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Pouco espaço em disco" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Não foi possível aplicar as alterações" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Erro de autenticação" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Erro inesperado" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Pacotes não confiáveis" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Erro desconhecido" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Não foi possível inicializar o sistema de pacotes. A sua configuração pode " -"estar inválida." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Parece que outro aplicativo está usando o sistema de pacotes neste momento. " -"Você precisa fechar todos os outros gerenciadores de pacotes antes de " -"instalar ou remover qualquer pacote." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Você não tem espaço em disco suficiente na pasta em %1 para continuar com " -"esta operação." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Não foi possível baixar os pacotes" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Ocorreu um erro ao aplicar as alterações:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Esta operação não pode continuar por não ter sido fornecida uma autorização " -"adequada" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Parece que o utilitário QApt falhou ou desapareceu. Por favor, informe o " -"erro aos programadores do QApt" - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"O seguinte pacote não foi verificado pelo seu autor. O download de pacotes " -"não confiáveis não é permitida pela sua configuração atual." -msgstr[1] "" -"Os seguintes pacotes não foram verificados pelo seus autores. O download de " -"pacotes não confiáveis não é permitida pela sua configuração atual." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Procurar atualizações" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Desmarcar tudo" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configurar as fontes de aplicativos" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Salvar as marcações como" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Não foi possível salvar o documento, uma vez não ter sido possível escrever " -"em %1\n" -"\n" -"Certifique-se de que tem acesso de escrita a este arquivo, ou que tem espaço " -"em disco suficiente." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Salvar a lista de pacotes instalados como" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Salvar a lista de downloads como" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Abrir arquivo" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Não foi possível marcar as alterações. Certifique-se de que o arquivo contém " -"marcações criadas pelo gerenciador de pacotes Muon ou pelo Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Escolha uma pasta" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "Foi adicionado %1 pacote com sucesso à cache" -msgstr[1] "Foram adicionados %1 pacotes com sucesso à cache" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"Não foram encontrados pacotes válidos nesta pasta. Certifique-se de que os " -"pacotes são compatíveis com o seu computador e são a última versão." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Não foi possível encontrar os pacotes" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 restantes" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Autenticar-se no serviço SSO do Ubuntu" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Mostrar notificações para:" @@ -1140,18 +162,18 @@ msgid "Downloading" msgstr "Baixando" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Concluído" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Aguardando" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Instalando" diff -Nru muon-1.9.60/po/pt_BR/muon-discover.po muon-2.0.0/po/pt_BR/muon-discover.po --- muon-1.9.60/po/pt_BR/muon-discover.po 2012-10-29 18:35:23.000000000 +0000 +++ muon-2.0.0/po/pt_BR/muon-discover.po 2013-04-01 20:33:45.000000000 +0000 @@ -1,15 +1,15 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # +# André Marcelo Alvarenga , 2012, 2013. # Luiz Fernando Ranghetti , 2012. -# André Marcelo Alvarenga , 2012. # Marcus Gama , 2012. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-24 08:17-0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-11 08:24-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -52,24 +52,43 @@ msgid "Display a list of entries with a category." msgstr "Mostrar uma lista de itens com determinada categoria." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Abre o Muon Discover no modo informado. Os modos correspondem aos botões da " +"barra de ferramentas." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Listar todos os modos disponíveis e enviar para a saída padrão." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Modos disponíveis:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Pesquisar..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Alguns erros foram encontrados ao configurar a interface; o aplicativo não " "pode continuar." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Erro de inicialização" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Adicionando origens..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Removendo origens..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Menu" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Configure e aprenda sobre o Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -84,90 +103,94 @@ msgid "Discard" msgstr "Descartar" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" -msgstr "%1 revisões" +msgstr "%1 análises" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Página inicial" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Iniciar" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" -msgstr "Revisão" +msgstr "Análise" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Tamanho total: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" -msgstr "Visão geral" +msgstr "Resumo" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Complementos" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" -msgstr "Revisões" +msgstr "Análises" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Atualizar" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Nome" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Avaliação" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Buzz" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Popularidade" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Origem" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Pesquisar em '%1'..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Pesquisar..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Concurso de popularidade" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "pontos: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Melhores classificações" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Bem-vindo ao\n" +"Descobridor do Muon!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -180,23 +203,34 @@ msgid "Remove" msgstr "Remover" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Instalado" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 msgid "Update All" msgstr "Atualizar tudo" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Carregando..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Voltar" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Descobrir" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Instalado (%1 atualização)" +msgstr[1] "Instalado (%1 atualizações)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Fontes" @@ -221,56 +255,60 @@ msgid "Summary:" msgstr "Resumo:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" -msgstr "Revisões" +msgstr "Análises:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" -msgstr "Diga-nos algo sobre esta revisão!" +msgstr "Diga-nos algo sobre esta análise!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" -msgstr "%1 em %2 pessoas acharam útil esta revisão" +msgstr "%1 em %2 pessoas acharam útil esta análise" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 by %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 por %2

" +"%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Útil? Sim/Não" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Adicionar fonte" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Especificar a nova fonte" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Cancelar" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - A linha de código do repositório APT a adicionar. Será uma " "das seguintes:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" -msgstr "%1 (executável)" +msgstr "%1 (Executável)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/pt_BR/muon-installer.po muon-2.0.0/po/pt_BR/muon-installer.po --- muon-1.9.60/po/pt_BR/muon-installer.po 2012-10-29 18:35:23.000000000 +0000 +++ muon-2.0.0/po/pt_BR/muon-installer.po 2013-04-01 20:33:45.000000000 +0000 @@ -3,21 +3,23 @@ # This file is distributed under the same license as the PACKAGE package. # # Marcus Vinícius de Andrade Gama , 2010. -# André Marcelo Alvarenga , 2010, 2011, 2012. +# André Marcelo Alvarenga , 2010, 2011. # Marcus Gama , 2011, 2012. +# André Marcelo Alvarenga , 2012. +# Luiz Fernando Ranghetti , 2012. msgid "" msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-08-21 19:23-0300\n" -"Last-Translator: Marcus Gama \n" -"Language-Team: Brazilian Portuguese \n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2012-08-16 22:49-0300\n" +"Last-Translator: Luiz Fernando Ranghetti \n" +"Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.5\n" +"X-Generator: Lokalize 1.4\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" msgctxt "NAME OF TRANSLATORS" @@ -28,7 +30,7 @@ msgid "Your emails" msgstr "alvarenga@kde.org" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -38,7 +40,7 @@ "Os seguintes aplicativos acabaram de ser instalados. Clique neles para " "executar:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Obter aplicativo" @@ -68,74 +70,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Obter aplicativos" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Aplicativos instalados" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Fornecidos pelo Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Fornecidos pelo Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Parceiros da Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Independentes" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Obter aplicativos" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Aplicativos instalados" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Histórico" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "O %1 foi instalado com sucesso." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Iniciar" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "O aplicativos foram instalados com sucesso." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Executar os novos aplicativos..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instalação concluída" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Em andamento" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Em andamento" @@ -209,18 +211,18 @@ msgid "Install" msgstr "Instalar" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Remover" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Instalar" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -278,19 +280,19 @@ msgid "No reviews available" msgstr "Nenhuma análise disponível" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Esta análise foi feita para uma versão mais antiga (Versão: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/pt_BR/muon-notifier.po muon-2.0.0/po/pt_BR/muon-notifier.po --- muon-1.9.60/po/pt_BR/muon-notifier.po 2012-10-29 18:35:23.000000000 +0000 +++ muon-2.0.0/po/pt_BR/muon-notifier.po 2013-04-01 20:33:45.000000000 +0000 @@ -2,22 +2,23 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Marcus Vinícius de Andrade Gama , 2010, 2011, 2012. -# André Marcelo Alvarenga , 2010, 2011, 2012. +# Marcus Vinícius de Andrade Gama , 2010, 2012. +# André Marcelo Alvarenga , 2010, 2011. +# André Marcelo Alvarenga , 2012. msgid "" msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-06-26 00:10-0300\n" -"Last-Translator: André Marcelo Alvarenga \n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2012-07-24 19:55-0300\n" +"Last-Translator: Marcus Gama \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -"X-Generator: Lokalize 1.0\n" +"X-Generator: Lokalize 1.4\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -Nru muon-1.9.60/po/pt_BR/muon-updater.po muon-2.0.0/po/pt_BR/muon-updater.po --- muon-1.9.60/po/pt_BR/muon-updater.po 2012-10-29 18:35:23.000000000 +0000 +++ muon-2.0.0/po/pt_BR/muon-updater.po 2013-04-01 20:33:45.000000000 +0000 @@ -1,16 +1,17 @@ -# Copyright (C) 2010-2012 This_file_is_part_of_KDE +# Tradução do muon-updater.po para Brazilian Portuguese +# Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Translation of muon-updater.po to Brazilian Portuguese # -# Marcus Vinícius de Andrade Gama , 2010, 2011, 2012. -# André Marcelo Alvarenga , 2010, 2011, 2012. -# Luiz Fernando Ranghetti , 2011. +# Marcus Vinícius de Andrade Gama , 2010, 2012. +# André Marcelo Alvarenga , 2010, 2011. +# André Marcelo Alvarenga , 2012, 2013. +# Luiz Fernando Ranghetti , 2012. msgid "" msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-21 14:08-0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-11 08:26-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -28,12 +29,12 @@ msgid "Your emails" msgstr "alvarenga@kde.org" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Ocultar" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -43,18 +44,18 @@ "A lista de alterações ainda não está disponível. Em vez disso, use o Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "A lista de alterações ainda não está disponível." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versão %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -86,151 +87,125 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Atualizações de aplicativos" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "É mais seguro conectar-se a um adaptador de energia antes de atualizar." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Está disponível uma nova versão do Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Ler as marcações..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Salvar as marcações como..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Salvar a lista de pacotes baixados..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Baixar os pacotes a partir da lista..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Adicionar os pacotes baixados" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Instalar atualizações" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Histórico..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Atualizar" -# 'Pacotes' deve ficar no plural. (alvarenga) -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Histórico de pacotes" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Cancelar" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" msgstr "Iniciando" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "Aguardando a autenticação" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "Aguardando" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "Aguardando a conclusão das outras transações" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "Aguardando a finalização dos outros gerenciadores de software" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "Aguardando a mídia necessária" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "Aguardando o arquivo de configuração" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "Carregando a lista de softwares" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Atualizando as fontes de software" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Baixando pacotes" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "Aplicando as alterações" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Concluída" +msgstr "Concluído" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "É necessário trocar a mídia" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Por favor, insira %1 em %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "Aviso - software não verificado" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -248,17 +223,17 @@ "presença de software não verificável pode ser um sinal de adulteração. Deseja continuar?" msgstr[1] "" -"As seguintes partes do software não puderam ser verificadas. " -"Instalar software não verificado representa um risco de segurança, " -"assim como a presença de software não verificável pode ser um sinal de " -"adulteração. Deseja continuar?" +"As seguintes partes do software não pôde ser verificada. Instalar " +"software não verificado representa um risco de segurança, assim como a " +"presença de software não verificável pode ser um sinal de adulteração. Deseja continuar?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "Arquivo de configuração alterado" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -270,28 +245,33 @@ "filename>, mas a sua versão foi modificada. Deseja manter a versão atual ou " "instalar a nova?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Usar a nova versão" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Manter a versão antiga" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Taxa de transferência: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 restantes" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -307,68 +287,61 @@ msgid "Download Size" msgstr "Tamanho da transferência" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Alguns pacotes não foram marcados para atualização.

A " +"atualização destes pacotes precisam que outros sejam instalados ou removidos." +"

Você deseja atualizar estes pacotes também?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Marcar tudo" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Atualizações de segurança importantes" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Atualizações de aplicativos" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Atualizações do sistema" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Não foi possível marcar todos os pacotes para atualização. As atualizações " -"disponíveis podem exigir que novos pacotes sejam instalados ou removidos. " -"Deseja marcar as atualizações que possam necessitar da instalação ou remoção " -"de pacotes adicionais?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Não foi possível marcar as atualizações" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Marcar as atualizações" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "" "Não é conhecido quando a última verificação por atualizações foi feita." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Por favor, clique em Procurar atualizações para " "verificar." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "O software neste computador está atualizado." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Última verificação a %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Nenhuma atualização disponível." \ No newline at end of file diff -Nru muon-1.9.60/po/pt_BR/muon.po muon-2.0.0/po/pt_BR/muon.po --- muon-1.9.60/po/pt_BR/muon.po 2012-10-29 18:35:23.000000000 +0000 +++ muon-2.0.0/po/pt_BR/muon.po 2013-04-01 20:33:45.000000000 +0000 @@ -1,17 +1,18 @@ -# Copyright (C) 2010-2012 This_file_is_part_of_KDE +# Tradução do muon.po para Brazilian Portuguese +# Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. -# Translation of muon.po to Brazilian Portuguese # -# Luiz Fernando Ranghetti , 2010. +# Luiz Fernando Ranghetti , 2010, 2012. # Aracele Torres , 2010. -# André Marcelo Alvarenga , 2010, 2011, 2012. +# André Marcelo Alvarenga , 2010, 2011. # Marcus Vinícius de Andrade Gama , 2010, 2012. +# André Marcelo Alvarenga , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-24 08:17-0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-11 08:27-0300\n" "Last-Translator: André Marcelo Alvarenga \n" "Language-Team: Brazilian Portuguese \n" "Language: pt_BR\n" @@ -179,18 +180,18 @@ msgid "Purge" msgstr "Eliminação" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Desmarcar" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "A Canonical oferece atualizações críticas para o %1 até %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -357,69 +358,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Ler as marcações..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Salvar as marcações como..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Salvar a lista de pacotes baixados..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Baixar os pacotes a partir da lista..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Adicionar os pacotes baixados" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Salvar a lista de pacotes instalados..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Atualização cautelosa" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Atualização completa" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Remover pacotes desnecessários" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Visualizar alterações" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Aplicar alterações" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Histórico..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -431,12 +402,12 @@ "atualização completa clicando no botão Atualização completa." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Não foi possível marcar as atualizações" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -445,17 +416,17 @@ "Não foi possível marcar as atualizações. Algumas delas têm dependências " "impossíveis de satisfazer no momento ou terão sido deixadas manualmente." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Voltar" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Visualizar alterações" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Histórico do pacote" @@ -472,52 +443,52 @@ msgid "Requested" msgstr "Requisitado" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Pesquisar" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Marcar para instalação" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Marcar para remoção" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Marcar para atualização" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Marcar para reinstalação" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Marcar para eliminação" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Bloquear o pacote na versão atual" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Desbloquear pacote" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Bloquear na versão atual" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -526,17 +497,17 @@ "Se remover este pacote poderá comprometer o seu sistema. Tem certeza de que " "deseja removê-lo?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Atenção - Removendo um pacote importante" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "Ocorreu um erro ao bloquear o pacote" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." @@ -544,18 +515,18 @@ "Não foi possível bloquear o pacote %1. Ocorreu um erro ao gravar o arquivo " "de bloqueio." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "O pacote \"%1\" não pôde ser marcado para instalação ou atualização:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Não é possível marcar o pacote" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -570,42 +541,24 @@ "mas nunca foi enviado, foi tornado obsoleto ou não está disponível nos " "repositórios que estão ativos no momento." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, mas será instalada a versão %4" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "ou %1 %2, mas será instalada a versão %3" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, mas não é possível instalar o pacote" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "ou %1, mas não é possível instalar o pacote" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, mas é um pacote virtual" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "ou %1, mas é um pacote virtual" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Revisar e aplicar as alterações>" @@ -623,7 +576,6 @@ msgstr[0] "1 pacote disponível, " msgstr[1] "%1 pacotes disponíveis, " -# É necessário estar no plural. (alvarenga) #: muon/StatusWidget.cpp:92 #, kde-format msgctxt "@info:status" @@ -745,7 +697,7 @@ #: muon/TransactionWidget.cpp:224 msgctxt "@info Status information, widget title" msgid "Finished" -msgstr "Concluída" +msgstr "Concluído" #: muon/TransactionWidget.cpp:253 msgctxt "@title:window" @@ -781,10 +733,10 @@ "presença de software não verificável pode ser um sinal de adulteração. Deseja continuar?" msgstr[1] "" -"As seguintes partes do software não puderam ser verificadas. " -"Instalar software não verificado representa um risco de segurança, " -"assim como a presença de software não verificável pode ser um sinal de " -"adulteração. Deseja continuar?" +"As seguintes partes do software não pôde ser verificada. Instalar " +"software não verificado representa um risco de segurança, assim como a " +"presença de software não verificável pode ser um sinal de adulteração. Deseja continuar?" #: muon/TransactionWidget.cpp:283 msgctxt "@title:window" diff -Nru muon-1.9.60/po/ro/libmuon.po muon-2.0.0/po/ro/libmuon.po --- muon-1.9.60/po/ro/libmuon.po 2012-10-29 18:35:25.000000000 +0000 +++ muon-2.0.0/po/ro/libmuon.po 2013-04-01 20:33:47.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sergiu Bivol , 2011, 2012. +# Sergiu Bivol , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-06-10 13:12+0300\n" -"Last-Translator: Sergiu Bivol \n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-01-31 12:38+0200\n" +"Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -16,1114 +16,127 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Aplicații" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Cu sursă deschisă" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Necunoscută" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 de descărcat, %2 pe disc" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 pe disc" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Accesorii" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Accesibilitate" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Instrumente pentru dezvoltatori" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Depanare" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Proiectarea interfețelor grafice" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "Medii integrate de dezvoltare" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Traducere" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilare" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Control versiune" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Dezvoltare web" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Educație" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Știință și educație" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomie" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologie" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Chimie" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Științe informatice și robotică" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Electronică" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Inginerie" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografie" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologie" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematică" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fizică" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Fonturi" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Jocuri" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Aventuri" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Jocuri de table" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Jocuri de cărți" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Puzzle" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications Backend" +msgstr "Aplicații" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +#, fuzzy +#| msgid "Applications" +msgid "Applications in your system" +msgstr "Aplicații" + +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Autentificare în serviciul SSO al Ubuntu" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" msgstr "" -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulare" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Sporturi" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafică" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Desen" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Pictură și retușare" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografie" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" msgstr "" -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Scanare și recunoaștere optică a textului" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Vizualizare" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Discuție" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Partajare de fișiere" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Poștă" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Navigatoare de Internet" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Birou" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Sistem și configurare" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" msgstr "" -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" msgstr "" -#: libmuon/Category/Category.cpp:64 -msgctxt "@label The label used for viewing all members of this category" -msgid "All" -msgstr "Toate" +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Confirmă modificările suplimentare" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Marcați modificările suplimentare?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Această acțiune necesită o modificare a altui pachet:" -msgstr[1] "Această acțiune necesită modificări ale altor pachete:" -msgstr[2] "Această acțiune necesită modificări ale altor pachete:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Istoric" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Caută" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Toate modificările" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Instalări" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Actualizări" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Eliminări" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Dată" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "" -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "instalat" +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "" -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Actualizat" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "retrogradat" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "eliminat" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "șters" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 la %3" +#: libmuon/Category/Category.cpp:44 +msgctxt "@label The label used for viewing all members of this category" +msgid "All" +msgstr "Toate" -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Acest Muon are puterile unei supravaci" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administrare sistem" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Sistem de bază" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infrastructura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Comunicații" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Baze de date" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Dezvoltare" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Documentație" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Depanare" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editoare" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Electronică" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Dispozitive încorporate" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Fonturi" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Jocuri și amuzament" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Mediul de birou GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafică" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Sistemul statistic GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Mediul de birou Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Radio amator" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Limbajul de programare Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Servere web" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Limbaje de calculator interpretate" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Limbajul de programare Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Compilația Software KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Nucleu și module" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Biblioteci - Dezvoltare" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Biblioteci" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Limbajul de programare Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Traducere" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Poștă electronică" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematică" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Diverse - Textuale" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Rețea" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Grupuri de știri" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Limbajul de programare OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Biblioteci - Vechi" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Inter-platformă" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Limbajul de programare Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Limbajul de programare PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Limbajul de programare Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Limbajul de programare Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Știință" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Interpretoare" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimedia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Compunere TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Procesare de text" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utilitare" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sisteme de control al versiunilor" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Aplicații video" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Diverse - Grafică" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Mediul de birou Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Mediul Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Necunoscut" - -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Convertit din RPM de Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internaționalizare și traducere" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Metapachete" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Restricționat la export" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Non-libere" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contribuite" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Educație" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Date de introspecție GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Neinstalat" - -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" -msgid "Installed" -msgstr "Instalat" - -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" -msgid "Upgradeable" -msgstr "Actualizabil" - -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:81 +#, fuzzy +#| msgctxt "@info:status Package state" +#| msgid "Broken" msgid "Broken" msgstr "Deteriorat" -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Configurație reziduală" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Instalat (se elimină automat)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Nicio modificare" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Instalează" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Actualizează" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Elimină" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Șterge" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinstalează" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Retrogradează" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Blocat" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Comun" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32 de biți" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64 de biți" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Initialization error" -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Eroare de inițializare" - -#: libmuon/MuonStrings.cpp:245 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to obtain package system lock" -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Nu se poate obține blocarea sistemului de pachete" - -#: libmuon/MuonStrings.cpp:247 +#: libmuon/resources/AbstractResource.cpp:82 #, fuzzy -#| msgctxt "@title:window" -#| msgid "Low disk space" -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Spațiu insuficient" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Eșec la aplicarea modificărilor" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Eroare de autentificare" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Eroare neașteptată" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Pachete nesigure" +#| msgid "Available updates" +msgid "Available" +msgstr "Actualizări disponibile" -#: libmuon/MuonStrings.cpp:259 +#: libmuon/resources/AbstractResource.cpp:83 #, fuzzy -#| msgctxt "@info license" -#| msgid "Unknown" -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Necunoscută" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Sistemul de pachete nu a putut fi inițializat. Configurația dumneavoastră " -"poate fi deteriorată." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Se pare că altă aplicație folosește sistemul de pachete în acest moment. " -"Trebuie să închideți toți ceilalți administratori de pachete înainte să " -"puteți adăuga sau elimina vreun pachet." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Nu aveți destul spațiu disponibil în dosarul din %1 pentru a continua " -"această operație." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Pachetele nu au putut fi descărcate" +#| msgctxt "@info:status describes a past-tense action" +#| msgid "Installed" +msgid "Installed" +msgstr "instalat" -#: libmuon/MuonStrings.cpp:288 +#: libmuon/resources/AbstractResource.cpp:84 #, fuzzy -#| msgctxt "@label" -#| msgid "An error occurred while applying changes:" -#| msgid_plural "The following errors occurred while applying changes:" -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "A intervenit o eroare la aplicarea modificărilor:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Această operație nu poate continua deoarece nu au fost furnizate " -"autorizările necesare" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Se pare că lucrătoarea QApt s-a blocat sau a dispărut. Raportați o eroare " -"către dezvoltatorii QApt." - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Următorul pachet nu a fost verificat de către autorul său. Descărcarea " -"pachetelor nesigure a fost interzisă de configurația dumneavoastră actuală." -msgstr[1] "" -"Următoarele pachete nu au fost verificate de către autorul lor. Descărcarea " -"pachetelor nesigure a fost interzisă de configurația dumneavoastră actuală." -msgstr[2] "" -"Următoarele pachete nu au fost verificate de către autorul lor. Descărcarea " -"pachetelor nesigure a fost interzisă de configurația dumneavoastră actuală." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Caută actualizări" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Demarchează toate" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Configurează sursele de programe" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Salvează marcările ca" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Nu am putut salva documentul deoarece nu am putut să scriu în %1\n" -"\n" -"Verificați dacă aveți permisiuni de scriere pentru acest fișier sau dacă " -"aveți suficient spațiu pe disc." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Salvează lista pachetelor instalate ca" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Salvează lista descărcărilor ca" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Deschide fișier" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Nu s-a putut marca nicio schimbare. Asigurați-vă că fișierul este unul cu " -"marcări creat fie de Administratorul de pachete Muon, fie de Administratorul " -"de pachete Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Alegeți un dosar" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 pachet a fost adăugat cu succes la cache" -msgstr[1] "%1 pachete au fost adăugate cu succes la cache" -msgstr[2] "%1 de pachete au fost adăugate cu succes la cache" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"În acest dosar nu au fost găsite pachete valide. Asigurați-vă că pachetele " -"sînt compatibile cu calculatorul dumneavoastră și sînt la ultima versiune." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Pachetul nu poate fi găsit" +#| msgctxt "@info:status Package state" +#| msgid "Upgradeable" +msgid "Upgradeable" +msgstr "Actualizabil" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, fuzzy, kde-format -#| msgctxt "@item:intext Remaining time" -#| msgid " - %1 remaining" msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr " - %1 rămas" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Autentificare în serviciul SSO al Ubuntu" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Arată notificări pentru:" @@ -1161,18 +174,18 @@ msgid "Downloading" msgstr "Se descarcă" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Gata" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Se așteaptă" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Se instalează" @@ -1283,25 +296,21 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1390,14 +399,12 @@ -#, fuzzy -#, fuzzy @@ -1438,7 +445,6 @@ -#, fuzzy @@ -1476,56 +482,48 @@ -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy -#, fuzzy @@ -1654,7 +652,6 @@ -#, fuzzy @@ -1669,11 +666,830 @@ -#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + +#, fuzzy + + + + +#, fuzzy + + + + +#, fuzzy + + + + +#, fuzzy + + + + +#, fuzzy + + + + +#, fuzzy + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +#, fuzzy + + + + #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/ro/muon-discover.po muon-2.0.0/po/ro/muon-discover.po --- muon-1.9.60/po/ro/muon-discover.po 1970-01-01 00:00:00.000000000 +0000 +++ muon-2.0.0/po/ro/muon-discover.po 2013-04-01 20:33:47.000000000 +0000 @@ -0,0 +1,314 @@ +# Copyright (C) YEAR This_file_is_part_of_KDE +# This file is distributed under the same license as the PACKAGE package. +# +# Sergiu Bivol , 2012, 2013. +msgid "" +msgstr "" +"Project-Id-Version: \n" +"Report-Msgid-Bugs-To: http://bugs.kde.org\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-01-31 12:36+0200\n" +"Last-Translator: Sergiu Bivol \n" +"Language-Team: Romanian \n" +"Language: ro\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " +"20)) ? 1 : 2;\n" +"X-Generator: Lokalize 1.5\n" + +#: discover/main.cpp:29 +msgid "An application discoverer" +msgstr "Descoperitor de aplicații" + +#: discover/main.cpp:35 +msgid "Muon Discover" +msgstr "Descoperire Muon" + +#: discover/main.cpp:36 +msgid "©2010-2012 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" + +#: discover/main.cpp:37 +msgid "Jonathan Thomas" +msgstr "Jonathan Thomas" + +#: discover/main.cpp:38 +msgid "Aleix Pol Gonzalez" +msgstr "Aleix Pol Gonzalez" + +#: discover/main.cpp:44 +msgid "Directly open the specified application by its package name." +msgstr "Deschide aplicația specificată direct, după denumirea pachetului său." + +#: discover/main.cpp:45 +msgid "Open with a program that can deal with the given mimetype." +msgstr "Deschide cu un program care se descurcă cu tipul MIME cerut." + +#: discover/main.cpp:46 +msgid "Display a list of entries with a category." +msgstr "Afișează o listă de înregistrări cu o categorie." + +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Căutare..." + +#: discover/MuonDiscoverMainWindow.cpp:109 +msgid "" +"Found some errors while setting up the GUI, the application can't proceed." +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:110 +msgid "Initialization error" +msgstr "Eroare de inițializare" + +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "" + +#: discover/qml/AddonsView.qml:37 +#, kde-format +msgid "%1
%2" +msgstr "%1
%2" + +#: discover/qml/AddonsView.qml:63 +msgid "Apply" +msgstr "Aplică" + +#: discover/qml/AddonsView.qml:68 +msgid "Discard" +msgstr "Elimină" + +#: discover/qml/ApplicationOverview.qml:64 +#, kde-format +msgid "%1 reviews" +msgstr "%1 recenzii" + +#: discover/qml/ApplicationOverview.qml:70 +msgid "Homepage" +msgstr "Pagina proiectului" + +#: discover/qml/ApplicationOverview.qml:79 +msgid "Launch" +msgstr "Lansează" + +#: discover/qml/ApplicationOverview.qml:86 +msgid "Review" +msgstr "Recenzie" + +#: discover/qml/ApplicationOverview.qml:91 +#, kde-format +msgid "Total Size: %1
" +msgstr "Dimensiune totală: %1
" + +#: discover/qml/ApplicationPage.qml:87 +msgid "Overview" +msgstr "Sumar" + +#: discover/qml/ApplicationPage.qml:91 +msgid "Add-ons" +msgstr "Suplimente" + +#: discover/qml/ApplicationPage.qml:96 +msgid "Reviews" +msgstr "Recenzii" + +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 +#: discover/qml/InstallApplicationButton.qml:38 +#: discover/qml/InstalledPage.qml:11 +msgid "Update" +msgstr "Actualizează" + +#: discover/qml/ApplicationsListPage.qml:111 +msgid "Name" +msgstr "Denumire" + +#: discover/qml/ApplicationsListPage.qml:117 +msgid "Rating" +msgstr "Evaluare" + +#: discover/qml/ApplicationsListPage.qml:123 +msgid "Buzz" +msgstr "Bîzîit" + +#: discover/qml/ApplicationsListPage.qml:129 +msgid "Popularity" +msgstr "Popularitate" + +#: discover/qml/ApplicationsListPage.qml:135 +msgid "Origin" +msgstr "Origine" + +#: discover/qml/CategoryPage.qml:34 +#, kde-format +msgid "Search in '%1'..." +msgstr "Caută în „%1”..." + +#: discover/qml/CategoryPage.qml:139 +#, fuzzy +#| msgid "Popularity Contest" +msgid "Popularity Contest" +msgstr "Concurs de popularitate" + +#: discover/qml/CategoryPage.qml:140 +#, kde-format +msgid "points: %1" +msgstr "puncte: %1" + +#: discover/qml/CategoryPage.qml:151 +#, fuzzy +#| msgid "Best Ratings" +msgid "Best Ratings" +msgstr "Cele mai bune evaluări" + +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Bun venit în\n" +"Descoperire Muon!" + +#: discover/qml/FeaturedBanner.qml:88 +#, kde-format +msgid "%1
%2" +msgstr "%1
%2" + +#: discover/qml/InstallApplicationButton.qml:43 +msgid "Install" +msgstr "Instalează" + +#: discover/qml/InstallApplicationButton.qml:48 +msgid "Remove" +msgstr "Elimină" + +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 +msgid "Installed" +msgstr "Instalat" + +#: discover/qml/InstalledPage.qml:31 +#, fuzzy +#| msgid "Update All!" +msgid "Update All" +msgstr "Actualizează tot!" + +#: discover/qml/Main.qml:41 +msgid "Loading..." +msgstr "Se încarcă..." + +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "" + +#: discover/qml/Main.qml:88 +msgid "Discover" +msgstr "Descoperă" + +#: discover/qml/Main.qml:94 +#, fuzzy, kde-format +#| msgid "Installed" +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Instalat" +msgstr[1] "Instalat" +msgstr[2] "Instalat" + +#: discover/qml/Main.qml:100 +msgid "Sources" +msgstr "Surse" + +#: discover/qml/ReviewDialog.qml:11 +#, kde-format +msgid "Reviewing %1" +msgstr "Se recenzează %1" + +#: discover/qml/ReviewDialog.qml:21 +msgid "Submit" +msgstr "Trimite" + +#: discover/qml/ReviewDialog.qml:30 +msgid "Close" +msgstr "Închide" + +#: discover/qml/ReviewDialog.qml:43 +msgid "Rating:" +msgstr "Evaluare:" + +#: discover/qml/ReviewDialog.qml:49 +msgid "Summary:" +msgstr "Sumar:" + +#: discover/qml/ReviewsView.qml:21 +msgid "Reviews:" +msgstr "Recenzii" + +#: discover/qml/ReviewsView.qml:30 +msgid "Tell us about this review!" +msgstr "Spuneți-ne despre această recenzie!" + +#: discover/qml/ReviewsView.qml:31 +#, kde-format +msgid "%1 out of %2 people found this review useful" +msgstr "%1 din %2 persoane au considerat utilă această recenzie" + +#: discover/qml/ReviewsView.qml:46 +#, kde-format +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" + +#: discover/qml/ReviewsView.qml:59 +msgid "Useful? Yes/No" +msgstr "Utilă? Da/Nu" + +#: discover/qml/SourcesPage.qml:17 +msgid "Add Source" +msgstr "Adaugă sursă" + +#: discover/qml/SourcesPage.qml:40 +msgid "Specify the new source" +msgstr "Specificați noua sursă" + +#: discover/qml/SourcesPage.qml:44 +msgid "OK" +msgstr "Bine" + +#: discover/qml/SourcesPage.qml:50 +msgid "Cancel" +msgstr "Renunță" + +#: discover/qml/SourcesPage.qml:72 +msgid " - The apt repository source line to add. This is one of:\n" +msgstr "" +" - Linia ce conține sursa depozitului „apt” de adăugat. E una " +"din:\n" + +#: discover/qml/SourcesPage.qml:136 +#, kde-format +msgid "%1 (Binary)" +msgstr "%1 (binar)" + +#: discover/qml/SourcesPage.qml:162 +#, kde-format +msgid "%1. %2" +msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/ro/muon-installer.po muon-2.0.0/po/ro/muon-installer.po --- muon-1.9.60/po/ro/muon-installer.po 2012-10-29 18:35:25.000000000 +0000 +++ muon-2.0.0/po/ro/muon-installer.po 2013-04-01 20:33:47.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sergiu Bivol , 2011, 2012. +# Sergiu Bivol , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-06-10 12:53+0300\n" -"Last-Translator: Sergiu Bivol \n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2013-01-31 12:35+0200\n" +"Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -26,7 +26,7 @@ msgid "Your emails" msgstr "sergiu@ase.md" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -37,7 +37,7 @@ msgstr[2] "" "Următoarele aplicații au fost instalate acum, apăsați pentru a le lansa:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Obține aplicații" @@ -60,83 +60,81 @@ msgstr "Centrul de Aplicații Muon" #: installer/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: installer/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Obține aplicații" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Aplicații instalate" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Furnizate de Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Furnizate de Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partenerii Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Independentă" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Obține aplicații" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Aplicații instalate" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Istoric" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 a fost instalat cu succes." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Pornește" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Aplicație instalată cu succes." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Lansare aplicații noi..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Instalare încheiată" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "În curs" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "în curs" @@ -211,18 +209,18 @@ msgid "Install" msgstr "Instalează" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Elimină" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Instalează" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -280,20 +278,20 @@ msgid "No reviews available" msgstr "Nu sînt disponibile recenzii" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "" "Această revizie a fost făcută pentru o versiune mai veche (versiunea %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" @@ -346,27 +344,19 @@ - - #, fuzzy - - #, fuzzy - - #, fuzzy - - #, fuzzy \ No newline at end of file diff -Nru muon-1.9.60/po/ro/muon-notifier.po muon-2.0.0/po/ro/muon-notifier.po --- muon-1.9.60/po/ro/muon-notifier.po 2012-10-29 18:35:25.000000000 +0000 +++ muon-2.0.0/po/ro/muon-notifier.po 2013-04-01 20:33:47.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sergiu Bivol , 2011, 2012. +# Sergiu Bivol , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-06-10 12:44+0300\n" -"Last-Translator: Sergiu Bivol \n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2013-01-31 12:35+0200\n" +"Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -Nru muon-1.9.60/po/ro/muon-updater.po muon-2.0.0/po/ro/muon-updater.po --- muon-1.9.60/po/ro/muon-updater.po 2012-10-29 18:35:25.000000000 +0000 +++ muon-2.0.0/po/ro/muon-updater.po 2013-04-01 20:33:47.000000000 +0000 @@ -1,20 +1,20 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sergiu Bivol , 2011, 2012. +# Sergiu Bivol , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-06-20 23:18+0300\n" -"Last-Translator: Sergiu Bivol \n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-01-31 12:35+0200\n" +"Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" @@ -26,12 +26,12 @@ msgid "Your emails" msgstr "sergiu@ase.md" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Ascunde" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -41,18 +41,18 @@ "Lista cu modificări nu este disponibilă încă. Folosiți Launchpad în schimb." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Lista cu modificări nu este disponibilă încă." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Versiune %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -77,82 +77,55 @@ msgstr "Administratorul de actualizări Muon" #: updater/main.cpp:38 -#, fuzzy -#| msgid "©2010, 2011 Jonathan Thomas" msgid "©2010-2012 Jonathan Thomas" -msgstr "©2010, 2011 Jonathan Thomas" +msgstr "©2010-2012 Jonathan Thomas" #: updater/main.cpp:39 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Actualizări de programe" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "Este mai sigur să conectați adaptorul de alimentare înainte de actualizare." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Este disponibilă o nouă versiune de Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "" - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "" - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Salvează lista de descărcare a pachetelor..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Descarcă pachete din listă..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Adaugă pachete descărcate" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Instalează actualizări" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Istoric..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Înnoire" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Istoric pachet" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Renunță" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -160,7 +133,7 @@ msgid "Starting" msgstr "Aplicarea modificărilor" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -168,8 +141,8 @@ msgid "Waiting for Authentication" msgstr "Aplicarea modificărilor" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -177,27 +150,27 @@ msgid "Waiting" msgstr "Aplicarea modificărilor" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -205,7 +178,7 @@ msgid "Loading Software List" msgstr "Se actualizează sursele de programe" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 #, fuzzy #| msgctxt "@info" #| msgid "Updating software sources" @@ -213,7 +186,7 @@ msgid "Updating software sources" msgstr "Se actualizează sursele de programe" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 #, fuzzy #| msgctxt "@info" #| msgid "Downloading Updates" @@ -221,7 +194,7 @@ msgid "Downloading Packages" msgstr "Se descarcă actualizările" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -229,7 +202,7 @@ msgid "Applying Changes" msgstr "Aplicarea modificărilor" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 #, fuzzy #| msgctxt "@info" #| msgid "Committing Changes" @@ -237,23 +210,23 @@ msgid "Finished" msgstr "Aplicarea modificărilor" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -269,12 +242,12 @@ msgstr[1] "" msgstr[2] "" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -283,111 +256,106 @@ "current version or install the new version?" msgstr "" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Use the new config file" msgid "Use New Version" -msgstr "Versiune %1:" +msgstr "Versiune" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 #, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" +#| msgctxt "@label Column label" +#| msgid "Version" msgctxt "@action Keep the old config file" msgid "Keep Old Version" -msgstr "Versiune %1:" +msgstr "Versiune" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Rata de descărcare: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 rămase" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" msgstr "Actualizări" #: updater/UpdateModel/UpdateModel.cpp:106 -#, fuzzy -#| msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" -#| msgid "Version %1:" msgctxt "@label Column label" msgid "Version" -msgstr "Versiune %1:" +msgstr "Versiune" #: updater/UpdateModel/UpdateModel.cpp:108 msgctxt "@label Column label" msgid "Download Size" msgstr "Dimensiune descărcare" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" + +#: updater/UpdaterWidget.cpp:72 +#, fuzzy +#| msgctxt "@action Reverts all potential changes to the cache" +#| msgid "Unmark All" +msgid "Mark All" +msgstr "Demarchează toate" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Actualizări importante de securitate" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Actualizări de programe" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Actualizări de sistem" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Nu au putut fi marcate toate pachetele pentru actualizare. Actualizările " -"disponibile pot necesita instalarea sau eliminarea unor noi pachete. Doriți " -"să marcați actualizările care pot necesita instalarea sau eliminarea unor " -"pachete suplimentare?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Imposibil de marcat actualizările" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Marchează actualizările" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Momentul ultimei verificări pentru actualizări este necunoscut." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." -msgstr "Apăsați pe caută actualizări pentru a verifica." +msgstr "Apăsați pe Caută actualizări pentru a verifica." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Programele de pe acest calculator sînt actuale." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Verificat ultima dată cu %1 în urmă." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Nu sînt disponibile actualizări." \ No newline at end of file diff -Nru muon-1.9.60/po/ro/muon.po muon-2.0.0/po/ro/muon.po --- muon-1.9.60/po/ro/muon.po 2012-10-29 18:35:25.000000000 +0000 +++ muon-2.0.0/po/ro/muon.po 2013-04-01 20:33:47.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Sergiu Bivol , 2011, 2012. +# Sergiu Bivol , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-06-10 12:38+0300\n" -"Last-Translator: Sergiu Bivol \n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-01-31 12:35+0200\n" +"Last-Translator: Sergiu Bivol \n" "Language-Team: Romanian \n" "Language: ro\n" "MIME-Version: 1.0\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=3; plural=n==1 ? 0 : (n==0 || (n%100 > 0 && n%100 < " "20)) ? 1 : 2;\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -176,18 +176,18 @@ msgid "Purge" msgstr "Ștergere" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Demarchează" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical oferă actualizări critice pentru %1 pînă în %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -347,78 +347,46 @@ msgstr "Administratorul de pachete Muon" #: muon/main.cpp:37 -#, fuzzy -#| msgid "© 2009-2011 Jonathan Thomas" msgid "© 2009-2012 Jonathan Thomas" -msgstr "© 2009-2011 Jonathan Thomas" +msgstr "© 2009-2012 Jonathan Thomas" #: muon/main.cpp:38 msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Citire marcări..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Salvare marcări ca..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Salvează lista de descărcare a pachetelor..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Descarcă pachete din listă..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Adaugă pachete descărcate" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Salvare listă cu pachete instalate..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Actualizare precaută" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Actualizare completă" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Elimină pachetele inutile" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Previzualizează modificările" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Aplică modificările" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Istoric..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -430,12 +398,12 @@ "actualizare completă apăsînd pe butonul Actualizare completă." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Imposibil de marcat actualizările" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -444,17 +412,17 @@ "Actualizările nu pot fi marcate. Unele actualizări pot avea dependențe de " "neîndeplinit momentan, sau pot fi reținute manual." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Înapoi" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Previzualizează modificările" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Istoric pachet" @@ -471,52 +439,52 @@ msgid "Requested" msgstr "Cerut" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Caută" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Marchează pentru instalare" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Marchează pentru eliminare" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Marchează pentru actualizare" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Marchează pentru reinstalare" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Marchează pentru epurare" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Blochează pachetul la versiunea actuală" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Deblochează pachetul" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Blochează la versiunea actuală" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -524,12 +492,12 @@ msgstr "" "Eliminarea acestui pachet vă poate deteriora sistemul. Sigur îl eliminați?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Avertisment – Eliminarea unui pachet important" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 #, fuzzy #| msgctxt "@title:window" #| msgid "Unable to Mark Package" @@ -537,24 +505,24 @@ msgid "Failed to Lock Package" msgstr "Imposibil de marcat pachetul" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Pachetul „%1” nu a putut fi marcat pentru instalare sau actualizare:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Imposibil de marcat pachetul" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -569,42 +537,24 @@ "și nu a fost încărcat niciodată, a fost marcat ca învechit, sau nu este " "disponibil în depozitele activate momentan." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, dar %4 urmează să fie instalat" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "sau %1 %2, dar %3 urmează să fie instalat" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, dar acesta nu este instalabil" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "sau %1, dar acesta nu este instalabil" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, dar acesta este un pachet virtual" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "sau %1, dar acesta este un pachet virtual" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Revizuiește și aplică modificările" diff -Nru muon-1.9.60/po/ru/libmuon.po muon-2.0.0/po/ru/libmuon.po --- muon-1.9.60/po/ru/libmuon.po 2012-10-29 18:35:28.000000000 +0000 +++ muon-2.0.0/po/ru/libmuon.po 2013-04-01 20:33:49.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Yuri Efremov , 2010, 2011, 2012. +# Yuri Efremov , 2010, 2011, 2013. # Alexander Potashev , 2010, 2011. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-21 20:39+0400\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-16 23:04+0400\n" "Last-Translator: Yuri Efremov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -22,1094 +22,110 @@ "X-Accelerator-Marker: &\n" "X-Text-Markup: kde4\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Приложения" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "С открытым кодом" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "С закрытым кодом" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Неизвестно" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "Для загрузки: %1, будет занято на диске: %2" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "Будет занято %1 на диске" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Инструменты" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Специальные возможности" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Инструменты для разработки" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Отладка" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Разработка графических интерфейсов" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "Интегрированные среды разработки" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Локализация" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Средства профилирования" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Системы контроля версий" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Веб-разработка" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Образование" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Научные и инженерные" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Астрономия" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Биология" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Химия" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Компьютерные науки и робототехника" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Электроника" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Инженерия" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "География" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Геология" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Математика" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Физика" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Шрифты" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Игры" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Аркады" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Настольные игры" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Карточные игры" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Головоломки" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Ролевые игры" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Симуляторы" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Спортивные" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Графические" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Рисование" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Рисование и редактирование" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Фотографирование" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Публикация" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Сканирование и распознавание" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Программы просмотра" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Интернет" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Общение" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Общий доступ к файлам" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Почта" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Веб-браузеры" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Мультимедиа" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Офис" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Параметры системы" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Комиксы" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Виджеты Plasma" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Модуль приложений" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Приложения в системе" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Войти в службу SSO Ubuntu" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Модуль Bodega" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Установка данных Bodega в системе" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Укажите регистрационные данные MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Тестовый модуль" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Модуль для тестирования графических интерфейсов muon" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Модуль KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Установка данных KNewStuff в системе" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Все" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Подтверждение дополнительных изменений" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Отметить дополнительные изменения?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Выполнение этого действия требует изменения в других пакетах:" -msgstr[1] "Выполнение этого действия требует изменения в других пакетах:" -msgstr[2] "Выполнение этого действия требует изменения в других пакетах:" -msgstr[3] "Выполнение этого действия требует изменения в другом пакете:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Журнал" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Поиск" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Все изменения" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Установка" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Обновление" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Удаление" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Дата" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Установлено" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "обновлён" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "снижена версия" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "удалён" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "полностью удалён" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 в %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Этот Muon имеет силу супер-коровы" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Системное администрирование" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Базовая система" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Инфраструктура Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Обмен информацией" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Базы данных" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Разработка" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Документация" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Отладка" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Редакторы" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Электроника" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Встроенные системы" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Шрифты" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Игры и развлечения" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Среда GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Графика" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Статистическая система GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Среда Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Любительское радио" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Язык Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Веб-серверы" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Интерпретируемые языки" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Язык Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "Среда KDE" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Ядро и модули" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Библиотеки — Разработка" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Библиотеки" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Язык Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Локализация" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Электронная почта" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Математика" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Разное — Консольные приложения" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Работа в сети" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Группы новостей" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Язык OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Библиотеки — Устаревшие" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Поддержка других платформ" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Язык Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Язык PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Язык Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Язык Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Наука" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Командные оболочки" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Мультимедиа" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Работа в TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Текстовые процессоры" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Утилиты" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Системы контроля версий" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Работа с видео" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Интернет" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Разное — графические приложения" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Среда Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Среда Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Неизвестные" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Сломан" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Преобразованные из RPM с помощью Alien" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Интернационализация и локализация" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Метапакеты" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "С ограничениями на экспорт" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Несвободные" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Пакеты пользователей" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Образование" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Данные интроспекции GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Не установленные" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Доступно" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" -msgstr "Установленные" +msgstr "Установлено" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Можно обновить" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Сломанные" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Окончательная настройка" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Установлено (автоматически удаляемое)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Без изменений" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Установка" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Обновления" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Удаление" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Полного удаления" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Переустановка" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Снижение версии" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Зафиксировано" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Общая" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-битная" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-битная" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Ошибка инициализации" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Не удалось заблокировать систему управления пакетами" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Недостаточно места на диске" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Не удалось применить изменения" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Ошибка аутентификации" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Неожиданная ошибка" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Ненадёжные пакеты" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Неизвестная ошибка" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Не удалось инициализировать систему управления пакетами, ваша конфигурация " -"может быть повреждена" - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Похоже, в настоящее время ещё одно приложение использует систему управления " -"пакетами. Вам следует завершить работу всех других программ управления " -"пакетами, прежде чем вы сможете устанавливать или удалять пакеты." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"В каталоге %1 недостаточно места для продолжения выполнения этого действия." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Не удалось загрузить пакеты" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "При внесении изменений произошла ошибка:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "Выполнение этого действия без соответствующего полномочия невозможно" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Похоже, базовая программа QApt аварийно завершила работу или исчезла из " -"списка процессов. Пожалуйста, сообщите об этой ошибке сопровождающему QApt." - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Следующие пакеты не были подписаны автором. Загрузка ненадёжных пакетов " -"запрещена текущими настройками." -msgstr[1] "" -"Следующие пакеты не были подписаны автором. Загрузка ненадёжных пакетов " -"запрещена текущими настройками." -msgstr[2] "" -"Следующие пакеты не были подписаны автором. Загрузка ненадёжных пакетов " -"запрещена текущими настройками." -msgstr[3] "" -"Следующий пакет не был подписан автором. Загрузка ненадёжных пакетов " -"запрещена текущими настройками." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Проверить обновления" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Снять все метки" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Настроить источники программ" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Сохранение отмеченных" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Не удалось сохранить документ из-за ошибки записи в %1\n" -"\n" -"Проверьте, есть ли у вас права на запись этого файла, и что достаточно " -"свободного места на диске." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Сохранение списка установленных пакетов" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Сохранение списка для загрузки" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Открытие файла" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Не удалось отметить изменения. Проверьте, что файл был создан программой " -"управления пакетами Muon или программой управления пакетами Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Выбор каталога" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "В кэш успешно добавлен %1 пакет" -msgstr[1] "В кэш успешно добавлены %1 пакета" -msgstr[2] "В кэш успешно добавлено %1 пакетов" -msgstr[3] "В кэш успешно добавлен 1 пакет" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"В этом каталоге не удалось найти ни одного допустимого пакета. Убедитесь, " -"что пакеты совместимы с вашей системой и имеют последнюю версию." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Не удалось найти пакеты" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "Осталось: %1" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Войти в службу SSO Ubuntu" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Показывать уведомления для:" @@ -1147,18 +163,18 @@ msgid "Downloading" msgstr "Загрузка" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Завершено" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Ожидание" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Установка" @@ -1171,121 +187,4 @@ #: libmuon/Transaction/TransactionListener.cpp:183 msgctxt "@info:status" msgid "Removing" -msgstr "Удаление" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#, fuzzy \ No newline at end of file +msgstr "Удаление" \ No newline at end of file diff -Nru muon-1.9.60/po/ru/muon-discover.po muon-2.0.0/po/ru/muon-discover.po --- muon-1.9.60/po/ru/muon-discover.po 2012-10-29 18:35:28.000000000 +0000 +++ muon-2.0.0/po/ru/muon-discover.po 2013-04-01 20:33:49.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Yuri Efremov , 2012. +# Yuri Efremov , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-21 20:56+0400\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-16 23:04+0400\n" "Last-Translator: Yuri Efremov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -43,32 +43,55 @@ #: discover/main.cpp:44 msgid "Directly open the specified application by its package name." -msgstr "" +msgstr "Запуск программы по имени пакета." #: discover/main.cpp:45 msgid "Open with a program that can deal with the given mimetype." msgstr "" +"Открыть с помощью программы, которая способна обрабатывать данные этого типа " +"MIME." #: discover/main.cpp:46 msgid "Display a list of entries with a category." +msgstr "Отображение списка записей с категорией." + +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." msgstr "" +"Открыть Muon Discover в указанном режиме. Названия режимов соответствуют " +"названиям кнопок панели инструментов." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Список всех доступных режимов с выводом на stdout." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Доступные режимы:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Поиск..." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" +"При настройке графического интерфейса были обнаружены ошибки. Продолжения " +"работы программы невозможно." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Ошибка инициализации" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Добавить источники..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Удалить источники ..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Меню" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Настроить и узнать о Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -83,90 +106,94 @@ msgid "Discard" msgstr "Отклонить" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "Отзывов: %1" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Домашняя страница" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Запустить" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Отзыв" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Общий размер: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Обзор" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Дополнения" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Отзывы" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Обновить" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "По названию" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "По оценке" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "По отзывам" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "По популярности" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "По источнику" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Поиск в «%1»..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Поиск..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Лидеры по популярности" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "очков: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Лучшие оценки" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Добро пожаловать в\n" +"Muon Discover!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -179,25 +206,36 @@ msgid "Remove" msgstr "Удалить" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Установлено" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "Обновить все!" +msgstr "Обновить всё" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Загрузка..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Назад" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Обзор программ" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Установлено (%1 обновление)" +msgstr[1] "Установлено (%1 обновления)" +msgstr[2] "Установлено (%1 обновлений)" +msgstr[3] "Установлено (%1 обновление)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Источники" @@ -222,58 +260,62 @@ msgid "Summary:" msgstr "Описание:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Отзывы:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Сообщите нам своё мнение об этом отзыве!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 из %2 пользователей считают этот отзыв полезным" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1, автор — %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 by %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "" "Считаете отзыв полезным? Да/Нет" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Добавить источник" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Укажите новый источник" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Отмена" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " — строка для добавления источника репозитория apt. Может быть " "одной из:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (Бинарные пакеты)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/ru/muon-installer.po muon-2.0.0/po/ru/muon-installer.po --- muon-1.9.60/po/ru/muon-installer.po 2012-10-29 18:35:28.000000000 +0000 +++ muon-2.0.0/po/ru/muon-installer.po 2013-04-01 20:33:49.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Yuri Efremov , 2010, 2011, 2012. +# Yuri Efremov , 2010, 2011, 2013. # Alexander Potashev , 2010. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-21 20:56+0400\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2013-01-17 19:52+0400\n" "Last-Translator: Yuri Efremov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -30,7 +30,7 @@ msgid "Your emails" msgstr "yur.arh@gmail.com" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -39,7 +39,7 @@ msgstr[2] "Установлены следующие приложения, для их запуска щёлкните по ним:" msgstr[3] "Установлено следующее приложение, для его запуска щёлкните по нему:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Получение программ" @@ -69,74 +69,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Доступные программы" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Установленные программы" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Предоставляется Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Предоставляется Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Партнёры компании Canonical" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Независимый источник" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Доступные программы" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Установленные программы" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Журнал" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 успешно установлено." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Запустить" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Приложения успешно установлены." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Запустить новые приложения..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Установка завершена" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Идёт работа" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Идёт работа" @@ -212,18 +212,18 @@ msgid "Install" msgstr "Установка" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Удаление" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Установка" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -281,19 +281,19 @@ msgid "No reviews available" msgstr "Отзывы отсутствуют" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Данный обзор был написан для старой версии (версия: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/ru/muon-notifier.po muon-2.0.0/po/ru/muon-notifier.po --- muon-1.9.60/po/ru/muon-notifier.po 2012-10-29 18:35:28.000000000 +0000 +++ muon-2.0.0/po/ru/muon-notifier.po 2013-04-01 20:33:49.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Yuri Efremov , 2010, 2011, 2012. +# Yuri Efremov , 2010, 2011, 2013. # Alexander Potashev , 2011. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-07-19 13:25+0400\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2013-01-17 19:53+0400\n" "Last-Translator: Yuri Efremov \n" "Language-Team: Russian \n" "Language: ru\n" diff -Nru muon-1.9.60/po/ru/muon-updater.po muon-2.0.0/po/ru/muon-updater.po --- muon-1.9.60/po/ru/muon-updater.po 2012-10-29 18:35:28.000000000 +0000 +++ muon-2.0.0/po/ru/muon-updater.po 2013-04-01 20:33:49.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Yuri Efremov , 2010, 2011, 2012. +# Yuri Efremov , 2010, 2011, 2013. # Alexander Potashev , 2011. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-21 21:48+0400\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-16 23:06+0400\n" "Last-Translator: Yuri Efremov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -30,12 +30,12 @@ msgid "Your emails" msgstr "yur.arh@gmail.com" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Скрыть" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -45,18 +45,18 @@ "Список изменений недоступен. Для его просмотра воспользуйтесь Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Список изменений недоступен." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Версия %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -88,150 +88,125 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Обновление программ" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "Для безопасного обновления используйте питание от сети переменного тока." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Доступна новая версия Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Открыть отмеченные..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Сохранить отмеченные как..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Сохранить список пакетов для загрузки..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Загрузить пакеты из списка..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Добавить загруженные пакеты" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Установить обновления" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Журнал..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Обновление" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Журнал пакетов" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Отменить" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" msgstr "Запуск" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "Ожидание аутентификации" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "Ожидание" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "Ожидание завершения других операций" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "Ожидание завершения работы других менеджеров программ" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "Ожидание носителя информации" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "Ожидание конфигурационного файла" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "Загрузка списка программ" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Обновление источников программ" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Загрузка пакетов" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "Применение изменений" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" msgstr "Завершено" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "Требуется сменить носитель" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "Пожалуйста, вставьте %1 в %2" +msgstr "Вставьте %1 в %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "Внимание — неподписанное программное обеспечение" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -260,12 +235,12 @@ "Установка непроверенного программного обеспечения представляет " "угрозу безопасности системы. Продолжить?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "Изменён конфигурационный файл" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -277,28 +252,33 @@ "ваша текущая версия была изменена. Использовать новую версию или оставить " "текущую?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Использовать новую версию" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Оставить текущую версию" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Скорость загрузки: %1/с" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 осталось" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -314,67 +294,61 @@ msgid "Download Size" msgstr "Размер загрузки" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Некоторые пакеты не обозначены для обновления.

Их обновление " +"требуется для установки или удаления других пакетов.

Выполнить обновление " +"этих пакетов?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Отметить всё" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Важные обновления безопасности" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Обновления приложений" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Обновления системы" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Не все пакеты могут быть отмечены для обновления. Доступным обновлениям " -"может потребоваться установка новых пакетов или удаление уже установленных. " -"Выполнить эти обновления?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Не удалось отметить обновления" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Отметить обновления" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Неизвестно, когда происходила последняя проверка наличия обновлений." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Для проверки наличия обновлений нажмите Проверить обновления." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "" "Программное обеспечение на этом компьютере находится в актуальном состоянии." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Последняя проверка была %1 назад." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Нет доступных обновлений." \ No newline at end of file diff -Nru muon-1.9.60/po/ru/muon.po muon-2.0.0/po/ru/muon.po --- muon-1.9.60/po/ru/muon.po 2012-10-29 18:35:28.000000000 +0000 +++ muon-2.0.0/po/ru/muon.po 2013-04-01 20:33:49.000000000 +0000 @@ -1,14 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Yuri Efremov , 2010, 2011, 2012. +# Yuri Efremov , 2010, 2011, 2013. # Alexander Potashev , 2010, 2011. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-21 21:45+0400\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-16 23:08+0400\n" "Last-Translator: Yuri Efremov \n" "Language-Team: Russian \n" "Language: ru\n" @@ -181,18 +181,18 @@ msgid "Purge" msgstr "Полного удаления" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Снять метки" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical предоставляет критические обновления для %1 до %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -359,69 +359,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Открыть отмеченные..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Сохранить отмеченные как..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Сохранить список пакетов для загрузки..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Загрузить пакеты из списка..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Добавить загруженные пакеты" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Сохранение списка установленных пакетов..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Осторожное обновление" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Полное обновление" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Удалить ненужные пакеты" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Просмотр изменений" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Применить изменения" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Журнал..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -433,12 +403,12 @@ "сделать полное обновление, нажав на кнопку Полное обновление." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Не удалось отметить обновления" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -447,17 +417,17 @@ "Не удалось отметить обновления. Некоторые обновления могут иметь " "невыполнимые зависимости, или они удержаны вручную." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Назад" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Просмотр изменений" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Журнал" @@ -474,89 +444,86 @@ msgid "Requested" msgstr "Действие" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Поиск" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Отметить для установки" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Отметить для удаления" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Отметить для обновления" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Отметить для переустановки" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Отметить для полного удаления" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Зафиксировать текущую версию пакета" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Снять фиксирование версии" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Зафиксировать текущую версию" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " "it?" msgstr "Удаление этого пакета может повредить систему. Удалить его?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Внимание — Удаление важного пакета" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Не удалось отметить пакет" +msgstr "Не удалось заблокировать пакет" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." -msgstr "" +msgstr "Пакет %1 не может быть заблокирован. Ошибка записи в файл блокировки." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Пакет «%1» не может быть отмечен для установки или обновления:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Не удалось отметить пакет" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -570,42 +537,24 @@ "никогда не был загружен, устарел или его нет ни в одном из включённых " "репозиториев." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, но будет установлено %4" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "или %1 %2, но будет установлено %3" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, но не может быть установлен" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "или %1, но не может быть установлен" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, но это виртуальный пакет" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "или %1, но это виртуальный пакет" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Обзор и применение изменений" @@ -757,7 +706,7 @@ #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" -msgstr "Пожалуйста, вставьте %1 в %2" +msgstr "Вставьте %1 в %2" #: muon/TransactionWidget.cpp:263 msgctxt "@title:window" diff -Nru muon-1.9.60/po/sk/libmuon.po muon-2.0.0/po/sk/libmuon.po --- muon-1.9.60/po/sk/libmuon.po 2012-10-29 18:35:34.000000000 +0000 +++ muon-2.0.0/po/sk/libmuon.po 2013-04-01 20:33:54.000000000 +0000 @@ -1,13 +1,13 @@ # translation of libmuon.po to Slovak # Richard Fric , 2010. # Milan Basa , 2011. -# Roman Paholík , 2012. +# Roman Paholík , 2013. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-18 12:31+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-10 15:39+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -17,1077 +17,103 @@ "X-Generator: Lokalize 1.5\n" "Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Aplikácie" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Open Source" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Proprietárne" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Neznáme" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 na stiahnutie, %2 na disku" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 na disku" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Príslušenstvo" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Prístupnosť" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Nástroje pre vývojárov" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Debugovanie" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Návrh grafického rozhrania" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "Vývojové prostredia" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Lokalizácia" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profilovanie" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Správa verzií" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Vývoj webu" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Vzdelávanie" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Veda a inžinierstvo" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronómia" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biológia" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Chémia" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Počítačová veda & Robotika" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Inžinierstvo" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografia" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geológia" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fyzika" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Písma" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Hry" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arkády" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Stolové hry" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Kartové hry" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Skladačky" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "RPG" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulátory" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Športovanie" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Kresba" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Maľovanie & Editovanie" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografovanie" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Publikovanie" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Skenovanie & OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Prehliadače" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Rozhovor" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Zdieľanie súborov" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Mail" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Webové prehliadače" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Multimédiá" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Kancelária" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Systém & Nastavenia" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Komikx" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Widgety plochy Plasma" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Backend aplikácií" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Aplikácie vo vašom systéme" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Prihlásiť sa do služby Ubuntu SSO" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Bodega Backend" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Nainštalovať údaje Bodega na váš systém" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Zadať prihlasovacie údaje MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Prázdny backend" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Prázdny backend na test frontendov muon" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "KNewStuff Backend" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Nainštalovať KNewStuff dáta na váš systém" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Všetko" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Potvrdiť ďalšie zmeny" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Označiť ďalšie zmeny?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Táto akcia vyžaduje zmenu ďalšieho balíka:" -msgstr[1] "Táto akcia vyžaduje zmeny ďalších balíkov:" -msgstr[2] "Táto akcia vyžaduje zmeny ďalších balíkov:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "História" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Hľadať" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Všetky zmeny" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Inštalácie" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Updaty" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Odstránené" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Dátum" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Inštalované" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Upgradované" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Downgradované" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Odstránené" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Uvoľnené" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 na %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Muon má super možnosti" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Administrácia systému" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Základný systém" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Mono/CLI Infraštruktúra" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Komunikácia" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Databázy" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Vývoj" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentácia" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Debugovanie" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Editory" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Zariadenia" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Fonty" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Hry a zábava" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "GNOME prostredie plochy" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "GNU R štatistický systém" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Gnustep prostredie plochy" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amatérske rádio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Haskell programovací jazyk" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Webové servery" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Interpretované počítačové jazyky" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Java programovací jazyk" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE softwareová kompilácia" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Kernel a moduly" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Knižnice - vývoj" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Knižnice" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Lisp programovací jazyk" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Lokalizácia" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "Email" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Rôzne - Textovo založené" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Siete" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Skupiny (Newsgroups)" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "OCaml programovací jazyk" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Knižnice - staré" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Cross Platform" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Perl programovací jazyk" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "PHP programovací jazyk" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Python programovací jazyk" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Ruby programovací jazyk" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Veda" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Shelly" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Multimédia" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "TeX autorizácia" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Textové procesory" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Utility" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Systémy kontroly verzií" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Video software" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Rôzne - Grafika" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Xfce prostredie plochy" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Zope/Plone prostredie" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Neznáme" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Chybné" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Konvertované Alienom z RPM" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Internacionalizácia a lokalizácia" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta balíčky" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Vyhradené na export" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Non-free" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Contrib" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Vzdelávanie" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Introspekčné dáta GObject" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Neinštalované" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Dostupné" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" -msgstr "Inštalované" +msgstr "Nainštalované" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" -msgstr "Upgradovateľné" - -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Vadné" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Trvalá konfigurácia" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Inštalované (auto-odstrániteľné)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Bez zmeny" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Inštalovať" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Upgradovať" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Odstrániť" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Uvoľniť" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Reinštalovať" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Downgradovať" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Zamknuté" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Spoločné" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bitové" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bitové" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Chyba inicializácie" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Nie je možné získať systémový zámok ku balíčkom" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Nedostatok diskového priestoru" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Zlyhalo použitie zmien" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Chyba autentikácie" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Neočakávaná chyba" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Neoverené balíčky" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Neznáma chyba" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Balíčkovací systém nie je možné inicializovať, asi máte narušenú " -"konfiguráciu." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Iná aplikácia práve používa balíčkovací systém. Musíte zavrieť všetkých " -"ostatných správcov balíčkov predtým ako budete inštalovať alebo odstraňovať " -"balíčky." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "" -"Nemáte dosť diskového priestoru v adresári na %1 aby sa mohlo pokračovať v " -"tejto operácii." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Nie ja možné stiahnuť balíčky" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Vyskytla sa chyba pri zavádzaní zmien:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "Táto operácia nemôže pokračovať pretože nebola prevedená autorizácia" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "Zdá sa že QApt sa zrútil. Pošlite prosím bug-report QApt maintainerom." - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Nasledujúci balíček nebol verifikovaný autorom. Sťahovanie neoverených " -"balíčkov nie je povolené vašou aktuálnou konfiguráciou." -msgstr[1] "" -"Nasledujúce balíčky neboli verifikované autorom. Sťahovanie neoverených " -"balíčkov nie je povolené vašou aktuálnou konfiguráciou." -msgstr[2] "" -"Nasledujúce balíčky neboli verifikované autorom. Sťahovanie neoverených " -"balíčkov nie je povolené vašou aktuálnou konfiguráciou." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Skontrolovať updaty" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Odznačiť všetko" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Konfigurácia zdrojov softwaru" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Uložiť označenia ako" - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dokument nemohol byť uložený, pretož nebolo umožnené zapisovať do " -"%1\n" -"\n" -"Skontrolujte či máte právo zápisu do súboru alebo či máte na disku dosť " -"miesta." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Uložiť zoznam inštalovaných balíčkov ako" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Uložiť zoznam sťahovaní ako" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Otvoriť súbor" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Nie je možné označiť zmeny. Presvedčte sa daný súbor je značkovacím súborom " -"balíčkovacieho menežéra Muon alebo Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Vyberte adresár" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 balíček bol úspešne pridaný do cache" -msgstr[1] "%1 balíčky boli úspešne pridané do cache" -msgstr[2] "%1 balíčkov bolo úspešne pridaných do cache" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"V tomto adresári sa nenašli platné balíčky. Presvedčte sa že balíčky sú " -"kompatibilné s vaším počítačom a že je to ich posledná verzia." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Balíčky neboli nájdené" +msgstr "Aktualizovateľné" #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format @@ -1095,11 +121,6 @@ msgid "%1 remaining" msgstr "%1 zostáva" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Prihlásiť sa do služby Ubuntu SSO" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Ukáž hlásenia pre:" @@ -1137,18 +158,18 @@ msgid "Downloading" msgstr "Sťahovanie" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Hotovo" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Čakanie" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Inštalovanie" diff -Nru muon-1.9.60/po/sk/muon-discover.po muon-2.0.0/po/sk/muon-discover.po --- muon-1.9.60/po/sk/muon-discover.po 2012-10-29 18:35:34.000000000 +0000 +++ muon-2.0.0/po/sk/muon-discover.po 2013-04-01 20:33:54.000000000 +0000 @@ -1,11 +1,11 @@ # translation of muon-discover.po to Slovak -# Roman Paholik , 2012. +# Roman Paholik , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon-discover\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-24 22:14+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-10 15:41+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -47,23 +47,42 @@ msgid "Display a list of entries with a category." msgstr "Zobraziť zoznam položiek s kategóriou." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Otvoriť Muon Discover a danom režime. Režimy korešpondujú s tlačidlami " +"panelu nástrojov." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Vypísať všetky dostupné režimy a vypísať ich na štandardný výstup." + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Dostupné režimy:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Hľadať..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Našli sa nejaké chyby počas nastavovania GUI, aplikácia nemôže pokračovať." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Chyba inicializácie" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Pridávania pôvodov..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Odstraňovanie pôvodov..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Ponuka" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Nastaviť a naučiť sa o Muon Discover" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -78,90 +97,94 @@ msgid "Discard" msgstr "Zahodiť" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 hodnotenia" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Domovská stránka" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Spustiť" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Revízia" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Celková veľkosť: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Prehľad" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Doplnky" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Revízie" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Aktualizovať" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Názov" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Hodnotenie" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Buzz" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Obľúbenosť" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Pôvod" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Hľadať v '%1'..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Hľadať..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Súťaž popularity" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "body: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Najlepšie hodnotenia" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Vitajte v\n" +"Muon Discover!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -174,23 +197,35 @@ msgid "Remove" msgstr "Odstrániť" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Nainštalované" -#: discover/qml/InstalledPage.qml:29 +#: discover/qml/InstalledPage.qml:31 msgid "Update All" msgstr "Aktualizovať všetko" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Načítava sa..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Späť" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Objaviť" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Nainštalované (%1 aktualizácia)" +msgstr[1] "Nainštalované (%1 aktualizácie)" +msgstr[2] "Nainštalované (%1 aktualizácií)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Zdroje" @@ -215,55 +250,59 @@ msgid "Summary:" msgstr "Súhrn:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Hodnotenia:" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Povedzte nám o tomto hodnotení!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 z %2 ľudí považujú toto hodnotenie za užitočné" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 do %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 od %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Užitočné? Áno/Nie" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Pridať zdroj" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Zadať nový zdroj" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "OK" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Zrušiť" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr "" " - Riadok zdroja apt repozitára na pridanie. Je to jeden z:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (binárne)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/sk/muon-installer.po muon-2.0.0/po/sk/muon-installer.po --- muon-1.9.60/po/sk/muon-installer.po 2012-10-29 18:35:34.000000000 +0000 +++ muon-2.0.0/po/sk/muon-installer.po 2013-04-01 20:33:54.000000000 +0000 @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: muon-installer\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" "PO-Revision-Date: 2012-08-20 15:25+0200\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" @@ -25,7 +25,7 @@ msgid "Your emails" msgstr "minkob@mail.t-com.sk" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -36,7 +36,7 @@ msgstr[2] "" "Nasledujúce aplikácie boli práve nainštalované, kliknite na ich spustenie." -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Dostať software" @@ -66,74 +66,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Dostať software" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Inštalovaný software" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Poskytnuté Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Poskytnuté Debianom" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partneri Canonicalu" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Nezávislý" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Dostať software" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Inštalovaný software" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "História" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 bol úspešne nainštalovaný" -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Štart" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Aplikácie úspešne inštalované." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Spustiť nové aplikácie..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Inštalácia kompletná" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "Prebieha" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "Prebieha" @@ -208,18 +208,18 @@ msgid "Install" msgstr "Inštalovať" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Odstrániť" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Inštalovať" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -277,19 +277,19 @@ msgid "No reviews available" msgstr "Žiadne dostupné recenzie" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Táto recenzia bola napísaná pre staršiu verziu (Verziu: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/sk/muon-notifier.po muon-2.0.0/po/sk/muon-notifier.po --- muon-1.9.60/po/sk/muon-notifier.po 2012-10-29 18:35:34.000000000 +0000 +++ muon-2.0.0/po/sk/muon-notifier.po 2013-04-01 20:33:54.000000000 +0000 @@ -5,7 +5,7 @@ msgstr "" "Project-Id-Version: muon-notifier\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" "PO-Revision-Date: 2012-07-30 09:09+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" diff -Nru muon-1.9.60/po/sk/muon-updater.po muon-2.0.0/po/sk/muon-updater.po --- muon-1.9.60/po/sk/muon-updater.po 2012-10-29 18:35:34.000000000 +0000 +++ muon-2.0.0/po/sk/muon-updater.po 2013-04-01 20:33:54.000000000 +0000 @@ -1,13 +1,13 @@ # translation of muon-updater.po to Slovak # Richard Fric , 2010. # Milan Basa , 2011. -# Roman Paholík , 2012. +# Roman Paholík , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon-updater\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-21 21:18+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-10 15:43+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -25,12 +25,12 @@ msgid "Your emails" msgstr "minkob@mail.t-com.sk" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Skryť" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -40,18 +40,18 @@ "Zoznam zmien ešte nie je dostupný. Please use Launchpad instead." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Zoznam zmien ešte nie je dostupný." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Verzia %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -83,149 +83,124 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Softwareové updaty" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "Lepšie je zapojiť napájací adaptér pred aktualizáciou." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Nová verzia Kubuntu je dostupná." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Načítať označenia..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Uložiť označenia ako..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Uložiť zoznam pre sťahovanie balíčkov...." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Stiahnuť balíčky zo zoznamu...." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Pridať stiahnuté balíčky" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Inštalovať updaty" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "História..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Aktualizovať" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "História balíka" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Zrušiť" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" -msgstr "Spúšťanie" +msgstr "Spúšťam" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "Čaká sa na overenie" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "Čakanie" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "Čakanie na ukončenie iných transakcií" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" msgstr "Čakanie na ukončenie iných správcov softvéru" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "Čakanie na potrebné médium" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "Čakanie na konfiguračný súbor" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "Načítavanie zoznamu softvéru" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Updatovanie softwareových zdrojov" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Sťahovanie balíčkov" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "Aplikujú sa zmeny" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" msgstr "Ukončené" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "Vyžaduje sa zmena média" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "Prosím vložte %1 do %2" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "Upozornenie - Neoverený softvér" -#: updater/ProgressWidget.cpp:240 +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -238,24 +213,24 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"Nasledujúci softvér nemôže byť overený. Inštalovanie neovereného " -"softvéru znamená bezpečnostné riziko, keďže prítomnosť neovereného softvéru " -"môže byť znakom manipulácie.Chcete pokračovať?" +"Nasledujúci softvér nemôže byť overený. Inštalácia neovereného " +"softvéru predstavuje bezpečnostné riziko, pretože prítomnosť neovereného " +"softvéru môže byť znakom manipulácie.Prajete si pokračovať?" msgstr[1] "" -"Nasledujúce softvéry nemôžu byť overene. Inštalovanie neovereného " +"Nasledujúce softvéry nemôžu byť overené. Inštalovanie neovereného " "softvéru znamená bezpečnostné riziko, keďže prítomnosť neovereného softvéru " "môže byť znakom manipulácie.Chcete pokračovať?" msgstr[2] "" -"Nasledujúce softvéry nemôžu byť overene. Inštalovanie neovereného " +"Nasledujúce softvéry nemôžu byť overené. Inštalovanie neovereného " "softvéru znamená bezpečnostné riziko, keďže prítomnosť neovereného softvéru " "môže byť znakom manipulácie.Chcete pokračovať?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "Konfiguračný súbor sa zmenil" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -267,28 +242,33 @@ "ale vaša verzia bola zmenená. Chcete ponechať vašu aktuálnu verziu alebo " "nainštalovať novú verziu?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Použiť novú verziu" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Ponechať starú verziu" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Rýchlosť sťahovania: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "%1 zostáva" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -304,65 +284,59 @@ msgid "Download Size" msgstr "Veľkosť inštalačného balíka" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Niektoré balíky neboli označené na aktualizáciu.

Aktualizácia " +"týchto balíkov potrebuje nainštalovať alebo odstrániť nejaké iné balíky.

Chcete aktualizovať aj tieto?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Označiť všetko" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Dôležité bezpečnostné aktualizácie" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Aktualizácie aplikácií" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Systémové aktualizácie" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Nie všetky balíky mohli byť označené na aktualizáciu. Dostupné aktualizácie " -"môžu vyžadovať inštaláciu alebo odstránenie nových balíkov. Chcete označiť " -"aktualizácie, ktoré vyžadujú inštaláciu alebo odstránenie ďalších balíkov?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Nepodarilo sa označiť aktualizácie" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Označiť aktualizácie" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Nie je známe, kedy sa naposledy kontrolovali aktualizácie." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Prosím kliknite na Kontrola aktualizácií na kontrolu." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Softvér na tomto počítači je aktuálny." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Naposledy skontrolované pred %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Žiadne aktualizácie nie sú dostupné." \ No newline at end of file diff -Nru muon-1.9.60/po/sk/muon.po muon-2.0.0/po/sk/muon.po --- muon-1.9.60/po/sk/muon.po 2012-10-29 18:35:34.000000000 +0000 +++ muon-2.0.0/po/sk/muon.po 2013-04-01 20:33:54.000000000 +0000 @@ -1,13 +1,13 @@ # translation of muon.po to Slovak # Richard Fric , 2010. # Milan Basa , 2011. -# Roman Paholík , 2012. +# Roman Paholík , 2012, 2013. msgid "" msgstr "" "Project-Id-Version: muon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-24 22:14+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-10 15:43+0100\n" "Last-Translator: Roman Paholík \n" "Language-Team: Slovak \n" "Language: sk\n" @@ -175,18 +175,18 @@ msgid "Purge" msgstr "Vyčistiť" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Odznačiť" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical poskytuje kritické updaty pre %1 do %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -352,69 +352,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Načítať označenia..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Uložiť označenia ako..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Uložiť zoznam balíčkov na stiahnutie..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Stiahnuť balíčky podľa zoznamu..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Všetky stiahnuté balíčky" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Ulož zoznam inštalovaných balíčkov..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Podmienený upgrade" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Plný upgrade" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Odstránenie nepotrebných balíčkov" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Zobraziť zmeny" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Aplikovať zmeny" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "História..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -425,12 +395,12 @@ "odstránenie nových balíčkov. Mali by ste skúsiť plný upgrade kliknutím na " "tlačidlo Plný upgrade." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Nie je možné označiť upgrady" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -439,17 +409,17 @@ "Nie je možný označiť upgrady. Niektoré upgrady môžu mať neuspokojené " "závislosti, alebo sú manuálne zablokované." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Naspäť" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Zobraziť zmeny" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "História balíčkov" @@ -466,52 +436,52 @@ msgid "Requested" msgstr "Požadované" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Hľadať" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Označiť na inštaláciu" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Označiť na odstránenie" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Označiť na aktualizáciu" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Označiť na preinštalovanie" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Označiť na vyčistenie" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Zamknúť balík na aktuálne verzii" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Odomknúť balík" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Zamknúť na aktuálnej verzii" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -519,34 +489,34 @@ msgstr "" "Odstránenie tohto balíka môže poškodiť váš systém. Určite ho chcete ostrániť?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Upozornenie - Odstraňovanie dôležitého balíka" -#: muon/PackageModel/PackageWidget.cpp:559 +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" msgstr "Zlyhalo zamknutie balíka" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "Balík %1 sa nedá zamknúť. Zlyhal zápis súboru zámku." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Balík \"%1\" nemohol byť označený na inštaláciu alebo aktualizáciu:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Nedá sa označiť balík" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -560,42 +530,24 @@ "nahratý, je zastaralý, alebo nie je dostupný z aktuálne povolených " "repozitárov." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, ale %4 sa bude inštalovať" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "alebo %1 %2, ale %3 sa bude inštalovať" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, ale nedá sa nainštalovať" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "alebo %1, ale nedá sa nainštalovať" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, alebo je to virtuálny balík" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "alebo %1, ale je to virtuálny balík" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Prezrieť a aplikovať zmeny" @@ -766,9 +718,9 @@ "unverifiable software can be a sign of tampering. Do you wish to " "continue?" msgstr[0] "" -"Nasledujúci softvér nemôže byť overený. Inštalovanie neovereného " -"softvéru znamená bezpečnostné riziko, keďže prítomnosť neovereného softvéru " -"môže byť znakom manipulácie.Chcete pokračovať?" +"Nasledujúci softvér nemôže byť overený. Inštalácia neovereného " +"softvéru predstavuje bezpečnostné riziko, pretože prítomnosť neovereného " +"softvéru môže byť znakom manipulácie.Prajete si pokračovať?" msgstr[1] "" "Nasledujúce softvéry nemôžu byť overené. Inštalovanie neovereného " "softvéru znamená bezpečnostné riziko, keďže prítomnosť neovereného softvéru " diff -Nru muon-1.9.60/po/sl/libmuon.po muon-2.0.0/po/sl/libmuon.po --- muon-1.9.60/po/sl/libmuon.po 2012-10-29 18:35:36.000000000 +0000 +++ muon-2.0.0/po/sl/libmuon.po 2013-04-01 20:33:56.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Andrej Mernik , 2012. +# Andrej Mernik , 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-19 16:59+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-14 19:03+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -16,1098 +16,112 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Programi" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "Odprta koda" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "Lastniško" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "Neznano" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 za prejem, %2 na disku" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 na disku" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "Pripomočki" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "Dostopnost" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "Orodja za razvijalce" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "Razhroščevanje" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "Zasnova grafičnih vmesnikov" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "Haskell" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "IDE-ji" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "Java" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "Prevodi" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "Perl" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "Profiliranje" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "Python" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "Nadzor različic" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "Spletni razvoj" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "Izobraževanje" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "Znanost in inženirstvo" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "Astronomija" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "Biologija" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "Kemija" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "Računalniška znanost in robotika" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "Inženirstvo" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "Geografija" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "Geologija" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "Fizika" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "Pisave" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "Igre" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "Arkade" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "Namizne igre" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "Igre s kartami" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "Sestavljanke" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "Igranje vlog" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "Simulacije" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "Športne" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "3D" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "Risanje" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "Barvanje in urejanje" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "Fotografija" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "Založništvo" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "Optično branje in OCR" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "Pregledovalniki" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "Internet" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "Klepet" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "Souporaba datotek" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "Pošta" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "Spletni brskalniki" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "Večpredstavnost" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "Pisarna" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "Sistem in nastavitve" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "Stripi" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "Gradniki namizja Plasma" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Zaledje programov" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Programi v vašem sistemu" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Prijavite se v storitev Ubuntu SSO" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Zaledje Bodega" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Namestite Bodegadata na vaš sistem" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Vnesite poverila MakePlayLive" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Poskusno zaledje" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Poskusno zaledje za preizkušanje začelij Muona" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Zaledje KNewStuff" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Namestite podatke KNewStuff na vaš sistem" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Vse" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Potrdi dodatne spremembe" - -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Označim dodatne spremembe?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "To dejanje zahteva spremembo drugih paketov:" -msgstr[1] "To dejanje zahteva spremembo drugega paketa:" -msgstr[2] "To dejanje zahteva spremembo drugih paketov:" -msgstr[3] "To dejanje zahteva spremembo drugih paketov:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Zgodovina" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Poišči" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "Vse spremembe" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "Namestitve" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "Posodobitve" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "Odstranitve" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "Datum" - -#: libmuon/HistoryView/HistoryView.cpp:101 -msgctxt "@info:status describes a past-tense action" -msgid "Installed" -msgstr "Nameščeno" - -#: libmuon/HistoryView/HistoryView.cpp:102 -msgctxt "@info:status describes a past-tense action" -msgid "Upgraded" -msgstr "Nadgrajeno" - -#: libmuon/HistoryView/HistoryView.cpp:103 -msgctxt "@status describes a past-tense action" -msgid "Downgraded" -msgstr "Podgrajeno" - -#: libmuon/HistoryView/HistoryView.cpp:104 -msgctxt "@status describes a past-tense action" -msgid "Removed" -msgstr "Odstranjeno" - -#: libmuon/HistoryView/HistoryView.cpp:105 -msgctxt "@status describes a past-tense action" -msgid "Purged" -msgstr "Počiščeno" - -#: libmuon/HistoryView/HistoryView.cpp:140 -#: libmuon/HistoryView/HistoryView.cpp:155 -#: libmuon/HistoryView/HistoryView.cpp:170 -#: libmuon/HistoryView/HistoryView.cpp:185 -#: libmuon/HistoryView/HistoryView.cpp:200 -#, kde-format -msgctxt "@item example: muon installed at 16:00" -msgid "%1 %2 at %3" -msgstr "%1 %2 ob %3" - -#: libmuon/MuonMainWindow.cpp:67 +#: libmuon/MuonMainWindow.cpp:66 msgctxt "@label Easter Egg" msgid "This Muon has super cow powers" msgstr "Ta Muon ima moči Super krave" -#: libmuon/MuonStrings.cpp:47 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"admin\"" -msgid "System Administration" -msgstr "Skrbništvo sistema" - -#: libmuon/MuonStrings.cpp:49 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"base\"" -msgid "Base System" -msgstr "Osnovni sistem" - -#: libmuon/MuonStrings.cpp:51 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"cli-mono" -"\"" -msgid "Mono/CLI Infrastructure" -msgstr "Infrastruktura Mono/CLI" - -#: libmuon/MuonStrings.cpp:53 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"comm\"" -msgid "Communication" -msgstr "Komunikacija" - -#: libmuon/MuonStrings.cpp:55 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"database" -"\"" -msgid "Databases" -msgstr "Podatkovne zbirke" - -#: libmuon/MuonStrings.cpp:57 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"devel\"" -msgid "Development" -msgstr "Razvoj" - -#: libmuon/MuonStrings.cpp:59 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"doc\"" -msgid "Documentation" -msgstr "Dokumentacija" - -#: libmuon/MuonStrings.cpp:61 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"debug\"" -msgid "Debug" -msgstr "Razhroščevanje" - -#: libmuon/MuonStrings.cpp:63 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"editors" -"\"" -msgid "Editors" -msgstr "Urejevalniki" - -#: libmuon/MuonStrings.cpp:65 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"electronics\"" -msgid "Electronics" -msgstr "Elektronika" - -#: libmuon/MuonStrings.cpp:67 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"embedded" -"\"" -msgid "Embedded Devices" -msgstr "Vgrajene naprave" - -#: libmuon/MuonStrings.cpp:69 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"fonts\"" -msgid "Fonts" -msgstr "Pisave" - -#: libmuon/MuonStrings.cpp:71 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"games\"" -msgid "Games and Amusement" -msgstr "Igre in zabava" - -#: libmuon/MuonStrings.cpp:73 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnome\"" -msgid "GNOME Desktop Environment" -msgstr "Namizno okolje GNOME" - -#: libmuon/MuonStrings.cpp:75 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"graphics" -"\"" -msgid "Graphics" -msgstr "Grafika" - -#: libmuon/MuonStrings.cpp:77 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnu-r\"" -msgid "GNU R Statistical System" -msgstr "Statistični sistem GNU R" - -#: libmuon/MuonStrings.cpp:79 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"gnustep" -"\"" -msgid "Gnustep Desktop Environment" -msgstr "Namizno okolje Gnustep" - -#: libmuon/MuonStrings.cpp:81 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"hamradio" -"\"" -msgid "Amateur Radio" -msgstr "Amaterski radio" - -#: libmuon/MuonStrings.cpp:83 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"haskell" -"\"" -msgid "Haskell Programming Language" -msgstr "Programski jezik Haskell" - -#: libmuon/MuonStrings.cpp:85 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"httpd\"" -msgid "Web Servers" -msgstr "Spletni strežniki" - -#: libmuon/MuonStrings.cpp:87 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"interpreters\"" -msgid "Interpreted Computer Languages" -msgstr "Računalniški jeziki, ki zahtevajo interpretacijo" - -#: libmuon/MuonStrings.cpp:89 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"java\"" -msgid "Java Programming Language" -msgstr "Programski jezik Java" - -#: libmuon/MuonStrings.cpp:91 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kde\"" -msgid "KDE Software Compilation" -msgstr "KDE Software Compilation" - -#: libmuon/MuonStrings.cpp:93 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"kernel\"" -msgid "Kernel and Modules" -msgstr "Jedro in moduli" - -#: libmuon/MuonStrings.cpp:95 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libdevel" -"\"" -msgid "Libraries - Development" -msgstr "Knjižnice - razvoj" - -#: libmuon/MuonStrings.cpp:97 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"libs\"" -msgid "Libraries" -msgstr "Knjižnice" - -#: libmuon/MuonStrings.cpp:99 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"lisp\"" -msgid "Lisp Programming Language" -msgstr "Programski jezik Lisp" - -#: libmuon/MuonStrings.cpp:101 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"localization\"" -msgid "Localization" -msgstr "Prevodi" - -#: libmuon/MuonStrings.cpp:103 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"mail\"" -msgid "Email" -msgstr "E-pošta" - -#: libmuon/MuonStrings.cpp:105 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"math\"" -msgid "Mathematics" -msgstr "Matematika" - -#: libmuon/MuonStrings.cpp:107 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"misc\"" -msgid "Miscellaneous - Text-based" -msgstr "Razno - besedilno" - -#: libmuon/MuonStrings.cpp:109 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"net\"" -msgid "Networking" -msgstr "Povezovanje" - -#: libmuon/MuonStrings.cpp:111 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"news\"" -msgid "Newsgroups" -msgstr "Novičarske skupine" - -#: libmuon/MuonStrings.cpp:113 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ocaml\"" -msgid "OCaml Programming Language" -msgstr "Programski jezik OCaml" - -#: libmuon/MuonStrings.cpp:115 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"oldlibs" -"\"" -msgid "Libraries - Old" -msgstr "Knjižnice - stare" - -#: libmuon/MuonStrings.cpp:117 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"otherosfs\"" -msgid "Cross Platform" -msgstr "Za več platform" - -#: libmuon/MuonStrings.cpp:119 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"perl\"" -msgid "Perl Programming Language" -msgstr "Programski jezik Perl" - -#: libmuon/MuonStrings.cpp:121 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"php\"" -msgid "PHP Programming Language" -msgstr "Programski jezik PHP" - -#: libmuon/MuonStrings.cpp:123 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"python\"" -msgid "Python Programming Language" -msgstr "Programski jezik Python" - -#: libmuon/MuonStrings.cpp:125 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"ruby\"" -msgid "Ruby Programming Language" -msgstr "Programski jezik Ruby" - -#: libmuon/MuonStrings.cpp:127 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"science" -"\"" -msgid "Science" -msgstr "Znanost" - -#: libmuon/MuonStrings.cpp:129 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"shells\"" -msgid "Shells" -msgstr "Lupine" - -#: libmuon/MuonStrings.cpp:131 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"sound\"" -msgid "Multimedia" -msgstr "Večpredstavnost" - -#: libmuon/MuonStrings.cpp:133 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"tex\"" -msgid "TeX Authoring" -msgstr "Izdelava z TeX" - -#: libmuon/MuonStrings.cpp:135 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"text\"" -msgid "Word Processing" -msgstr "Urejevalniki besedila" - -#: libmuon/MuonStrings.cpp:137 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"utils\"" -msgid "Utilities" -msgstr "Potrebščine" - -#: libmuon/MuonStrings.cpp:139 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"vcs\"" -msgid "Version Control Systems" -msgstr "Sistemi za nadzor različic" - -#: libmuon/MuonStrings.cpp:141 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"video\"" -msgid "Video Software" -msgstr "Programska oprema za video" - -#: libmuon/MuonStrings.cpp:143 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"web\"" -msgid "Internet" -msgstr "Internet" - -#: libmuon/MuonStrings.cpp:145 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"x11\"" -msgid "Miscellaneous - Graphical" -msgstr "Razno - grafično" - -#: libmuon/MuonStrings.cpp:147 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"xfce\"" -msgid "Xfce Desktop Environment" -msgstr "Namizno okolje Xfce" - -#: libmuon/MuonStrings.cpp:149 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"zope\"" -msgid "Zope/Plone Environment" -msgstr "Okolje Zope/Plone" - -#: libmuon/MuonStrings.cpp:151 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"unknown" -"\"" -msgid "Unknown" -msgstr "Neznano" +#: libmuon/resources/AbstractResource.cpp:81 +msgid "Broken" +msgstr "Pokvarjeno" -#: libmuon/MuonStrings.cpp:153 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"alien\"" -msgid "Converted from RPM by Alien" -msgstr "Pretvorjeno iz RPM s pomočjo Alien-a" - -#: libmuon/MuonStrings.cpp:155 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"translations\"" -msgid "Internationalization and Localization" -msgstr "Mednarodna jezikovna prilagoditev in prevodi" - -#: libmuon/MuonStrings.cpp:157 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"metapackages\"" -msgid "Meta Packages" -msgstr "Meta paketi" - -#: libmuon/MuonStrings.cpp:159 -msgctxt "" -"@item:inlistbox Debian package section \"non-US\", for packages that cannot " -"be shipped in the US" -msgid "Restricted On Export" -msgstr "Omejeno ob izvozu" - -#: libmuon/MuonStrings.cpp:161 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"non-free" -"\"" -msgid "Non-free" -msgstr "Ni prosto" - -#: libmuon/MuonStrings.cpp:163 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section \"contrib" -"\"" -msgid "Contrib" -msgstr "Prispevano" - -#: libmuon/MuonStrings.cpp:165 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"education\"" -msgid "Education" -msgstr "Izobraževanje" - -#: libmuon/MuonStrings.cpp:167 -msgctxt "" -"@item:inlistbox Human-readable name for the Debian package section " -"\"introspection\"" -msgid "GObject Introspection Data" -msgstr "Podatki GObject Introspection" - -#: libmuon/MuonStrings.cpp:193 -msgctxt "@info:status Package state" -msgid "Not Installed" -msgstr "Ni nameščeno" +#: libmuon/resources/AbstractResource.cpp:82 +msgid "Available" +msgstr "Na voljo" -#: libmuon/MuonStrings.cpp:194 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:83 msgid "Installed" msgstr "Nameščeno" -#: libmuon/MuonStrings.cpp:195 -msgctxt "@info:status Package state" +#: libmuon/resources/AbstractResource.cpp:84 msgid "Upgradeable" msgstr "Ima nadgradnjo" -#: libmuon/MuonStrings.cpp:196 -msgctxt "@info:status Package state" -msgid "Broken" -msgstr "Pokvarjeno" - -#: libmuon/MuonStrings.cpp:197 -msgctxt "@info:status Package state" -msgid "Residual Configuration" -msgstr "Preostala nastavitev" - -#: libmuon/MuonStrings.cpp:198 -msgctxt "@info:status Package state" -msgid "Installed (auto-removable)" -msgstr "Nameščeno (samodejno odstranljivo)" - -#: libmuon/MuonStrings.cpp:199 -msgctxt "@info:status Package state" -msgid "No Change" -msgstr "Brez sprememb" - -#: libmuon/MuonStrings.cpp:200 libmuon/MuonStrings.cpp:201 -msgctxt "@info:status Requested action" -msgid "Install" -msgstr "Namesti" - -#: libmuon/MuonStrings.cpp:202 -msgctxt "@info:status Requested action" -msgid "Upgrade" -msgstr "Nadgradi" - -#: libmuon/MuonStrings.cpp:203 -msgctxt "@info:status Requested action" -msgid "Remove" -msgstr "Odstrani" - -#: libmuon/MuonStrings.cpp:204 -msgctxt "@info:status Requested action" -msgid "Purge" -msgstr "Počisti" - -#: libmuon/MuonStrings.cpp:205 -msgctxt "@info:status Requested action" -msgid "Reinstall" -msgstr "Ponovno namesti" - -#: libmuon/MuonStrings.cpp:206 -msgctxt "@info:status Requested action" -msgid "Downgrade" -msgstr "Podgradi" - -#: libmuon/MuonStrings.cpp:208 -msgctxt "@info:status Package locked at a certain version" -msgid "Locked" -msgstr "Zaklenjeno" - -#: libmuon/MuonStrings.cpp:221 -msgctxt "@item:inlistbox" -msgid "Common" -msgstr "Skupno" - -#: libmuon/MuonStrings.cpp:222 -msgctxt "@item:inlistbox CPU architecture" -msgid "32-bit" -msgstr "32-bit" - -#: libmuon/MuonStrings.cpp:223 -msgctxt "@item:inlistbox CPU architecture" -msgid "64-bit" -msgstr "64-bit" - -#: libmuon/MuonStrings.cpp:224 -msgctxt "@item:inlistbox PU architecture" -msgid "Power PC" -msgstr "Power PC" - -#: libmuon/MuonStrings.cpp:243 -msgctxt "@title:window" -msgid "Initialization Error" -msgstr "Napaka med začenjanjem" - -#: libmuon/MuonStrings.cpp:245 -msgctxt "@title:window" -msgid "Unable to Obtain Package System Lock" -msgstr "Ni mogoče zakleniti sistema za pakete" - -#: libmuon/MuonStrings.cpp:247 -msgctxt "@title:window" -msgid "Low Disk Space" -msgstr "Prostora na disku je malo" - -#: libmuon/MuonStrings.cpp:250 -msgctxt "@title:window" -msgid "Failed to Apply Changes" -msgstr "Sprememb ni bilo mogoče uveljaviti" - -#: libmuon/MuonStrings.cpp:252 -msgctxt "@title:window" -msgid "Authentication error" -msgstr "Napaka med overitvijo" - -#: libmuon/MuonStrings.cpp:254 -msgctxt "@title:window" -msgid "Unexpected Error" -msgstr "Nepričakovana napaka" - -#: libmuon/MuonStrings.cpp:256 -msgctxt "@title:window" -msgid "Untrusted Packages" -msgstr "Paketi, ki niso zaupanja vredni" - -#: libmuon/MuonStrings.cpp:259 -msgctxt "@title:window" -msgid "Unknown Error" -msgstr "Neznana napaka" - -#: libmuon/MuonStrings.cpp:269 -msgctxt "@label" -msgid "" -"The package system could not be initialized, your configuration may be " -"broken." -msgstr "" -"Sistema za pakete ni bilo mogoče začeti. Morda so nastavitve pokvarjene." - -#: libmuon/MuonStrings.cpp:274 -msgctxt "@label" -msgid "" -"Another application seems to be using the package system at this time. You " -"must close all other package managers before you will be able to install or " -"remove any packages." -msgstr "" -"Kot kaže v tem trenutku sistem za pakete že uporablja nek drug program. " -"Preden lahko namestite ali odstranite pakete morate zapreti vse druge " -"upravljalnike paketov." - -#: libmuon/MuonStrings.cpp:281 -#, kde-format -msgctxt "@label" -msgid "" -"You do not have enough disk space in the directory at %1 to continue with " -"this operation." -msgstr "Za nadaljevanje tega dejanja ni na voljo dovolj prostora v mapi %1." - -#: libmuon/MuonStrings.cpp:285 -msgctxt "@label" -msgid "Could not download packages" -msgstr "Paketov ni bilo mogoče prejeti" - -#: libmuon/MuonStrings.cpp:288 -msgctxt "@label" -msgid "An error occurred while applying changes:" -msgstr "Med uveljavljanjem sprememb je prišlo do napake:" - -#: libmuon/MuonStrings.cpp:292 -msgctxt "@label" -msgid "" -"This operation cannot continue since proper authorization was not provided" -msgstr "" -"Tega dejanja ni mogoče nadaljevati saj ni bila pridobljena ustrezna " -"pooblastitev" - -#: libmuon/MuonStrings.cpp:296 -msgctxt "@label" -msgid "" -"It appears that the QApt worker has either crashed or disappeared. Please " -"report a bug to the QApt maintainers" -msgstr "" -"Kot kaže se je proces QApt sesul ali pa je izginil. Prosimo, da o tej napaki " -"obvestite razvijalce QApt." - -#: libmuon/MuonStrings.cpp:301 -msgctxt "@label" -msgid "" -"The following package has not been verified by its author. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgid_plural "" -"The following packages have not been verified by their authors. Downloading " -"untrusted packages has been disallowed by your current configuration." -msgstr[0] "" -"Naslednji paketi nimajo potrdil svojih avtorjev. Glede na trenutne " -"nastavitve je prejemanje paketov, ki niso zaupanja vredni, prepovedano." -msgstr[1] "" -"Naslednji paket nima potrdil svojih avtorjev. Glede na trenutne nastavitve " -"je prejemanje paketov, ki niso zaupanja vredni, prepovedano." -msgstr[2] "" -"Naslednja paketa nimata potrdil svojih avtorjev. Glede na trenutne " -"nastavitve je prejemanje paketov, ki niso zaupanja vredni, prepovedano." -msgstr[3] "" -"Naslednji paketi nimajo potrdil svojih avtorjev. Glede na trenutne " -"nastavitve je prejemanje paketov, ki niso zaupanja vredni, prepovedano." - -#: libmuon/QAptActions.cpp:62 -msgctxt "@action Checks the Internet for updates" -msgid "Check for Updates" -msgstr "Preveri za posodobitvami" - -#: libmuon/QAptActions.cpp:79 -msgctxt "@action Reverts all potential changes to the cache" -msgid "Unmark All" -msgstr "Odstrani vse oznake" - -#: libmuon/QAptActions.cpp:84 -msgctxt "@action Opens the software sources configuration dialog" -msgid "Configure Software Sources" -msgstr "Nastavi programske vire" - -#: libmuon/QAptActions.cpp:124 -msgctxt "@title:window" -msgid "Save Markings As" -msgstr "Shrani oznake kot " - -#: libmuon/QAptActions.cpp:131 libmuon/QAptActions.cpp:156 -#: libmuon/QAptActions.cpp:180 -#, kde-format -msgctxt "@label" -msgid "" -"The document could not be saved, as it was not possible to write to " -"%1\n" -"\n" -"Check that you have write access to this file or that enough disk space is " -"available." -msgstr "" -"Dokument ni bil shranjen, ker ni bilo mogoče pisati v %1\n" -"\n" -"Preverite, da imate pravice do pisanja v to datoteko oz. da je na voljo " -"dovolj prostora." - -#: libmuon/QAptActions.cpp:149 -msgctxt "@title:window" -msgid "Save Installed Packages List As" -msgstr "Shrani seznam nameščenih paketov kot" - -#: libmuon/QAptActions.cpp:173 -msgctxt "@title:window" -msgid "Save Download List As" -msgstr "Shrani seznam prejemanj paketov kot" - -#: libmuon/QAptActions.cpp:196 libmuon/QAptActions.cpp:214 -msgctxt "@title:window" -msgid "Open File" -msgstr "Odpri datoteko" - -#: libmuon/QAptActions.cpp:222 -msgctxt "@label" -msgid "" -"Could not mark changes. Please make sure that the file is a markings file " -"created by either the Muon Package Manager or the Synaptic Package Manager." -msgstr "" -"Ni bilo mogoče označiti sprememb. Prepričajte se, da je bila datoteka z " -"oznakami ustvarjena z Upravljalnikom paketov Muon ali Upravljalnikom paketov " -"Synaptic." - -#: libmuon/QAptActions.cpp:236 -msgctxt "@title:window" -msgid "Choose a Directory" -msgstr "Izberite mapo" - -#: libmuon/QAptActions.cpp:259 -#, kde-format -msgctxt "@label" -msgid "%1 package was successfully added to the cache" -msgid_plural "%1 packages were successfully added to the cache" -msgstr[0] "%1 paketov je bilo uspešno dodanih v predpomnilnik" -msgstr[1] "%1 paket je bil uspešno dodan v predpomnilnik" -msgstr[2] "%1 paketa sta bila uspešno dodana v predpomnilnik" -msgstr[3] "%1 paketi so bili uspešno dodani v predpomnilnik" - -#: libmuon/QAptActions.cpp:265 -msgctxt "@label" -msgid "" -"No valid packages could be found in this directory. Please make sure the " -"packages are compatible with your computer and are at the latest version." -msgstr "" -"V mapi ni bilo mogoče najti veljavnih paketov. Prepričajte se, da so paketi " -"združljivi z vašim računalnikom in so najnovejših različic." - -#: libmuon/QAptActions.cpp:269 -msgctxt "@title:window" -msgid "Packages Could Not be Found" -msgstr "Paketov ni bilo mogoče najti" - #: libmuon/resources/ResourcesUpdatesModel.cpp:100 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "preostaja %1" -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:60 -#: libmuon/ReviewsBackend/UbuntuLoginBackend.cpp:68 -msgid "Log in to the Ubuntu SSO service" -msgstr "Prijavite se v storitev Ubuntu SSO" - #: libmuon/settings/NotifySettingsPage.cpp:46 msgid "Show notifications for:" msgstr "Prikaži obvestila za:" @@ -1145,18 +159,18 @@ msgid "Downloading" msgstr "Prejemanje" -#: libmuon/Transaction/TransactionListener.cpp:143 -#: libmuon/Transaction/TransactionListener.cpp:160 +#: libmuon/Transaction/TransactionListener.cpp:144 +#: libmuon/Transaction/TransactionListener.cpp:161 msgctxt "@info:status Progress text when done" msgid "Done" msgstr "Končano" -#: libmuon/Transaction/TransactionListener.cpp:153 +#: libmuon/Transaction/TransactionListener.cpp:154 msgctxt "@info:status Progress text when waiting" msgid "Waiting" msgstr "Čakanje" -#: libmuon/Transaction/TransactionListener.cpp:174 +#: libmuon/Transaction/TransactionListener.cpp:175 msgctxt "@info:status" msgid "Installing" msgstr "Nameščanje" diff -Nru muon-1.9.60/po/sl/muon-discover.po muon-2.0.0/po/sl/muon-discover.po --- muon-1.9.60/po/sl/muon-discover.po 2012-10-29 18:35:36.000000000 +0000 +++ muon-2.0.0/po/sl/muon-discover.po 2013-04-01 20:33:56.000000000 +0000 @@ -1,13 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Andrej Mernik , 2012. +# Jure Repinc , 2012. +# Andrej Mernik , 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-10 12:05+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-03-14 19:03+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -16,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" #: discover/main.cpp:29 msgid "An application discoverer" @@ -50,24 +51,43 @@ msgid "Display a list of entries with a category." msgstr "Prikaži seznam vnosov s kategorijo." -#: discover/MuonDiscoverMainWindow.cpp:153 +#: discover/main.cpp:47 +msgid "" +"Open Muon Discover in a said mode. Modes correspond to the toolbar buttons." +msgstr "" +"Odpre Odkritelj Muon v podanem načinu. Načini ustrezajo gumbom orodne " +"vrstice." + +#: discover/main.cpp:48 +msgid "List all the available modes and output them on stdout." +msgstr "Izpiši vse razpoložljive načine in jih pošlji v standardni izpis-" + +#: discover/main.cpp:70 +msgid "Available modes:\n" +msgstr "Razpoložljivi načini:\n" + +#: discover/MuonDiscoverMainWindow.cpp:93 discover/qml/CategoryPage.qml:36 +msgid "Search..." +msgstr "Poišči ..." + +#: discover/MuonDiscoverMainWindow.cpp:109 msgid "" "Found some errors while setting up the GUI, the application can't proceed." msgstr "" "Med nastavljanjem grafičnega vmesnika so bile odkrite napake, program ne " "more nadaljevati." -#: discover/MuonDiscoverMainWindow.cpp:154 +#: discover/MuonDiscoverMainWindow.cpp:110 msgid "Initialization error" msgstr "Napaka med začenjanjem" -#: discover/OriginsBackend.cpp:182 -msgid "Adding Origins..." -msgstr "Dodajanje virov ..." - -#: discover/OriginsBackend.cpp:196 -msgid "Removing Origins..." -msgstr "Odstranjevanje virov ..." +#: discover/MuonDiscoverMainWindow.cpp:240 +msgid "Menu" +msgstr "Meni" + +#: discover/MuonDiscoverMainWindow.cpp:241 +msgid "Configure and learn about Muon Discover" +msgstr "Nastavite in podučite se o Odkritelju Muon" #: discover/qml/AddonsView.qml:37 #, kde-format @@ -82,90 +102,94 @@ msgid "Discard" msgstr "Zavrzi" -#: discover/qml/ApplicationOverview.qml:45 +#: discover/qml/ApplicationOverview.qml:64 #, kde-format msgid "%1 reviews" msgstr "%1 ocen" -#: discover/qml/ApplicationOverview.qml:51 +#: discover/qml/ApplicationOverview.qml:70 msgid "Homepage" msgstr "Domača stran" -#: discover/qml/ApplicationOverview.qml:60 +#: discover/qml/ApplicationOverview.qml:79 msgid "Launch" msgstr "Zaženi" -#: discover/qml/ApplicationOverview.qml:68 +#: discover/qml/ApplicationOverview.qml:86 msgid "Review" msgstr "Ocena" -#: discover/qml/ApplicationOverview.qml:73 +#: discover/qml/ApplicationOverview.qml:91 #, kde-format msgid "Total Size: %1
" msgstr "Skupna velikost: %1
" -#: discover/qml/ApplicationPage.qml:68 +#: discover/qml/ApplicationPage.qml:87 msgid "Overview" msgstr "Pregled" -#: discover/qml/ApplicationPage.qml:72 +#: discover/qml/ApplicationPage.qml:91 msgid "Add-ons" msgstr "Dodatki" -#: discover/qml/ApplicationPage.qml:77 +#: discover/qml/ApplicationPage.qml:96 msgid "Reviews" msgstr "Ocene" -#: discover/qml/ApplicationsGridDelegate.qml:169 -#: discover/qml/ApplicationsList.qml:101 +#: discover/qml/ApplicationsGridDelegate.qml:194 +#: discover/qml/ApplicationsList.qml:120 #: discover/qml/InstallApplicationButton.qml:38 #: discover/qml/InstalledPage.qml:11 msgid "Update" msgstr "Posodobi" -#: discover/qml/ApplicationsListPage.qml:85 +#: discover/qml/ApplicationsListPage.qml:111 msgid "Name" msgstr "Ime" -#: discover/qml/ApplicationsListPage.qml:91 +#: discover/qml/ApplicationsListPage.qml:117 msgid "Rating" msgstr "Ocena" -#: discover/qml/ApplicationsListPage.qml:97 +#: discover/qml/ApplicationsListPage.qml:123 msgid "Buzz" msgstr "Buzz" -#: discover/qml/ApplicationsListPage.qml:103 +#: discover/qml/ApplicationsListPage.qml:129 msgid "Popularity" msgstr "Priljubljenost" -#: discover/qml/ApplicationsListPage.qml:109 +#: discover/qml/ApplicationsListPage.qml:135 msgid "Origin" msgstr "Izvor" -#: discover/qml/CategoryPage.qml:14 +#: discover/qml/CategoryPage.qml:34 #, kde-format msgid "Search in '%1'..." msgstr "Išči v '%1' ..." -#: discover/qml/CategoryPage.qml:16 discover/qml/Main.qml:120 -msgid "Search..." -msgstr "Poišči ..." - -#: discover/qml/CategoryPage.qml:127 +#: discover/qml/CategoryPage.qml:139 msgid "Popularity Contest" msgstr "Natečaj priljubljenosti" -#: discover/qml/CategoryPage.qml:128 +#: discover/qml/CategoryPage.qml:140 #, kde-format msgid "points: %1" msgstr "točk: %1" -#: discover/qml/CategoryPage.qml:139 +#: discover/qml/CategoryPage.qml:151 msgid "Best Ratings" msgstr "Najboljše ocene" -#: discover/qml/FeaturedBanner.qml:149 +#: discover/qml/DefaultBanner.qml:16 +msgid "" +"Welcome to\n" +"Muon Discover!" +msgstr "" +"Dobrodošli v\n" +"Odkritelj Muon!" + +#: discover/qml/FeaturedBanner.qml:88 #, kde-format msgid "%1
%2" msgstr "%1
%2" @@ -178,25 +202,36 @@ msgid "Remove" msgstr "Odstrani" -#: discover/qml/InstalledPage.qml:11 discover/qml/Main.qml:88 +#: discover/qml/InstalledPage.qml:12 discover/qml/Main.qml:94 msgid "Installed" msgstr "Nameščeno" -#: discover/qml/InstalledPage.qml:29 -#, fuzzy -#| msgid "Update All!" +#: discover/qml/InstalledPage.qml:31 msgid "Update All" -msgstr "Posodobi vse!" +msgstr "Posodobi vse" -#: discover/qml/Main.qml:23 +#: discover/qml/Main.qml:41 msgid "Loading..." msgstr "Nalaganje ..." -#: discover/qml/Main.qml:86 +#: discover/qml/Main.qml:79 +msgid "Back" +msgstr "Nazaj" + +#: discover/qml/Main.qml:88 msgid "Discover" msgstr "Odkrijte" -#: discover/qml/Main.qml:91 +#: discover/qml/Main.qml:94 +#, kde-format +msgid "Installed (%1 update)" +msgid_plural "Installed (%1 updates)" +msgstr[0] "Nameščeno (%1 posodobitev)" +msgstr[1] "Nameščeno (%1 posodobitev)" +msgstr[2] "Nameščeno (%1 posodobitvi)" +msgstr[3] "Nameščeno (%1 posodobitve)" + +#: discover/qml/Main.qml:100 msgid "Sources" msgstr "Viri" @@ -221,54 +256,58 @@ msgid "Summary:" msgstr "Povzetek:" -#: discover/qml/ReviewsView.qml:19 +#: discover/qml/ReviewsView.qml:21 msgid "Reviews:" msgstr "Ocene" -#: discover/qml/ReviewsView.qml:28 +#: discover/qml/ReviewsView.qml:30 msgid "Tell us about this review!" msgstr "Povejte nam o tej oceni!" -#: discover/qml/ReviewsView.qml:29 +#: discover/qml/ReviewsView.qml:31 #, kde-format msgid "%1 out of %2 people found this review useful" msgstr "%1 od %2 oseb je ta ocena uporabna" -#: discover/qml/ReviewsView.qml:44 +#: discover/qml/ReviewsView.qml:46 #, kde-format -msgid "%1 by %2

%3
%4" -msgstr "%1 od %2

%3
%4" +msgid "" +"

%1 by %2

%3

%4

" +msgstr "" +"

%1 od %2

%3

%4

" -#: discover/qml/ReviewsView.qml:57 +#: discover/qml/ReviewsView.qml:59 msgid "Useful? Yes/No" msgstr "Uporabno? Da/Ne" -#: discover/qml/SourcesPage.qml:16 +#: discover/qml/SourcesPage.qml:17 msgid "Add Source" msgstr "Dodaj vir" -#: discover/qml/SourcesPage.qml:39 +#: discover/qml/SourcesPage.qml:40 msgid "Specify the new source" msgstr "Navedite nov vir" -#: discover/qml/SourcesPage.qml:43 +#: discover/qml/SourcesPage.qml:44 msgid "OK" msgstr "V redu" -#: discover/qml/SourcesPage.qml:49 +#: discover/qml/SourcesPage.qml:50 msgid "Cancel" msgstr "Prekliči" -#: discover/qml/SourcesPage.qml:71 +#: discover/qml/SourcesPage.qml:72 msgid " - The apt repository source line to add. This is one of:\n" msgstr " - Vrstica skladišča apt, ki bo dodana. To je ena izmed:\n" -#: discover/qml/SourcesPage.qml:135 +#: discover/qml/SourcesPage.qml:136 #, kde-format msgid "%1 (Binary)" msgstr "%1 (dvojiško)" -#: discover/qml/SourcesPage.qml:161 +#: discover/qml/SourcesPage.qml:162 #, kde-format msgid "%1. %2" msgstr "%1. %2" \ No newline at end of file diff -Nru muon-1.9.60/po/sl/muon-installer.po muon-2.0.0/po/sl/muon-installer.po --- muon-1.9.60/po/sl/muon-installer.po 2012-10-29 18:35:36.000000000 +0000 +++ muon-2.0.0/po/sl/muon-installer.po 2013-04-01 20:33:56.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Andrej Mernik , 2012. +# Andrej Mernik , 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-24 04:13+0200\n" -"PO-Revision-Date: 2012-10-10 12:06+0200\n" +"POT-Creation-Date: 2013-03-13 10:22+0100\n" +"PO-Revision-Date: 2013-01-10 22:19+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -26,7 +26,7 @@ msgid "Your emails" msgstr "andrejm@ubuntu.si" -#: installer/ApplicationLauncher.cpp:47 +#: installer/ApplicationLauncher.cpp:43 msgid "The following application was just installed, click on it to launch:" msgid_plural "" "The following applications were just installed, click on them to launch:" @@ -35,7 +35,7 @@ msgstr[2] "Nameščena sta bila naslednja programa, za zagon ju kliknite:" msgstr[3] "Nameščeni so bili naslednji programi, za zagon jih kliknite:" -#: installer/AvailableView.cpp:43 +#: installer/AvailableView.cpp:44 msgid "Get Software" msgstr "Dobi programsko opremo" @@ -65,74 +65,74 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: installer/MainWindow.cpp:282 -msgctxt "@item:inlistbox Parent item for available software" -msgid "Get Software" -msgstr "Dobi programsko opremo" - -#: installer/MainWindow.cpp:290 -msgctxt "@item:inlistbox Parent item for installed software" -msgid "Installed Software" -msgstr "Nameščena programska oprema" - -#: installer/MainWindow.cpp:306 installer/MainWindow.cpp:375 +#: installer/MainWindow.cpp:222 msgctxt "@item:inlistbox" msgid "Provided by Kubuntu" msgstr "Ponuja Kubuntu" -#: installer/MainWindow.cpp:311 +#: installer/MainWindow.cpp:227 msgctxt "@item:inlistbox" msgid "Provided by Debian" msgstr "Ponuja Debian" -#: installer/MainWindow.cpp:317 installer/MainWindow.cpp:381 +#: installer/MainWindow.cpp:233 msgctxt "" "@item:inlistbox The name of the repository provided by Canonical, Ltd. " msgid "Canonical Partners" msgstr "Partnerji Canonicala" -#: installer/MainWindow.cpp:326 installer/MainWindow.cpp:388 +#: installer/MainWindow.cpp:242 msgctxt "@item:inlistbox An independent software source" msgid "Independent" msgstr "Neodvisno" -#: installer/MainWindow.cpp:402 +#: installer/MainWindow.cpp:290 +msgctxt "@item:inlistbox Parent item for available software" +msgid "Get Software" +msgstr "Dobi programsko opremo" + +#: installer/MainWindow.cpp:296 +msgctxt "@item:inlistbox Parent item for installed software" +msgid "Installed Software" +msgstr "Nameščena programska oprema" + +#: installer/MainWindow.cpp:318 msgctxt "@item:inlistbox Item for showing the history view" msgid "History" msgstr "Zgodovina" -#: installer/MainWindow.cpp:500 +#: installer/MainWindow.cpp:397 #, kde-format msgctxt "@info" msgid "%1 was successfully installed." msgstr "%1 je bil uspešno nameščen." -#: installer/MainWindow.cpp:502 +#: installer/MainWindow.cpp:400 msgctxt "@action" msgid "Start" msgstr "Začni" -#: installer/MainWindow.cpp:508 +#: installer/MainWindow.cpp:406 msgctxt "@info" msgid "Applications successfully installed." msgstr "Programi so bili uspešno nameščeni." -#: installer/MainWindow.cpp:509 +#: installer/MainWindow.cpp:407 msgctxt "@action" msgid "Run New Applications..." msgstr "Zaženi nove programe ..." -#: installer/MainWindow.cpp:531 +#: installer/MainWindow.cpp:429 msgctxt "@title:window" msgid "Installation Complete" msgstr "Namestitev zaključena" -#: installer/MainWindow.cpp:573 +#: installer/MainWindow.cpp:471 msgctxt "@item:inlistbox Item for showing the progress view" msgid "In Progress" msgstr "V teku" -#: installer/ProgressView.cpp:39 +#: installer/ProgressView.cpp:37 msgctxt "@info" msgid "In Progress" msgstr "v teku" @@ -208,18 +208,18 @@ msgid "Install" msgstr "Namesti" -#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:546 +#: installer/ResourceDetailsView/ResourceDetailsWidget.cpp:545 msgctxt "@action" msgid "Remove" msgstr "Odstrani" -#: installer/ResourceView/ResourceDelegate.cpp:64 +#: installer/ResourceView/ResourceDelegate.cpp:63 #: installer/ResourceView/ResourceExtender.cpp:56 #: installer/ResourceView/ResourceExtender.cpp:122 msgid "Install" msgstr "Namesti" -#: installer/ResourceView/ResourceDelegate.cpp:66 +#: installer/ResourceView/ResourceDelegate.cpp:65 #: installer/ResourceView/ResourceExtender.cpp:52 #: installer/ResourceView/ResourceExtender.cpp:119 msgid "Remove" @@ -277,19 +277,19 @@ msgid "No reviews available" msgstr "Ni razpoložljivih ocen" -#: installer/ReviewsWidget/ReviewWidget.cpp:91 +#: installer/ReviewsWidget/ReviewWidget.cpp:124 #, kde-format msgctxt "@label Formatted: username, date" msgid "%1, %2" msgstr "%1, %2" -#: installer/ReviewsWidget/ReviewWidget.cpp:103 +#: installer/ReviewsWidget/ReviewWidget.cpp:136 #, kde-format msgctxt "@label" msgid "This review was written for an older version (Version: %1)" msgstr "Ta ocena je bila napisana za starejšo različico (različica: %1)" -#: installer/ReviewsWidget/ReviewWidget.cpp:110 +#: installer/ReviewsWidget/ReviewWidget.cpp:143 #, kde-format msgctxt "@label" msgid "%1 out of %2 person found this review useful" diff -Nru muon-1.9.60/po/sl/muon-notifier.po muon-2.0.0/po/sl/muon-notifier.po --- muon-1.9.60/po/sl/muon-notifier.po 2012-10-29 18:35:36.000000000 +0000 +++ muon-2.0.0/po/sl/muon-notifier.po 2013-04-01 20:33:56.000000000 +0000 @@ -1,13 +1,13 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Andrej Mernik , 2012. +# Andrej Mernik , 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-09-27 04:41+0200\n" -"PO-Revision-Date: 2012-07-29 20:31+0200\n" +"POT-Creation-Date: 2012-09-27 12:55+0200\n" +"PO-Revision-Date: 2013-01-10 22:19+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -16,7 +16,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" diff -Nru muon-1.9.60/po/sl/muon-updater.po muon-2.0.0/po/sl/muon-updater.po --- muon-1.9.60/po/sl/muon-updater.po 2012-10-29 18:35:36.000000000 +0000 +++ muon-2.0.0/po/sl/muon-updater.po 2013-04-01 20:33:56.000000000 +0000 @@ -1,13 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Andrej Mernik , 2012. +# Jure Repinc , 2012. +# Andrej Mernik , 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-22 04:35+0200\n" -"PO-Revision-Date: 2012-10-19 17:00+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-14 19:04+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -16,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -26,12 +27,12 @@ msgid "Your emails" msgstr "andrejm@ubuntu.si" -#: updater/ChangelogWidget.cpp:55 +#: updater/ChangelogWidget.cpp:54 msgctxt "@action:button" msgid "Hide" msgstr "Skrij" -#: updater/ChangelogWidget.cpp:172 +#: updater/ChangelogWidget.cpp:161 #, kde-format msgctxt "@info/rich" msgid "" @@ -41,18 +42,18 @@ "Seznam sprememb še ni na voljo. Namesto tega uporabite povezavo na Launchpad." -#: updater/ChangelogWidget.cpp:176 +#: updater/ChangelogWidget.cpp:165 msgctxt "@info" msgid "The list of changes is not yet available." msgstr "Seznam sprememb še ni na voljo." -#: updater/ChangelogWidget.cpp:231 +#: updater/ChangelogWidget.cpp:203 #, kde-format msgctxt "@info:label Refers to a software version, Ex: Version 1.2.1:" msgid "Version %1:" msgstr "Različica %1:" -#: updater/ChangelogWidget.cpp:235 +#: updater/ChangelogWidget.cpp:207 #, kde-format msgctxt "@info:label" msgid "This update was issued on %1" @@ -84,163 +85,126 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: updater/MainWindow.cpp:65 +#: updater/MainWindow.cpp:70 msgctxt "@title:window" msgid "Software Updates" msgstr "Posodobitve programske opreme" -#: updater/MainWindow.cpp:72 +#: updater/MainWindow.cpp:77 msgctxt "@info Warning to plug in laptop before updating" msgid "It is safer to plug in the power adapter before updating." msgstr "" "Varneje je, če pred posodabljanjem, vklopite napajanje iz električnega " "omrežja." -#: updater/MainWindow.cpp:81 +#: updater/MainWindow.cpp:86 msgctxt "Notification when a new version of Kubuntu is available" msgid "A new version of Kubuntu is available." msgstr "Na voljo je nova različica Kubuntu." -#: updater/MainWindow.cpp:151 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Preberi oznake ..." - -#: updater/MainWindow.cpp:156 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Shrani oznake kot ..." - -#: updater/MainWindow.cpp:161 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Shrani seznam prejemanj paketov ..." - -#: updater/MainWindow.cpp:166 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Prejmi pakete iz seznama ..." - -#: updater/MainWindow.cpp:175 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Dodaj prejete pakete" - -#: updater/MainWindow.cpp:180 +#: updater/MainWindow.cpp:121 msgctxt "@action Downloads and installs updates" msgid "Install Updates" msgstr "Namesti posodobitve" -#: updater/MainWindow.cpp:187 +#: updater/MainWindow.cpp:129 msgctxt "@action::inmenu" msgid "History..." msgstr "Zgodovina ..." -#: updater/MainWindow.cpp:191 +#: updater/MainWindow.cpp:133 msgctxt "@action" msgid "Upgrade" msgstr "Nadgradi" -#: updater/MainWindow.cpp:344 +#: updater/MainWindow.cpp:294 msgctxt "@title:window" msgid "Package History" msgstr "Zgodovina paketov" -#: updater/ProgressWidget.cpp:61 +#: updater/ProgressWidget.cpp:60 msgctxt "@action:button Cancels the download" msgid "Cancel" msgstr "Prekliči" -#: updater/ProgressWidget.cpp:128 +#: updater/ProgressWidget.cpp:127 msgctxt "@info Status info, widget title" msgid "Starting" msgstr "Začenjanje" -#: updater/ProgressWidget.cpp:133 +#: updater/ProgressWidget.cpp:132 msgctxt "@info Status info, widget title" msgid "Waiting for Authentication" msgstr "Čakanje na overitev" -#: updater/ProgressWidget.cpp:138 updater/ProgressWidget.cpp:145 -#: updater/ProgressWidget.cpp:152 updater/ProgressWidget.cpp:159 +#: updater/ProgressWidget.cpp:137 updater/ProgressWidget.cpp:144 +#: updater/ProgressWidget.cpp:151 updater/ProgressWidget.cpp:158 msgctxt "@info Status information, widget title" msgid "Waiting" msgstr "Čakanje" -#: updater/ProgressWidget.cpp:140 +#: updater/ProgressWidget.cpp:139 msgctxt "@info Status info" msgid "Waiting for other transactions to finish" msgstr "Čakanje, da se zaključijo druge transakcije" -#: updater/ProgressWidget.cpp:147 +#: updater/ProgressWidget.cpp:146 msgctxt "@info Status info" msgid "Waiting for other software managers to quit" -msgstr "Čakanje, da se drugi upravitelji programske opreme končajo" +msgstr "Čakanje, da se končajo drugi upravitelji programske opreme" -#: updater/ProgressWidget.cpp:154 +#: updater/ProgressWidget.cpp:153 msgctxt "@info Status info" msgid "Waiting for required medium" msgstr "Čakanje na zahtevan nosilec" -#: updater/ProgressWidget.cpp:161 +#: updater/ProgressWidget.cpp:160 msgctxt "@info Status info" msgid "Waiting for configuration file" msgstr "Čakanje na nastavitveno datoteko" -#: updater/ProgressWidget.cpp:172 +#: updater/ProgressWidget.cpp:171 msgctxt "@info Status info" msgid "Loading Software List" msgstr "Nalaganja seznama programske opreme" -#: updater/ProgressWidget.cpp:179 +#: updater/ProgressWidget.cpp:178 msgctxt "@info Status information, widget title" msgid "Updating software sources" msgstr "Posodabljanje programskih virov" -#: updater/ProgressWidget.cpp:184 +#: updater/ProgressWidget.cpp:183 msgctxt "@info Status information, widget title" msgid "Downloading Packages" msgstr "Prejemanje paketov" -#: updater/ProgressWidget.cpp:193 +#: updater/ProgressWidget.cpp:192 msgctxt "@info Status information, widget title" msgid "Applying Changes" msgstr "Uveljavljanje sprememb" -#: updater/ProgressWidget.cpp:198 +#: updater/ProgressWidget.cpp:197 msgctxt "@info Status information, widget title" msgid "Finished" msgstr "Zaključeno" -#: updater/ProgressWidget.cpp:228 +#: updater/ProgressWidget.cpp:227 msgctxt "@title:window" msgid "Media Change Required" msgstr "Zahtevana je zamenjava nosilca" -#: updater/ProgressWidget.cpp:229 +#: updater/ProgressWidget.cpp:228 #, kde-format msgctxt "@label" msgid "Please insert %1 into %2" msgstr "V %2 vstavite %1" -#: updater/ProgressWidget.cpp:238 +#: updater/ProgressWidget.cpp:237 msgctxt "@title:window" msgid "Warning - Unverified Software" msgstr "Opozorilo – nepreverjena programska oprema" -#: updater/ProgressWidget.cpp:240 -#, fuzzy -#| msgctxt "@label" -#| msgid "" -#| "The following piece of software cannot be verified. Installing " -#| "unverified software represents a security risk, as the presence of " -#| "unverifiable software can be a sign of tampering. Do you wish " -#| "to continue?" -#| msgid_plural "" -#| "The following pieces of software cannot be authenticated. " -#| "Installing unverified software represents a security risk, as " -#| "the presence of unverifiable software can be a sign of tampering. Do you wish to continue?" +#: updater/ProgressWidget.cpp:239 msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " @@ -269,12 +233,12 @@ "paketov predstavlja varnostno tveganje, saj lahko nepreverljivost kaže na " "znake nedovoljenega spreminjanja. Ali želite nadaljevati?" -#: updater/ProgressWidget.cpp:258 +#: updater/ProgressWidget.cpp:257 msgctxt "@title:window" msgid "Configuration File Changed" msgstr "Nastavitvena datoteka je bila spremenjena" -#: updater/ProgressWidget.cpp:260 +#: updater/ProgressWidget.cpp:259 #, kde-format msgctxt "@label Notifies a config file change" msgid "" @@ -286,28 +250,33 @@ "vendar je bila vaša različica spremenjena. Bi želeli obdržati trenutno " "različico ali namestiti novo?" -#: updater/ProgressWidget.cpp:265 +#: updater/ProgressWidget.cpp:264 msgctxt "@action Use the new config file" msgid "Use New Version" msgstr "Uporabi novo različico" -#: updater/ProgressWidget.cpp:266 +#: updater/ProgressWidget.cpp:265 msgctxt "@action Keep the old config file" msgid "Keep Old Version" msgstr "Ohrani staro različico" -#: updater/ProgressWidget.cpp:289 +#: updater/ProgressWidget.cpp:288 #, kde-format msgctxt "@label Download rate" msgid "Download rate: %1/s" msgstr "Hitrost prejemanja: %1/s" -#: updater/ProgressWidget.cpp:301 +#: updater/ProgressWidget.cpp:300 #, kde-format msgctxt "@item:intext Remaining time" msgid "%1 remaining" msgstr "preostaja %1" +#: updater/UpdateModel/UpdateItem.cpp:131 +#, kde-format +msgid "%1 (%2)" +msgstr "%1 (%2)" + #: updater/UpdateModel/UpdateModel.cpp:104 msgctxt "@label Column label" msgid "Updates" @@ -323,65 +292,59 @@ msgid "Download Size" msgstr "Velikost prejema" -#: updater/UpdaterWidget.cpp:147 +#: updater/UpdaterWidget.cpp:69 +msgctxt "@label" +msgid "" +"Some packages were not marked for update.

The update of these " +"packages need some others to be installed or removed.

Do you want to " +"update those too?" +msgstr "" +"Nekateri paketi niso bili označeni za nadgradnjo.

Posodobitev " +"teh paketov potrebuje namestitev ali odstranitev drugih paketov.

Ali " +"želite posodobiti tudi te?" + +#: updater/UpdaterWidget.cpp:72 +msgid "Mark All" +msgstr "Označi vse" + +#: updater/UpdaterWidget.cpp:164 msgctxt "@item:inlistbox" msgid "Important Security Updates" msgstr "Pomembne varnostne posodobitve" -#: updater/UpdaterWidget.cpp:150 +#: updater/UpdaterWidget.cpp:167 msgctxt "@item:inlistbox" msgid "Application Updates" msgstr "Posodobitve programov" -#: updater/UpdaterWidget.cpp:153 +#: updater/UpdaterWidget.cpp:170 msgctxt "@item:inlistbox" msgid "System Updates" msgstr "Sistemske posodobitve" -#: updater/UpdaterWidget.cpp:317 -msgctxt "@label" -msgid "" -"Not all packages could be marked for upgrade. The available upgrades may " -"require new packages to be installed or removed. Do you want to mark " -"upgrades that may require the installation or removal of additional packages?" -msgstr "" -"Vseh paketov ni bilo mogoče označiti za nadgradnjo. Razpoložljive nadgradnje " -"morda zahtevajo, da se namestijo ali odstranijo paketi. Želite označiti tudi " -"te?" - -#: updater/UpdaterWidget.cpp:322 -msgctxt "@title:window" -msgid "Unable to Mark Upgrades" -msgstr "Ni mogoče označiti nadgradenj" - -#: updater/UpdaterWidget.cpp:323 -msgctxt "@action" -msgid "Mark Upgrades" -msgstr "Označi nadgradnje" - -#: updater/UpdaterWidget.cpp:351 +#: updater/UpdaterWidget.cpp:331 msgctxt "@info" msgid "It is unknown when the last check for updates was." msgstr "Ni znano kdaj se je nazadnje preverilo za posodobitvami." -#: updater/UpdaterWidget.cpp:352 updater/UpdaterWidget.cpp:374 +#: updater/UpdaterWidget.cpp:332 updater/UpdaterWidget.cpp:354 msgctxt "@info" msgid "Please click Check for Updates to check." msgstr "" "Za preverjanje kliknite na Preveri za posodobitvami." -#: updater/UpdaterWidget.cpp:363 +#: updater/UpdaterWidget.cpp:343 msgctxt "@info" msgid "The software on this computer is up to date." msgstr "Programska oprema na tem računalniku je posodobljena." -#: updater/UpdaterWidget.cpp:364 updater/UpdaterWidget.cpp:369 +#: updater/UpdaterWidget.cpp:344 updater/UpdaterWidget.cpp:349 #, kde-format msgctxt "@info" msgid "Last checked %1 ago." msgstr "Nazadnje preverjeno pred %1." -#: updater/UpdaterWidget.cpp:368 +#: updater/UpdaterWidget.cpp:348 msgctxt "@info" msgid "No updates are available." msgstr "Na voljo ni nobene posodobitve." \ No newline at end of file diff -Nru muon-1.9.60/po/sl/muon.po muon-2.0.0/po/sl/muon.po --- muon-1.9.60/po/sl/muon.po 2012-10-29 18:35:36.000000000 +0000 +++ muon-2.0.0/po/sl/muon.po 2013-04-01 20:33:56.000000000 +0000 @@ -1,13 +1,14 @@ # Copyright (C) YEAR This_file_is_part_of_KDE # This file is distributed under the same license as the PACKAGE package. # -# Andrej Mernik , 2012. +# Jure Repinc , 2012. +# Andrej Mernik , 2013. msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-28 03:25+0100\n" -"PO-Revision-Date: 2012-10-19 17:00+0200\n" +"POT-Creation-Date: 2013-03-19 18:04+0100\n" +"PO-Revision-Date: 2013-03-14 19:05+0100\n" "Last-Translator: Andrej Mernik \n" "Language-Team: Slovenian \n" "Language: sl\n" @@ -16,7 +17,7 @@ "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n" "%100==4 ? 3 : 0);\n" -"X-Generator: Lokalize 1.4\n" +"X-Generator: Lokalize 1.5\n" msgctxt "NAME OF TRANSLATORS" msgid "Your names" @@ -177,18 +178,18 @@ msgid "Purge" msgstr "Čiščenje" -#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:180 +#: muon/DetailsTabs/MainTab.cpp:109 muon/PackageModel/PackageWidget.cpp:182 msgctxt "@action:button" msgid "Unmark" msgstr "Odstrani oznako" -#: muon/DetailsTabs/MainTab.cpp:177 +#: muon/DetailsTabs/MainTab.cpp:178 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "Canonical provides critical updates for %1 until %2." msgstr "Canonical ponuja kritične posodobitve za %1 do %2." -#: muon/DetailsTabs/MainTab.cpp:181 +#: muon/DetailsTabs/MainTab.cpp:182 #, kde-format msgctxt "@info Tells how long Canonical, Ltd. will support a package" msgid "" @@ -355,69 +356,39 @@ msgid "Jonathan Thomas" msgstr "Jonathan Thomas" -#: muon/MainWindow.cpp:193 -msgctxt "@action" -msgid "Read Markings..." -msgstr "Preberi oznake ..." - -#: muon/MainWindow.cpp:198 -msgctxt "@action" -msgid "Save Markings As..." -msgstr "Shrani oznake kot ..." - -#: muon/MainWindow.cpp:203 -msgctxt "@action" -msgid "Save Package Download List..." -msgstr "Shrani seznam prejemanj paketov ..." - -#: muon/MainWindow.cpp:208 -msgctxt "@action" -msgid "Download Packages From List..." -msgstr "Prejmi pakete iz seznama ..." - -#: muon/MainWindow.cpp:219 -msgctxt "@action" -msgid "Add Downloaded Packages" -msgstr "Dodaj prejete pakete" - -#: muon/MainWindow.cpp:224 -msgctxt "@action" -msgid "Save Installed Packages List..." -msgstr "Shrani seznam nameščenih paketov ..." - -#: muon/MainWindow.cpp:229 +#: muon/MainWindow.cpp:180 msgctxt "@action Marks upgradeable packages for upgrade" msgid "Cautious Upgrade" msgstr "Previdna nadgradnja" -#: muon/MainWindow.cpp:235 +#: muon/MainWindow.cpp:186 msgctxt "" "@action Marks upgradeable packages, including ones that install/remove new " "things" msgid "Full Upgrade" msgstr "Polna nadgradnja" -#: muon/MainWindow.cpp:241 +#: muon/MainWindow.cpp:192 msgctxt "@action Marks packages no longer needed for removal" msgid "Remove Unnecessary Packages" msgstr "Odstrani nepotrebne pakete" -#: muon/MainWindow.cpp:246 +#: muon/MainWindow.cpp:197 msgctxt "@action Takes the user to the preview page" msgid "Preview Changes" msgstr "Predogled sprememb" -#: muon/MainWindow.cpp:251 +#: muon/MainWindow.cpp:202 msgctxt "@action Applys the changes a user has made" msgid "Apply Changes" msgstr "Uveljavi spremembe" -#: muon/MainWindow.cpp:258 +#: muon/MainWindow.cpp:209 msgctxt "@action::inmenu" msgid "History..." msgstr "Zgodovina ..." -#: muon/MainWindow.cpp:273 +#: muon/MainWindow.cpp:224 msgctxt "@label" msgid "" "Unable to mark upgrades. The available upgrades may require new packages to " @@ -428,12 +399,12 @@ "se namestijo ali odstranijo novi paketi. Morda bi želeli izvesti polno " "nadgradnjo tako da kliknete na gumb Polna nadgradnja." -#: muon/MainWindow.cpp:278 muon/MainWindow.cpp:293 +#: muon/MainWindow.cpp:229 muon/MainWindow.cpp:244 msgctxt "@title:window" msgid "Unable to Mark Upgrades" msgstr "Ni mogoče označiti nadgradenj" -#: muon/MainWindow.cpp:290 +#: muon/MainWindow.cpp:241 msgctxt "@label" msgid "" "Unable to mark upgrades. Some upgrades may have unsatisfiable dependencies " @@ -442,17 +413,17 @@ "Ni mogoče označiti nadgradenj. Nekatere nadgradnje trenutno nimajo " "izpolnjenih odvisnosti ali pa so bile ročno zadržane." -#: muon/MainWindow.cpp:366 +#: muon/MainWindow.cpp:317 msgctxt "@action:intoolbar Return from the preview page" msgid "Back" msgstr "Nazaj" -#: muon/MainWindow.cpp:380 +#: muon/MainWindow.cpp:331 msgctxt "@action" msgid "Preview Changes" msgstr "Predogled sprememb" -#: muon/MainWindow.cpp:497 +#: muon/MainWindow.cpp:445 msgctxt "@title:window" msgid "Package History" msgstr "Zgodovina paketov" @@ -469,52 +440,52 @@ msgid "Requested" msgstr "Zahtevano" -#: muon/PackageModel/PackageWidget.cpp:102 +#: muon/PackageModel/PackageWidget.cpp:104 msgctxt "@label Line edit click message" msgid "Search" msgstr "Poišči" -#: muon/PackageModel/PackageWidget.cpp:155 +#: muon/PackageModel/PackageWidget.cpp:157 msgctxt "@action:inmenu" msgid "Mark for Installation" msgstr "Označi za namestitev" -#: muon/PackageModel/PackageWidget.cpp:160 +#: muon/PackageModel/PackageWidget.cpp:162 msgctxt "@action:button" msgid "Mark for Removal" msgstr "Označi za odstranitev" -#: muon/PackageModel/PackageWidget.cpp:165 +#: muon/PackageModel/PackageWidget.cpp:167 msgctxt "@action:button" msgid "Mark for Upgrade" msgstr "Označi za nadgradnjo" -#: muon/PackageModel/PackageWidget.cpp:170 +#: muon/PackageModel/PackageWidget.cpp:172 msgctxt "@action:button" msgid "Mark for Reinstallation" msgstr "Označi za ponovno namestitev" -#: muon/PackageModel/PackageWidget.cpp:175 +#: muon/PackageModel/PackageWidget.cpp:177 msgctxt "@action:button" msgid "Mark for Purge" msgstr "Označi za čiščenje" -#: muon/PackageModel/PackageWidget.cpp:186 +#: muon/PackageModel/PackageWidget.cpp:188 msgctxt "@action:button" msgid "Lock Package at Current Version" msgstr "Zakleni paket na trenutno različico" -#: muon/PackageModel/PackageWidget.cpp:320 +#: muon/PackageModel/PackageWidget.cpp:322 msgctxt "@action:button" msgid "Unlock package" msgstr "Odkleni paket" -#: muon/PackageModel/PackageWidget.cpp:324 +#: muon/PackageModel/PackageWidget.cpp:326 msgctxt "@action:button" msgid "Lock at Current Version" msgstr "Zakleni na trenutno različico" -#: muon/PackageModel/PackageWidget.cpp:372 +#: muon/PackageModel/PackageWidget.cpp:374 msgctxt "@label" msgid "" "Removing this package may break your system. Are you sure you want to remove " @@ -523,37 +494,36 @@ "Odstranitev tega paketa lahko pokvari vaš sistem. Ali ste prepričani, da ga " "želite odstraniti?" -#: muon/PackageModel/PackageWidget.cpp:373 +#: muon/PackageModel/PackageWidget.cpp:375 msgctxt "@label" msgid "Warning - Removing Important Package" msgstr "Pozor - odstranjevanje pomembnega paketa" -#: muon/PackageModel/PackageWidget.cpp:559 -#, fuzzy -#| msgctxt "@title:window" -#| msgid "Unable to Mark Package" +#: muon/PackageModel/PackageWidget.cpp:561 msgctxt "@title:window" msgid "Failed to Lock Package" -msgstr "Ni bilo mogoče označiti paketa" +msgstr "Ni bilo mogoče zakleniti paketa" -#: muon/PackageModel/PackageWidget.cpp:560 +#: muon/PackageModel/PackageWidget.cpp:562 #, kde-format msgctxt "@info Error text" msgid "The package %1 could not be locked. Failed to write lock file." msgstr "" +"Paketa %1 ni bilo mogoče zakleniti, saj ni bilo mogoče zapisati zaklepne " +"datoteke." -#: muon/PackageModel/PackageWidget.cpp:610 +#: muon/PackageModel/PackageWidget.cpp:611 #, kde-format msgctxt "@label" msgid "The \"%1\" package could not be marked for installation or upgrade:" msgstr "Paketa '%1' ni bilo mogoče označiti za namestitev ali nadgradnjo:" -#: muon/PackageModel/PackageWidget.cpp:613 +#: muon/PackageModel/PackageWidget.cpp:614 msgctxt "@title:window" msgid "Unable to Mark Package" msgstr "Ni bilo mogoče označiti paketa" -#: muon/PackageModel/PackageWidget.cpp:635 +#: muon/PackageModel/PackageWidget.cpp:631 #, kde-format msgctxt "@label" msgid "" @@ -566,42 +536,24 @@ "\tTo ponavadi pomeni, da je bil omenjen v odvisnosti, a ni bil poslan, je " "zastarel ali pa ni na voljo iz trenutno omogočenih skladišč." -#: muon/PackageModel/PackageWidget.cpp:652 +#: muon/PackageModel/PackageWidget.cpp:638 #, kde-format msgctxt "@label Example: Depends: libqapt 0.1, but 0.2 is to be installed" msgid "%1: %2 %3, but %4 is to be installed" msgstr "%1: %2 %3, ampak nameščen bo %4" -#: muon/PackageModel/PackageWidget.cpp:658 -#, kde-format -msgctxt "@label Example: or libqapt 0.1, but 0.2 is to be installed" -msgid "or %1 %2, but %3 is to be installed" -msgstr "ali %1 %2, ampak nameščen bo %3" - -#: muon/PackageModel/PackageWidget.cpp:677 +#: muon/PackageModel/PackageWidget.cpp:644 #, kde-format msgctxt "@label Example: Depends: libqapt, but is not installable" msgid "%1: %2, but it is not installable" msgstr "%1: %2, ampak ga ni mogoče namestiti" -#: muon/PackageModel/PackageWidget.cpp:683 -#, kde-format -msgctxt "@label Example: or libqapt, but is not installable" -msgid "or %1, but is not installable" -msgstr "ali %1, ampak ga ni mogoče namestiti" - -#: muon/PackageModel/PackageWidget.cpp:702 +#: muon/PackageModel/PackageWidget.cpp:649 #, kde-format msgctxt "@label Example: Depends: libqapt, but it is a virtual package" msgid "%1: %2, but it is a virtual package" msgstr "%1: %2, ampak je navidezni paket" -#: muon/PackageModel/PackageWidget.cpp:708 -#, kde-format -msgctxt "@label Example: or libqapt, but it is a virtual package" -msgid "or %1, but it is a virtual package" -msgstr "ali %1, ampak je navidezni paket" - #: muon/ReviewWidget.cpp:30 msgid "Review and Apply Changes" msgstr "Preglejte in uveljavite spremembe" @@ -761,18 +713,6 @@ msgstr "Opozorilo – nepreverjena programska oprema" #: muon/TransactionWidget.cpp:265 -#, fuzzy -#| msgctxt "@label" -#| msgid "" -#| "The following piece of software cannot be verified. Installing " -#| "unverified software represents a security risk, as the presence of " -#| "unverifiable software can be a sign of tampering. Do you wish " -#| "to continue?" -#| msgid_plural "" -#| "The following pieces of software cannot be authenticated. " -#| "Installing unverified software represents a security risk, as " -#| "the presence of unverifiable software can be a sign of tampering. Do you wish to continue?" msgctxt "@label" msgid "" "The following piece of software cannot be verified. Installing " diff -Nru muon-1.9.60/po/sr/libmuon.po muon-2.0.0/po/sr/libmuon.po --- muon-1.9.60/po/sr/libmuon.po 2012-10-29 18:35:39.000000000 +0000 +++ muon-2.0.0/po/sr/libmuon.po 2013-04-01 20:33:59.000000000 +0000 @@ -1,12 +1,12 @@ # Translation of libmuon.po into Serbian. # Dalibor Djuric , 2011. -# Chusslove Illich , 2011, 2012. +# Chusslove Illich , 2011, 2012, 2013. msgid "" msgstr "" "Project-Id-Version: libmuon\n" "Report-Msgid-Bugs-To: http://bugs.kde.org\n" -"POT-Creation-Date: 2012-10-17 10:42+0200\n" -"PO-Revision-Date: 2012-10-20 16:36+0200\n" +"POT-Creation-Date: 2013-03-09 10:35+0100\n" +"PO-Revision-Date: 2013-02-23 19:22+0100\n" "Last-Translator: Chusslove Illich \n" "Language-Team: Serbian \n" "Language: sr\n" @@ -20,1250 +20,105 @@ "X-Environment: kde\n" "X-Generator: Lokalize 1.1\n" -#: libmuon/ApplicationBackend/Application.cpp:175 +#: libmuon/backends/ApplicationBackend/Application.cpp:177 msgid "Applications" msgstr "Програми" -#: libmuon/ApplicationBackend/Application.cpp:263 +#: libmuon/backends/ApplicationBackend/Application.cpp:278 msgctxt "@info license" msgid "Open Source" msgstr "отворенокодна" -#: libmuon/ApplicationBackend/Application.cpp:265 +#: libmuon/backends/ApplicationBackend/Application.cpp:280 msgctxt "@info license" msgid "Proprietary" msgstr "власничка" -#: libmuon/ApplicationBackend/Application.cpp:267 +#: libmuon/backends/ApplicationBackend/Application.cpp:282 msgctxt "@info license" msgid "Unknown" msgstr "непозната" -#: libmuon/ApplicationBackend/Application.cpp:398 +#: libmuon/backends/ApplicationBackend/Application.cpp:413 #, kde-format msgctxt "@info app size" msgid "%1 to download, %2 on disk" msgstr "%1 за преузимање, %2 на диску" -#: libmuon/ApplicationBackend/Application.cpp:402 +#: libmuon/backends/ApplicationBackend/Application.cpp:417 #, kde-format msgctxt "@info app size" msgid "%1 on disk" msgstr "%1 на диску" -#: libmuon/categories.xml:5 -msgctxt "Category" -msgid "Accessories" -msgstr "" -"Допунске алатке" -"|/|" -"$[својство лок 'Допунским алаткама']" - -#: libmuon/categories.xml:16 -msgctxt "Category" -msgid "Accessibility" -msgstr "" -"Приступачност" -"|/|" -"$[својство лок 'Приступачности']" - -#: libmuon/categories.xml:27 -msgctxt "Category" -msgid "Developer Tools" -msgstr "" -"Програмерске алатке" -"|/|" -"$[својство лок 'Програмерским алаткама']" - -#: libmuon/categories.xml:42 -msgctxt "Category" -msgid "Debugging" -msgstr "" -"Исправљање" -"|/|" -"$[својство лок 'Исправљању']" - -#: libmuon/categories.xml:52 -msgctxt "Category" -msgid "Graphic Interface Design" -msgstr "" -"Дизајнирање графичког сучеља" -"|/|" -"$[својство лок 'Дизајнирању графичког сучеља']" - -#: libmuon/categories.xml:62 -msgctxt "Category" -msgid "Haskell" -msgstr "" -"Хаскел" -"|/|" -"$[својство лок 'Хаскелу']" - -#: libmuon/categories.xml:75 -msgctxt "Category" -msgid "IDEs" -msgstr "" -"ИДЕ‑ови" -"|/|" -"$[својство лок 'ИДЕ‑овима']" - -#: libmuon/categories.xml:85 -msgctxt "Category" -msgid "Java" -msgstr "" -"Јава" -"|/|" -"$[својство лок 'Јави']" - -#: libmuon/categories.xml:98 -msgctxt "Category" -msgid "Localization" -msgstr "" -"Локализација" -"|/|" -"$[својство лок 'Локализацији']" - -#: libmuon/categories.xml:108 -msgctxt "Category" -msgid "Perl" -msgstr "" -"Перл" -"|/|" -"$[својство лок 'Перлу']" - -#: libmuon/categories.xml:121 -msgctxt "Category" -msgid "Profiling" -msgstr "" -"Профилисање" -"|/|" -"$[својство лок 'Профилисању']" - -#: libmuon/categories.xml:131 -msgctxt "Category" -msgid "Python" -msgstr "" -"Питон" -"|/|" -"$[својство лок 'Питону']" - -#: libmuon/categories.xml:144 -msgctxt "Category" -msgid "Version Control" -msgstr "" -"Управљање верзијама" -"|/|" -"$[својство лок 'Управљању верзијама']" - -#: libmuon/categories.xml:158 -msgctxt "Category" -msgid "Web Development" -msgstr "" -"Развој за Веб" -"|/|" -"$[својство лок 'Развоју за Веб']" - -#: libmuon/categories.xml:171 -msgctxt "Category" -msgid "Education" -msgstr "" -"Образовање" -"|/|" -"$[својство лок 'Образовању']" - -#: libmuon/categories.xml:185 -msgctxt "Category" -msgid "Science & Engineering" -msgstr "" -"Природне науке и инжењерство" -"|/|" -"$[својство лок 'Природним наукама и инжењерству']" - -#: libmuon/categories.xml:194 -msgctxt "Category" -msgid "Astronomy" -msgstr "" -"Астрономија" -"|/|" -"$[својство лок 'Астрономији']" - -#: libmuon/categories.xml:203 -msgctxt "Category" -msgid "Biology" -msgstr "" -"Биологија" -"|/|" -"$[својство лок 'Биологији']" - -#: libmuon/categories.xml:212 -msgctxt "Category" -msgid "Chemistry" -msgstr "" -"Хемија" -"|/|" -"$[својство лок 'Хемији']" - -#: libmuon/categories.xml:221 -msgctxt "Category" -msgid "Computer Science & Robotics" -msgstr "" -"Рачунарство и роботика" -"|/|" -"$[својство лок 'Рачунарству и роботици']" - -#: libmuon/categories.xml:232 -msgctxt "Category" -msgid "Electronics" -msgstr "" -"Електроника" -"|/|" -"$[својство лок 'Електроници']" - -#: libmuon/categories.xml:241 -msgctxt "Category" -msgid "Engineering" -msgstr "" -"Инжењерство" -"|/|" -"$[својство лок 'Инжењерству']" - -#: libmuon/categories.xml:250 -msgctxt "Category" -msgid "Geography" -msgstr "" -"Географија" -"|/|" -"$[својство лок 'Географији']" - -#: libmuon/categories.xml:259 -msgctxt "Category" -msgid "Geology" -msgstr "" -"Геологија" -"|/|" -"$[својство лок 'Геологији']" - -#: libmuon/categories.xml:269 -msgctxt "Category" -msgid "Mathematics" -msgstr "" -"Математика" -"|/|" -"$[својство лок 'Математици']" - -#: libmuon/categories.xml:288 -msgctxt "Category" -msgid "Physics" -msgstr "" -"Физика" -"|/|" -"$[својство лок 'Физици']" - -#: libmuon/categories.xml:299 -msgctxt "Category" -msgid "Fonts" -msgstr "" -"Фонтови" -"|/|" -"$[својство лок 'Фонтовима']" - -#: libmuon/categories.xml:315 -msgctxt "Category" -msgid "Games" -msgstr "" -"Игре" -"|/|" -"$[својство лок 'Играма']" - -#: libmuon/categories.xml:324 -msgctxt "Category" -msgid "Arcade" -msgstr "" -"Аркадне" -"|/|" -"$[својство лок 'Аркадним']" - -#: libmuon/categories.xml:333 -msgctxt "Category" -msgid "Board Games" -msgstr "" -"Игре на табли" -"|/|" -"$[својство лок 'Играма на табли']" - -#: libmuon/categories.xml:342 -msgctxt "Category" -msgid "Card Games" -msgstr "" -"Игре са картама" -"|/|" -"$[својство лок 'Играма са картама']" - -#: libmuon/categories.xml:351 -msgctxt "Category" -msgid "Puzzles" -msgstr "" -"Логичке" -"|/|" -"$[својство лок 'Логичким']" - -#: libmuon/categories.xml:360 -msgctxt "Category" -msgid "Role Playing" -msgstr "" -"Играње улога" -"|/|" -"$[својство лок 'Игрању улога']" - -#: libmuon/categories.xml:369 -msgctxt "Category" -msgid "Simulation" -msgstr "" -"Симулација" -"|/|" -"$[својство лок 'Симулацији']" - -#: libmuon/categories.xml:378 -msgctxt "Category" -msgid "Sports" -msgstr "" -"Спортови" -"|/|" -"$[својство лок 'Спортовима']" - -#: libmuon/categories.xml:391 -msgctxt "Category" -msgid "Graphics" -msgstr "" -"Графика" -"|/|" -"$[својство лок 'Графици']" - -#: libmuon/categories.xml:399 -msgctxt "Category" -msgid "3D" -msgstr "" -"3Д" -"|/|" -"$[својство лок '3Д-у']" - -#: libmuon/categories.xml:408 -msgctxt "Category" -msgid "Drawing" -msgstr "" -"Цртање" -"|/|" -"$[својство лок 'Цртању']" - -#: libmuon/categories.xml:420 -msgctxt "Category" -msgid "Painting & Editing" -msgstr "" -"Сликање и ретуширање" -"|/|" -"$[својство лок 'Сликању и ретуширању']" - -#: libmuon/categories.xml:433 -msgctxt "Category" -msgid "Photography" -msgstr "" -"Фотографија" -"|/|" -"$[својство лок 'Фотографији']" - -#: libmuon/categories.xml:442 -msgctxt "Category" -msgid "Publishing" -msgstr "" -"Издаваштво" -"|/|" -"$[својство лок 'Издаваштву']" - -#: libmuon/categories.xml:451 -msgctxt "Category" -msgid "Scanning & OCR" -msgstr "" -"Скенирање и ОЦР" -"|/|" -"$[својство лок 'Скенирању и ОЦР‑у']" - -#: libmuon/categories.xml:461 -msgctxt "Category" -msgid "Viewers" -msgstr "" -"Приказивачи" -"|/|" -"$[својство лок 'Приказивачима']" - -#: libmuon/categories.xml:473 -msgctxt "Category" -msgid "Internet" -msgstr "" -"Интернет" -"|/|" -"$[својство лок 'Интернету']" - -#: libmuon/categories.xml:481 -msgctxt "Category" -msgid "Chat" -msgstr "" -"Ћаскање" -"|/|" -"$[својство лок 'Ћаскању']" - -#: libmuon/categories.xml:491 -msgctxt "Category" -msgid "File Sharing" -msgstr "" -"Дељење фајлова" -"|/|" -"$[својство лок 'Дељењу фајлова']" - -#: libmuon/categories.xml:500 -msgctxt "Category" -msgid "Mail" -msgstr "" -"Е‑пошта" -"|/|" -"$[својство лок 'Е‑пошти']" - -#: libmuon/categories.xml:509 -msgctxt "Category" -msgid "Web Browsers" -msgstr "" -"Веб прегледачи" -"|/|" -"$[својство лок 'Веб прегледачима']" - -#: libmuon/categories.xml:521 -msgctxt "Category" -msgid "Multimedia" -msgstr "" -"Мултимедија" -"|/|" -"$[својство лок 'Мултимедији']" - -#: libmuon/categories.xml:532 -msgctxt "Category" -msgid "Office" -msgstr "" -"Канцеларија" -"|/|" -"$[својство лок 'Канцеларији']" - -#: libmuon/categories.xml:542 -msgctxt "Category" -msgid "System & Settings" -msgstr "" -"Систем и поставке" -"|/|" -"$[својство лок 'Систему и поставкама']" - -#: libmuon/categories.xml:553 -msgctxt "Category" -msgid "Comics" -msgstr "" -"Стрипови" -"|/|" -"$[својство лок 'Стриповима']" - -#: libmuon/categories.xml:563 -msgctxt "Category" -msgid "Plasma Desktop Widgets" -msgstr "" -"Плазма виџети површи" -"|/|" -"$[својство лок 'Плазма виџетима површи']" +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications Backend" +msgstr "Позадина за програме" + +#: libmuon/backends/ApplicationBackend/ApplicationBackend.cpp:63 +msgid "Applications in your system" +msgstr "Програми на систему" + +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:60 +#: libmuon/backends/ApplicationBackend/UbuntuLoginBackend.cpp:68 +msgid "Log in to the Ubuntu SSO service" +msgstr "Пријави се на Убунтуов ССО сервис" -#: libmuon/Category/Category.cpp:64 +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Bodega Backend" +msgstr "Позадина Бодеге" + +# rewrite-msgid: /to your system// +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:38 +msgid "Install Bodega data in your system" +msgstr "Инсталирајте податке из Бодеге" + +#: libmuon/backends/BodegaBackend/BodegaBackend.cpp:59 +msgid "Enter MakePlayLive credentials" +msgstr "Унесите креденцијале за Мејк‑плеј‑лив" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy Backend" +msgstr "Лажна позадина" + +#: libmuon/backends/DummyBackend/DummyBackend.cpp:32 +msgid "Dummy backend to test muon frontends" +msgstr "Лажна позадина за испробавање Муонових прочеља" + +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "KNewStuff Backend" +msgstr "Позадина К‑новотарија" + +# rewrite-msgid: /to your system// +#: libmuon/backends/KNSBackend/KNSBackend.cpp:43 +msgid "Install KNewStuff data in your system" +msgstr "Инсталирајте податке из К‑новотарија" + +#: libmuon/Category/Category.cpp:44 msgctxt "@label The label used for viewing all members of this category" msgid "All" msgstr "Све" -#: libmuon/ChangesDialog.cpp:40 -msgctxt "@title:window" -msgid "Confirm Additional Changes" -msgstr "Потврда додатних измена" - -# >> @title:window -#: libmuon/ChangesDialog.cpp:45 -msgctxt "@info" -msgid "

Mark additional changes?

" -msgstr "

Означити додатне измене?

" - -#: libmuon/ChangesDialog.cpp:49 -msgid "This action requires a change to another package:" -msgid_plural "This action requires changes to other packages:" -msgstr[0] "Ова радња захтева измену других пакета:" -msgstr[1] "Ова радња захтева измену других пакета:" -msgstr[2] "Ова радња захтева измену других пакета:" -msgstr[3] "Ова радња захтева измену другог пакета:" - -#: libmuon/HistoryView/HistoryView.cpp:52 -msgctxt "@info" -msgid "History" -msgstr "Историјат" - -#: libmuon/HistoryView/HistoryView.cpp:58 -msgctxt "@label Line edit click message" -msgid "Search" -msgstr "Претрага" - -#: libmuon/HistoryView/HistoryView.cpp:70 -msgctxt "@item:inlistbox Filters all changes in the history view" -msgid "All changes" -msgstr "све измене" - -#: libmuon/HistoryView/HistoryView.cpp:74 -msgctxt "@item:inlistbox Filters installations in the history view" -msgid "Installations" -msgstr "инсталације" - -#: libmuon/HistoryView/HistoryView.cpp:78 -msgctxt "@item:inlistbox Filters updates in the history view" -msgid "Updates" -msgstr "ажурирања" - -#: libmuon/HistoryView/HistoryView.cpp:82 -msgctxt "@item:inlistbox Filters removals in the history view" -msgid "Removals" -msgstr "уклањања" - -#: libmuon/HistoryView/HistoryView.cpp:93 -msgctxt "@title:column" -msgid "Date" -msgstr "датум" - -# >> part of sentence " installed at