Merge lp:~dpm/gwibber/bug-538851 into lp:gwibber

Proposed by David Planella
Status: Merged
Merged at revision: not available
Proposed branch: lp:~dpm/gwibber/bug-538851
Merge into: lp:gwibber
Diff against target: 87 lines (+3/-56)
4 files modified
gwibber-accounts.desktop.in (+1/-0)
gwibber-preferences.desktop.in (+1/-0)
gwibber.desktop (+0/-56)
gwibber.desktop.in (+1/-0)
To merge this branch: bzr merge lp:~dpm/gwibber/bug-538851
Reviewer Review Type Date Requested Status
Ken VanDine Approve
Review via email: mp+21354@code.launchpad.net

Description of the change

Added X-GNOME-Gettext-Domain to allow translations of the desktop files to be loaded at runtime in Ubuntu and OpenSuse. For Ubuntu, this will provide a fix for LP:538851

Distributions not using this key will load static translations as usual.

Removed translations from the .desktop file. They are already in the PO files and are put in the .desktop file at build time"

To post a comment you must log in.
Revision history for this message
Ken VanDine (ken-vandine) wrote :

Approved, thanks!

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'gwibber-accounts.desktop.in'
2--- gwibber-accounts.desktop.in 2010-03-12 16:37:46 +0000
3+++ gwibber-accounts.desktop.in 2010-03-15 08:57:13 +0000
4@@ -7,3 +7,4 @@
5 Exec=gwibber-accounts
6 Icon=gwibber
7 Categories=GTK;GNOME;Settings;
8+X-GNOME-Gettext-Domain=gwibber
9
10=== modified file 'gwibber-preferences.desktop.in'
11--- gwibber-preferences.desktop.in 2010-03-12 16:37:46 +0000
12+++ gwibber-preferences.desktop.in 2010-03-15 08:57:13 +0000
13@@ -7,3 +7,4 @@
14 Exec=gwibber-preferences
15 Icon=gwibber
16 Categories=GTK;GNOME;Settings;
17+X-GNOME-Gettext-Domain=gwibber
18
19=== removed file 'gwibber.desktop'
20--- gwibber.desktop 2010-02-08 01:58:54 +0000
21+++ gwibber.desktop 1970-01-01 00:00:00 +0000
22@@ -1,56 +0,0 @@
23-[Desktop Entry]
24-Name=Gwibber
25-X-GNOME-FullName=Gwibber Social Client
26-Type=Application
27-Comment=Microblogging client for GNOME
28-Comment[ar]=خادم المدونات القصيرة لجنوم
29-Comment[bg]=Микроблог клиент за GNOME
30-Comment[ca]=Client de Microblogging per a GNOME
31-Comment[cy]=Cleient microblogio ar gyfer GNOME
32-Comment[da]=Mikroblogging klient til GNOME
33-Comment[de]=Mikro-Blogging-Klient für GNOME
34-Comment[en_CA]=Microblogging client for GNOME
35-Comment[en_GB]=Microblogging client for GNOME
36-Comment[es]=Cliente de microblogging para GNOME
37-Comment[fi]=Mikrobloggausohjelma Gnomelle
38-Comment[fr]=Client de microblogging pour GNOME
39-Comment[it]=Client GNOME per micro-blog
40-Comment[lo]=Microblogging client ສຳລັບ GNOME
41-Comment[nb]=Mikroblogging klient for GNOME
42-Comment[nl]=Microblogging-cliënt voor GNOME
43-Comment[pl]=Klient mikroblogowania dla GNOME
44-Comment[pt]=Cliente de Microblogging para o GNOME
45-Comment[pt_BR]=Cliente microblog para GNOME
46-Comment[ru]=Клиент GNOME для микроблоггинга
47-Comment[sv]=Mikroblogg klient för GNOME
48-Comment[tr]=GNOME için mikroblog istemcisi
49-Comment[uk]=Клієнт Мікроблоґування длч GNOME
50-Comment[zh_CN]=基于GNOME的微博客客户端
51-Exec=gwibber
52-Icon=gwibber
53-Categories=GTK;GNOME;Network;
54-GenericName=Microblogging Client
55-GenericName[ar]=خادم المدونات القصيرة
56-GenericName[bg]=Микроблог клиент
57-GenericName[ca]=Client de Microblogging
58-GenericName[cy]=Cleient Microblogio
59-GenericName[da]=Mikroblogging klient
60-GenericName[de]=Mikro-Blogging-Klient
61-GenericName[en_CA]=Microblogging Client
62-GenericName[en_GB]=Microblogging Client
63-GenericName[es]=Cliente de microblogging
64-GenericName[fi]=Mikrobloggausohjelma
65-GenericName[fr]=Client de Microblogging
66-GenericName[id]=Microblogging Client
67-GenericName[it]=Client per micro-blog
68-GenericName[lo]=Microblogging Client
69-GenericName[nb]=Mikroblogging Klient
70-GenericName[nl]=Microblogging-cliënt
71-GenericName[pl]=Klient mikroblogowania
72-GenericName[pt]=Cliente de Microbogging
73-GenericName[pt_BR]=Cliente Microblog
74-GenericName[ru]=Клиент для микроблоггинга
75-GenericName[sv]=Mikroblogg Klient
76-GenericName[tr]=Mikroblog İstemcisi
77-GenericName[uk]=Клієнт Мікроблоґування
78-GenericName[zh_CN]=微博客客户端
79
80=== modified file 'gwibber.desktop.in'
81--- gwibber.desktop.in 2010-02-25 23:14:27 +0000
82+++ gwibber.desktop.in 2010-03-15 08:57:13 +0000
83@@ -7,3 +7,4 @@
84 Exec=gwibber
85 Icon=gwibber
86 Categories=GTK;GNOME;Network;
87+X-GNOME-Gettext-Domain=gwibber