commit kinfocenter5 for openSUSE:Factory
Hello community,
here is the log from the commit of package kinfocenter5 for openSUSE:Factory checked in at 2014-07-25 09:09:13
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kinfocenter5 (Old)
and /work/SRC/openSUSE:Factory/.kinfocenter5.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kinfocenter5"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kinfocenter5/kinfocenter5.changes 2014-07-15 08:00:16.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kinfocenter5.new/kinfocenter5.changes 2014-07-25 09:09:59.000000000 +0200
@@ -1,0 +2,13 @@
+Fri Jul 18 21:32:42 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Added opensuse-kinfocenter.diff to have some openSUSE distro info
+ in kinfocenter (backported from 4.11.x kdebase4-workspace package)
+
+-------------------------------------------------------------------
+Fri Jul 11 18:49:15 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 5.0.0
+ * Plasma 5.0 Final
+- Adjust BuildRequires depending whether Qt is built with openGL or open GL ES2
+
+-------------------------------------------------------------------
Old:
----
kinfocenter-4.98.0.tar.xz
New:
----
kinfocenter-5.0.0.tar.xz
opensuse-kinfocenter.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kinfocenter5.spec ++++++
--- /var/tmp/diff_new_pack.Ve9ZIg/_old 2014-07-25 09:10:00.000000000 +0200
+++ /var/tmp/diff_new_pack.Ve9ZIg/_new 2014-07-25 09:10:00.000000000 +0200
@@ -17,13 +17,15 @@
Name: kinfocenter5
-Version: 4.98.0
+Version: 5.0.0
Release: 0
Summary: Utility that provides information about a computer system
License: GPL-2.0+
Group: System/GUI/KDE
Url: http://www.kde.org/
-Source: http://download.kde.org/unstable/plasma/%{version}/src/kinfocenter-%{version}.tar.xz
+Source: http://download.kde.org/stable/plasma/%{version}/kinfocenter-%{version}.tar.xz
+# PATCH-FIX-OPENSUSE opensuse-kinfocenter.diff (created by Alin M. Elena to have some openSUSE distro info in kinfocenter)
+Patch0: opensuse-kinfocenter.diff
BuildRequires: extra-cmake-modules
BuildRequires: kcmutils-devel
BuildRequires: kcompletion-devel
@@ -44,7 +46,11 @@
BuildRequires: pkgconfig(Qt5Core) >= 5.3.0
BuildRequires: pkgconfig(Qt5Gui) >= 5.3.0
BuildRequires: pkgconfig(egl)
+%ifarch %arm aarch64
+BuildRequires: pkgconfig(glesv2)
+%else
BuildRequires: pkgconfig(gl)
+%endif
BuildRequires: pkgconfig(glu)
BuildRequires: pkgconfig(wayland-client)
Conflicts: kdebase4-workspace
@@ -57,6 +63,7 @@
%prep
%setup -q -n kinfocenter-%{version}
+%patch0 -p1
%build
%cmake_kf5 -d build -- -DBUILD_po=OFF
++++++ kinfocenter-4.98.0.tar.xz -> kinfocenter-5.0.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/Modules/info/wayland.desktop new/kinfocenter-5.0.0/Modules/info/wayland.desktop
--- old/kinfocenter-4.98.0/Modules/info/wayland.desktop 2014-07-03 16:50:58.000000000 +0200
+++ new/kinfocenter-5.0.0/Modules/info/wayland.desktop 2014-07-10 17:00:47.000000000 +0200
@@ -41,6 +41,7 @@
Name[tr]=Wayland
Name[uk]=Wayland
Name[x-test]=xxWaylandxx
+Name[zh_CN]=Wayland
Name[zh_TW]=Wayland
Comment=Information about the Wayland Compositor
@@ -76,6 +77,7 @@
Comment[tr]=Wayland dizgici hakkında bilgiler
Comment[uk]=Відомості щодо засобу композиції Wayland
Comment[x-test]=xxInformation about the Wayland Compositorxx
+Comment[zh_CN]=关于 Wayland 的信息。
Comment[zh_TW]=關於 Wayland 的資訊
X-KDE-Keywords=Wayland,Compositor,Display,System Information
@@ -110,6 +112,7 @@
X-KDE-Keywords[tr]=Wayland,Dizgici,Görüntü,Sistem Bilgileri
X-KDE-Keywords[uk]=Wayland,Compositor,Display,System Information,композиція,засіб,дисплей,монітор,відомості щодо системи
X-KDE-Keywords[x-test]=xxWayland,Compositor,Display,System Informationxx
+X-KDE-Keywords[zh_CN]=Wayland,Compositor,Display,System Information,显示,系统信息,混成
X-KDE-Keywords[zh_TW]=Wayland,Compositor,Display,System Information
Categories=Qt;KDE;X-KDE-information;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/Modules/infosummary/infosum.cpp new/kinfocenter-5.0.0/Modules/infosummary/infosum.cpp
--- old/kinfocenter-4.98.0/Modules/infosummary/infosum.cpp 2014-07-03 16:50:58.000000000 +0200
+++ new/kinfocenter-5.0.0/Modules/infosummary/infosum.cpp 2014-07-10 17:00:47.000000000 +0200
@@ -62,7 +62,7 @@
{
DefaultBoxWidget *osWidget = new DefaultBoxWidget();
osWidget->setIcon(QIcon::fromTheme(QStringLiteral("kde")));
- osWidget->setLabelTitles(i18n("OS Version"),i18n("KDE SC Version"), i18n("Hostname"));
+ osWidget->setLabelTitles(i18n("OS Version"),i18n("KDE Plasma Version"), i18n("Hostname"));
OsDepInfo *osInfo = new OsDepInfo();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/doc/en_US/index.docbook new/kinfocenter-5.0.0/doc/en_US/index.docbook
--- old/kinfocenter-4.98.0/doc/en_US/index.docbook 2014-07-03 16:50:58.000000000 +0200
+++ new/kinfocenter-5.0.0/doc/en_US/index.docbook 2014-07-10 17:00:47.000000000 +0200
@@ -242,7 +242,7 @@
</para>
<itemizedlist>
<listitem><para><guilabel>OS Version</guilabel>: This is the version information of the Operating System KInfoCenter is present on.</para></listitem>
-<listitem><para><guilabel>KDE SC Version</guilabel>: This is the version of the KDE Software Collection KInfoCenter was compiled on.</para></listitem>
+<listitem><para><guilabel>KDE Plasma Version</guilabel>: This is the version of the KDE Plasma Workspace KInfoCenter was compiled on.</para></listitem>
<listitem><para><guilabel>Hostname</guilabel>: This is the hostname of the computer KInfoCenter is present on.</para></listitem>
</itemizedlist>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/kcontrol/menus/kde-information.directory new/kinfocenter-5.0.0/kcontrol/menus/kde-information.directory
--- old/kinfocenter-4.98.0/kcontrol/menus/kde-information.directory 2014-07-03 16:50:58.000000000 +0200
+++ new/kinfocenter-5.0.0/kcontrol/menus/kde-information.directory 2014-07-10 17:00:47.000000000 +0200
@@ -17,6 +17,7 @@
Name[nb]=Informasjon
Name[nds]=Informatschoon
Name[nl]=Informatie
+Name[pa]=ਜਾਣਕਾਰੀ
Name[pl]=Informacje
Name[pt]=Informação
Name[pt_BR]=Informações
@@ -31,6 +32,7 @@
Name[tr]=Bilgilendirme
Name[uk]=Інформація
Name[x-test]=xxInformationxx
+Name[zh_CN]=信息
Name[zh_TW]=資訊
Icon=hwinfo
X-KDE-BaseGroup=info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcm_infobase.po new/kinfocenter-5.0.0/po/ar/kcm_infobase.po
--- old/kinfocenter-4.98.0/po/ar/kcm_infobase.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcm_infobase.po 2014-07-10 17:00:58.000000000 +0200
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\n"
"X-Project-Style: kde\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcm_infosummary.po new/kinfocenter-5.0.0/po/ar/kcm_infosummary.po
--- old/kinfocenter-4.98.0/po/ar/kcm_infosummary.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcm_infosummary.po 2014-07-10 17:00:58.000000000 +0200
@@ -16,7 +16,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Virtaal 0.7.1\n"
"X-Project-Style: kde\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcm_memory.po new/kinfocenter-5.0.0/po/ar/kcm_memory.po
--- old/kinfocenter-4.98.0/po/ar/kcm_memory.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcm_memory.po 2014-07-10 17:00:58.000000000 +0200
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: KBabel 1.11.4\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcm_pci.po new/kinfocenter-5.0.0/po/ar/kcm_pci.po
--- old/kinfocenter-4.98.0/po/ar/kcm_pci.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcm_pci.po 2014-07-10 17:00:58.000000000 +0200
@@ -18,7 +18,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Lokalize 1.2\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcmdevinfo.po new/kinfocenter-5.0.0/po/ar/kcmdevinfo.po
--- old/kinfocenter-4.98.0/po/ar/kcmdevinfo.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcmdevinfo.po 2014-07-10 17:00:58.000000000 +0200
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Translate Toolkit 1.10.0\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcminfo.po new/kinfocenter-5.0.0/po/ar/kcminfo.po
--- old/kinfocenter-4.98.0/po/ar/kcminfo.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcminfo.po 2014-07-10 17:00:58.000000000 +0200
@@ -24,7 +24,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Lokalize 1.2\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcmnic.po new/kinfocenter-5.0.0/po/ar/kcmnic.po
--- old/kinfocenter-4.98.0/po/ar/kcmnic.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcmnic.po 2014-07-10 17:00:58.000000000 +0200
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Lokalize 1.0\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcmopengl.po new/kinfocenter-5.0.0/po/ar/kcmopengl.po
--- old/kinfocenter-4.98.0/po/ar/kcmopengl.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcmopengl.po 2014-07-10 17:00:58.000000000 +0200
@@ -17,7 +17,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: KBabel 1.11.4\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcmsamba.po new/kinfocenter-5.0.0/po/ar/kcmsamba.po
--- old/kinfocenter-4.98.0/po/ar/kcmsamba.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcmsamba.po 2014-07-10 17:00:58.000000000 +0200
@@ -21,7 +21,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: Lokalize 1.2\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcmusb.po new/kinfocenter-5.0.0/po/ar/kcmusb.po
--- old/kinfocenter-4.98.0/po/ar/kcmusb.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcmusb.po 2014-07-10 17:00:58.000000000 +0200
@@ -20,7 +20,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: KBabel 1.11.4\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kcmview1394.po new/kinfocenter-5.0.0/po/ar/kcmview1394.po
--- old/kinfocenter-4.98.0/po/ar/kcmview1394.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kcmview1394.po 2014-07-10 17:00:58.000000000 +0200
@@ -20,7 +20,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: KBabel 1.11.4\n"
#: view1394.cpp:66
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/ar/kinfocenter.po new/kinfocenter-5.0.0/po/ar/kinfocenter.po
--- old/kinfocenter-4.98.0/po/ar/kinfocenter.po 2014-07-03 16:51:08.000000000 +0200
+++ new/kinfocenter-5.0.0/po/ar/kinfocenter.po 2014-07-10 17:00:58.000000000 +0200
@@ -21,7 +21,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 ? 4 : 5;\n"
+"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
"X-Generator: KBabel 1.11.4\n"
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/pa/kcmdevinfo.po new/kinfocenter-5.0.0/po/pa/kcmdevinfo.po
--- old/kinfocenter-4.98.0/po/pa/kcmdevinfo.po 2014-07-03 16:55:20.000000000 +0200
+++ new/kinfocenter-5.0.0/po/pa/kcmdevinfo.po 2014-07-10 17:04:59.000000000 +0200
@@ -267,7 +267,7 @@
#: soldevicetypes.cpp:226
msgid "File System"
-msgstr "ਫਾਇਲ ਸਿਸਟਮ"
+msgstr "ਫਾਈਲ ਸਿਸਟਮ"
#: soldevicetypes.cpp:228
msgid "Partition Table"
@@ -288,7 +288,7 @@
#: soldevicetypes.cpp:237
msgid "File System Type: "
-msgstr "ਫਾਇਲ ਸਿਸਟਮ ਕਿਸਮ: "
+msgstr "ਫਾਈਲ ਸਿਸਟਮ ਕਿਸਮ: "
#: soldevicetypes.cpp:239
msgid "Label: "
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/pa/kcmsamba.po new/kinfocenter-5.0.0/po/pa/kcmsamba.po
--- old/kinfocenter-4.98.0/po/pa/kcmsamba.po 2014-07-03 16:55:20.000000000 +0200
+++ new/kinfocenter-5.0.0/po/pa/kcmsamba.po 2014-07-10 17:04:59.000000000 +0200
@@ -49,7 +49,7 @@
#: kcmsambalog.cpp:39
msgid "Samba log file: "
-msgstr "ਸਾਂਬਾ ਲਾਗ ਫਾਇਲ:"
+msgstr "ਸਾਂਬਾ ਲਾਗ ਫਾਈਲ:"
#: kcmsambalog.cpp:39
msgid "Show opened connections"
@@ -61,11 +61,11 @@
#: kcmsambalog.cpp:40
msgid "Show opened files"
-msgstr "ਖੁੱਲੀਆਂ ਫਾਇਲਾਂ ਵੇਖੋ"
+msgstr "ਖੁੱਲੀਆਂ ਫਾਈਲਾਂ ਵੇਖੋ"
#: kcmsambalog.cpp:40
msgid "Show closed files"
-msgstr "ਬੰਦ ਫਾਇਲਾਂ ਵੇਖੋ"
+msgstr "ਬੰਦ ਫਾਈਲਾਂ ਵੇਖੋ"
#: kcmsambalog.cpp:40
msgid "&Update"
@@ -112,7 +112,7 @@
"Click here to refresh the information on this page. The log file (shown "
"above) will be read to obtain the events logged by samba."
msgstr ""
-"ਇਹ ਪੇਜ਼ ਦੀ ਜਾਣਕਾਰੀ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਵਾਸਤੇ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ। ਲਾਗ ਫਾਇਲ (ਜੋ ਉੱਤੇ ਦਿੱਤੀ ਹੈ) ਸਾਂਬਾ ਵਲੋਂ "
+"ਇਹ ਪੇਜ਼ ਦੀ ਜਾਣਕਾਰੀ ਨੂੰ ਤਾਜ਼ਾ ਕਰਨ ਵਾਸਤੇ ਇੱਥੇ ਕਲਿੱਕ ਕਰੋ। ਲਾਗ ਫਾਈਲ (ਜੋ ਉੱਤੇ ਦਿੱਤੀ ਹੈ) ਸਾਂਬਾ ਵਲੋਂ "
"ਦਿੱਤੇ ਲਾਗ ਈਵੈਂਟ ਤੋਂ ਪੜ੍ਹੀ ਜਾਵੇਗੀ।"
#: kcmsambalog.cpp:90 kcmsambalog.cpp:91
@@ -125,7 +125,7 @@
#: kcmsambalog.cpp:90 kcmsambalog.cpp:92 kcmsambastatistics.cpp:69
msgid "Service/File"
-msgstr "ਸਰਵਿਸ/ਫਾਇਲ"
+msgstr "ਸਰਵਿਸ/ਫਾਈਲ"
#: kcmsambalog.cpp:91 kcmsambalog.cpp:92 kcmsambastatistics.cpp:69
msgid "Host/User"
@@ -152,16 +152,16 @@
#: kcmsambalog.cpp:215
msgid " FILE OPENED"
-msgstr " ਫਾਇਲ ਖੁੱਲੀ"
+msgstr " ਫਾਈਲ ਖੁੱਲੀ"
#: kcmsambalog.cpp:221
msgid " FILE CLOSED"
-msgstr " ਫਾਇਲ ਬੰਦ"
+msgstr " ਫਾਈਲ ਬੰਦ"
#: kcmsambalog.cpp:229
#, kde-format
msgid "Could not open file %1"
-msgstr "ਫਾਇਲ %1 ਨੂੰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
+msgstr "ਫਾਈਲ %1 ਨੂੰ ਖੋਲਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"
#: kcmsambastatistics.cpp:44
msgid "Connections: 0"
@@ -177,7 +177,7 @@
#: kcmsambastatistics.cpp:53
msgid "Service/File:"
-msgstr "ਸਰਵਿਸ/ਫਾਇਲ:"
+msgstr "ਸਰਵਿਸ/ਫਾਈਲ:"
#: kcmsambastatistics.cpp:57
msgid "Host/User:"
@@ -213,7 +213,7 @@
#: kcmsambastatistics.cpp:74
msgid "File Access"
-msgstr "ਫਾਇਲ ਪਹੁੰਚ"
+msgstr "ਫਾਈਲ ਪਹੁੰਚ"
#: kcmsambastatistics.cpp:130
#, kde-format
@@ -223,11 +223,11 @@
#: kcmsambastatistics.cpp:131
#, kde-format
msgid "File accesses: %1"
-msgstr "ਫਾਇਲ ਪਹੁੰਚ: %1"
+msgstr "ਫਾਈਲ ਪਹੁੰਚ: %1"
#: kcmsambastatistics.cpp:165 kcmsambastatistics.cpp:220
msgid "FILE OPENED"
-msgstr "ਫਾਇਲ ਖੁੱਲੀ"
+msgstr "ਫਾਈਲ ਖੁੱਲੀ"
#: ksmbstatus.cpp:52
msgid "Service"
@@ -251,7 +251,7 @@
#: ksmbstatus.cpp:53
msgid "Open Files"
-msgstr "ਫਾਇਲਾਂ ਖੋਲ੍ਹੋ"
+msgstr "ਫਾਈਲਾਂ ਖੋਲ੍ਹੋ"
#: ksmbstatus.cpp:157
msgid "Error: Unable to run smbstatus"
@@ -259,7 +259,7 @@
#: ksmbstatus.cpp:179
msgid "Error: Unable to open configuration file \"smb.conf\""
-msgstr "ਗਲਤੀ: ਸੰਰਚਨਾ ਫਾਇਲ \"smb.conf\" ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
+msgstr "ਗਲਤੀ: ਸੰਰਚਨਾ ਫਾਈਲ \"smb.conf\" ਖੋਲਣ ਵਿੱਚ ਅਸਫਲ"
#: main.cpp:61
msgid "&Exports"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kinfocenter-4.98.0/po/pa/kinfocenter.po new/kinfocenter-5.0.0/po/pa/kinfocenter.po
--- old/kinfocenter-4.98.0/po/pa/kinfocenter.po 2014-07-03 16:55:20.000000000 +0200
+++ new/kinfocenter-5.0.0/po/pa/kinfocenter.po 2014-07-10 17:04:59.000000000 +0200
@@ -68,7 +68,7 @@
#: infocenter.cpp:265
msgid "Unable to open file to write export information"
-msgstr "ਐਕਸਪੋਰਟ ਜਾਣਕਾਰੀ ਲਿਖਣ ਲਈ ਫਾਇਲ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਅਸਮਰੱਥ"
+msgstr "ਐਕਸਪੋਰਟ ਜਾਣਕਾਰੀ ਲਿਖਣ ਲਈ ਫਾਈਲ ਖੋਲ੍ਹਣ ਵਾਸਤੇ ਅਸਮਰੱਥ"
#: infocenter.cpp:270
#, kde-format
++++++ opensuse-kinfocenter.diff ++++++
diff --git a/Modules/infosummary/infosum.cpp b/Modules/infosummary/infosum.cpp
index e58beb0..02f000c 100644
--- a/Modules/infosummary/infosum.cpp
+++ b/Modules/infosummary/infosum.cpp
@@ -61,12 +61,12 @@ void InfoSumPlugin::createDisplay()
void InfoSumPlugin::createOsBox()
{
DefaultBoxWidget *osWidget = new DefaultBoxWidget();
- osWidget->setIcon(QIcon::fromTheme(QStringLiteral("kde")));
+ osWidget->setIcon(QIcon::fromTheme(QStringLiteral("suse")));
osWidget->setLabelTitles(i18n("OS Version"),i18n("KDE Plasma Version"), i18n("Hostname"));
OsDepInfo *osInfo = new OsDepInfo();
- osWidget->setLabelOne(osInfo->osVersion());
+ osWidget->setLabelOne(osInfo->osVersion()+'\n'+osInfo->distroName());
osWidget->setLabelTwo(QString(PLASMA_VERSION_STRING));
osWidget->setLabelThree(osInfo->hostName());
osWidget->setWhatsThis(i18nc("OS whats this","This shows information about your Operating System"));
diff --git a/Modules/infosummary/osdepinfo.cpp b/Modules/infosummary/osdepinfo.cpp
index 34afecc..8b7043f 100644
--- a/Modules/infosummary/osdepinfo.cpp
+++ b/Modules/infosummary/osdepinfo.cpp
@@ -37,6 +37,11 @@ const QString OsDepInfo::osVersion()
return m_osVersion;
}
+const QString OsDepInfo::distroName()
+{
+ return m_distroName;
+}
+
#if defined(Q_OS_UNIX)
#include "osdepinfo_unix.cpp"
#else
@@ -50,6 +55,7 @@ void OsDepInfo::setDepInfo()
{
m_osVersion.clear();
m_hostName.clear();
+ m_distroName.clear();
}
#endif // Q_OS_UNIX
diff --git a/Modules/infosummary/osdepinfo.h b/Modules/infosummary/osdepinfo.h
index 3452e8b..564a86c 100644
--- a/Modules/infosummary/osdepinfo.h
+++ b/Modules/infosummary/osdepinfo.h
@@ -32,12 +32,14 @@ class OsDepInfo
const QString hostName();
const QString osVersion();
+ const QString distroName();
private:
void setDepInfo();
QString m_hostName;
QString m_osVersion;
+ QString m_distroName;
};
#endif //OSDEPINFO
diff --git a/Modules/infosummary/osdepinfo_unix.cpp b/Modules/infosummary/osdepinfo_unix.cpp
index d237337..3971945 100644
--- a/Modules/infosummary/osdepinfo_unix.cpp
+++ b/Modules/infosummary/osdepinfo_unix.cpp
@@ -23,6 +23,18 @@
#include "osdepinfo.h"
#include
participants (1)
-
root@hilbert.suse.de