diff --git a/SoObjects/Appointments/SOGoAptMailDeletion.m b/SoObjects/Appointments/SOGoAptMailDeletion.m index dec1e8c04..e0c13c8ee 100644 --- a/SoObjects/Appointments/SOGoAptMailDeletion.m +++ b/SoObjects/Appointments/SOGoAptMailDeletion.m @@ -22,17 +22,19 @@ #include "SOGoAptMailNotification.h" @interface SOGoAptMailEnglishDeletion : SOGoAptMailNotification -{ -} @end @implementation SOGoAptMailEnglishDeletion @end @interface SOGoAptMailFrenchDeletion : SOGoAptMailNotification -{ -} @end @implementation SOGoAptMailFrenchDeletion @end + +@interface SOGoAptMailGermanDeletion : SOGoAptMailNotification +@end + +@implementation SOGoAptMailGermanDeletion +@end diff --git a/SoObjects/Appointments/SOGoAptMailInvitation.m b/SoObjects/Appointments/SOGoAptMailInvitation.m index 64f8a8b75..84d4b3f7c 100644 --- a/SoObjects/Appointments/SOGoAptMailInvitation.m +++ b/SoObjects/Appointments/SOGoAptMailInvitation.m @@ -19,20 +19,22 @@ 02111-1307, USA. */ -#include "SOGoAptMailNotification.h" +#import "SOGoAptMailNotification.h" @interface SOGoAptMailEnglishInvitation : SOGoAptMailNotification -{ -} @end @implementation SOGoAptMailEnglishInvitation @end @interface SOGoAptMailFrenchInvitation : SOGoAptMailNotification -{ -} @end @implementation SOGoAptMailFrenchInvitation @end + +@interface SOGoAptMailGermanInvitation : SOGoAptMailNotification +@end + +@implementation SOGoAptMailGermanInvitation +@end diff --git a/SoObjects/Appointments/SOGoAptMailRemoval.m b/SoObjects/Appointments/SOGoAptMailRemoval.m index d10493f81..0053ce4be 100644 --- a/SoObjects/Appointments/SOGoAptMailRemoval.m +++ b/SoObjects/Appointments/SOGoAptMailRemoval.m @@ -19,20 +19,22 @@ 02111-1307, USA. */ -#include "SOGoAptMailNotification.h" +#import "SOGoAptMailNotification.h" @interface SOGoAptMailEnglishRemoval : SOGoAptMailNotification -{ -} @end @implementation SOGoAptMailEnglishRemoval @end @interface SOGoAptMailFrenchRemoval : SOGoAptMailNotification -{ -} @end @implementation SOGoAptMailFrenchRemoval @end + +@interface SOGoAptMailGermanRemoval : SOGoAptMailNotification +@end + +@implementation SOGoAptMailGermanRemoval +@end diff --git a/SoObjects/Mailer/GNUmakefile b/SoObjects/Mailer/GNUmakefile index 698e6b6fa..2abb34c71 100644 --- a/SoObjects/Mailer/GNUmakefile +++ b/SoObjects/Mailer/GNUmakefile @@ -30,9 +30,7 @@ Mailer_OBJC_FILES += \ SOGoDraftsFolder.m \ SOGoDraftObject.m \ \ - SOGoMailForward.m \ - SOGoMailEnglishForward.m \ - SOGoMailFrenchForward.m + SOGoMailForward.m Mailer_RESOURCE_FILES += \ Version \ @@ -40,7 +38,8 @@ Mailer_RESOURCE_FILES += \ Mailer_RESOURCE_FILES += \ SOGoMailEnglishForward.wo \ - SOGoMailFrenchForward.wo + SOGoMailFrenchForward.wo \ + SOGoMailGermanForward.wo -include GNUmakefile.preamble include $(GNUSTEP_MAKEFILES)/wobundle.make diff --git a/SoObjects/Mailer/SOGoMailEnglishForward.m b/SoObjects/Mailer/SOGoMailEnglishForward.m deleted file mode 100644 index 73e2b50e0..000000000 --- a/SoObjects/Mailer/SOGoMailEnglishForward.m +++ /dev/null @@ -1,29 +0,0 @@ -/* SOGoMailEnglishForward.m - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import "SOGoMailForward.h" - -@interface SOGoMailEnglishForward : SOGoMailForward -@end - -@implementation SOGoMailEnglishForward -@end diff --git a/SoObjects/Mailer/SOGoMailForward.h b/SoObjects/Mailer/SOGoMailForward.h index 6ad18c018..d5da45494 100644 --- a/SoObjects/Mailer/SOGoMailForward.h +++ b/SoObjects/Mailer/SOGoMailForward.h @@ -38,4 +38,13 @@ @end +@interface SOGoMailEnglishForward : SOGoMailForward +@end + +@interface SOGoMailFrenchForward : SOGoMailForward +@end + +@interface SOGoMailGermanForward : SOGoMailForward +@end + #endif /* SOGOMAILFORWARD_H */ diff --git a/SoObjects/Mailer/SOGoMailForward.m b/SoObjects/Mailer/SOGoMailForward.m index a09db3736..ce3545ddb 100644 --- a/SoObjects/Mailer/SOGoMailForward.m +++ b/SoObjects/Mailer/SOGoMailForward.m @@ -150,3 +150,12 @@ } @end + +@implementation SOGoMailEnglishForward +@end + +@implementation SOGoMailFrenchForward +@end + +@implementation SOGoMailGermanForward +@end diff --git a/SoObjects/Mailer/SOGoMailFrenchForward.m b/SoObjects/Mailer/SOGoMailFrenchForward.m deleted file mode 100644 index cb229b0a4..000000000 --- a/SoObjects/Mailer/SOGoMailFrenchForward.m +++ /dev/null @@ -1,29 +0,0 @@ -/* SOGoMailFrenchForward.m - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import "SOGoMailForward.h" - -@interface SOGoMailFrenchForward : SOGoMailForward -@end - -@implementation SOGoMailFrenchForward -@end diff --git a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html index eb2429712..26fa08039 100644 --- a/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html +++ b/SoObjects/Mailer/SOGoMailGermanForward.wo/SOGoMailGermanForward.html @@ -1,4 +1,4 @@ --------- Message original -------- +-------- Original E-Mail -------- Betreff: <#subject/> Datum: <#date/> Sender: <#from/> diff --git a/UI/SOGoUI/GNUmakefile b/UI/SOGoUI/GNUmakefile index 554741b55..034e2764c 100644 --- a/UI/SOGoUI/GNUmakefile +++ b/UI/SOGoUI/GNUmakefile @@ -28,11 +28,7 @@ libSOGoUI_OBJC_FILES += \ SOGoJSStringFormatter.m \ WOContext+UIx.m \ \ - SOGoACLAdvisory.m \ - SOGoACLFrenchAdditionAdvisory.m \ - SOGoACLFrenchRemovalAdvisory.m \ - SOGoACLEnglishAdditionAdvisory.m \ - SOGoACLEnglishRemovalAdvisory.m + SOGoACLAdvisory.m # make diff --git a/UI/SOGoUI/SOGoACLAdvisory.h b/UI/SOGoUI/SOGoACLAdvisory.h index 788a49a02..c6ac9b664 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.h +++ b/UI/SOGoUI/SOGoACLAdvisory.h @@ -47,4 +47,22 @@ @end +@interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdvisory +@end + +@interface SOGoACLEnglishRemovalAdvisory : SOGoACLAdvisory +@end + +@interface SOGoACLFrenchAdditionAdvisory : SOGoACLAdvisory +@end + +@interface SOGoACLFrenchRemovalAdvisory : SOGoACLAdvisory +@end + +@interface SOGoACLGermanAdditionAdvisory : SOGoACLAdvisory +@end + +@interface SOGoACLGermanRemovalAdvisory : SOGoACLAdvisory +@end + #endif /* SOGOACLADVISORY_H */ diff --git a/UI/SOGoUI/SOGoACLAdvisory.m b/UI/SOGoUI/SOGoACLAdvisory.m index 31b42ad6c..12c2be31b 100644 --- a/UI/SOGoUI/SOGoACLAdvisory.m +++ b/UI/SOGoUI/SOGoACLAdvisory.m @@ -209,3 +209,21 @@ } @end + +@implementation SOGoACLEnglishAdditionAdvisory +@end + +@implementation SOGoACLEnglishRemovalAdvisory +@end + +@implementation SOGoACLFrenchAdditionAdvisory +@end + +@implementation SOGoACLFrenchRemovalAdvisory +@end + +@implementation SOGoACLGermanAdditionAdvisory +@end + +@implementation SOGoACLGermanRemovalAdvisory +@end diff --git a/UI/SOGoUI/SOGoACLEnglishAdditionAdvisory.h b/UI/SOGoUI/SOGoACLEnglishAdditionAdvisory.h deleted file mode 100644 index cfc2bc5c7..000000000 --- a/UI/SOGoUI/SOGoACLEnglishAdditionAdvisory.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SOGoACLEnglishAdditionAdvisory.h - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef SOGOACLFRENCHADDITIONADVISORY_H -#define SOGOACLFRENCHADDITIONADVISORY_H - -#import "SOGoACLAdvisory.h" - -@interface SOGoACLEnglishAdditionAdvisory : SOGoACLAdvisory -@end - -#endif /* SOGOACLFRENCHADDITIONADVISORY_H */ diff --git a/UI/SOGoUI/SOGoACLEnglishAdditionAdvisory.m b/UI/SOGoUI/SOGoACLEnglishAdditionAdvisory.m deleted file mode 100644 index 323684dc7..000000000 --- a/UI/SOGoUI/SOGoACLEnglishAdditionAdvisory.m +++ /dev/null @@ -1,32 +0,0 @@ -/* SOGoACLEnglishAdditionAdvisory.m - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import "SOGoACLEnglishAdditionAdvisory.h" - -@implementation SOGoACLEnglishAdditionAdvisory - -- (NSString *) aclMethod -{ - return @"add"; -} - -@end diff --git a/UI/SOGoUI/SOGoACLEnglishRemovalAdvisory.h b/UI/SOGoUI/SOGoACLEnglishRemovalAdvisory.h deleted file mode 100644 index 7590f1060..000000000 --- a/UI/SOGoUI/SOGoACLEnglishRemovalAdvisory.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SOGoACLEnglishRemovalAdvisory.h - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef SOGOACLENGLISHREMOVALADVISORY_H -#define SOGOACLENGLISHREMOVALADVISORY_H - -#import "SOGoACLAdvisory.h" - -@interface SOGoACLEnglishRemovalAdvisory : SOGoACLAdvisory -@end - -#endif /* SOGOACLENGLISHREMOVALADVISORY_H */ diff --git a/UI/SOGoUI/SOGoACLEnglishRemovalAdvisory.m b/UI/SOGoUI/SOGoACLEnglishRemovalAdvisory.m deleted file mode 100644 index f5eacbcf0..000000000 --- a/UI/SOGoUI/SOGoACLEnglishRemovalAdvisory.m +++ /dev/null @@ -1,32 +0,0 @@ -/* SOGoACLEnglishRemovalAdvisory.m - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import "SOGoACLEnglishRemovalAdvisory.h" - -@implementation SOGoACLEnglishRemovalAdvisory - -- (NSString *) aclMethod -{ - return @"add"; -} - -@end diff --git a/UI/SOGoUI/SOGoACLFrenchAdditionAdvisory.h b/UI/SOGoUI/SOGoACLFrenchAdditionAdvisory.h deleted file mode 100644 index 2b482ac18..000000000 --- a/UI/SOGoUI/SOGoACLFrenchAdditionAdvisory.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SOGoACLFrenchAdditionAdvisory.h - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef SOGOACLFRENCHADDITIONADVISORY_H -#define SOGOACLFRENCHADDITIONADVISORY_H - -#import "SOGoACLAdvisory.h" - -@interface SOGoACLFrenchAdditionAdvisory : SOGoACLAdvisory -@end - -#endif /* SOGOACLFRENCHADDITIONADVISORY_H */ diff --git a/UI/SOGoUI/SOGoACLFrenchAdditionAdvisory.m b/UI/SOGoUI/SOGoACLFrenchAdditionAdvisory.m deleted file mode 100644 index 229dcbc95..000000000 --- a/UI/SOGoUI/SOGoACLFrenchAdditionAdvisory.m +++ /dev/null @@ -1,27 +0,0 @@ -/* SOGoACLFrenchAdditionAdvisory.m - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import "SOGoACLFrenchAdditionAdvisory.h" - -@implementation SOGoACLFrenchAdditionAdvisory - -@end diff --git a/UI/SOGoUI/SOGoACLFrenchRemovalAdvisory.h b/UI/SOGoUI/SOGoACLFrenchRemovalAdvisory.h deleted file mode 100644 index 9a6c9634d..000000000 --- a/UI/SOGoUI/SOGoACLFrenchRemovalAdvisory.h +++ /dev/null @@ -1,31 +0,0 @@ -/* SOGoACLFrenchRemovalAdvisory.h - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#ifndef SOGOACLFRENCHREMOVALADVISORY_H -#define SOGOACLFRENCHREMOVALADVISORY_H - -#import "SOGoACLAdvisory.h" - -@interface SOGoACLFrenchRemovalAdvisory : SOGoACLAdvisory -@end - -#endif /* SOGOACLFRENCHREMOVALADVISORY_H */ diff --git a/UI/SOGoUI/SOGoACLFrenchRemovalAdvisory.m b/UI/SOGoUI/SOGoACLFrenchRemovalAdvisory.m deleted file mode 100644 index 050d2cfca..000000000 --- a/UI/SOGoUI/SOGoACLFrenchRemovalAdvisory.m +++ /dev/null @@ -1,27 +0,0 @@ -/* SOGoACLFrenchRemovalAdvisory.m - this file is part of SOGo - * - * Copyright (C) 2007 Inverse groupe conseil - * - * Author: Wolfgang Sourdeau - * - * This file is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2, or (at your option) - * any later version. - * - * This file is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; see the file COPYING. If not, write to - * the Free Software Foundation, Inc., 59 Temple Place - Suite 330, - * Boston, MA 02111-1307, USA. - */ - -#import "SOGoACLFrenchRemovalAdvisory.h" - -@implementation SOGoACLFrenchRemovalAdvisory - -@end