From a8f52aedcf01053de4b4d0bc96a9559657cdf579 Mon Sep 17 00:00:00 2001
From: Alexandre Prokoudine <alexandre.prokoudine@gmail.com>
Date: Wed, 8 Jul 2009 16:52:57 +0000
Subject: Contextual split of translatable message

(bzr r8232)
---
 src/ui/widget/licensor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/widget/licensor.cpp')

diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 05f00edfc..a5f1d89be 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -35,7 +35,7 @@ const struct rdf_license_t _proprietary_license =
   {_("Proprietary"), "", 0};
 
 const struct rdf_license_t _other_license = 
-  {_("Other"), "", 0};
+  {Q_("MetadataLicence|Other"), "", 0};
 
 class LicenseItem : public Gtk::RadioButton {
 public:
-- 
cgit v1.2.3


From 4cd79453c07adefb912a4dbd0afb2e7c2722bd90 Mon Sep 17 00:00:00 2001
From: johnce <johnce@users.sourceforge.net>
Date: Wed, 5 Aug 2009 06:38:07 +0000
Subject: SPDocument->Document

(bzr r8408)
---
 src/ui/widget/licensor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/widget/licensor.cpp')

diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index a5f1d89be..778fbc6cc 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -119,7 +119,7 @@ Licensor::init (Gtk::Tooltips& tt, Registry& wr)
 }
 
 void 
-Licensor::update (SPDocument *doc)
+Licensor::update (Document *doc)
 {
     /* identify the license info */
     struct rdf_license_t * license = rdf_get_license (doc);
-- 
cgit v1.2.3


From 51c2905fd3e99955db2d823b79abb763d8097028 Mon Sep 17 00:00:00 2001
From: Maximilian Albert <maximilian.albert@gmail.com>
Date: Thu, 6 Aug 2009 14:17:17 +0000
Subject: Revert recent refactoring changes by johnce because they break the
 build, which cannot be fixed easily.

(bzr r8422)
---
 src/ui/widget/licensor.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/ui/widget/licensor.cpp')

diff --git a/src/ui/widget/licensor.cpp b/src/ui/widget/licensor.cpp
index 778fbc6cc..a5f1d89be 100644
--- a/src/ui/widget/licensor.cpp
+++ b/src/ui/widget/licensor.cpp
@@ -119,7 +119,7 @@ Licensor::init (Gtk::Tooltips& tt, Registry& wr)
 }
 
 void 
-Licensor::update (Document *doc)
+Licensor::update (SPDocument *doc)
 {
     /* identify the license info */
     struct rdf_license_t * license = rdf_get_license (doc);
-- 
cgit v1.2.3