summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS13
-rw-r--r--RELEASE2
-rw-r--r--contrib/colord.spec.in2
-rw-r--r--doc/website/download.html1
-rw-r--r--po/nb.po13
5 files changed, 23 insertions, 8 deletions
diff --git a/NEWS b/NEWS
index d09cb6f..4714747 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,16 @@
+Version 1.2.8
+~~~~~~~~~~~~~
+Released: 2015-01-15
+
+Notes:
+ - The required libgusb library version has been bumped to 0.2.2
+
+Bugfixes:
+ - Check for dbus when enabling sane (Niels Ole Salscheider)
+ - Do not use the deprecated GUsbDeviceList (Richard Hughes)
+ - Fix build without gobject-introspection (Niels Ole Salscheider)
+ - Fix possible critical warning when using g_dbus_watch_name() (Richard Hughes)
+
Version 1.2.7
~~~~~~~~~~~~~
Released: 2014-12-02
diff --git a/RELEASE b/RELEASE
index e623594..8d73cf9 100644
--- a/RELEASE
+++ b/RELEASE
@@ -6,7 +6,7 @@ git shortlog COLORD_1_2_7.. | grep -i -v trivial | grep -v Merge > NEWS.new
Version 1.2.8
~~~~~~~~~~~~~
-Released: 2014-xx-xx
+Released: 2015-xx-xx
New Features:
Bugfixes:
diff --git a/contrib/colord.spec.in b/contrib/colord.spec.in
index 3489dc4..1c75001 100644
--- a/contrib/colord.spec.in
+++ b/contrib/colord.spec.in
@@ -37,7 +37,7 @@ BuildRequires: polkit-devel >= 0.103
BuildRequires: sqlite-devel
BuildRequires: gobject-introspection-devel
BuildRequires: vala-tools
-BuildRequires: libgusb-devel
+BuildRequires: libgusb-devel >= 0.2.2
BuildRequires: gtk-doc
BuildRequires: color-filesystem
%if !0%{?rhel}
diff --git a/doc/website/download.html b/doc/website/download.html
index 89abbaa..26f6d6c 100644
--- a/doc/website/download.html
+++ b/doc/website/download.html
@@ -34,6 +34,7 @@ modified translations as required or suggested.
</p>
<table>
<tr><td><b>Version</b></td><td>&nbsp;&nbsp;</td><td><b>Date</b></td></tr>
+<tr><td>1.2.8</td><td></td><td>2015-01-15</td></tr>
<tr><td>1.2.7</td><td></td><td>2014-12-02</td></tr>
<tr><td>1.2.6</td><td></td><td>2014-11-24</td></tr>
<tr><td>1.2.5</td><td></td><td>2014-11-10</td></tr>
diff --git a/po/nb.po b/po/nb.po
index 9617a9b..da9c61f 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -4,6 +4,7 @@
#
# Translators:
# Mats Taraldsvik <mats.taraldsvik@gmail.com>, 2008
+# pere <pere-transifex@hungry.com>, 2015
# Torstein Husebø <torstein.huseboe@gmail.com>, 2014
# Torstein Husebø <torstein@huseboe.net>, 2014
msgid ""
@@ -11,8 +12,8 @@ msgstr ""
"Project-Id-Version: colord\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-12-02 14:47+0000\n"
-"PO-Revision-Date: 2015-01-06 09:34+0000\n"
-"Last-Translator: Richard Hughes <richard@hughsie.com>\n"
+"PO-Revision-Date: 2015-01-07 18:51+0000\n"
+"Last-Translator: pere <pere-transifex@hungry.com>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/projects/p/colord/language/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -370,11 +371,11 @@ msgstr "Vis klient- og nisseversjon"
#. TRANSLATORS: command line option
msgid "Show the value without any header"
-msgstr ""
+msgstr "Vis verdien uten noen header"
#. TRANSLATORS: command line option
msgid "Filter object properties when displaying"
-msgstr ""
+msgstr "Filtrer objektegenskaper ved visning"
#. TRANSLATORS: command description
msgid "Dump all debug data to a file"
@@ -539,7 +540,7 @@ msgstr ""
msgid ""
"The URI of the web service that allows the calibration tools to upload a "
"specific profile to the Internet."
-msgstr ""
+msgstr "URI-en til nett-tjenesten som gjør det mulig for kalibreringsverktøyet a laste opp en spesifikk profil til Internettet."
msgid "Compatible with Adobe RGB (1998)"
msgstr "Kompatibel med Adobe RGB (1998)"
@@ -591,7 +592,7 @@ msgid ""
"This test profile is used to make all colors on the screen slightly more "
"blue by altering the video card lookup table. This allows the user to check "
"the calibration is being applied correctly."
-msgstr ""
+msgstr "Denne testprofilen brukes til å gjøre alle fargene på skjermen litt mer blå ved å endre videokortest oppslagstabell. Dette gjør det mulig for brukeren å sjekke at kalibrering tas i bruk som den skal."
#. TRANSLATORS: 'Adobe Photoshop' is a trademark, don't translate
msgid ""