~ubuntu-branches/ubuntu/precise/glom/precise-updates

« back to all changes in this revision

Viewing changes to glom/libglom/data_structure/translatable_item.cc

  • Committer: Bazaar Package Importer
  • Author(s): Chris Coulson
  • Date: 2009-10-09 16:50:36 UTC
  • mfrom: (1.1.42 upstream)
  • Revision ID: james.westby@ubuntu.com-20091009165036-orinvwmohk838xxl
Tags: 1.12.2-0ubuntu1
* New upstream version:
  - FFE LP: #391664
* debian/control:
  - Bump python-gnome2-extras-dev build-dep to >= 2.25.3.
  - Bump libgdamm3.0-dev build-dep to libgdamm4.0-dev >= 3.99.14.
  - Change libgda3-dev build-dep to libgda-4.0-dev.
  - Change libgda3-postgres dependency to libgda-4.0-postgres.
  - Bump libgtkmm-2.4-dev build-dep to >= 2.14.
  - Add build-dep on libgconfmm-2.6-dev.
  - Bump libgoocanvasmm-dev build-dep to >= 0.14.0.
  - Remove build-dep on libbakery-2.6-dev.
  - Bump postgresql-8.3 dependency to postgresql-8.4.
  - Change scrollkeeper build-dep to rarian-compat.
  - Rename libglom{0,-dev} -> libglom-1.12-{0,dev}. Upstream include
    APIVER in the library name now.
* debian/rules:
  - Update --with-postgres-utils configure flag to point to the new
    path.
  - Drop deprecated --disable-scrollkeeper configure flag.
  - Update DEB_SHLIBDEPS_INCLUDE with new libglom-1.12-0 package name.
  - Don't include /usr/share/cdbs/1/rules/simple-patchsys.mk - there
    are currently no patches.
* debian/libglom-1.12-0.install:
  - Updated for new version.
* debian/libglom-1.12-dev.install:
  - Install pc and header files.
* debian/glom-doc.install:
  - Updated for new version.
* debian/glom.install:
  - Updated for new version.
* Fix debian/watch.
* Dropped obsolete 10-distro-install-postgres-change.patch.
* Built against latest libgoocanvasmm (LP: #428445).
* Also closes LP: #230007, LP: #393229, LP: #393231, LP: #394507,
  LP: #394887, LP: #394894, LP: #397409, LP: #381563.

Show diffs side-by-side

added added

removed removed

Lines of Context:
19
19
 */
20
20
 
21
21
#include "translatable_item.h"
22
 
#include <glom/libglom/utils.h>
 
22
#include <libglom/utils.h>
23
23
#include <glibmm/i18n.h>
24
24
#include <iostream>
25
25
 
264
264
    return "Table";
265
265
  else if(item_type == TRANSLATABLE_TYPE_LAYOUT_ITEM)
266
266
    return "Layout Group";
267
 
  else if (item_type == TRANSLATABLE_TYPE_CUSTOM_TITLE)
 
267
  else if(item_type == TRANSLATABLE_TYPE_CUSTOM_TITLE)
268
268
    return "Field Title";
269
269
  else if(item_type == TRANSLATABLE_TYPE_BUTTON)
270
270
    return "Button";
294
294
    return _("Table");
295
295
  else if(item_type == TRANSLATABLE_TYPE_LAYOUT_ITEM)
296
296
    return _("Layout Group");
297
 
  else if (item_type == TRANSLATABLE_TYPE_CUSTOM_TITLE)
 
297
  else if(item_type == TRANSLATABLE_TYPE_CUSTOM_TITLE)
298
298
    return _("Field Title");
299
299
  else if(item_type == TRANSLATABLE_TYPE_BUTTON)
300
300
    return _("Button");