Merge lp:~dpm/ubuntu/lucid/computer-janitor/bug-522154 into lp:ubuntu/lucid/computer-janitor

[David Planella]

Proposed fix for bug 522154 to make the application translatable

[James Westby (james-w)]

review: Abstain

[Michael Vogt (mvo)]

Thanks, merged

review: Approve

[Michael Vogt (mvo)]

computer-janitor (2.0.3-0ubuntu1) maverick; urgency=low
...
    - Ensure that POTFILES.in has the proper type information for the
      ComputerJanitor.ui file. (LP: #612493)
...

merged

=== modified file 'po/POTFILES.in'
--- po/POTFILES.in	2009-11-25 10:00:18 +0000
+++ po/POTFILES.in	2010-03-09 08:37:18 +0000
@@ -11,7 +11,7 @@
 computerjanitorapp/ui_gtk.py
 computerjanitorapp/ui.py
 computerjanitorapp/ui_tests.py
-data/ComputerJanitor.ui
+[type: gettext/glade]data/ComputerJanitor.ui
 data/computer-janitor-gtk.desktop.in
 plugins/add_nfs_common_plugin.py
 plugins/autoremoval_plugin.py

=== removed file 'po/computerjanitorapp.pot'
--- po/computerjanitorapp.pot	2009-02-19 09:37:52 +0000
+++ po/computerjanitorapp.pot	1970-01-01 00:00:00 +0000
@@ -1,202 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-02-11 19:05+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <[e-mail]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#: ../computerjanitorapp/app.py:35
-#, python-format
-msgid ""
-"Essential package %s is missing. There may be problems with apt sources.list "
-"or Packages files may be missing?"
-msgstr ""
-
-#. We're OK with something going wrong.
-#: ../computerjanitorapp/app.py:65
-msgid "Logging to syslog cannot be set up."
-msgstr ""
-
-#: ../computerjanitorapp/app.py:85
-msgid "Running application, with:"
-msgstr ""
-
-#: ../computerjanitorapp/app.py:102
-msgid ""
-"\n"
-"%prog [options] find\n"
-"%prog [options] cleanup [CRUFT]...\n"
-"%prog [options] ignore [CRUFT]...\n"
-"%prog [options] unignore [CRUFT]...\n"
-"\n"
-"%prog finds and removes cruft from your system. \n"
-"\n"
-"Cruft is anything that shouldn't be on the system, but is. Stretching\n"
-"the definition, it is also things that should be on the system, but\n"
-"aren't."
-msgstr ""
-
-#: ../computerjanitorapp/app.py:115
-msgid ""
-"Make the 'cleanup' command remove all packages, if none are given on the "
-"command line."
-msgstr ""
-
-#: ../computerjanitorapp/app.py:121
-#, python-format
-msgid "Store state of each piece of cruft in FILE. (Default is %default)."
-msgstr ""
-
-#: ../computerjanitorapp/app.py:125
-msgid ""
-"Don't actually remove anything, just to do so. This is useful for testing "
-"stuff."
-msgstr ""
-
-#: ../computerjanitorapp/app.py:130
-msgid ""
-"Verbose operation: make find show an explanation for each piece of cruft "
-"found."
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:30
-#, python-format
-msgid "Unknown command: %s"
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:36
-#, python-format
-msgid "Unknown cruft: %s"
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:42
-msgid "computer-janitor must be run as root, sorry."
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:114
-msgid "removable"
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:116
-msgid "ignored"
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:141
-#, python-format
-msgid "Ignored: %s"
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:145 ../computerjanitorapp/ui_gtk.py:88
-#, python-format
-msgid "Pretending to remove cruft: %s"
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:147 ../computerjanitorapp/ui_gtk.py:90
-#, python-format
-msgid "Removing cruft: %s"
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:151 ../computerjanitorapp/ui_gtk.py:96
-#, python-format
-msgid "Pretending to post-cleanup: %s"
-msgstr ""
-
-#: ../computerjanitorapp/ui_cli.py:153 ../computerjanitorapp/ui_gtk.py:98
-#, python-format
-msgid "Post-cleanup: %s"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:54
-msgid "Finding plugins"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:61
-msgid "Finding cruft"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:84
-msgid "Cleaning up cruft"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:94
-msgid "Post-cleanup"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:104
-msgid "Could not clean up properly"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:149
-msgid "Really clean up?"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:156
-#, python-format
-msgid ""
-"You are <b>removing %d .deb packages.</b> This may break your system, if you "
-"need them. Do you want to continue?"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:161
-msgid "Do you want to continue?"
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:204
-msgid "Root access required."
-msgstr ""
-
-#: ../computerjanitorapp/ui_gtk.py:205
-msgid "You must run computer-janitor-gtk as root. Sorry."
-msgstr ""
-
-#. create the column with the toggle
-#: ../computerjanitorapp/ui_gtk.py:304
-msgid "Remove?"
-msgstr ""
-
-#. create the column with the name of cruft
-#: ../computerjanitorapp/ui_gtk.py:313
-msgid "Name"
-msgstr ""
-
-#. Display the version number.
-#: ../computerjanitorapp/ui_gtk.py:329
-#, python-format
-msgid "Computer Janitor %s"
-msgstr ""
-
-#: ../data/ComputerJanitor.glade.h:1
-msgid "<big><b>Keep your system clean</b></big>"
-msgstr ""
-
-#: ../data/ComputerJanitor.glade.h:2
-#: ../data/computer-janitor-gtk.desktop.in.h:2
-msgid "Computer Janitor"
-msgstr ""
-
-#: ../data/ComputerJanitor.glade.h:3
-msgid "This application helps you to get rid of cruft."
-msgstr ""
-
-#: ../data/ComputerJanitor.glade.h:4
-msgid "_Cleanup"
-msgstr ""
-
-#: ../data/ComputerJanitor.glade.h:5
-msgid "updates"
-msgstr ""
-
-#: ../data/computer-janitor-gtk.desktop.in.h:1
-msgid "Clean up a system so it's more like a freshly installed one"
-msgstr ""