launchpad-reviewers team mailing list archive

Thread
Date

[Merge] lp:~danilo/launchpad/bug-401620 into lp:launchpad

To: mp+78565@xxxxxxxxxxxxxxxxxx
From: Данило Шеган <danilo@xxxxxxxxxxxxx>
Date: Fri, 07 Oct 2011 11:13:28 -0000
Reply-to: mp+78565@xxxxxxxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

Данило Шеган has proposed merging lp:~danilo/launchpad/bug-401620 into lp:launchpad.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)
Related bugs:
  Bug #401620 in Launchpad itself: "Remove POTMsgSet.sequence from db schema."
  https://bugs.launchpad.net/launchpad/+bug/401620

For more details, see:
https://code.launchpad.net/~danilo/launchpad/bug-401620/+merge/78565

= Bug 401620: drop potmsgset.sequence =

With the code changes landed for bug 401618 to remove all remaining use of potmsgset.sequence, we can now drop the column from the database.

== Demo and Q/A ==

If the tests pass, all is good.

= Launchpad lint =

Checking for conflicts and issues in changed files.

Linting changed files:
  database/sampledata/current.sql
  database/sampledata/current-dev.sql
  database/schema/patch-2208-01-2.sql
  database/schema/comments.sql
-- 
https://code.launchpad.net/~danilo/launchpad/bug-401620/+merge/78565
Your team Launchpad code reviewers is requested to review the proposed merge of lp:~danilo/launchpad/bug-401620 into lp:launchpad.

=== modified file 'database/sampledata/current-dev.sql'
--- database/sampledata/current-dev.sql	2011-10-06 12:50:37 +0000
+++ database/sampledata/current-dev.sql	2011-10-07 11:12:12 +0000
@@ -2828,6 +2828,7 @@
 
 ALTER TABLE branch DISABLE TRIGGER ALL;
 
+<<<<<<< TREE
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (1, 'Mozilla Firefox Mainline', 'text', 12, 4, 12, 'main', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--MAIN--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:42.98217', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.837773', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'firefox', '~name12/firefox/main', NULL, NULL, NULL, false);
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (2, 'Mozilla Thunderbird Mainline', 'Bazaar import of the Mozilla Thunderbird CVS mainline.', 11, 8, 1, 'main', NULL, 'http://bazaar.example.com/thunderbird@xxxxxxxxxxxxxxx/thunderbird--MAIN--0', NULL, 30, NULL, '2006-04-08 01:40:15.816029', 1, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.042944', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.842033', 11, NULL, NULL, NULL, NULL, NULL, NULL, 'stevea', 'thunderbird', '~stevea/thunderbird/main', NULL, NULL, NULL, false);
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (3, 'Python Twisted Trunk', 'Bazaar import of the Twisted SVN trunk.', 7, NULL, 3, 'trunk', NULL, 'http://bazaar.example.com/twisted@xxxxxxxxxxxxxxx/twisted--trunk--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.04419', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.843681', 7, NULL, NULL, NULL, NULL, NULL, NULL, 'spiv', NULL, '~spiv/+junk/trunk', NULL, NULL, NULL, false);
@@ -2866,6 +2867,46 @@
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (30, NULL, NULL, 12, 16, 12, 'feature-x', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2007-05-28 02:37:07.814303', 0, NULL, true, 1, NULL, '2007-12-06 19:58:26.861424', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'landscape', '~name12/landscape/feature-x', NULL, NULL, NULL, true);
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (75, 'GNOME Terminal Import Branch', NULL, 24, 6, NULL, 'import', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-06-25 20:04:03.9465', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.862009', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'gnome-terminal', '~vcs-imports/gnome-terminal/import', NULL, NULL, NULL, false);
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (76, 'Evolution Import Branch', NULL, 24, 5, NULL, 'import', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-06-25 20:04:04.218451', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.862857', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'evolution', '~vcs-imports/evolution/import', NULL, NULL, NULL, false);
+=======
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (1, 'Mozilla Firefox Mainline', 'text', 12, 4, 12, 'main', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--MAIN--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:42.98217', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.837773', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'firefox', '~name12/firefox/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (2, 'Mozilla Thunderbird Mainline', 'Bazaar import of the Mozilla Thunderbird CVS mainline.', 11, 8, 1, 'main', NULL, 'http://bazaar.example.com/thunderbird@xxxxxxxxxxxxxxx/thunderbird--MAIN--0', NULL, 30, NULL, '2006-04-08 01:40:15.816029', 1, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.042944', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.842033', 11, NULL, NULL, NULL, NULL, NULL, NULL, 'stevea', 'thunderbird', '~stevea/thunderbird/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (3, 'Python Twisted Trunk', 'Bazaar import of the Twisted SVN trunk.', 7, NULL, 3, 'trunk', NULL, 'http://bazaar.example.com/twisted@xxxxxxxxxxxxxxx/twisted--trunk--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.04419', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.843681', 7, NULL, NULL, NULL, NULL, NULL, NULL, 'spiv', NULL, '~spiv/+junk/trunk', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (4, 'Bugzila Mainline', 'text', 3, NULL, NULL, 'main', NULL, 'http://bazaar.example.com/bugzilla@xxxxxxxxxxxxxxx/bugzila--MAIN--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.045278', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.844341', 3, NULL, NULL, NULL, NULL, NULL, NULL, 'justdave', NULL, '~justdave/+junk/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (5, 'Arch Devel', 'text', 8, NULL, NULL, 'devel-1.0', NULL, 'http://bazaar.example.com/arch@xxxxxxxxxxxxxxx/arch--devel--1.0', NULL, 30, NULL, '2006-04-08 22:20:14.973705', 9, 'I do not like Arch, so I am pretending it failed to mirror.', NULL, NULL, NULL, '2006-10-16 18:31:43.046996', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.844975', 8, NULL, NULL, NULL, NULL, NULL, NULL, 'jblack', NULL, '~jblack/+junk/devel-1.0', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (6, 'Kiwi2 Mainline', 'text', 9, NULL, NULL, 'main', NULL, 'http://bazaar.example.com/kiwi2@xxxxxxxxxxxxxxx/kiwi2--MAIN--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.048164', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.84562', 9, NULL, NULL, NULL, NULL, NULL, NULL, 'kiko', NULL, '~kiko/+junk/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (7, 'Plone Trunk', 'text', 10, NULL, NULL, 'trunk', NULL, 'http://bazaar.example.com/plone@xxxxxxxxxxxxxxx/plone--trunk--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.049222', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.846258', 10, NULL, NULL, NULL, NULL, NULL, NULL, 'limi', NULL, '~limi/+junk/trunk', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (8, 'Evolution 2.0', 'text', 13, 5, NULL, '2.0', NULL, 'http://bazaar.example.com/gnome@xxxxxxxxxxxxxxx/gnome--evolution--2.0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.050317', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.846899', 13, NULL, NULL, NULL, NULL, NULL, NULL, 'carlos', 'evolution', '~carlos/evolution/2.0', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (9, 'Iso-codes 0.35', 'text', 13, 7, NULL, '0.35', NULL, 'http://bazaar.example.com/iso-codes@xxxxxxxxxxxxxxx/iso-codes--iso-codes--0.35', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.051395', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.847595', 13, NULL, NULL, NULL, NULL, NULL, NULL, 'carlos', 'iso-codes', '~carlos/iso-codes/0.35', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (10, 'Mozilla Firefox 0.9.2', 'text', 1, 4, NULL, 'release-0.9.2', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9.2', NULL, 30, NULL, NULL, 0, NULL, NULL, 'mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9.2--base-0', NULL, '2006-10-16 18:31:43.052449', 1, NULL, false, 2, NULL, '2007-12-06 19:58:26.848365', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', 'firefox', '~mark/firefox/release-0.9.2', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (11, 'Mozilla Firefox 0.9.1', 'text', 1, 4, NULL, 'release--0.9.1', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9.1', NULL, 30, NULL, NULL, 0, NULL, NULL, 'mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9.1--base-0', NULL, '2006-10-16 18:31:43.053511', 1, NULL, false, 2, NULL, '2007-12-06 19:58:26.849077', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', 'firefox', '~mark/firefox/release--0.9.1', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (12, 'Mozilla Firefox 0.9', 'text', 1, 4, NULL, 'release-0.9', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9', NULL, 30, NULL, NULL, 0, NULL, NULL, 'mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9--base-0', NULL, '2006-10-16 18:31:43.054581', 1, NULL, false, 2, NULL, '2007-12-06 19:58:26.84976', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', 'firefox', '~mark/firefox/release-0.9', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (13, 'Mozilla Firefox 0.8', 'text', 1, 4, NULL, 'release-0.8', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.8', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.055661', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.850415', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', 'firefox', '~mark/firefox/release-0.8', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (14, NULL, NULL, 24, 5, NULL, 'main', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.056714', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.85103', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'evolution', '~vcs-imports/evolution/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (15, 'GNOME Terminal Mainline', 'Main branch of development for GNOME Terminal. Stable branches are based on that one.
+
+Home page: http://example.com/gnome-terminal', 12, 6, NULL, 'main', 'http://example.com/gnome-terminal', 'http://example.com/gnome-terminal/main', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.057682', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.851575', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (16, 'GNOME Terminal 2.6 Releases', 'Release branch of GNOME Terminal for the GNOME 2.6 environment.
+
+Home page: http://example.com/gnome-terminal/', 12, 6, NULL, '2.6', 'http://example.com/gnome-terminal/', 'http://example.com/gnome-terminal/2.6', NULL, 50, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.058953', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.852227', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/2.6', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (17, 'GNOME Terminal 2.4 Releases', 'Obsolete branch for GNOME 2.4 releases of GNOME Terminal.', 12, 6, NULL, '2.4', NULL, 'http://example.com/gnome-terminal/2.4', NULL, 80, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.060078', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.852889', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/2.4', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (18, 'Klingon support in GNOME Terminal', 'Experimental feature branch for developping and testing Klingon support in GNOME Terminal.
+
+Home page: http://trekkies.example.com/k12n', 12, 6, 12, 'klingon', 'http://trekkies.example.com/k12n', 'http://trekkies.example.com/gnome-terminal/klingon', NULL, 10, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.061162', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.85354', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/klingon', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (19, 'Slowing GNOME Terminal scrolling', 'Feature branch for slowing down the scrolling of text in GNOME Terminal.', 12, 6, 12, 'slowness', NULL, 'http://users.example.com/gnome-terminal/slowness', NULL, 70, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.062427', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.854214', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/slowness', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (20, 'Ubuntu Junk Code', 'Sample junk branch.', 12, NULL, 17, 'junk.dev', NULL, 'http://example.com/a', NULL, 10, NULL, NULL, 0, NULL, NULL, 'foo@localhost-20051031170357-1301ad6d387feb23', NULL, '2006-10-16 18:31:43.06351', 6, NULL, false, 2, NULL, '2007-12-06 19:58:26.854821', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', NULL, '~name12/+junk/junk.dev', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (21, 'Junk Code Contributions', 'Contribute code to the junk branch.', 12, NULL, 12, 'junk.contrib', NULL, 'http://example.com/b', NULL, 30, NULL, NULL, 0, NULL, NULL, 'foo@localhost-20051031170357-1301ad6d387feb23', NULL, '2006-10-16 18:31:43.064578', 6, NULL, false, 2, NULL, '2007-12-06 19:58:26.855432', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', NULL, '~name12/+junk/junk.contrib', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (22, 'Python twisted feature', 'Feature branch for twisted.', 7, NULL, 4, 'feature', NULL, 'http://not.launchpad.server.com/a-branch', NULL, 30, NULL, '2005-03-09 15:45:00', 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.065642', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.856045', 7, NULL, NULL, NULL, NULL, NULL, NULL, 'spiv', NULL, '~spiv/+junk/feature', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (23, 'Another Python twisted feature', 'Another Feature branch for twisted.', 7, NULL, 4, 'feature2', NULL, 'http://whynot.launchpad.server.com/another-branch', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.066804', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.856677', 7, NULL, NULL, NULL, NULL, NULL, NULL, 'spiv', NULL, '~spiv/+junk/feature2', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (24, 'Launchpad support for Gnome Terminal', 'Add Launchpad support to Gnome Terminal', 57, 6, 57, 'launchpad', NULL, 'http://users.example.com/gnome-terminal/launchpad', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.067922', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.857318', 16, NULL, NULL, NULL, NULL, NULL, NULL, 'launchpad', 'gnome-terminal', '~launchpad/gnome-terminal/launchpad', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (25, NULL, NULL, 12, 6, NULL, 'pushed', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.06897', 0, NULL, false, 1, NULL, '2007-12-06 19:58:26.857983', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/pushed', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (26, NULL, NULL, 12, 6, NULL, 'mirrored', NULL, NULL, NULL, 30, '2007-03-16 14:12:49.050332', NULL, 0, NULL, NULL, NULL, NULL, '2007-03-16 03:12:49.050332', 0, NULL, false, 1, NULL, '2007-12-06 19:58:26.858547', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/mirrored', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (27, NULL, NULL, 12, 6, NULL, 'scanned', NULL, NULL, NULL, 30, '2007-03-16 14:14:29.935752', NULL, 0, NULL, '2007-03-16 14:14:29.935752', NULL, NULL, '2007-03-16 03:14:29.935752', 0, NULL, false, 1, NULL, '2007-12-06 19:58:26.85913', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/scanned', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (28, NULL, NULL, 1, NULL, 1, 'testdoc', NULL, NULL, NULL, 30, NULL, NULL, 1, 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum', NULL, NULL, NULL, '2007-05-04 01:16:03.75446', 0, NULL, false, 1, NULL, '2007-12-06 19:58:26.859847', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', NULL, '~mark/+junk/testdoc', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (29, 'Landscape trunk', NULL, 64, 16, 12, 'trunk', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2007-05-28 02:37:07.814303', 0, NULL, true, 1, NULL, '2007-12-06 19:58:26.860757', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'landscape-developers', 'landscape', '~landscape-developers/landscape/trunk', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (30, NULL, NULL, 12, 16, 12, 'feature-x', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2007-05-28 02:37:07.814303', 0, NULL, true, 1, NULL, '2007-12-06 19:58:26.861424', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'landscape', '~name12/landscape/feature-x', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (75, 'GNOME Terminal Import Branch', NULL, 24, 6, NULL, 'import', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-06-25 20:04:03.9465', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.862009', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'gnome-terminal', '~vcs-imports/gnome-terminal/import', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (76, 'Evolution Import Branch', NULL, 24, 5, NULL, 'import', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-06-25 20:04:04.218451', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.862857', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'evolution', '~vcs-imports/evolution/import', NULL, NULL, NULL, NULL);
+>>>>>>> MERGE-SOURCE
 
 
 ALTER TABLE branch ENABLE TRIGGER ALL;
@@ -7217,225 +7258,225 @@
 
 ALTER TABLE potmsgset DISABLE TRIGGER ALL;
 
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (1, 1, 1, 1, '', 'a11y/addressbook/ea-addressbook-view.c:94
-a11y/addressbook/ea-addressbook-view.c:103
-a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (2, 2, 2, 1, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (3, 3, 3, 1, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (4, 4, 4, 1, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (5, 5, 5, 1, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (6, 6, 6, 1, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (7, 7, 7, 1, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (8, 8, 8, 1, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (9, 9, 9, 1, '', 'addressbook/addressbook-errors.xml.h:2', 'addressbook:ldap-init primary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (10, 10, 10, 1, '', 'addressbook/addressbook-errors.xml.h:4', 'addressbook:ldap-init secondary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (11, 11, 11, 1, '', 'addressbook/addressbook-errors.xml.h:6', 'addressbook:ldap-auth primary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (12, 12, 12, 1, '', 'addressbook/addressbook-errors.xml.h:8', 'addressbook:ldap-auth secondary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (13, 13, 13, 1, '', 'addressbook/gui/component/addressbook-migrate.c:124
-calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (14, 14, 14, 1, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (15, 15, 15, 1, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (16, 17, 16, 1, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (17, 19, 17, 1, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (18, 21, 18, 1, ' start po-group: common', 'encfs/FileUtils.cpp:1044', 'xgroup(common)', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (19, 22, 19, 1, '', 'encfs/main.cpp:340', 'xgroup(usage)', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (20, 23, 20, 1, '', 'encfs/FileUtils.cpp:535', 'xgroup(setup)', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (21, 24, 0, 1, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (22, 26, 22, 1, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (23, 27, 0, 1, NULL, 'foo.c:123', 'This is a comment...', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (24, 28, 1, 3, '', 'src/netapplet.c:131', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (25, 29, 2, 3, '', 'src/netapplet.c:133', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (26, 30, 3, 3, '', 'src/netapplet.c:135', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (27, 31, 4, 3, '', 'src/netapplet.c:139', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (28, 32, 5, 3, '', 'src/netapplet.c:141', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (29, 33, 6, 3, '', 'src/netapplet.c:291 src/netapplet.c:312', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (30, 34, 7, 3, '', 'src/netapplet.c:359', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (31, 35, 8, 3, '', 'src/netapplet.c:391', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (32, 36, 9, 3, '', 'src/netapplet.c:410', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (33, 37, 10, 3, '', 'src/netapplet.c:427', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (34, 38, 11, 3, '', 'src/netapplet.c:479', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (35, 39, 12, 3, '', 'src/netapplet.c:496', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (36, 40, 13, 3, '', 'src/netapplet.c:732', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (37, 41, 14, 3, '', 'src/netapplet.c:747', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (38, 42, 15, 3, '', 'src/netapplet.c:768', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (39, 43, 16, 3, '', 'src/netapplet.c:870', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (40, 44, 17, 3, '', 'src/netapplet.c:955', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (41, 45, 18, 3, '', 'src/netapplet.c:958', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (42, 46, 19, 3, '', 'src/netapplet.c:970', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (43, 47, 20, 3, '', 'src/netapplet.c:1015', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (44, 48, 21, 3, '', 'src/netapplet.c:1018', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (45, 49, 22, 3, '', 'src/netapplet.c:1021', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (46, 50, 23, 3, '', 'src/netapplet.c:1032', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (47, 51, 24, 3, '', 'src/netapplet.c:1072', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (48, 52, 25, 3, '', 'src/netapplet.c:1082', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (49, 53, 26, 3, '', 'src/netapplet.c:1093', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (50, 54, 27, 3, '', 'src/netapplet.c:1526', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (51, 55, 28, 3, '', 'src/netapplet.glade.h:1', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (52, 56, 29, 3, '', 'src/netapplet.glade.h:2', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (53, 57, 30, 3, '', 'src/netapplet.glade.h:3', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (54, 58, 31, 3, '', 'src/netapplet.glade.h:4', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (55, 59, 32, 3, '', 'src/netapplet.glade.h:5', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (56, 60, 33, 3, '', 'src/netapplet.glade.h:6', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (57, 61, 34, 3, '', 'src/netapplet.glade.h:7', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (58, 62, 35, 3, '', 'src/netapplet.glade.h:8', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (59, 63, 36, 3, '', 'src/netapplet.glade.h:9', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (60, 64, 37, 3, '', 'src/netapplet.glade.h:10', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (61, 65, 38, 3, '', 'src/netapplet.glade.h:11', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (62, 66, 39, 3, '', 'src/netapplet.glade.h:12', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (63, 67, 40, 3, '', 'src/netapplet.glade.h:13', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (64, 68, 41, 3, '', 'src/netapplet.glade.h:14', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (65, 69, 42, 3, '', 'src/netapplet.glade.h:15', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (66, 70, 43, 3, '', 'src/netapplet.glade.h:16', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (67, 71, 1, 2, '', 'pmount.c:50', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (68, 72, 2, 2, '', 'pmount.c:57', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (69, 73, 3, 2, '', 'pmount.c:64', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (70, 74, 4, 2, '', 'pmount.c:67', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (71, 75, 5, 2, '', 'pmount.c:120', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (72, 76, 6, 2, '', 'pmount.c:126', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (73, 77, 7, 2, '', 'pmount.c:130', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (74, 78, 8, 2, '', 'pmount.c:134', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (75, 79, 9, 2, '', 'pmount.c:141', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (76, 80, 10, 2, '', 'pmount.c:171 pumount.c:98', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (77, 81, 11, 2, '', 'pmount.c:176 pmount.c:270', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (78, 82, 12, 2, '', 'pmount.c:212', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (79, 83, 13, 2, '', 'pmount.c:218', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (80, 84, 14, 2, '', 'pmount.c:242', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (81, 85, 15, 2, '', 'pmount.c:258 pumount.c:124', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (82, 86, 16, 2, '', 'pmount.c:274', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (83, 87, 17, 2, '', 'pmount.c:347', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (84, 88, 18, 2, '', 'pmount.c:361', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (85, 89, 19, 2, '', 'pmount.c:401', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (86, 90, 20, 2, '', 'pmount.c:417', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (87, 91, 21, 2, '', 'pmount.c:509 pumount.c:181', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (88, 92, 22, 2, '', 'pmount.c:542 pumount.c:201', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (89, 93, 23, 2, '', 'pmount.c:580', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (90, 94, 24, 2, '', 'pmount.c:589 pumount.c:237', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (91, 95, 25, 2, '', 'pmount.c:595 pumount.c:243', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (92, 96, 26, 2, '', 'pmount.c:635', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (93, 97, 27, 2, '', 'pmount.c:656', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (94, 98, 28, 2, '', 'pmount-hal.c:29', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (95, 99, 29, 2, '', 'pmount-hal.c:140', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (96, 100, 30, 2, '', 'pmount-hal.c:169', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (97, 101, 31, 2, '', 'pmount-hal.c:175', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (98, 102, 32, 2, '', 'pmount-hal.c:182', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (99, 103, 33, 2, '', 'policy.c:79', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (100, 104, 34, 2, '', 'policy.c:90', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (101, 105, 35, 2, '', 'policy.c:97', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (102, 106, 36, 2, '', 'policy.c:128', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (103, 107, 37, 2, '', 'policy.c:228', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (104, 108, 38, 2, '', 'policy.c:233', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (105, 109, 39, 2, '', 'policy.c:251 policy.c:307', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (106, 110, 40, 2, '', 'policy.c:338', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (107, 111, 41, 2, '', 'policy.c:340', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (108, 112, 42, 2, '', 'policy.c:342', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (109, 113, 43, 2, '', 'policy.c:378', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (110, 114, 44, 2, '', 'policy.c:393', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (111, 115, 45, 2, '', 'policy.c:411', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (112, 116, 46, 2, '', 'policy.c:413', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (113, 117, 47, 2, '', 'pumount.c:42', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (114, 118, 48, 2, '', 'pumount.c:72', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (115, 119, 49, 2, '', 'pumount.c:78', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (116, 120, 50, 2, '', 'pumount.c:108 pumount.c:136', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (117, 121, 51, 2, '', 'pumount.c:140', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (118, 122, 52, 2, '', 'pumount.c:148', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (119, 123, 53, 2, '', 'utils.c:51', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (120, 124, 54, 2, '', 'utils.c:107', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (121, 125, 55, 2, '', 'utils.c:122', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (122, 126, 56, 2, '', 'utils.c:129', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (123, 127, 57, 2, '', 'utils.c:149', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (124, 128, 58, 2, '', 'utils.c:158', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (125, 129, 59, 2, '', 'utils.c:210', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (126, 130, 60, 2, '', 'utils.c:252', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (127, 131, 61, 2, '', 'utils.c:261', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (128, 132, 62, 2, '', 'utils.c:270', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (129, 133, 63, 2, '', 'utils.c:279', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (130, 1, 1, 4, '', 'a11y/addressbook/ea-addressbook-view.c:94
-a11y/addressbook/ea-addressbook-view.c:103
-a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (131, 2, 2, 4, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (132, 3, 3, 4, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (133, 4, 4, 4, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (134, 5, 5, 4, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (135, 6, 6, 4, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (136, 7, 7, 4, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (137, 8, 8, 4, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (138, 9, 9, 4, '', 'addressbook/addressbook-errors.xml.h:2', 'addressbook:ldap-init primary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (139, 10, 10, 4, '', 'addressbook/addressbook-errors.xml.h:4', 'addressbook:ldap-init secondary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (140, 11, 11, 4, '', 'addressbook/addressbook-errors.xml.h:6', 'addressbook:ldap-auth primary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (141, 12, 12, 4, '', 'addressbook/addressbook-errors.xml.h:8', 'addressbook:ldap-auth secondary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (142, 13, 13, 4, '', 'addressbook/gui/component/addressbook-migrate.c:124
-calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (143, 14, 14, 4, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (144, 15, 15, 4, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (145, 17, 16, 4, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (146, 19, 17, 4, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (147, 21, 18, 4, ' start po-group: common', 'encfs/FileUtils.cpp:1044', 'xgroup(common)', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (148, 22, 19, 4, '', 'encfs/main.cpp:340', 'xgroup(usage)', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (149, 23, 20, 4, '', 'encfs/FileUtils.cpp:535', 'xgroup(setup)', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (150, 24, 21, 4, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (151, 26, 22, 4, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (152, 134, 1, 5, '', '../mozilla-browser.templates:3', 'Type: note
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (153, 135, 2, 5, '', '../mozilla-browser.templates:3', 'Type: note
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (154, 136, 3, 5, '', '../mozilla-browser.templates:3', 'Type: note
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (155, 137, 4, 5, '', '../mozilla-browser.templates:11', 'Type: select
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (1, 1, 1, '', 'a11y/addressbook/ea-addressbook-view.c:94
+a11y/addressbook/ea-addressbook-view.c:103
+a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (2, 2, 1, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (3, 3, 1, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (4, 4, 1, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (5, 5, 1, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (6, 6, 1, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (7, 7, 1, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (8, 8, 1, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (9, 9, 1, '', 'addressbook/addressbook-errors.xml.h:2', 'addressbook:ldap-init primary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (10, 10, 1, '', 'addressbook/addressbook-errors.xml.h:4', 'addressbook:ldap-init secondary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (11, 11, 1, '', 'addressbook/addressbook-errors.xml.h:6', 'addressbook:ldap-auth primary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (12, 12, 1, '', 'addressbook/addressbook-errors.xml.h:8', 'addressbook:ldap-auth secondary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (13, 13, 1, '', 'addressbook/gui/component/addressbook-migrate.c:124
+calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (14, 14, 1, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (15, 15, 1, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (16, 17, 1, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (17, 19, 1, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (18, 21, 1, ' start po-group: common', 'encfs/FileUtils.cpp:1044', 'xgroup(common)', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (19, 22, 1, '', 'encfs/main.cpp:340', 'xgroup(usage)', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (20, 23, 1, '', 'encfs/FileUtils.cpp:535', 'xgroup(setup)', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (21, 24, 1, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (22, 26, 1, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (23, 27, 1, NULL, 'foo.c:123', 'This is a comment...', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (24, 28, 3, '', 'src/netapplet.c:131', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (25, 29, 3, '', 'src/netapplet.c:133', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (26, 30, 3, '', 'src/netapplet.c:135', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (27, 31, 3, '', 'src/netapplet.c:139', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (28, 32, 3, '', 'src/netapplet.c:141', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (29, 33, 3, '', 'src/netapplet.c:291 src/netapplet.c:312', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (30, 34, 3, '', 'src/netapplet.c:359', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (31, 35, 3, '', 'src/netapplet.c:391', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (32, 36, 3, '', 'src/netapplet.c:410', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (33, 37, 3, '', 'src/netapplet.c:427', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (34, 38, 3, '', 'src/netapplet.c:479', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (35, 39, 3, '', 'src/netapplet.c:496', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (36, 40, 3, '', 'src/netapplet.c:732', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (37, 41, 3, '', 'src/netapplet.c:747', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (38, 42, 3, '', 'src/netapplet.c:768', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (39, 43, 3, '', 'src/netapplet.c:870', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (40, 44, 3, '', 'src/netapplet.c:955', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (41, 45, 3, '', 'src/netapplet.c:958', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (42, 46, 3, '', 'src/netapplet.c:970', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (43, 47, 3, '', 'src/netapplet.c:1015', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (44, 48, 3, '', 'src/netapplet.c:1018', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (45, 49, 3, '', 'src/netapplet.c:1021', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (46, 50, 3, '', 'src/netapplet.c:1032', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (47, 51, 3, '', 'src/netapplet.c:1072', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (48, 52, 3, '', 'src/netapplet.c:1082', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (49, 53, 3, '', 'src/netapplet.c:1093', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (50, 54, 3, '', 'src/netapplet.c:1526', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (51, 55, 3, '', 'src/netapplet.glade.h:1', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (52, 56, 3, '', 'src/netapplet.glade.h:2', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (53, 57, 3, '', 'src/netapplet.glade.h:3', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (54, 58, 3, '', 'src/netapplet.glade.h:4', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (55, 59, 3, '', 'src/netapplet.glade.h:5', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (56, 60, 3, '', 'src/netapplet.glade.h:6', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (57, 61, 3, '', 'src/netapplet.glade.h:7', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (58, 62, 3, '', 'src/netapplet.glade.h:8', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (59, 63, 3, '', 'src/netapplet.glade.h:9', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (60, 64, 3, '', 'src/netapplet.glade.h:10', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (61, 65, 3, '', 'src/netapplet.glade.h:11', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (62, 66, 3, '', 'src/netapplet.glade.h:12', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (63, 67, 3, '', 'src/netapplet.glade.h:13', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (64, 68, 3, '', 'src/netapplet.glade.h:14', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (65, 69, 3, '', 'src/netapplet.glade.h:15', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (66, 70, 3, '', 'src/netapplet.glade.h:16', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (67, 71, 2, '', 'pmount.c:50', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (68, 72, 2, '', 'pmount.c:57', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (69, 73, 2, '', 'pmount.c:64', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (70, 74, 2, '', 'pmount.c:67', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (71, 75, 2, '', 'pmount.c:120', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (72, 76, 2, '', 'pmount.c:126', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (73, 77, 2, '', 'pmount.c:130', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (74, 78, 2, '', 'pmount.c:134', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (75, 79, 2, '', 'pmount.c:141', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (76, 80, 2, '', 'pmount.c:171 pumount.c:98', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (77, 81, 2, '', 'pmount.c:176 pmount.c:270', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (78, 82, 2, '', 'pmount.c:212', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (79, 83, 2, '', 'pmount.c:218', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (80, 84, 2, '', 'pmount.c:242', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (81, 85, 2, '', 'pmount.c:258 pumount.c:124', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (82, 86, 2, '', 'pmount.c:274', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (83, 87, 2, '', 'pmount.c:347', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (84, 88, 2, '', 'pmount.c:361', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (85, 89, 2, '', 'pmount.c:401', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (86, 90, 2, '', 'pmount.c:417', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (87, 91, 2, '', 'pmount.c:509 pumount.c:181', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (88, 92, 2, '', 'pmount.c:542 pumount.c:201', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (89, 93, 2, '', 'pmount.c:580', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (90, 94, 2, '', 'pmount.c:589 pumount.c:237', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (91, 95, 2, '', 'pmount.c:595 pumount.c:243', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (92, 96, 2, '', 'pmount.c:635', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (93, 97, 2, '', 'pmount.c:656', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (94, 98, 2, '', 'pmount-hal.c:29', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (95, 99, 2, '', 'pmount-hal.c:140', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (96, 100, 2, '', 'pmount-hal.c:169', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (97, 101, 2, '', 'pmount-hal.c:175', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (98, 102, 2, '', 'pmount-hal.c:182', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (99, 103, 2, '', 'policy.c:79', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (100, 104, 2, '', 'policy.c:90', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (101, 105, 2, '', 'policy.c:97', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (102, 106, 2, '', 'policy.c:128', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (103, 107, 2, '', 'policy.c:228', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (104, 108, 2, '', 'policy.c:233', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (105, 109, 2, '', 'policy.c:251 policy.c:307', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (106, 110, 2, '', 'policy.c:338', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (107, 111, 2, '', 'policy.c:340', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (108, 112, 2, '', 'policy.c:342', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (109, 113, 2, '', 'policy.c:378', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (110, 114, 2, '', 'policy.c:393', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (111, 115, 2, '', 'policy.c:411', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (112, 116, 2, '', 'policy.c:413', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (113, 117, 2, '', 'pumount.c:42', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (114, 118, 2, '', 'pumount.c:72', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (115, 119, 2, '', 'pumount.c:78', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (116, 120, 2, '', 'pumount.c:108 pumount.c:136', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (117, 121, 2, '', 'pumount.c:140', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (118, 122, 2, '', 'pumount.c:148', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (119, 123, 2, '', 'utils.c:51', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (120, 124, 2, '', 'utils.c:107', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (121, 125, 2, '', 'utils.c:122', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (122, 126, 2, '', 'utils.c:129', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (123, 127, 2, '', 'utils.c:149', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (124, 128, 2, '', 'utils.c:158', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (125, 129, 2, '', 'utils.c:210', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (126, 130, 2, '', 'utils.c:252', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (127, 131, 2, '', 'utils.c:261', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (128, 132, 2, '', 'utils.c:270', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (129, 133, 2, '', 'utils.c:279', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (130, 1, 4, '', 'a11y/addressbook/ea-addressbook-view.c:94
+a11y/addressbook/ea-addressbook-view.c:103
+a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (131, 2, 4, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (132, 3, 4, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (133, 4, 4, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (134, 5, 4, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (135, 6, 4, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (136, 7, 4, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (137, 8, 4, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (138, 9, 4, '', 'addressbook/addressbook-errors.xml.h:2', 'addressbook:ldap-init primary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (139, 10, 4, '', 'addressbook/addressbook-errors.xml.h:4', 'addressbook:ldap-init secondary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (140, 11, 4, '', 'addressbook/addressbook-errors.xml.h:6', 'addressbook:ldap-auth primary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (141, 12, 4, '', 'addressbook/addressbook-errors.xml.h:8', 'addressbook:ldap-auth secondary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (142, 13, 4, '', 'addressbook/gui/component/addressbook-migrate.c:124
+calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (143, 14, 4, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (144, 15, 4, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (145, 17, 4, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (146, 19, 4, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (147, 21, 4, ' start po-group: common', 'encfs/FileUtils.cpp:1044', 'xgroup(common)', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (148, 22, 4, '', 'encfs/main.cpp:340', 'xgroup(usage)', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (149, 23, 4, '', 'encfs/FileUtils.cpp:535', 'xgroup(setup)', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (150, 24, 4, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (151, 26, 4, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (152, 134, 5, '', '../mozilla-browser.templates:3', 'Type: note
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (153, 135, 5, '', '../mozilla-browser.templates:3', 'Type: note
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (154, 136, 5, '', '../mozilla-browser.templates:3', 'Type: note
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (155, 137, 5, '', '../mozilla-browser.templates:11', 'Type: select
 Choices', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (156, 138, 5, 5, '', '../mozilla-browser.templates:13', 'Type: select
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (157, 139, 6, 5, '', '../mozilla-browser.templates:13', 'Type: select
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (158, 140, 7, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (159, 141, 8, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (160, 142, 9, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (161, 27, 0, 4, NULL, 'foo.c:123', 'This is a comment...', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (162, 143, 0, 5, NULL, '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (163, 144, 0, 5, NULL, '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (164, 145, 0, 5, NULL, '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (165, 146, 23, 1, '', 'lib/getopt.c:629 lib/getopt.c:641', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (166, 147, 1, 7, '', 'test_browserwidget.py:34', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (167, 147, 1, 8, '', 'test_browserwidget.py:34', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (168, 148, 1, 6, '', 'Wammu/Main.py:469', '', 'python-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (169, 149, 2, 6, '', 'Wammu/Error.py:82', '', 'python-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (170, 150, 3, 6, '', 'Wammu/PhoneSearch.py:127 Wammu/PhoneSearch.py:157', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (171, 151, 4, 6, '', 'Wammu/Data.py:652', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (172, 152, 5, 6, '', 'Wammu/Main.py:276', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (173, 153, 6, 6, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (174, 154, 7, 6, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (175, 155, 8, 6, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (176, 1, 1, 9, '', 'a11y/addressbook/ea-addressbook-view.c:94
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (156, 138, 5, '', '../mozilla-browser.templates:13', 'Type: select
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (157, 139, 5, '', '../mozilla-browser.templates:13', 'Type: select
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (158, 140, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (159, 141, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (160, 142, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (161, 27, 4, NULL, 'foo.c:123', 'This is a comment...', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (162, 143, 5, NULL, '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (163, 144, 5, NULL, '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (164, 145, 5, NULL, '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (165, 146, 1, '', 'lib/getopt.c:629 lib/getopt.c:641', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (166, 147, 7, '', 'test_browserwidget.py:34', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (167, 147, 8, '', 'test_browserwidget.py:34', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (168, 148, 6, '', 'Wammu/Main.py:469', '', 'python-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (169, 149, 6, '', 'Wammu/Error.py:82', '', 'python-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (170, 150, 6, '', 'Wammu/PhoneSearch.py:127 Wammu/PhoneSearch.py:157', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (171, 151, 6, '', 'Wammu/Data.py:652', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (172, 152, 6, '', 'Wammu/Main.py:276', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (173, 153, 6, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (174, 154, 6, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (175, 155, 6, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (176, 1, 9, '', 'a11y/addressbook/ea-addressbook-view.c:94
 a11y/addressbook/ea-addressbook-view.c:103
 a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (177, 2, 2, 9, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (178, 3, 3, 9, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (179, 4, 4, 9, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (180, 5, 5, 9, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (181, 6, 6, 9, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (182, 7, 7, 9, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (183, 8, 8, 9, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (184, 9, 9, 9, '', 'addressbook/addressbook-errors.xml.h:2', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (185, 10, 10, 9, '', 'addressbook/addressbook-errors.xml.h:4', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (186, 11, 11, 9, '', 'addressbook/addressbook-errors.xml.h:6', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (187, 12, 12, 9, '', 'addressbook/addressbook-errors.xml.h:8', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (188, 13, 13, 9, '', 'addressbook/gui/component/addressbook-migrate.c:124
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (177, 2, 9, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (178, 3, 9, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (179, 4, 9, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (180, 5, 9, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (181, 6, 9, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (182, 7, 9, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (183, 8, 9, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (184, 9, 9, '', 'addressbook/addressbook-errors.xml.h:2', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (185, 10, 9, '', 'addressbook/addressbook-errors.xml.h:4', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (186, 11, 9, '', 'addressbook/addressbook-errors.xml.h:6', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (187, 12, 9, '', 'addressbook/addressbook-errors.xml.h:8', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (188, 13, 9, '', 'addressbook/gui/component/addressbook-migrate.c:124
 calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (189, 14, 14, 9, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (190, 15, 15, 9, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (191, 17, 16, 9, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (192, 19, 17, 9, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (193, 21, 18, 9, '', 'encfs/FileUtils.cpp:1044', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (194, 22, 19, 9, '', 'encfs/main.cpp:340', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (195, 23, 20, 9, '', 'encfs/FileUtils.cpp:535', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (196, 24, 21, 9, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (197, 26, 22, 9, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (198, 147, 1, 10, '', 'test_browserwidget.py:34', '', '', 'Something', NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (199, 156, 2, 10, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (200, 157, 3, 10, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (201, 158, 4, 10, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (189, 14, 9, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (190, 15, 9, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (191, 17, 9, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (192, 19, 9, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (193, 21, 9, '', 'encfs/FileUtils.cpp:1044', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (194, 22, 9, '', 'encfs/main.cpp:340', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (195, 23, 9, '', 'encfs/FileUtils.cpp:535', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (196, 24, 9, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (197, 26, 9, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (198, 147, 10, '', 'test_browserwidget.py:34', '', '', 'Something', NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (199, 156, 10, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (200, 157, 10, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (201, 158, 10, '', '', '', '', NULL, NULL);
 
 
 ALTER TABLE potmsgset ENABLE TRIGGER ALL;

=== modified file 'database/sampledata/current.sql'
--- database/sampledata/current.sql	2011-10-03 07:37:37 +0000
+++ database/sampledata/current.sql	2011-10-07 11:12:12 +0000
@@ -2767,6 +2767,7 @@
 
 ALTER TABLE branch DISABLE TRIGGER ALL;
 
+<<<<<<< TREE
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (1, 'Mozilla Firefox Mainline', 'text', 12, 4, 12, 'main', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--MAIN--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:42.98217', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.837773', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'firefox', '~name12/firefox/main', NULL, NULL, NULL, false);
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (2, 'Mozilla Thunderbird Mainline', 'Bazaar import of the Mozilla Thunderbird CVS mainline.', 11, 8, 1, 'main', NULL, 'http://bazaar.example.com/thunderbird@xxxxxxxxxxxxxxx/thunderbird--MAIN--0', NULL, 30, NULL, '2006-04-08 01:40:15.816029', 1, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.042944', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.842033', 11, NULL, NULL, NULL, NULL, NULL, NULL, 'stevea', 'thunderbird', '~stevea/thunderbird/main', NULL, NULL, NULL, false);
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (3, 'Python Twisted Trunk', 'Bazaar import of the Twisted SVN trunk.', 7, NULL, 3, 'trunk', NULL, 'http://bazaar.example.com/twisted@xxxxxxxxxxxxxxx/twisted--trunk--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.04419', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.843681', 7, NULL, NULL, NULL, NULL, NULL, NULL, 'spiv', NULL, '~spiv/+junk/trunk', NULL, NULL, NULL, false);
@@ -2805,6 +2806,46 @@
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (30, NULL, NULL, 12, 16, 12, 'feature-x', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2007-05-28 02:37:07.814303', 0, NULL, true, 1, NULL, '2007-12-06 19:58:26.861424', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'landscape', '~name12/landscape/feature-x', NULL, NULL, NULL, true);
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (75, 'GNOME Terminal Import Branch', NULL, 24, 6, NULL, 'import', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-06-25 20:04:03.9465', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.862009', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'gnome-terminal', '~vcs-imports/gnome-terminal/import', NULL, NULL, NULL, false);
 INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (76, 'Evolution Import Branch', NULL, 24, 5, NULL, 'import', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-06-25 20:04:04.218451', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.862857', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'evolution', '~vcs-imports/evolution/import', NULL, NULL, NULL, false);
+=======
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (1, 'Mozilla Firefox Mainline', 'text', 12, 4, 12, 'main', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--MAIN--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:42.98217', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.837773', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'firefox', '~name12/firefox/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (2, 'Mozilla Thunderbird Mainline', 'Bazaar import of the Mozilla Thunderbird CVS mainline.', 11, 8, 1, 'main', NULL, 'http://bazaar.example.com/thunderbird@xxxxxxxxxxxxxxx/thunderbird--MAIN--0', NULL, 30, NULL, '2006-04-08 01:40:15.816029', 1, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.042944', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.842033', 11, NULL, NULL, NULL, NULL, NULL, NULL, 'stevea', 'thunderbird', '~stevea/thunderbird/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (3, 'Python Twisted Trunk', 'Bazaar import of the Twisted SVN trunk.', 7, NULL, 3, 'trunk', NULL, 'http://bazaar.example.com/twisted@xxxxxxxxxxxxxxx/twisted--trunk--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.04419', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.843681', 7, NULL, NULL, NULL, NULL, NULL, NULL, 'spiv', NULL, '~spiv/+junk/trunk', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (4, 'Bugzila Mainline', 'text', 3, NULL, NULL, 'main', NULL, 'http://bazaar.example.com/bugzilla@xxxxxxxxxxxxxxx/bugzila--MAIN--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.045278', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.844341', 3, NULL, NULL, NULL, NULL, NULL, NULL, 'justdave', NULL, '~justdave/+junk/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (5, 'Arch Devel', 'text', 8, NULL, NULL, 'devel-1.0', NULL, 'http://bazaar.example.com/arch@xxxxxxxxxxxxxxx/arch--devel--1.0', NULL, 30, NULL, '2006-04-08 22:20:14.973705', 9, 'I do not like Arch, so I am pretending it failed to mirror.', NULL, NULL, NULL, '2006-10-16 18:31:43.046996', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.844975', 8, NULL, NULL, NULL, NULL, NULL, NULL, 'jblack', NULL, '~jblack/+junk/devel-1.0', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (6, 'Kiwi2 Mainline', 'text', 9, NULL, NULL, 'main', NULL, 'http://bazaar.example.com/kiwi2@xxxxxxxxxxxxxxx/kiwi2--MAIN--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.048164', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.84562', 9, NULL, NULL, NULL, NULL, NULL, NULL, 'kiko', NULL, '~kiko/+junk/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (7, 'Plone Trunk', 'text', 10, NULL, NULL, 'trunk', NULL, 'http://bazaar.example.com/plone@xxxxxxxxxxxxxxx/plone--trunk--0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.049222', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.846258', 10, NULL, NULL, NULL, NULL, NULL, NULL, 'limi', NULL, '~limi/+junk/trunk', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (8, 'Evolution 2.0', 'text', 13, 5, NULL, '2.0', NULL, 'http://bazaar.example.com/gnome@xxxxxxxxxxxxxxx/gnome--evolution--2.0', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.050317', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.846899', 13, NULL, NULL, NULL, NULL, NULL, NULL, 'carlos', 'evolution', '~carlos/evolution/2.0', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (9, 'Iso-codes 0.35', 'text', 13, 7, NULL, '0.35', NULL, 'http://bazaar.example.com/iso-codes@xxxxxxxxxxxxxxx/iso-codes--iso-codes--0.35', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.051395', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.847595', 13, NULL, NULL, NULL, NULL, NULL, NULL, 'carlos', 'iso-codes', '~carlos/iso-codes/0.35', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (10, 'Mozilla Firefox 0.9.2', 'text', 1, 4, NULL, 'release-0.9.2', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9.2', NULL, 30, NULL, NULL, 0, NULL, NULL, 'mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9.2--base-0', NULL, '2006-10-16 18:31:43.052449', 1, NULL, false, 2, NULL, '2007-12-06 19:58:26.848365', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', 'firefox', '~mark/firefox/release-0.9.2', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (11, 'Mozilla Firefox 0.9.1', 'text', 1, 4, NULL, 'release--0.9.1', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9.1', NULL, 30, NULL, NULL, 0, NULL, NULL, 'mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9.1--base-0', NULL, '2006-10-16 18:31:43.053511', 1, NULL, false, 2, NULL, '2007-12-06 19:58:26.849077', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', 'firefox', '~mark/firefox/release--0.9.1', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (12, 'Mozilla Firefox 0.9', 'text', 1, 4, NULL, 'release-0.9', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9', NULL, 30, NULL, NULL, 0, NULL, NULL, 'mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.9--base-0', NULL, '2006-10-16 18:31:43.054581', 1, NULL, false, 2, NULL, '2007-12-06 19:58:26.84976', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', 'firefox', '~mark/firefox/release-0.9', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (13, 'Mozilla Firefox 0.8', 'text', 1, 4, NULL, 'release-0.8', NULL, 'http://bazaar.example.com/mozilla@xxxxxxxxxxxxxxx/mozilla--release--0.8', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.055661', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.850415', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', 'firefox', '~mark/firefox/release-0.8', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (14, NULL, NULL, 24, 5, NULL, 'main', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.056714', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.85103', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'evolution', '~vcs-imports/evolution/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (15, 'GNOME Terminal Mainline', 'Main branch of development for GNOME Terminal. Stable branches are based on that one.
+
+Home page: http://example.com/gnome-terminal', 12, 6, NULL, 'main', 'http://example.com/gnome-terminal', 'http://example.com/gnome-terminal/main', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.057682', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.851575', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/main', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (16, 'GNOME Terminal 2.6 Releases', 'Release branch of GNOME Terminal for the GNOME 2.6 environment.
+
+Home page: http://example.com/gnome-terminal/', 12, 6, NULL, '2.6', 'http://example.com/gnome-terminal/', 'http://example.com/gnome-terminal/2.6', NULL, 50, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.058953', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.852227', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/2.6', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (17, 'GNOME Terminal 2.4 Releases', 'Obsolete branch for GNOME 2.4 releases of GNOME Terminal.', 12, 6, NULL, '2.4', NULL, 'http://example.com/gnome-terminal/2.4', NULL, 80, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.060078', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.852889', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/2.4', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (18, 'Klingon support in GNOME Terminal', 'Experimental feature branch for developping and testing Klingon support in GNOME Terminal.
+
+Home page: http://trekkies.example.com/k12n', 12, 6, 12, 'klingon', 'http://trekkies.example.com/k12n', 'http://trekkies.example.com/gnome-terminal/klingon', NULL, 10, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.061162', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.85354', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/klingon', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (19, 'Slowing GNOME Terminal scrolling', 'Feature branch for slowing down the scrolling of text in GNOME Terminal.', 12, 6, 12, 'slowness', NULL, 'http://users.example.com/gnome-terminal/slowness', NULL, 70, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.062427', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.854214', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/slowness', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (20, 'Ubuntu Junk Code', 'Sample junk branch.', 12, NULL, 17, 'junk.dev', NULL, 'http://example.com/a', NULL, 10, NULL, NULL, 0, NULL, NULL, 'foo@localhost-20051031170357-1301ad6d387feb23', NULL, '2006-10-16 18:31:43.06351', 6, NULL, false, 2, NULL, '2007-12-06 19:58:26.854821', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', NULL, '~name12/+junk/junk.dev', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (21, 'Junk Code Contributions', 'Contribute code to the junk branch.', 12, NULL, 12, 'junk.contrib', NULL, 'http://example.com/b', NULL, 30, NULL, NULL, 0, NULL, NULL, 'foo@localhost-20051031170357-1301ad6d387feb23', NULL, '2006-10-16 18:31:43.064578', 6, NULL, false, 2, NULL, '2007-12-06 19:58:26.855432', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', NULL, '~name12/+junk/junk.contrib', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (22, 'Python twisted feature', 'Feature branch for twisted.', 7, NULL, 4, 'feature', NULL, 'http://not.launchpad.server.com/a-branch', NULL, 30, NULL, '2005-03-09 15:45:00', 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.065642', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.856045', 7, NULL, NULL, NULL, NULL, NULL, NULL, 'spiv', NULL, '~spiv/+junk/feature', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (23, 'Another Python twisted feature', 'Another Feature branch for twisted.', 7, NULL, 4, 'feature2', NULL, 'http://whynot.launchpad.server.com/another-branch', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.066804', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.856677', 7, NULL, NULL, NULL, NULL, NULL, NULL, 'spiv', NULL, '~spiv/+junk/feature2', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (24, 'Launchpad support for Gnome Terminal', 'Add Launchpad support to Gnome Terminal', 57, 6, 57, 'launchpad', NULL, 'http://users.example.com/gnome-terminal/launchpad', NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.067922', 0, NULL, false, 2, NULL, '2007-12-06 19:58:26.857318', 16, NULL, NULL, NULL, NULL, NULL, NULL, 'launchpad', 'gnome-terminal', '~launchpad/gnome-terminal/launchpad', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (25, NULL, NULL, 12, 6, NULL, 'pushed', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-10-16 18:31:43.06897', 0, NULL, false, 1, NULL, '2007-12-06 19:58:26.857983', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/pushed', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (26, NULL, NULL, 12, 6, NULL, 'mirrored', NULL, NULL, NULL, 30, '2007-03-16 14:12:49.050332', NULL, 0, NULL, NULL, NULL, NULL, '2007-03-16 03:12:49.050332', 0, NULL, false, 1, NULL, '2007-12-06 19:58:26.858547', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/mirrored', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (27, NULL, NULL, 12, 6, NULL, 'scanned', NULL, NULL, NULL, 30, '2007-03-16 14:14:29.935752', NULL, 0, NULL, '2007-03-16 14:14:29.935752', NULL, NULL, '2007-03-16 03:14:29.935752', 0, NULL, false, 1, NULL, '2007-12-06 19:58:26.85913', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'gnome-terminal', '~name12/gnome-terminal/scanned', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (28, NULL, NULL, 1, NULL, 1, 'testdoc', NULL, NULL, NULL, 30, NULL, NULL, 1, 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum', NULL, NULL, NULL, '2007-05-04 01:16:03.75446', 0, NULL, false, 1, NULL, '2007-12-06 19:58:26.859847', 1, NULL, NULL, NULL, NULL, NULL, NULL, 'mark', NULL, '~mark/+junk/testdoc', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (29, 'Landscape trunk', NULL, 64, 16, 12, 'trunk', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2007-05-28 02:37:07.814303', 0, NULL, true, 1, NULL, '2007-12-06 19:58:26.860757', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'landscape-developers', 'landscape', '~landscape-developers/landscape/trunk', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (30, NULL, NULL, 12, 16, 12, 'feature-x', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2007-05-28 02:37:07.814303', 0, NULL, true, 1, NULL, '2007-12-06 19:58:26.861424', 12, NULL, NULL, NULL, NULL, NULL, NULL, 'name12', 'landscape', '~name12/landscape/feature-x', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (75, 'GNOME Terminal Import Branch', NULL, 24, 6, NULL, 'import', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-06-25 20:04:03.9465', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.862009', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'gnome-terminal', '~vcs-imports/gnome-terminal/import', NULL, NULL, NULL, NULL);
+INSERT INTO branch (id, title, summary, owner, product, author, name, home_page, url, whiteboard, lifecycle_status, last_mirrored, last_mirror_attempt, mirror_failures, mirror_status_message, last_scanned, last_scanned_id, last_mirrored_id, date_created, revision_count, next_mirror_time, private, branch_type, reviewer, date_last_modified, registrant, branch_format, repository_format, metadir_format, stacked_on, distroseries, sourcepackagename, owner_name, target_suffix, unique_name, size_on_disk, merge_queue, merge_queue_config, transitively_private) VALUES (76, 'Evolution Import Branch', NULL, 24, 5, NULL, 'import', NULL, NULL, NULL, 30, NULL, NULL, 0, NULL, NULL, NULL, NULL, '2006-06-25 20:04:04.218451', 0, NULL, false, 3, NULL, '2007-12-06 19:58:26.862857', 24, NULL, NULL, NULL, NULL, NULL, NULL, 'vcs-imports', 'evolution', '~vcs-imports/evolution/import', NULL, NULL, NULL, NULL);
+>>>>>>> MERGE-SOURCE
 
 
 ALTER TABLE branch ENABLE TRIGGER ALL;
@@ -7147,225 +7188,225 @@
 
 ALTER TABLE potmsgset DISABLE TRIGGER ALL;
 
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (1, 1, 1, 1, '', 'a11y/addressbook/ea-addressbook-view.c:94
-a11y/addressbook/ea-addressbook-view.c:103
-a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (2, 2, 2, 1, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (3, 3, 3, 1, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (4, 4, 4, 1, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (5, 5, 5, 1, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (6, 6, 6, 1, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (7, 7, 7, 1, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (8, 8, 8, 1, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (9, 9, 9, 1, '', 'addressbook/addressbook-errors.xml.h:2', 'addressbook:ldap-init primary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (10, 10, 10, 1, '', 'addressbook/addressbook-errors.xml.h:4', 'addressbook:ldap-init secondary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (11, 11, 11, 1, '', 'addressbook/addressbook-errors.xml.h:6', 'addressbook:ldap-auth primary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (12, 12, 12, 1, '', 'addressbook/addressbook-errors.xml.h:8', 'addressbook:ldap-auth secondary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (13, 13, 13, 1, '', 'addressbook/gui/component/addressbook-migrate.c:124
-calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (14, 14, 14, 1, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (15, 15, 15, 1, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (16, 17, 16, 1, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (17, 19, 17, 1, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (18, 21, 18, 1, ' start po-group: common', 'encfs/FileUtils.cpp:1044', 'xgroup(common)', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (19, 22, 19, 1, '', 'encfs/main.cpp:340', 'xgroup(usage)', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (20, 23, 20, 1, '', 'encfs/FileUtils.cpp:535', 'xgroup(setup)', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (21, 24, 0, 1, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (22, 26, 22, 1, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (23, 27, 0, 1, NULL, 'foo.c:123', 'This is a comment...', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (24, 28, 1, 3, '', 'src/netapplet.c:131', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (25, 29, 2, 3, '', 'src/netapplet.c:133', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (26, 30, 3, 3, '', 'src/netapplet.c:135', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (27, 31, 4, 3, '', 'src/netapplet.c:139', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (28, 32, 5, 3, '', 'src/netapplet.c:141', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (29, 33, 6, 3, '', 'src/netapplet.c:291 src/netapplet.c:312', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (30, 34, 7, 3, '', 'src/netapplet.c:359', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (31, 35, 8, 3, '', 'src/netapplet.c:391', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (32, 36, 9, 3, '', 'src/netapplet.c:410', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (33, 37, 10, 3, '', 'src/netapplet.c:427', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (34, 38, 11, 3, '', 'src/netapplet.c:479', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (35, 39, 12, 3, '', 'src/netapplet.c:496', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (36, 40, 13, 3, '', 'src/netapplet.c:732', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (37, 41, 14, 3, '', 'src/netapplet.c:747', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (38, 42, 15, 3, '', 'src/netapplet.c:768', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (39, 43, 16, 3, '', 'src/netapplet.c:870', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (40, 44, 17, 3, '', 'src/netapplet.c:955', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (41, 45, 18, 3, '', 'src/netapplet.c:958', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (42, 46, 19, 3, '', 'src/netapplet.c:970', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (43, 47, 20, 3, '', 'src/netapplet.c:1015', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (44, 48, 21, 3, '', 'src/netapplet.c:1018', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (45, 49, 22, 3, '', 'src/netapplet.c:1021', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (46, 50, 23, 3, '', 'src/netapplet.c:1032', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (47, 51, 24, 3, '', 'src/netapplet.c:1072', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (48, 52, 25, 3, '', 'src/netapplet.c:1082', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (49, 53, 26, 3, '', 'src/netapplet.c:1093', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (50, 54, 27, 3, '', 'src/netapplet.c:1526', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (51, 55, 28, 3, '', 'src/netapplet.glade.h:1', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (52, 56, 29, 3, '', 'src/netapplet.glade.h:2', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (53, 57, 30, 3, '', 'src/netapplet.glade.h:3', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (54, 58, 31, 3, '', 'src/netapplet.glade.h:4', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (55, 59, 32, 3, '', 'src/netapplet.glade.h:5', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (56, 60, 33, 3, '', 'src/netapplet.glade.h:6', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (57, 61, 34, 3, '', 'src/netapplet.glade.h:7', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (58, 62, 35, 3, '', 'src/netapplet.glade.h:8', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (59, 63, 36, 3, '', 'src/netapplet.glade.h:9', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (60, 64, 37, 3, '', 'src/netapplet.glade.h:10', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (61, 65, 38, 3, '', 'src/netapplet.glade.h:11', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (62, 66, 39, 3, '', 'src/netapplet.glade.h:12', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (63, 67, 40, 3, '', 'src/netapplet.glade.h:13', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (64, 68, 41, 3, '', 'src/netapplet.glade.h:14', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (65, 69, 42, 3, '', 'src/netapplet.glade.h:15', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (66, 70, 43, 3, '', 'src/netapplet.glade.h:16', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (67, 71, 1, 2, '', 'pmount.c:50', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (68, 72, 2, 2, '', 'pmount.c:57', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (69, 73, 3, 2, '', 'pmount.c:64', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (70, 74, 4, 2, '', 'pmount.c:67', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (71, 75, 5, 2, '', 'pmount.c:120', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (72, 76, 6, 2, '', 'pmount.c:126', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (73, 77, 7, 2, '', 'pmount.c:130', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (74, 78, 8, 2, '', 'pmount.c:134', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (75, 79, 9, 2, '', 'pmount.c:141', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (76, 80, 10, 2, '', 'pmount.c:171 pumount.c:98', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (77, 81, 11, 2, '', 'pmount.c:176 pmount.c:270', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (78, 82, 12, 2, '', 'pmount.c:212', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (79, 83, 13, 2, '', 'pmount.c:218', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (80, 84, 14, 2, '', 'pmount.c:242', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (81, 85, 15, 2, '', 'pmount.c:258 pumount.c:124', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (82, 86, 16, 2, '', 'pmount.c:274', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (83, 87, 17, 2, '', 'pmount.c:347', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (84, 88, 18, 2, '', 'pmount.c:361', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (85, 89, 19, 2, '', 'pmount.c:401', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (86, 90, 20, 2, '', 'pmount.c:417', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (87, 91, 21, 2, '', 'pmount.c:509 pumount.c:181', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (88, 92, 22, 2, '', 'pmount.c:542 pumount.c:201', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (89, 93, 23, 2, '', 'pmount.c:580', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (90, 94, 24, 2, '', 'pmount.c:589 pumount.c:237', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (91, 95, 25, 2, '', 'pmount.c:595 pumount.c:243', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (92, 96, 26, 2, '', 'pmount.c:635', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (93, 97, 27, 2, '', 'pmount.c:656', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (94, 98, 28, 2, '', 'pmount-hal.c:29', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (95, 99, 29, 2, '', 'pmount-hal.c:140', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (96, 100, 30, 2, '', 'pmount-hal.c:169', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (97, 101, 31, 2, '', 'pmount-hal.c:175', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (98, 102, 32, 2, '', 'pmount-hal.c:182', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (99, 103, 33, 2, '', 'policy.c:79', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (100, 104, 34, 2, '', 'policy.c:90', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (101, 105, 35, 2, '', 'policy.c:97', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (102, 106, 36, 2, '', 'policy.c:128', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (103, 107, 37, 2, '', 'policy.c:228', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (104, 108, 38, 2, '', 'policy.c:233', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (105, 109, 39, 2, '', 'policy.c:251 policy.c:307', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (106, 110, 40, 2, '', 'policy.c:338', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (107, 111, 41, 2, '', 'policy.c:340', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (108, 112, 42, 2, '', 'policy.c:342', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (109, 113, 43, 2, '', 'policy.c:378', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (110, 114, 44, 2, '', 'policy.c:393', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (111, 115, 45, 2, '', 'policy.c:411', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (112, 116, 46, 2, '', 'policy.c:413', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (113, 117, 47, 2, '', 'pumount.c:42', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (114, 118, 48, 2, '', 'pumount.c:72', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (115, 119, 49, 2, '', 'pumount.c:78', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (116, 120, 50, 2, '', 'pumount.c:108 pumount.c:136', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (117, 121, 51, 2, '', 'pumount.c:140', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (118, 122, 52, 2, '', 'pumount.c:148', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (119, 123, 53, 2, '', 'utils.c:51', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (120, 124, 54, 2, '', 'utils.c:107', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (121, 125, 55, 2, '', 'utils.c:122', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (122, 126, 56, 2, '', 'utils.c:129', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (123, 127, 57, 2, '', 'utils.c:149', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (124, 128, 58, 2, '', 'utils.c:158', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (125, 129, 59, 2, '', 'utils.c:210', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (126, 130, 60, 2, '', 'utils.c:252', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (127, 131, 61, 2, '', 'utils.c:261', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (128, 132, 62, 2, '', 'utils.c:270', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (129, 133, 63, 2, '', 'utils.c:279', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (130, 1, 1, 4, '', 'a11y/addressbook/ea-addressbook-view.c:94
-a11y/addressbook/ea-addressbook-view.c:103
-a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (131, 2, 2, 4, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (132, 3, 3, 4, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (133, 4, 4, 4, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (134, 5, 5, 4, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (135, 6, 6, 4, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (136, 7, 7, 4, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (137, 8, 8, 4, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (138, 9, 9, 4, '', 'addressbook/addressbook-errors.xml.h:2', 'addressbook:ldap-init primary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (139, 10, 10, 4, '', 'addressbook/addressbook-errors.xml.h:4', 'addressbook:ldap-init secondary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (140, 11, 11, 4, '', 'addressbook/addressbook-errors.xml.h:6', 'addressbook:ldap-auth primary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (141, 12, 12, 4, '', 'addressbook/addressbook-errors.xml.h:8', 'addressbook:ldap-auth secondary', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (142, 13, 13, 4, '', 'addressbook/gui/component/addressbook-migrate.c:124
-calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (143, 14, 14, 4, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (144, 15, 15, 4, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (145, 17, 16, 4, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (146, 19, 17, 4, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (147, 21, 18, 4, ' start po-group: common', 'encfs/FileUtils.cpp:1044', 'xgroup(common)', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (148, 22, 19, 4, '', 'encfs/main.cpp:340', 'xgroup(usage)', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (149, 23, 20, 4, '', 'encfs/FileUtils.cpp:535', 'xgroup(setup)', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (150, 24, 21, 4, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (151, 26, 22, 4, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (152, 134, 1, 5, '', '../mozilla-browser.templates:3', 'Type: note
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (153, 135, 2, 5, '', '../mozilla-browser.templates:3', 'Type: note
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (154, 136, 3, 5, '', '../mozilla-browser.templates:3', 'Type: note
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (155, 137, 4, 5, '', '../mozilla-browser.templates:11', 'Type: select
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (1, 1, 1, '', 'a11y/addressbook/ea-addressbook-view.c:94
+a11y/addressbook/ea-addressbook-view.c:103
+a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (2, 2, 1, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (3, 3, 1, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (4, 4, 1, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (5, 5, 1, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (6, 6, 1, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (7, 7, 1, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (8, 8, 1, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (9, 9, 1, '', 'addressbook/addressbook-errors.xml.h:2', 'addressbook:ldap-init primary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (10, 10, 1, '', 'addressbook/addressbook-errors.xml.h:4', 'addressbook:ldap-init secondary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (11, 11, 1, '', 'addressbook/addressbook-errors.xml.h:6', 'addressbook:ldap-auth primary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (12, 12, 1, '', 'addressbook/addressbook-errors.xml.h:8', 'addressbook:ldap-auth secondary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (13, 13, 1, '', 'addressbook/gui/component/addressbook-migrate.c:124
+calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (14, 14, 1, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (15, 15, 1, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (16, 17, 1, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (17, 19, 1, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (18, 21, 1, ' start po-group: common', 'encfs/FileUtils.cpp:1044', 'xgroup(common)', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (19, 22, 1, '', 'encfs/main.cpp:340', 'xgroup(usage)', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (20, 23, 1, '', 'encfs/FileUtils.cpp:535', 'xgroup(setup)', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (21, 24, 1, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (22, 26, 1, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (23, 27, 1, NULL, 'foo.c:123', 'This is a comment...', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (24, 28, 3, '', 'src/netapplet.c:131', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (25, 29, 3, '', 'src/netapplet.c:133', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (26, 30, 3, '', 'src/netapplet.c:135', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (27, 31, 3, '', 'src/netapplet.c:139', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (28, 32, 3, '', 'src/netapplet.c:141', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (29, 33, 3, '', 'src/netapplet.c:291 src/netapplet.c:312', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (30, 34, 3, '', 'src/netapplet.c:359', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (31, 35, 3, '', 'src/netapplet.c:391', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (32, 36, 3, '', 'src/netapplet.c:410', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (33, 37, 3, '', 'src/netapplet.c:427', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (34, 38, 3, '', 'src/netapplet.c:479', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (35, 39, 3, '', 'src/netapplet.c:496', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (36, 40, 3, '', 'src/netapplet.c:732', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (37, 41, 3, '', 'src/netapplet.c:747', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (38, 42, 3, '', 'src/netapplet.c:768', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (39, 43, 3, '', 'src/netapplet.c:870', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (40, 44, 3, '', 'src/netapplet.c:955', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (41, 45, 3, '', 'src/netapplet.c:958', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (42, 46, 3, '', 'src/netapplet.c:970', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (43, 47, 3, '', 'src/netapplet.c:1015', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (44, 48, 3, '', 'src/netapplet.c:1018', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (45, 49, 3, '', 'src/netapplet.c:1021', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (46, 50, 3, '', 'src/netapplet.c:1032', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (47, 51, 3, '', 'src/netapplet.c:1072', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (48, 52, 3, '', 'src/netapplet.c:1082', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (49, 53, 3, '', 'src/netapplet.c:1093', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (50, 54, 3, '', 'src/netapplet.c:1526', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (51, 55, 3, '', 'src/netapplet.glade.h:1', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (52, 56, 3, '', 'src/netapplet.glade.h:2', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (53, 57, 3, '', 'src/netapplet.glade.h:3', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (54, 58, 3, '', 'src/netapplet.glade.h:4', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (55, 59, 3, '', 'src/netapplet.glade.h:5', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (56, 60, 3, '', 'src/netapplet.glade.h:6', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (57, 61, 3, '', 'src/netapplet.glade.h:7', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (58, 62, 3, '', 'src/netapplet.glade.h:8', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (59, 63, 3, '', 'src/netapplet.glade.h:9', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (60, 64, 3, '', 'src/netapplet.glade.h:10', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (61, 65, 3, '', 'src/netapplet.glade.h:11', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (62, 66, 3, '', 'src/netapplet.glade.h:12', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (63, 67, 3, '', 'src/netapplet.glade.h:13', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (64, 68, 3, '', 'src/netapplet.glade.h:14', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (65, 69, 3, '', 'src/netapplet.glade.h:15', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (66, 70, 3, '', 'src/netapplet.glade.h:16', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (67, 71, 2, '', 'pmount.c:50', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (68, 72, 2, '', 'pmount.c:57', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (69, 73, 2, '', 'pmount.c:64', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (70, 74, 2, '', 'pmount.c:67', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (71, 75, 2, '', 'pmount.c:120', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (72, 76, 2, '', 'pmount.c:126', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (73, 77, 2, '', 'pmount.c:130', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (74, 78, 2, '', 'pmount.c:134', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (75, 79, 2, '', 'pmount.c:141', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (76, 80, 2, '', 'pmount.c:171 pumount.c:98', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (77, 81, 2, '', 'pmount.c:176 pmount.c:270', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (78, 82, 2, '', 'pmount.c:212', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (79, 83, 2, '', 'pmount.c:218', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (80, 84, 2, '', 'pmount.c:242', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (81, 85, 2, '', 'pmount.c:258 pumount.c:124', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (82, 86, 2, '', 'pmount.c:274', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (83, 87, 2, '', 'pmount.c:347', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (84, 88, 2, '', 'pmount.c:361', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (85, 89, 2, '', 'pmount.c:401', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (86, 90, 2, '', 'pmount.c:417', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (87, 91, 2, '', 'pmount.c:509 pumount.c:181', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (88, 92, 2, '', 'pmount.c:542 pumount.c:201', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (89, 93, 2, '', 'pmount.c:580', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (90, 94, 2, '', 'pmount.c:589 pumount.c:237', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (91, 95, 2, '', 'pmount.c:595 pumount.c:243', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (92, 96, 2, '', 'pmount.c:635', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (93, 97, 2, '', 'pmount.c:656', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (94, 98, 2, '', 'pmount-hal.c:29', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (95, 99, 2, '', 'pmount-hal.c:140', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (96, 100, 2, '', 'pmount-hal.c:169', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (97, 101, 2, '', 'pmount-hal.c:175', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (98, 102, 2, '', 'pmount-hal.c:182', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (99, 103, 2, '', 'policy.c:79', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (100, 104, 2, '', 'policy.c:90', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (101, 105, 2, '', 'policy.c:97', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (102, 106, 2, '', 'policy.c:128', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (103, 107, 2, '', 'policy.c:228', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (104, 108, 2, '', 'policy.c:233', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (105, 109, 2, '', 'policy.c:251 policy.c:307', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (106, 110, 2, '', 'policy.c:338', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (107, 111, 2, '', 'policy.c:340', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (108, 112, 2, '', 'policy.c:342', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (109, 113, 2, '', 'policy.c:378', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (110, 114, 2, '', 'policy.c:393', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (111, 115, 2, '', 'policy.c:411', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (112, 116, 2, '', 'policy.c:413', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (113, 117, 2, '', 'pumount.c:42', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (114, 118, 2, '', 'pumount.c:72', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (115, 119, 2, '', 'pumount.c:78', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (116, 120, 2, '', 'pumount.c:108 pumount.c:136', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (117, 121, 2, '', 'pumount.c:140', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (118, 122, 2, '', 'pumount.c:148', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (119, 123, 2, '', 'utils.c:51', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (120, 124, 2, '', 'utils.c:107', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (121, 125, 2, '', 'utils.c:122', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (122, 126, 2, '', 'utils.c:129', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (123, 127, 2, '', 'utils.c:149', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (124, 128, 2, '', 'utils.c:158', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (125, 129, 2, '', 'utils.c:210', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (126, 130, 2, '', 'utils.c:252', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (127, 131, 2, '', 'utils.c:261', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (128, 132, 2, '', 'utils.c:270', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (129, 133, 2, '', 'utils.c:279', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (130, 1, 4, '', 'a11y/addressbook/ea-addressbook-view.c:94
+a11y/addressbook/ea-addressbook-view.c:103
+a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (131, 2, 4, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (132, 3, 4, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (133, 4, 4, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (134, 5, 4, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (135, 6, 4, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (136, 7, 4, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (137, 8, 4, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (138, 9, 4, '', 'addressbook/addressbook-errors.xml.h:2', 'addressbook:ldap-init primary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (139, 10, 4, '', 'addressbook/addressbook-errors.xml.h:4', 'addressbook:ldap-init secondary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (140, 11, 4, '', 'addressbook/addressbook-errors.xml.h:6', 'addressbook:ldap-auth primary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (141, 12, 4, '', 'addressbook/addressbook-errors.xml.h:8', 'addressbook:ldap-auth secondary', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (142, 13, 4, '', 'addressbook/gui/component/addressbook-migrate.c:124
+calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (143, 14, 4, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (144, 15, 4, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (145, 17, 4, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (146, 19, 4, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (147, 21, 4, ' start po-group: common', 'encfs/FileUtils.cpp:1044', 'xgroup(common)', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (148, 22, 4, '', 'encfs/main.cpp:340', 'xgroup(usage)', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (149, 23, 4, '', 'encfs/FileUtils.cpp:535', 'xgroup(setup)', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (150, 24, 4, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (151, 26, 4, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (152, 134, 5, '', '../mozilla-browser.templates:3', 'Type: note
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (153, 135, 5, '', '../mozilla-browser.templates:3', 'Type: note
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (154, 136, 5, '', '../mozilla-browser.templates:3', 'Type: note
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (155, 137, 5, '', '../mozilla-browser.templates:11', 'Type: select
 Choices', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (156, 138, 5, 5, '', '../mozilla-browser.templates:13', 'Type: select
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (157, 139, 6, 5, '', '../mozilla-browser.templates:13', 'Type: select
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (158, 140, 7, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (159, 141, 8, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (160, 142, 9, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
-Description', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (161, 27, 0, 4, NULL, 'foo.c:123', 'This is a comment...', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (162, 143, 0, 5, NULL, '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (163, 144, 0, 5, NULL, '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (164, 145, 0, 5, NULL, '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (165, 146, 23, 1, '', 'lib/getopt.c:629 lib/getopt.c:641', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (166, 147, 1, 7, '', 'test_browserwidget.py:34', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (167, 147, 1, 8, '', 'test_browserwidget.py:34', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (168, 148, 1, 6, '', 'Wammu/Main.py:469', '', 'python-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (169, 149, 2, 6, '', 'Wammu/Error.py:82', '', 'python-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (170, 150, 3, 6, '', 'Wammu/PhoneSearch.py:127 Wammu/PhoneSearch.py:157', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (171, 151, 4, 6, '', 'Wammu/Data.py:652', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (172, 152, 5, 6, '', 'Wammu/Main.py:276', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (173, 153, 6, 6, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (174, 154, 7, 6, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (175, 155, 8, 6, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (176, 1, 1, 9, '', 'a11y/addressbook/ea-addressbook-view.c:94
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (156, 138, 5, '', '../mozilla-browser.templates:13', 'Type: select
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (157, 139, 5, '', '../mozilla-browser.templates:13', 'Type: select
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (158, 140, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (159, 141, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (160, 142, 5, '', '../mozilla-browser.templates:24', 'Type: boolean
+Description', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (161, 27, 4, NULL, 'foo.c:123', 'This is a comment...', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (162, 143, 5, NULL, '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (163, 144, 5, NULL, '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (164, 145, 5, NULL, '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (165, 146, 1, '', 'lib/getopt.c:629 lib/getopt.c:641', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (166, 147, 7, '', 'test_browserwidget.py:34', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (167, 147, 8, '', 'test_browserwidget.py:34', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (168, 148, 6, '', 'Wammu/Main.py:469', '', 'python-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (169, 149, 6, '', 'Wammu/Error.py:82', '', 'python-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (170, 150, 6, '', 'Wammu/PhoneSearch.py:127 Wammu/PhoneSearch.py:157', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (171, 151, 6, '', 'Wammu/Data.py:652', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (172, 152, 6, '', 'Wammu/Main.py:276', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (173, 153, 6, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (174, 154, 6, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (175, 155, 6, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (176, 1, 9, '', 'a11y/addressbook/ea-addressbook-view.c:94
 a11y/addressbook/ea-addressbook-view.c:103
 a11y/addressbook/ea-minicard-view.c:119', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (177, 2, 2, 9, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (178, 3, 3, 9, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (179, 4, 4, 9, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (180, 5, 5, 9, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (181, 6, 6, 9, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (182, 7, 7, 9, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (183, 8, 8, 9, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (184, 9, 9, 9, '', 'addressbook/addressbook-errors.xml.h:2', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (185, 10, 10, 9, '', 'addressbook/addressbook-errors.xml.h:4', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (186, 11, 11, 9, '', 'addressbook/addressbook-errors.xml.h:6', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (187, 12, 12, 9, '', 'addressbook/addressbook-errors.xml.h:8', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (188, 13, 13, 9, '', 'addressbook/gui/component/addressbook-migrate.c:124
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (177, 2, 9, '', 'a11y/addressbook/ea-minicard-view.c:101', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (178, 3, 9, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (179, 4, 9, '', 'a11y/addressbook/ea-minicard-view.c:102', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (180, 5, 9, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (181, 6, 9, '', 'a11y/addressbook/ea-minicard-view.c:104', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (182, 7, 9, '', 'a11y/addressbook/ea-minicard-view.c:105', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (183, 8, 9, '', 'a11y/addressbook/ea-minicard.c:166', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (184, 9, 9, '', 'addressbook/addressbook-errors.xml.h:2', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (185, 10, 9, '', 'addressbook/addressbook-errors.xml.h:4', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (186, 11, 9, '', 'addressbook/addressbook-errors.xml.h:6', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (187, 12, 9, '', 'addressbook/addressbook-errors.xml.h:8', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (188, 13, 9, '', 'addressbook/gui/component/addressbook-migrate.c:124
 calendar/gui/migration.c:188 mail/em-migrate.c:1201', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (189, 14, 14, 9, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (190, 15, 15, 9, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (191, 17, 16, 9, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (192, 19, 17, 9, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (193, 21, 18, 9, '', 'encfs/FileUtils.cpp:1044', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (194, 22, 19, 9, '', 'encfs/main.cpp:340', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (195, 23, 20, 9, '', 'encfs/FileUtils.cpp:535', '', 'c-format', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (196, 24, 21, 9, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (197, 26, 22, 9, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (198, 147, 1, 10, '', 'test_browserwidget.py:34', '', '', 'Something', NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (199, 156, 2, 10, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (200, 157, 3, 10, '', '', '', '', NULL, NULL);
-INSERT INTO potmsgset (id, msgid_singular, sequence, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (201, 158, 4, 10, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (189, 14, 9, '', 'addressbook/gui/component/addressbook-migrate.c:1123', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (190, 15, 9, '', 'addressbook/gui/widgets/e-addressbook-model.c:151', '', 'c-format', NULL, 16);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (191, 17, 9, '', 'addressbook/gui/widgets/eab-gui-util.c:275', '', 'c-format', NULL, 18);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (192, 19, 9, '', 'addressbook/gui/widgets/foo.c:345', '', 'c-format', NULL, 20);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (193, 21, 9, '', 'encfs/FileUtils.cpp:1044', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (194, 22, 9, '', 'encfs/main.cpp:340', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (195, 23, 9, '', 'encfs/FileUtils.cpp:535', '', 'c-format', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (196, 24, 9, '', 'encfs/encfsctl.cpp:346', '', 'c-format', NULL, 25);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (197, 26, 9, '', 'modules/aggregator.module:15', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (198, 147, 10, '', 'test_browserwidget.py:34', '', '', 'Something', NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (199, 156, 10, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (200, 157, 10, '', '', '', '', NULL, NULL);
+INSERT INTO potmsgset (id, msgid_singular, potemplate, commenttext, filereferences, sourcecomment, flagscomment, context, msgid_plural) VALUES (201, 158, 10, '', '', '', '', NULL, NULL);
 
 
 ALTER TABLE potmsgset ENABLE TRIGGER ALL;

=== modified file 'database/schema/comments.sql'
--- database/schema/comments.sql	2011-09-28 03:51:30 +0000
+++ database/schema/comments.sql	2011-10-07 11:12:12 +0000
@@ -823,7 +823,6 @@
 COMMENT ON COLUMN POTMsgSet.context IS 'Context uniquely defining a message when there are messages with same primemsgids.';
 COMMENT ON COLUMN POTMsgSet.msgid_singular IS 'The singular msgid for this message.';
 COMMENT ON COLUMN POTMsgSet.msgid_plural IS 'The plural msgid for this message.';
-COMMENT ON COLUMN POTMsgSet."sequence" IS 'The position of this message set inside the potemplate.';
 COMMENT ON COLUMN POTMsgSet.potemplate IS 'The potemplate where this message set is stored.';
 COMMENT ON COLUMN POTMsgSet.commenttext IS 'The comment text that is associated to this message set.';
 COMMENT ON COLUMN POTMsgSet.filereferences IS 'The list of files and their line number where this message set was extracted from.';

=== added file 'database/schema/patch-2208-01-2.sql'
--- database/schema/patch-2208-01-2.sql	1970-01-01 00:00:00 +0000
+++ database/schema/patch-2208-01-2.sql	2011-10-07 11:12:12 +0000
@@ -0,0 +1,7 @@
+-- Copyright 2011 Canonical Ltd.  This software is licensed under the
+-- GNU Affero General Public License version 3 (see the file LICENSE).
+SET client_min_messages=ERROR;
+
+ALTER TABLE POTMsgSet DROP COLUMN "sequence";
+
+INSERT INTO LaunchpadDatabaseRevision VALUES (2208, 01, 2);