Merge lp:~jjed/app-install-data-ubuntu/no_dups into lp:app-install-data-ubuntu

Proposed by Jjed
Status: Merged
Merged at revision: 694
Proposed branch: lp:~jjed/app-install-data-ubuntu/no_dups
Merge into: lp:app-install-data-ubuntu
Diff against target: 267 lines (+0/-243)
5 files modified
menu-data-additional/ccsm.desktop (+0/-12)
menu-data-additional/gparted.desktop (+0/-66)
menu-data-additional/gvim.desktop (+0/-82)
menu-data-additional/nact.desktop (+0/-67)
menu-data-additional/nm-applet.desktop (+0/-16)
To merge this branch: bzr merge lp:~jjed/app-install-data-ubuntu/no_dups
Reviewer Review Type Date Requested Status
Michael Vogt Pending
Review via email: mp+71412@code.launchpad.net

Description of the change

The recent release of app-install-data-ubuntu contains some duplicate desktop entries (eg LP:#824593 and LP:#824855). This is due to custom-built .desktop files in menu-data-additional/ for packages that now have their own, perfectly adequate entries.

The branch removes the following duplicates:

    ccsm.desktop -> compizconfig-settings-manager:ccsm.desktop
    gparted.desktop -> gparted:gparted.desktop
    gvim.desktop -> vim-gui-common:gvim.desktop
    nact.desktop -> nautilus-actions:nact.desktop
    nm-applet.desktop -> nm-applet.desktop

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== removed file 'menu-data-additional/ccsm.desktop'
2--- menu-data-additional/ccsm.desktop 2011-08-02 07:34:30 +0000
3+++ menu-data-additional/ccsm.desktop 1970-01-01 00:00:00 +0000
4@@ -1,12 +0,0 @@
5-[Desktop Entry]
6-Encoding=UTF-8
7-Name=Advanced Desktop Effects Settings (ccsm)
8-Comment=Configure Compiz with CompizConfig
9-Icon=ccsm
10-Exec=ccsm
11-Terminal=false
12-Type=Application
13-Categories=Application;Settings;
14-X-AppInstall-Package=compizconfig-settings-manager
15-X-AppInstall-Popcon=12019
16-X-AppInstall-Section=universe
17
18=== removed file 'menu-data-additional/gparted.desktop'
19--- menu-data-additional/gparted.desktop 2011-08-02 07:34:30 +0000
20+++ menu-data-additional/gparted.desktop 1970-01-01 00:00:00 +0000
21@@ -1,66 +0,0 @@
22-[Desktop Entry]
23-Encoding=UTF-8
24-Name=Gnome Partition Editor
25-Name[bg]=Редактор на дялове на твърд диск за GNOME
26-Name[ca]=Editor de particions del GNOME
27-Name[cs]=Editor oddílů pro Gnome
28-Name[de]=GNOME Partitionierungswerkzeug
29-Name[el]=Επεξεργαστής διαμερισμάτων δίσκων του Gnome
30-Name[en_CA]=Gnome Partition Editor
31-Name[en_GB]=Gnome Partition Editor
32-Name[es]=Editor de particiones de Gnome
33-Name[fi]=Gnomen levyosioiden muokkain
34-Name[fr]=Éditeur de partition de Gnome
35-Name[gl]=Editor de particións de Gnome
36-Name[he]=עורך המחיצות של GNOME
37-Name[hu]=Gnome partíciószerkesztő
38-Name[it]=Editor di partizioni per GNOME
39-Name[lt]=Gnome skirsnių redaktorius
40-Name[mk]=Уредувач на партиции за Гном
41-Name[nl]=Gnome Partitiebewerker
42-Name[pa]=ਗਨੋਮ ਭਾਗ ਸੰਪਾਦਕ
43-Name[pt]=Editor de Partições do Gnome
44-Name[pt_BR]=Editor de Partições do GNOME
45-Name[ru]=Редактор разделов диска для GNOME
46-Name[sv]=Gnome-partitionsredigerare
47-Name[uk]=Редактор розділів дисків для GNOME
48-Name[vi]=Bộ hiệu chỉnh phân vùng Gnome
49-Name[zh_CN]=Gnome 分区编辑器
50-Name[zh_TW]=Gnome 分割區編輯器
51-Comment=Gnome Partition Editor
52-Comment[bg]=Редактор на дялове на твърд диск за GNOME
53-Comment[ca]=Editor de particions del GNOME
54-Comment[cs]=Editor oddílů pro Gnome
55-Comment[de]=GNOME Partitionierungswerkzeug
56-Comment[el]=Επεξεργαστής διαμερισμάτων δίσκων του Gnome
57-Comment[en_CA]=Gnome Partition Editor
58-Comment[en_GB]=Gnome Partition Editor
59-Comment[es]=Editor de particiones de Gnome
60-Comment[fi]=Gnomen levyosioiden muokkain
61-Comment[fr]=Éditeur de partition de Gnome
62-Comment[gl]=Editor de particións de Gnome
63-Comment[he]=עורך המחיצות של GNOME
64-Comment[hu]=Gnome partíciószerkesztő
65-Comment[it]=Editor di partizioni per GNOME
66-Comment[lt]=Gnome skirsnių redaktorius
67-Comment[mk]=Уредувач на партиции за Гном
68-Comment[nl]=Gnome Partitiebewerker
69-Comment[pa]=ਗਨੋਮ ਭਾਗ ਸੰਪਾਦਕ
70-Comment[pt]=Editor de Partições do Gnome
71-Comment[pt_BR]=Editor de Partições do GNOME
72-Comment[ru]=Редактор разделов диска для GNOME
73-Comment[sv]=Gnome-partitionsredigerare
74-Comment[uk]=Редактор розділів дисків для GNOME
75-Comment[vi]=Bộ hiệu chỉnh phân vùng Gnome
76-Comment[zh_CN]=Gnome 分区编辑器
77-Comment[zh_TW]=Gnome 分割區編輯器
78-Icon=gparted.png
79-Terminal=false
80-Type=Application
81-StartupNotify=true
82-Categories=GNOME;Application;System;
83-X-KDE-SubstituteUID=true
84-X-Ubuntu-Gettext-Domain=gparted
85-X-AppInstall-Package=gparted
86-X-AppInstall-Popcon=7506
87-X-AppInstall-Section=main
88
89=== removed file 'menu-data-additional/gvim.desktop'
90--- menu-data-additional/gvim.desktop 2011-08-02 07:34:30 +0000
91+++ menu-data-additional/gvim.desktop 1970-01-01 00:00:00 +0000
92@@ -1,82 +0,0 @@
93-[Desktop Entry]
94-Encoding=UTF-8
95-Name=GVim Text Editor
96-Comment=Edit text files
97-Comment[af]=Redigeer tekslêers
98-Comment[am]=የጽሑፍ ፋይሎች ያስተካክሉ
99-Comment[ar]=حرّر ملفات نصية
100-Comment[az]=Mətn fayllarını redaktə edin
101-Comment[be]=Рэдагаваньне тэкставых файлаў
102-Comment[bg]=Редактиране на текстови файлове
103-Comment[bn]=টেক্স্ট ফাইল এডিট করুন
104-Comment[bs]=Izmijeni tekstualne datoteke
105-Comment[ca]=Edita fitxers de text
106-Comment[cs]=Úprava textových souborů
107-Comment[cy]=Golygu ffeiliau testun
108-Comment[da]=Redigér tekstfiler
109-Comment[de]=Textdateien bearbeiten
110-Comment[el]=Επεξεργασία αρχείων κειμένου
111-Comment[en_CA]=Edit text files
112-Comment[en_GB]=Edit text files
113-Comment[es]=Edita archivos de texto
114-Comment[et]=Redigeeri tekstifaile
115-Comment[eu]=Editatu testu-fitxategiak
116-Comment[fa]=ویرایش پرونده‌های متنی
117-Comment[fi]=Muokkaa tekstitiedostoja
118-Comment[fr]=Édite des fichiers texte
119-Comment[ga]=Eagar comhad Téacs
120-Comment[gu]=લખાણ ફાઇલોમાં ફેરફાર કરો
121-Comment[he]=ערוך קבצי טקסט
122-Comment[hi]=पाठ फ़ाइलें संपादित करें
123-Comment[hr]=Uređivanje tekstualne datoteke
124-Comment[hu]=Szövegfájlok szerkesztése
125-Comment[id]=Edit file teks
126-Comment[it]=Modifica file di testo
127-Comment[ja]=テキスト・ファイルを編集します
128-Comment[kn]=ಪಠ್ಯ ಕಡತಗಳನ್ನು ಸಂಪಾದಿಸು
129-Comment[ko]=텍스트 파일을 편집합니다
130-Comment[lt]=Redaguoti tekstines bylas
131-Comment[lv]=Rediģēt teksta failus
132-Comment[mk]=Уреди текстуални фајлови
133-Comment[ml]=വാചക രചനകള് തിരുത്തുക
134-Comment[mn]=Текст файл боловсруулах
135-Comment[mr]=गद्य फाइल संपादित करा
136-Comment[ms]=Edit fail teks
137-Comment[nb]=Rediger tekstfiler
138-Comment[ne]=पाठ फाइललाई संशोधन गर्नुहोस्
139-Comment[nl]=Tekstbestanden bewerken
140-Comment[nn]=Rediger tekstfiler
141-Comment[no]=Rediger tekstfiler
142-Comment[or]=ପାଠ୍ଯ ଫାଇଲଗୁଡ଼ିକୁ ସମ୍ପାଦନ କରନ୍ତୁ
143-Comment[pa]=ਪਾਠ ਫਾਇਲਾਂ ਸੰਪਾਦਨ
144-Comment[pl]=Edytor plików tekstowych
145-Comment[pt]=Editar ficheiros de texto
146-Comment[pt_BR]=Edite arquivos de texto
147-Comment[ro]=Editare fişiere text
148-Comment[ru]=Редактор текстовых файлов
149-Comment[sk]=Úprava textových súborov
150-Comment[sl]=Urejanje datotek z besedili
151-Comment[sq]=Përpuno files teksti
152-Comment[sr]=Измени текстуалне датотеке
153-Comment[sr@Latn]=Izmeni tekstualne datoteke
154-Comment[sv]=Redigera textfiler
155-Comment[ta]=உரை கோப்புகளை தொகுக்கவும்
156-Comment[th]=แก้ไขแฟ้มข้อความ
157-Comment[tk]=Metin faýllary editle
158-Comment[tr]=Metin dosyalarını düzenle
159-Comment[uk]=Редактор текстових файлів
160-Comment[vi]=Soạn thảo tập tin văn bản
161-Comment[wa]=Asspougnî des fitchîs tecses
162-Comment[zh_CN]=编辑文本文件
163-Comment[zh_TW]=編輯文字檔
164-Exec=gvim -f %U
165-Terminal=false
166-Type=Application
167-Icon=_usr_share_pixmaps_vim.svg
168-Categories=Application;Utility;TextEditor;
169-StartupNotify=true
170-MimeType=text/plain;
171-NoDisplay=true
172-X-AppInstall-Package=vim-gnome
173-X-AppInstall-Popcon=6782
174-X-AppInstall-Section=main
175
176=== removed file 'menu-data-additional/nact.desktop'
177--- menu-data-additional/nact.desktop 2011-08-02 07:34:30 +0000
178+++ menu-data-additional/nact.desktop 1970-01-01 00:00:00 +0000
179@@ -1,67 +0,0 @@
180-[Desktop Entry]
181-Version=1.0
182-Type=Application
183-Encoding=UTF-8
184-Name=Nautilus Actions Configuration
185-Name[bg]=Настройки на действията на Nautilus
186-Name[bn]=নটিলাস অ্যাকশন কনফিগারেশন
187-Name[ca]=Configuració de les accions del Nautilus
188-Name[cs]=Konfigurace akcí programu Nautilus
189-Name[da]=Konfiguration af Nautilus-handlinger
190-Name[de]=Nautilus-Aktionen
191-Name[en_CA]=Nautilus Actions Configuration
192-Name[es]=Configuración de acciones de Nautilus
193-Name[fi]=Nautilus-lisätoimintojen asetukset
194-Name[fr]=Configuration des actions de Nautilus
195-Name[gl]=Configuración de Accións de Nautilus
196-Name[gu]=નોટિલસ ક્રિયાઓ રૂપરેખાંકન
197-Name[he]=הגדרת פעולות נאוטליוס
198-Name[ja]=Nautilus アクションの設定
199-Name[lt]=Nautilus veiksmų konfigūravimas
200-Name[mk]=Конфигурација на дејствата
201-Name[nb]=Nautilus handlinger
202-Name[nl]=Nautilus acties-configuratie
203-Name[pa]=ਨਟਾਲਿਸ ਕਾਰਵਾਈ ਸੰਰਚਨਾ
204-Name[pt_BR]=Configuração do Nautilus Actions
205-Name[ru]=Настройка действий в Nautilus
206-Name[sv]=Konfiguration av Nautilus-åtgärder
207-Name[th]=การกำหนดค่าปฏิบัติการของ Nautilus
208-Name[vi]=Cấu hình Hành động Nautilus
209-Name[zh_CN]=Nautilus 动作配置
210-Name[zh_HK]=Nautilus 動作組態
211-Name[zh_TW]=Nautilus 動作組態
212-Comment=Add items to the Nautilus popup menu
213-Comment[bg]=Добавяне на елементи към контекстното меню на Nautilus
214-Comment[bn]=নটিলাসের পপ-আপ মেনুতে নতুন এন্ট্রি যোগ করো
215-Comment[ca]=Afegeix elements al menú emergent del Nautilus
216-Comment[cs]=Přidat položky do vyskakovacího menu programu Nautilus
217-Comment[da]=Tilføj menupunkter til Nautilus pop op-menuen
218-Comment[de]=Aktionen zum Kontextmenü von Nautilus hinzufügen
219-Comment[en_CA]=Add items to the Nautilus popup menu
220-Comment[es]=Añadir elementos al menú contextual de Nautilus
221-Comment[fi]=Lisää kohtia Nautiluksen ponnahdusvalikkoon
222-Comment[fr]=Ajoute des entrées au menu contextuel de Nautilus
223-Comment[gl]=Engadir elementos ao menú emerxente de Nautilus
224-Comment[gu]=નોટિલસ પોપઅપ મેનુમાં વસ્તુઓ ઉમેરો
225-Comment[he]=הוספת פריטים לתפריט הקופץ של נאוטילוס
226-Comment[ja]=アイテムを Nautilus のポップアップ・メニューに追加します
227-Comment[lt]=Įtraukti naujus punktus į Nautilus meniu
228-Comment[mk]=Додајте предмети во скокачкото мени
229-Comment[nb]=Legg til oppføringer i kontekstmenyen i Nautilus
230-Comment[nl]=Items toevoegen aan het popup-menu van Nautilus
231-Comment[pa]=ਨਾਟੀਲਸ ਪਾਪਅੱਪ ਮੇਨੂ ਵਿੱਚ ਇਕਾਈਆਂ ਜੋੜੋ
232-Comment[pt_BR]=Adicione itens ao menu de contexto do Nautilus
233-Comment[ru]=Добавьте новые действия во всплывающее меню Nautilus
234-Comment[sv]=Lägg till poster till Nautilus popupmeny
235-Comment[th]=เพิ่มรายการเข้าในเมนูผุดขึ้นของ Nautilus
236-Comment[vi]=Thêm mục vào trình đơn bật lên Nautilus
237-Comment[zh_CN]=在 Nautilus 弹出菜单中添加项目
238-Comment[zh_HK]=加入項目到 Nautilus 彈出式選單
239-Comment[zh_TW]=加入項目到 Nautilus 彈出式選單
240-Exec=nautilus-actions-config
241-Icon=nautilus-actions
242-Categories=GNOME;Application;Other;
243-X-Ubuntu-Gettext-Domain=nautilus-actions
244-X-AppInstall-Package=nautilus-actions
245-X-AppInstall-Popcon=9476
246-X-AppInstall-Section=universe
247
248=== removed file 'menu-data-additional/nm-applet.desktop'
249--- menu-data-additional/nm-applet.desktop 2011-08-02 07:34:30 +0000
250+++ menu-data-additional/nm-applet.desktop 1970-01-01 00:00:00 +0000
251@@ -1,16 +0,0 @@
252-[Desktop Entry]
253-Encoding=UTF-8
254-Name=Network Manager
255-Comment=Network Manager applet
256-Icon=nm-device-wireless
257-Exec=nm-applet --sm-disable
258-Terminal=false
259-Type=Application
260-Categories=Application;Network;
261-X-GNOME-Bugzilla-Bugzilla=GNOME
262-X-GNOME-Bugzilla-Product=NetworkManager
263-X-GNOME-Bugzilla-Component=general
264-X-GNOME-Autostart-enabled=true
265-X-AppInstall-Package=network-manager-gnome
266-X-AppInstall-Popcon=140230
267-X-AppInstall-Section=main

Subscribers

People subscribed via source and target branches

to all changes: