~ubuntu-branches/ubuntu/oneiric/gnome-panel/oneiric

« back to all changes in this revision

Viewing changes to .pc/50_fix-potfiles.patch/po/POTFILES.in

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher, Sebastien Bacher, Jeremy Bicha
  • Date: 2011-05-30 11:04:49 UTC
  • mfrom: (1.13.10 upstream) (2.2.5 experimental)
  • Revision ID: james.westby@ubuntu.com-20110530110449-hinl17kxkcefjw6x
Tags: 1:3.0.2-0ubuntu1
[ Sebastien Bacher ]
* New upstream version
* debian/control.in:
  - the new libgweather version is in oneiric, use it
  - drop the python and python-gconf depends, 
    they were added for gnome-panel-add which is still using gconf and buggy
* debian/gnome-panel-data.install:
  - don't install the apport hook, it's only getting gconf datas which 
    doesn't work since gnome-panel uses gsettings
* debian/patches/90_build_fixes.patch:
  - restore build fix from git not applied in the new serie
* debian/patches/01_panel_submenus.patch:
  - don't take that Debian diff, the .menus use the upstream naming in Ubuntu
* debian/patches/06_no_resize_grip.patch:
  - dropped, the issue is fixed in the new version
* debian/patches/50_fix-potfiles.patch:
  - dropped, the issue is fixed in the new version
* debian/watch:
  - track unstable series as well

Drop those delta, since gnome-panel is not the default Ubuntu session now we
can go back to an experience closer to the upstream one: 
* debian/control.in:
  - drop the indicators recommends, unity-2d is the ubuntu fallback session
    so we can get back to use an upstream config for gnome-panel and reduce
    the delta we carry
* debian/patches/04_default_panel_config.patch:
  - don't modify the upstream layout
* debian/patches/05_no_session_delay.patch:
  - no need to tweak the upstream session to optimize it
* debian/patches/16_compiz_workspace_switcher.patch:
  - go back to the upstream switcher behaviour    
* debian/patches/25_dynamic_fusa_detection.patch:
  - not needed since we use the upstream layout, could be ported if someone
    is wanting to do the work though
* debian/patches/30_disable-initial-animation.patch, debian/rules:
  - drop the --disable-initial-animation, that was some login optimization
    but since it's not the default desktop you should go back to the 
    upstream behaviour

[ Jeremy Bicha ]   
* New upstream version
* Merge from Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Recommends gnome-settings-daemon which has the timezone polkit service
* debian/rules:
  - Update translations template.
* debian/gnome-panel-data.install:
  - Install apport hook
  - Install the "About Ubuntu" menu item.
* debian/patches/01_layout.patch:
  - Disabled, Help & About Ubuntu don't fit as well in Gnome Panel 3
* debian/patches/01_panel_submenus.patch.
  - Dropped
* debian/patches/03_dnd_places_link.patch:
  - Disabled, when using Drag'n'Drop from Places menu, install a link launcher
    (.desktop file) instead of copying the entire directory.
* debian/patches/17_about-ubuntu-translation.patch:
  - List ubuntu-about.desktop for translation.
* debian/patches/40_unset_menuproxy.patch:
  - Make sure gnome-panel and the applets don't pick up menu proxies.
* debian/patches/50_fix-potfiles.patch
  - Fix i18n
* debian/patches/85_disable_shutdown_on_ltsp.patch:
  - Suppress the shutdown option in the panel if LTSP_CLIENT is set.
* debian/patches/71_change_bookmark_submenu_limit_value.patch
  - Dropped, picked up by Debian
* debian/patches/18_lockdown_lock_editor.patch:
* debian/patches/90_git_wnck_show_realize.patch:
* debian/patches/90_fix_linking_DSO_link.patch:
* debian/patches/91_gir_annotations.patch
* debian/patches/92_git_calendar_day.patch
* debian/patches/92_git_fix_applets_in_multiscreen.patch:
  - Dropped, applied upstream
* debian/watch:
  - watch unstable versions

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
# List of source files containing translatable strings.
2
 
# Please keep this file sorted alphabetically.
3
 
[encoding: UTF-8]
4
 
applets/clock/calendar-client.c
5
 
applets/clock/calendar-window.c
6
 
applets/clock/clock.c
7
 
[type: gettext/glade]applets/clock/clock.ui
8
 
applets/clock/clock.schemas.in
9
 
applets/clock/clock-location.c
10
 
applets/clock/clock-location-tile.c
11
 
applets/clock/clock-utils.c
12
 
applets/clock/org.gnome.panel.ClockApplet.panel-applet.in.in
13
 
applets/fish/fish.c
14
 
[type: gettext/glade]applets/fish/fish.ui
15
 
applets/fish/fish.schemas.in
16
 
applets/fish/org.gnome.panel.FishApplet.panel-applet.in.in
17
 
applets/notification_area/main.c
18
 
applets/notification_area/na-tray-manager.c
19
 
applets/notification_area/org.gnome.panel.NotificationAreaApplet.panel-applet.in.in
20
 
applets/wncklet/org.gnome.panel.Wncklet.panel-applet.in.in
21
 
applets/wncklet/showdesktop.c
22
 
applets/wncklet/window-list.c
23
 
[type: gettext/glade]applets/wncklet/window-list.ui
24
 
applets/wncklet/window-list.schemas.in
25
 
applets/wncklet/window-menu.c
26
 
applets/wncklet/wncklet.c
27
 
applets/wncklet/workspace-switcher.c
28
 
[type: gettext/glade]applets/wncklet/workspace-switcher.ui
29
 
applets/wncklet/workspace-switcher.schemas.in
30
 
bonobo/libpanel-applet/GNOME_Panel_TestApplet.server.in
31
 
bonobo/libpanel-applet/panel-test-applets-bonobo.c
32
 
[type: gettext/glade]bonobo/libpanel-applet/panel-test-applets-bonobo.ui
33
 
bonobo/panel-module/GNOME_Panel_Popup.xml
34
 
gnome-panel/libegg/eggdesktopfile.c
35
 
gnome-panel/libegg/eggsmclient.c
36
 
gnome-panel/libpanel-util/panel-error.c
37
 
gnome-panel/libpanel-util/panel-icon-chooser.c
38
 
gnome-panel/libpanel-util/panel-launch.c
39
 
gnome-panel/libpanel-util/panel-show.c
40
 
gnome-panel/applet.c
41
 
gnome-panel/button-widget.c
42
 
gnome-panel/drawer.c
43
 
gnome-panel/gnome-desktop-item-edit.c
44
 
gnome-panel/gnome-panel.desktop.in.in
45
 
gnome-panel/launcher.c
46
 
gnome-panel/main.c
47
 
gnome-panel/menu.c
48
 
gnome-panel/nothing.cP
49
 
gnome-panel/panel-action-button.c
50
 
gnome-panel/panel-addto.c
51
 
gnome-panel/panel-applet-frame.c
52
 
gnome-panel/panel-bindings.c
53
 
gnome-panel/panel-compatibility.c
54
 
gnome-panel/panel-context-menu.c
55
 
gnome-panel/panel-ditem-editor.c
56
 
gnome-panel/panel-force-quit.c
57
 
gnome-panel/panel-frame.c
58
 
gnome-panel/panel-general.schemas.in
59
 
gnome-panel/panel-global.schemas.in
60
 
gnome-panel/panel-menu-bar.c
61
 
gnome-panel/panel-menu-button.c
62
 
gnome-panel/panel-menu-items.c
63
 
gnome-panel/panel-object.schemas.in
64
 
gnome-panel/panel-profile.c
65
 
gnome-panel/panel-properties-dialog.c
66
 
[type: gettext/glade]gnome-panel/panel-properties-dialog.ui
67
 
gnome-panel/panel-recent.c
68
 
gnome-panel/panel-run-dialog.c
69
 
[type: gettext/glade]gnome-panel/panel-run-dialog.ui
70
 
gnome-panel/panel-separator.c
71
 
gnome-panel/panel-shell.c
72
 
gnome-panel/panel-stock-icons.c
73
 
gnome-panel/panel-test-applets.c
74
 
[type: gettext/glade]gnome-panel/panel-test-applets.ui
75
 
gnome-panel/panel-toplevel.c
76
 
gnome-panel/panel-toplevel.schemas.in
77
 
gnome-panel/panel-util.c
78
 
gnome-panel/panel.c
79
 
libpanel-applet/panel-applet.c
80
 
libpanel-applet/org.gnome.panel.TestApplet.panel-applet.in
81
 
debian/ubuntu-about.desktop.in