~ubuntu-branches/ubuntu/wily/gnome-menus/wily-proposed

« back to all changes in this revision

Viewing changes to po/POTFILES.in

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2013-06-08 16:16:43 UTC
  • mfrom: (1.1.73) (2.2.5 saucy-proposed)
  • Revision ID: package-import@ubuntu.com-20130608161643-eemx2dcsvjyw3wz1
Tags: 3.8.0-1ubuntu1
* Merge with Debian, remaining changes:
  - debian/gnome-menus.postinst:
    + Disable blacklist to not break old applications
  - debian/gnome-menus.triggers: Drop "gmenucache".
  - debian/patches/series: Disable 01_default_prefix.patch
  - debian/patches/09_app_install_entry.patch:
    + Include Software Center in menus
  - debian/patches/70_ubuntu-directories.patch
    + Add Ubuntu-specific directories back to POTFILES.in
* Dropped changes:
  - debian/patches/22_directory-suffix-for-icons.patch
  - debian/gnome-menus.maintscript:
    + ensure conffile is removed on upgrade (not needed after 12.04 LTS)
* Refreshed patches
* debian/patches/50_add-gcc-apps.patch
  - Unhide Settings panels in GNOME Shell since we're sticking with Settings
    3.6 for now. Settings 3.8 includes a GNOME Shell 3.8 search provider.
* debian/patches/git_restore_calculator.patch:
  - Git patch to not hide Calculator from the menus

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
desktop-directories/Education.directory.in
6
6
desktop-directories/Game.directory.in
7
7
desktop-directories/Graphics.directory.in
8
 
desktop-directories/Hardware.directory.in
9
8
desktop-directories/Network.directory.in
10
9
desktop-directories/Office.directory.in
11
 
desktop-directories/Personal.directory.in
12
 
desktop-directories/System.directory.in
13
10
desktop-directories/System-Tools.directory.in
14
11
desktop-directories/Utility-Accessibility.directory.in
15
12
desktop-directories/Utility.directory.in
16
13
desktop-directories/X-GNOME-Menu-Applications.directory.in
17
14
desktop-directories/X-GNOME-Other.directory.in
 
15
desktop-directories/X-GNOME-Sundry.directory.in
 
16
desktop-directories/X-GNOME-Utilities.directory.in
18
17
desktop-directories/X-GNOME-WebApplications.directory.in
19
 
simple-editor/gmenu-simple-editor.desktop.in
20
 
[type: gettext/glade]simple-editor/gmenu-simple-editor.ui
21
 
simple-editor/GMenuSimpleEditor/main.py
22
 
simple-editor/GMenuSimpleEditor/maindialog.py
23
 
simple-editor/GMenuSimpleEditor/menufilewriter.py
24
18
debian/desktop-files/ActionGames.directory.in
25
19
debian/desktop-files/AdventureGames.directory.in
26
20
debian/desktop-files/ArcadeGames.directory.in