From dc01e8e42fff68b0fcf56e814cf837110da54d1d Mon Sep 17 00:00:00 2001
From: Bryce Harrington <bryce@bryceharrington.org>
Date: Wed, 17 Sep 2014 21:37:41 -0700
Subject: Fix build for fink on OS X 10.9 by including unistd.h

Fixes: https://bugs.launchpad.net/inkscape/+bug/1340914

Fixed bugs:
  - https://launchpad.net/bugs/1340914

(bzr r13560)
---
 src/color-profile.cpp | 1 +
 1 file changed, 1 insertion(+)

(limited to 'src/color-profile.cpp')

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index aa0750c00..6f335b590 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -19,6 +19,7 @@
 #include <gtk/gtk.h>
 #endif // DEBUG_LCMS
 
+#include <unistd.h>
 #include <cstring>
 #include <string>
 #include <io/sys.h>
-- 
cgit v1.2.3


From 50a19700fb02a712803aa3623f0920d562116534 Mon Sep 17 00:00:00 2001
From: Nicolas Dufour <nicoduf@yahoo.fr>
Date: Thu, 2 Oct 2014 10:32:46 +0200
Subject: i18n. Fix for Bug #380522 (strings that need to be fixed for
 translation). Translations. Inkscape.pot and French translation update.

Fixed bugs:
  - https://launchpad.net/bugs/380522

(bzr r13576)
---
 src/color-profile.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/color-profile.cpp')

diff --git a/src/color-profile.cpp b/src/color-profile.cpp
index 6f335b590..28550b75d 100644
--- a/src/color-profile.cpp
+++ b/src/color-profile.cpp
@@ -911,7 +911,7 @@ Glib::ustring getNameFromProfile(cmsHPROFILE profile)
         if ( name && !g_utf8_validate(name, -1, NULL) ) {
             name = _("(invalid UTF-8 string)");
         }
-        nameStr = (name) ? name : _("None");
+        nameStr = (name) ? name : C_("Profile name", "None");
 #elif HAVE_LIBLCMS2
     cmsUInt32Number byteLen = cmsGetProfileInfo(profile, cmsInfoDescription, "en", "US", NULL, 0);
     if (byteLen > 0) {
-- 
cgit v1.2.3