merge of '6aeeb3251c5dd31e0dac8d1c8470510175e9f5b8'

and '78cbeb2cfe85058b7c9dee2b29c5079d29e518cf'

Monotone-Parent: 6aeeb3251c5dd31e0dac8d1c8470510175e9f5b8
Monotone-Parent: 78cbeb2cfe85058b7c9dee2b29c5079d29e518cf
Monotone-Revision: 9b21095125798a3afffd2df7a2d64d32a2e652d5

Monotone-Author: flachapelle@inverse.ca
Monotone-Date: 2011-04-28T20:11:38
Monotone-Branch: ca.inverse.sogo
maint-2.0.2
Francis Lachapelle 2011-04-28 20:11:38 +00:00
commit be9c57cfd0
4 changed files with 3 additions and 3 deletions

View File

@ -460,7 +460,7 @@ validate_endbeforestart = "The end date that you entered occurs before the st
"Tasks in View" = "Tasks in View";
"eventDeleteConfirmation" = "The following event(s) will be erased: \n%{0}\nWould you like to continue?";
"taskDeleteConfirmation" = "Erasing this task will be permanent.\nWould you like to continue?";
"taskDeleteConfirmation" = "The following task(s) will be erased: \n%{0}\nWould you like to continue?";
"You cannot remove nor unsubscribe from your personal calendar."
= "You cannot remove nor unsubscribe from your personal calendar.";

View File

@ -460,7 +460,7 @@ validate_endbeforestart = "La date de fin est avant la date de début.";
"Tasks in View" = "Afficher les tâches";
"eventDeleteConfirmation" = "Le ou les événements suivants seront supprimés :\n%{0}\nVoulez-vous continuer?";
"taskDeleteConfirmation" = "L'effacement de cette tâche sera permanent.\nVoulez-vous continuer?";
"taskDeleteConfirmation" = "Le ou les tâches suivantes seront supprimées :\n%{0}\nVoulez-vous continuer?";
"You cannot remove nor unsubscribe from your personal calendar."
= "Vous ne pouvez pas supprimer ni vous désabonner de votre agenda personnel.";

View File

@ -453,7 +453,7 @@ validate_endbeforestart = "La data finale specificata è precedente alla data
"Workweek days only" = "Solo giorni lavorativi";
"Tasks in View" = "Attività in elenco";
"eventDeleteConfirmation" = "Stai per cancellare in maniera permanente l'evento.\nVuoi procedere?";
"eventDeleteConfirmation" = "Il seguente evento(i) sarà cancellato: \n%{0}\nVuoi continuare?";
"taskDeleteConfirmation" = "Stai per cancellare in maniera permanente il l'attività.\nVuoi procedere?";
"You cannot remove nor unsubscribe from your personal calendar."