diff --git a/SOPE/sope-gsmake2.diff b/SOPE/sope-gsmake2.diff index a2172e35f..be7db0877 100644 --- a/SOPE/sope-gsmake2.diff +++ b/SOPE/sope-gsmake2.diff @@ -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) diff --git a/UI/Scheduler/French.lproj/Localizable.strings b/UI/Scheduler/French.lproj/Localizable.strings index 48c6ab45c..cf83e1cc6 100644 --- a/UI/Scheduler/French.lproj/Localizable.strings +++ b/UI/Scheduler/French.lproj/Localizable.strings @@ -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";