Merge remote branch 'origin/f14/master' into f13/master
This commit is contained in:
commit
2e42a6242f
4
.gitignore
vendored
4
.gitignore
vendored
@ -1,3 +1 @@
|
|||||||
/kdelibs-4.5.2.tar.bz2
|
/kdelibs-4.5.5.tar.bz2
|
||||||
/kdelibs-4.5.3.tar.bz2
|
|
||||||
/kdelibs-4.5.4.tar.bz2
|
|
||||||
|
@ -1,37 +0,0 @@
|
|||||||
--- branches/KDE/4.5/kdelibs/kdoctools/customization/el/user.entities 2010/06/27 18:59:06 1143427
|
|
||||||
+++ branches/KDE/4.5/kdelibs/kdoctools/customization/el/user.entities 2010/12/01 19:19:41 1202659
|
|
||||||
@@ -6,3 +6,34 @@
|
|
||||||
names (which if they occur will cost you a _lot_ of time)
|
|
||||||
-->
|
|
||||||
|
|
||||||
+<!ENTITY Alt "<keycap>Alt</keycap>">
|
|
||||||
+<!ENTITY Backspace "<keycap>Backspace</keycap>">
|
|
||||||
+<!ENTITY cdrom '<hardware>συσκευή CD-ROM</hardware>'>
|
|
||||||
+<!ENTITY Ctrl "<keycap>Ctrl</keycap>">
|
|
||||||
+<!ENTITY dpi '<acronym>dpi</acronym>'>
|
|
||||||
+<!ENTITY eg "<abbrev>π.χ.</abbrev>">
|
|
||||||
+<!ENTITY Enter "<keycap>Enter</keycap>">
|
|
||||||
+<!ENTITY Esc "<keycap>Esc</keycap>">
|
|
||||||
+<!ENTITY etc "<abbrev>κλπ.</abbrev>">
|
|
||||||
+<!ENTITY FAQ '<acronym>FAQ</acronym>'>
|
|
||||||
+<!ENTITY ie "<abbrev>δηλ.</abbrev>">
|
|
||||||
+<!ENTITY infocenter "<application>Κέντρο πληροφοριών</application>">
|
|
||||||
+<!ENTITY kcontrolcenter "<application>Κέντρο ελέγχου του &kde;</application>">
|
|
||||||
+<!ENTITY kicon "<guiicon>
|
|
||||||
+<inlinemediaobject>
|
|
||||||
+ <objectinfo><title>&kde;'s K-icon</title></objectinfo>
|
|
||||||
+ <imageobject><imagedata fileref='common/kmenu.png' format='PNG'/></imageobject>
|
|
||||||
+ <textobject><phrase>K</phrase></textobject>
|
|
||||||
+</inlinemediaobject>
|
|
||||||
+</guiicon> icon"><!-- if image is localised, then entityref should be used
|
|
||||||
+ instead of fileref -->
|
|
||||||
+<!ENTITY kmenu "<guimenu>K</guimenu> menu">
|
|
||||||
+<!ENTITY LMB "<mousebutton>αριστερό</mousebutton> κλικ ποντικιού">
|
|
||||||
+<!ENTITY MMB "<mousebutton>μεσαίο</mousebutton> κλικ ποντικιού">
|
|
||||||
+<!ENTITY OS "λειτουργικό σύστημα"><!-- <acronym>OS</acronym>-->
|
|
||||||
+<!ENTITY partman "<application>Διαχειριστής κατατμήσεων του KDE</application>">
|
|
||||||
+<!ENTITY RMB "<mousebutton>δεξί</mousebutton> κλικ ποντικιού">
|
|
||||||
+<!ENTITY Shift "<keycap>Shift</keycap>">
|
|
||||||
+<!ENTITY systemsettings "<application>Ρυθμίσεις συστήματος</application>">
|
|
||||||
+<!ENTITY systemtray "<application>πλαίσιο συστήματος</application>">
|
|
||||||
+<!ENTITY Tab "<keycap>Tab</keycap>">
|
|
@ -15,8 +15,8 @@
|
|||||||
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
|
%global strigi_version %(pkg-config --modversion libstreams 2>/dev/null || echo %{strigi_ver})
|
||||||
|
|
||||||
Summary: KDE Libraries
|
Summary: KDE Libraries
|
||||||
Version: 4.5.4
|
Version: 4.5.5
|
||||||
Release: 2%{?dist}
|
Release: 1%{?dist}
|
||||||
|
|
||||||
Name: kdelibs
|
Name: kdelibs
|
||||||
Epoch: 6
|
Epoch: 6
|
||||||
@ -102,7 +102,6 @@ Patch27: kdelibs-4.4.80-no_rpath.patch
|
|||||||
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
|
Patch50: kdelibs-4.5.1-knewstuff_gpg2.patch
|
||||||
|
|
||||||
## 4.5 upstream, stable branch
|
## 4.5 upstream, stable branch
|
||||||
Patch100: kdelibs-4.5.4-kdoctools_el.patch
|
|
||||||
|
|
||||||
## trunk upstream
|
## trunk upstream
|
||||||
# http://websvn.kde.org/?view=revision&revision=1185912
|
# http://websvn.kde.org/?view=revision&revision=1185912
|
||||||
@ -271,7 +270,6 @@ format for use with the Qt 4 Assistant or KDevelop 4.
|
|||||||
%patch50 -p1 -b .knewstuff_gpg2
|
%patch50 -p1 -b .knewstuff_gpg2
|
||||||
|
|
||||||
# upstream patches, stable branch
|
# upstream patches, stable branch
|
||||||
%patch100 -p4 -b .kdoctools_el
|
|
||||||
|
|
||||||
# upstream patches, trunk
|
# upstream patches, trunk
|
||||||
%patch151 -p3 -b .plasma_wallpaper_configchanged
|
%patch151 -p3 -b .plasma_wallpaper_configchanged
|
||||||
@ -520,6 +518,9 @@ rm -rf %{buildroot}
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Jan 05 2011 Rex Dieter <rdieter@fedoraproject.org> 4.5.5-1
|
||||||
|
- 4.5.5
|
||||||
|
|
||||||
* Sat Dec 04 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.4-2
|
* Sat Dec 04 2010 Rex Dieter <rdieter@fedoraproject.org> - 4.5.4-2
|
||||||
- update kdoctools/el from branch (kde-l10n entities)
|
- update kdoctools/el from branch (kde-l10n entities)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user