X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?a=blobdiff_plain;ds=sidebyside;f=properties%2Fev-properties-view.c;h=9a9d13c0d7ab624da2c901fc601a864a262ec8ea;hb=369ce2e964c0092b9d6e873f80e2468c4c3d8013;hp=6382af4a7ef5a24831d73355ca6e92e994f7e771;hpb=309a8fb96dd401d07f774c687bda59da77bd41d2;p=evince.git

diff --git a/properties/ev-properties-view.c b/properties/ev-properties-view.c
index 6382af4a..9a9d13c0 100644
--- a/properties/ev-properties-view.c
+++ b/properties/ev-properties-view.c
@@ -28,7 +28,7 @@
 #include <langinfo.h>
 #endif
 
-#include <glib/gi18n.h>
+#include <glib/gi18n-lib.h>
 #include <gtk/gtk.h>
 
 #include "ev-properties-view.h"
@@ -56,20 +56,20 @@ typedef struct {
 } PropertyInfo;
 
 static const PropertyInfo properties_info[] = {
-	{ TITLE_PROPERTY,         N_("Title") },
-	{ URI_PROPERTY,           N_("Location") },
-	{ SUBJECT_PROPERTY,       N_("Subject") },
-	{ AUTHOR_PROPERTY,        N_("Author") },
-	{ KEYWORDS_PROPERTY,      N_("Keywords") },
-	{ PRODUCER_PROPERTY,      N_("Producer") },
-	{ CREATOR_PROPERTY,       N_("Creator") },
-	{ CREATION_DATE_PROPERTY, N_("Created") },
-	{ MOD_DATE_PROPERTY,      N_("Modified") },
-	{ N_PAGES_PROPERTY,       N_("Number of Pages") },
-	{ LINEARIZED_PROPERTY,    N_("Optimized") },
-	{ FORMAT_PROPERTY,        N_("Format") },
-	{ SECURITY_PROPERTY,      N_("Security") },
-	{ PAPER_SIZE_PROPERTY,    N_("Paper Size") }
+	{ TITLE_PROPERTY,         N_("Title:") },
+	{ URI_PROPERTY,           N_("Location:") },
+	{ SUBJECT_PROPERTY,       N_("Subject:") },
+	{ AUTHOR_PROPERTY,        N_("Author:") },
+	{ KEYWORDS_PROPERTY,      N_("Keywords:") },
+	{ PRODUCER_PROPERTY,      N_("Producer:") },
+	{ CREATOR_PROPERTY,       N_("Creator:") },
+	{ CREATION_DATE_PROPERTY, N_("Created:") },
+	{ MOD_DATE_PROPERTY,      N_("Modified:") },
+	{ N_PAGES_PROPERTY,       N_("Number of Pages:") },
+	{ LINEARIZED_PROPERTY,    N_("Optimized:") },
+	{ FORMAT_PROPERTY,        N_("Format:") },
+	{ SECURITY_PROPERTY,      N_("Security:") },
+	{ PAPER_SIZE_PROPERTY,    N_("Paper Size:") }
 };
 
 struct _EvPropertiesView {
@@ -111,14 +111,19 @@ static char *
 ev_properties_view_format_date (GTime utime)
 {
 	time_t time = (time_t) utime;
-	struct tm t;
 	char s[256];
-	const char *fmt_hack = "%c";
+	const char fmt_hack[] = "%c";
 	size_t len;
-
+#ifdef HAVE_LOCALTIME_R
+	struct tm t;
 	if (time == 0 || !localtime_r (&time, &t)) return NULL;
-
 	len = strftime (s, sizeof (s), fmt_hack, &t);
+#else
+	struct tm *t;
+	if (time == 0 || !(t = localtime (&time)) ) return NULL;
+	len = strftime (s, sizeof (s), fmt_hack, t);
+#endif
+
 	if (len == 0 || s[0] == '\0') return NULL;
 
 	return g_locale_to_utf8 (s, -1, NULL, NULL, NULL);
@@ -176,7 +181,7 @@ set_property (GtkTable    *table,
 
 	label = gtk_label_new (NULL);
 	g_object_set (G_OBJECT (label), "xalign", 0.0, NULL);
-	markup = g_strdup_printf ("<b>%s:</b>", properties_info[property].label);
+	markup = g_strdup_printf ("<b>%s</b>", _(properties_info[property].label));
 	gtk_label_set_markup (GTK_LABEL (label), markup);
 	g_free (markup);