← Back to branch summary

~ubuntu-branches/ubuntu/natty/kde4libs/natty-proposed

« back to all changes in this revision

Viewing changes to kdoctools/customization/ca/user.entities

  • Committer: Bazaar Package Importer
  • Author(s): Jonathan Riddell, Scott Kitterman, Jonathan Riddell
  • Date: 2010-11-22 17:59:02 UTC
  • mfrom: (1.6.1 upstream)
  • Revision ID: james.westby@ubuntu.com-20101122175902-yubxubd0pg6hn11z
Tags: 4:4.5.80a-0ubuntu1
[ Scott Kitterman ]
* New upstream beta release
  - Refreshed all patches
  - Updated debian/patches/10_make_libkdeinit4_private.diff to use Qfile
    instead of Qstring in kdecore/kernel/kstandarddirs_unix.cpp
  - Updated debian/patches/kubuntu_01_kubuntu_useragent.diff to provide
    Kubuntu in the Konqueror user agen string with the changes in
    kio/kio/kprotocolmanager.cpp
  - Partially updated debian/patches/kubuntu_05_langpack_desktop_files.diff
    and left the balance in kdecore/localization/klocale.cpp.rej for later
    revision
  - Update debian/patches/kubuntu_06_user_disk_mounting.diff for changes in
    solid/solid/backends/hal/halstorageaccess.cpp
  - Remove debian/patches/kubuntu_71_backport_plasma_webview_changes.diff
    (backported from upstream, so already present now)
  - Add minimum version for libattica-dev of 0.1.90 to build-depends
  - Bump minimum version for libsoprano-dev build-depend to 2.5.60
  - Add minimum version for shared-desktop-ontologies of 0.5 in build-dep

[ Jonathan Riddell ]
* Add build-depends on grantlee, libudev-dev, hupnp (FIXME needs packaging fixes)
* Update kubuntu_04_add_langpack_path.diff 28_find_old_kde4_html_documentation.diff
  22_hack_in_etc_kde4_in_kstandarddirs.diff for QT_NO_CAST_FROM_ASCII
* Update kubuntu_05_langpack_desktop_files.diff for new upstream code
* Add kubuntu_78_solid_trunk.diff to fix solid linking
* Add libnepomukutils4 package for new library
* Don't install kcm_ssl for now, e-mailed upstream to suggest moving to kdebase
* Add kubuntu_79_knewstuff_fix.diff to fix compile broken by non-trunk commit
  http://websvn.kde.org/?view=revision&revision=1199825
* kdelibs5-data replaces old kdebase-runtime-data due to moved file
* Add kubuntu_80_find_hupnp.diff to find hupnp include files, committed upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
kdoctools/customization/ca/user.entities
6
6
     names (which if they occur will cost you a _lot_ of time)
7
7
 -->
8
8
<!ENTITY Alt    "<keycap>Alt</keycap>">
9
 
<!ENTITY Retro  "<keycap>Retrocés</keycap>"><!-- English: &Backspace; -->
 
9
<!ENTITY BDR    "botó <mousebutton>dret</mousebutton> del ratolí"><!-- English: &RMB; -->
 
10
<!ENTITY BER    "botó <mousebutton>esquerre</mousebutton> del ratolí"><!-- English: &LMB; -->
 
11
<!ENTITY BMR    "botó <mousebutton>mig</mousebutton> del ratolí"><!-- English: &MMB; -->
10
12
<!ENTITY cdrom  "<hardware>unitat lectora de CD-ROM</hardware>">
 
13
<!ENTITY centrecontrol  "<application>Centre de control del &kde;</application>"><!-- English: &kcontrolcenter; -->
 
14
<!ENTITY centreinfo     "<application>Centre d'informació</application>"><!-- English: &infocenter; -->
11
15
<!ENTITY Ctrl   "<keycap>Ctrl</keycap>">
12
 
<!ENTITY ppp    "<acronym>ppp</acronym>"><!-- English: &dpi; -->
13
 
<!ENTITY pex    "<abbrev>p.ex.</abbrev>"><!-- English: &eg; -->
14
 
<!ENTITY Intro  "<keycap>Intro</keycap>"><!-- English: &Enter; -->
 
16
<!ENTITY ead    "<abbrev>és a dir</abbrev>"><!-- English: &ie; -->
15
17
<!ENTITY Esc    "<keycap>Esc</keycap>">
16
18
<!ENTITY etc    "<abbrev>etc.</abbrev>">
17
 
<!ENTITY PMF    "<acronym>PMF</acronym>"><!-- English: &FAQ; -->
18
 
<!ENTITY ead    "<abbrev>és a dir</abbrev>"><!-- English: &ie; -->
19
 
<!ENTITY centreinfo     "<application>Centre d'informació</application>"><!-- English: &infocenter; -->
20
 
<!ENTITY centrecontrol  "<application>Centre de control del &kde;</application>"><!-- English: &kcontrolcenter; -->
 
19
<!ENTITY IGU    "<acronym>IGU</acronym>"><!-- English: &GUI; -->
 
20
<!ENTITY Intro  "<keycap>Retorn</keycap>"><!-- English: &Enter; -->
21
21
<!ENTITY kicon  "<guiicon>
22
22
<inlinemediaobject>
23
23
 <objectinfo><title>Les icones del &kde;</title></objectinfo>
27
27
</guiicon> icon"><!-- if image is localised, then entityref should be used
28
28
                      instead of fileref -->
29
29
<!ENTITY kmenu  "Menú <guimenu>K</guimenu>">
30
 
<!ENTITY BER    "botó <mousebutton>esquerre</mousebutton> del ratolí"><!-- English: &LMB; -->
31
 
<!ENTITY BMR    "botó <mousebutton>mig</mousebutton> del ratolí"><!-- English: &MMB; -->
32
 
<!ENTITY SO     "sistema operatiu"><!-- English: &OS; -->
33
 
<!ENTITY BDR    "botó <mousebutton>dret</mousebutton> del ratolí"><!-- English: &RMB; -->
34
30
<!ENTITY Maj    "<keycap>Majús.</keycap>"><!-- English: &Shift; -->
 
31
<!ENTITY partman "<application>Gestor de particions del KDE</application>"> <!-- English: &partman; (KDE Partition Manager)-->
 
32
<!ENTITY pex    "<abbrev>p. ex.</abbrev>"><!-- English: &eg; -->
 
33
<!ENTITY PMF    "<acronym>PMF</acronym>"><!-- English: &FAQ; -->
 
34
<!ENTITY ppp    "<acronym>ppp</acronym>"><!-- English: &dpi; -->
 
35
<!ENTITY Retro  "<keycap>Retrocés</keycap>"><!-- English: &Backspace; -->
35
36
<!ENTITY safatasistema  "<application>safata del sistema</application>"><!-- English: &systemtray; -->
 
37
<!ENTITY SO     "sistema operatiu"><!-- English: &OS; -->
 
38
<!ENTITY systemsettings "<application>Arranjament del sistema</application>"> <!-- English: &systemsettings; -->
36
39
<!ENTITY Tab    "<keycap>Tabulador</keycap>">
37
 
<!ENTITY IGU    "<acronym>IGU</acronym>"><!-- English: &GUI; -->
38
 
<!ENTITY partman "<application>Gestor de particions del KDE</application>"> <!-- English: &partman; (KDE Partition Manager)-->
39
 
<!ENTITY systemsettings "<application>Arranjament del sistema</application>"> <!-- English: &systemsettings; -->
40
40
 
41
41
<!-- ROLES OF TRANSLATORS -->
42
42
<!ENTITY traductor.Antoni.Bella         '<othercredit role="translator"><firstname>Antoni</firstname><surname>Bella</surname><affiliation><address><email>bella5@teleline.es</email></address></affiliation><contrib>Traductor</contrib></othercredit>'>