From d50af8cc235d0a1829895242fc0da5585e4a2864 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 8 Jul 2009 19:14:30 +0000 Subject: [PATCH 1/2] Monotone-Parent: 13cce380f729a93828b7261702643a96f1d6f502 Monotone-Revision: f59cab33b87189c92c1486ece43d7b86576c8984 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-07-08T19:14:30 Monotone-Branch: ca.inverse.sogo --- UI/Scheduler/French.lproj/Localizable.strings | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) 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"; From cf3fca068c824c71b501cd2bb798dc85e102b749 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Wed, 8 Jul 2009 21:06:11 +0000 Subject: [PATCH 2/2] Monotone-Parent: f59cab33b87189c92c1486ece43d7b86576c8984 Monotone-Revision: 72e05191b28fdea36565f18fc1803f1d197aee92 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2009-07-08T21:06:11 Monotone-Branch: ca.inverse.sogo --- SOPE/sope-gsmake2.diff | 24 ------------------------ 1 file changed, 24 deletions(-) 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)