merge of '09e8d7e8a0e862b146d8d9bab41abd1661bb95b2'

and '72e05191b28fdea36565f18fc1803f1d197aee92'

Monotone-Parent: 09e8d7e8a0e862b146d8d9bab41abd1661bb95b2
Monotone-Parent: 72e05191b28fdea36565f18fc1803f1d197aee92
Monotone-Revision: 41c1c5726230c10d450e8d6282dda4a8d0ce1de3

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2009-07-08T22:52:40
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2009-07-08 22:52:40 +00:00
commit 8c50019c30
2 changed files with 6 additions and 30 deletions

View File

@ -1360,30 +1360,6 @@ Index: sope-core/EOCoreData/GNUmakefile
endif
-include GNUmakefile.postamble
--include fhs.make
Index: sopex/GNUmakefile
===================================================================
--- sopex/GNUmakefile (révision 1632)
+++ sopex/GNUmakefile (copie de travail)
@@ -1,6 +1,6 @@
# GNUstep makefile
--include ../config.make
+include ../config.make
include $(GNUSTEP_MAKEFILES)/common.make
ifeq ($(FOUNDATION_LIB),apple)
Index: sopex/SOPEX/GNUmakefile
===================================================================
--- sopex/SOPEX/GNUmakefile (révision 1632)
+++ sopex/SOPEX/GNUmakefile (copie de travail)
@@ -1,6 +1,6 @@
# GNUstep makefile
--include ../../config.make
+include ../../config.make
include $(GNUSTEP_MAKEFILES)/common.make
include ./Version
Index: xmlrpc_call/GNUmakefile
===================================================================
--- xmlrpc_call/GNUmakefile (révision 1632)

View File

@ -366,13 +366,13 @@
"category_TRAVEL" = "Voyage";
"category_VACATION" = "Absence";
"repeat_NEVER" = "Ne se répète pas";
"repeat_DAILY" = "Quotidiennement";
"repeat_WEEKLY" = "Hebdomadairement";
"repeat_BI-WEEKLY" = "Bi-hebdomadairement";
"repeat_NEVER" = "Jamais";
"repeat_DAILY" = "Quotidienne";
"repeat_WEEKLY" = "Hebdomadaire";
"repeat_BI-WEEKLY" = "Toutes les deux semaines";
"repeat_EVERY WEEKDAY" = "Chaque jour ouvrable";
"repeat_MONTHLY" = "Mensuellement";
"repeat_YEARLY" = "Annuellement";
"repeat_MONTHLY" = "Mensuelle";
"repeat_YEARLY" = "Annuelle";
"repeat_CUSTOM" = "Personnaliser...";
"reminder_NONE" = "Pas de rappel";