amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-23 04:15:26 +00:00
Code Issues Projects Releases Wiki Activity

Small fix to the DnD code for contacts and small French translation fix for the "Tentative" status

Browse Source 
Monotone-Parent: 82a45236051a8825c5786369ead73de38b7f5183
Monotone-Revision: 9db82412ca8b860c427e66329c7aad43fc24aea4

Monotone-Author: ludovic@Sophos.ca
Monotone-Date: 2010-07-21T00:20:30
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Ludovic Marcotte
2010-07-21 00:20:30 +00:00
parent 65ec32bfb7
commit f1258d4bc7
6 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/Common/UIxFolderActions.m
+1 -1
View File
@@ -1,6 +1,6 @@
/* UIxFolderActions.m - this file is part of SOGo
*
* Copyright (C) 2007 Inverse inc.
* Copyright (C) 2007-2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
UI/Contacts/UIxContactFoldersView.m
+1 -1
View File
@@ -1,6 +1,6 @@
/* UIxContactFoldersView.m - this file is part of SOGo
*
* Copyright (C) 2006-2009 Inverse inc.
* Copyright (C) 2006-2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
UI/Contacts/UIxContactsUserFolders.m
+1 -1
View File
@@ -1,6 +1,6 @@
/* UIxContactsUserFolders.m - this file is part of SOGo
*
* Copyright (C) 2007 Inverse inc.
* Copyright (C) 2007-2010 Inverse inc.
*
* Author: Wolfgang Sourdeau <wsourdeau@inverse.ca>
*
UI/MailPartViewers/French.lproj/Localizable.strings
+1 -1
View File
@@ -22,7 +22,7 @@ request_info = "vous invite à une réunion.";
"Update status" = "Intégrer les modifications";
Accept = "Accepter";
Decline = "Decliner";
Tentative = "Tentative";
Tentative = "Tentatif";
"Delegate ..." = "Déléguer ...";
"Delegated to" = "Délégué à";
"Update status in calendar" = "Mettre l'agenda à jour";
UI/Scheduler/French.lproj/Localizable.strings
+2 -2
View File
@@ -318,7 +318,7 @@
/* status type */
"status_" = "Non-spécifié";
"status_NOT-SPECIFIED" = "Non spécifié";
"status_TENTATIVE" = "Tentative";
"status_TENTATIVE" = "Tentatif";
"status_CONFIRMED" = "Confirmé";
"status_CANCELLED" = "Annulé";
"status_NEEDS-ACTION" = "En attente";
@@ -470,7 +470,7 @@ validate_endbeforestart = "La date de fin est avant la date de début.";
"Needs action" = "En attente";
"Accepted" = "Accepté";
"Declined" = "Décliné";
"Tentative" = "Tentative";
"Tentative" = "Tentatif";
"Free" = "Libre";
"Busy" = "Occupé";
UI/WebServerResources/ContactsUI.js
+1 -1
View File
@@ -1311,7 +1311,7 @@ function dropSelectedContacts (action, toId) {
}
}
var fromId = $(selectedFolders[0]).id;
if (!currentFolderIsRemote () || action != "move") {
if (!currentFolderIsRemote () && fromId.substring(1) != toId) {
var url = ApplicationBaseURL + fromId + "/" + action
+ "?folder=" + toId + "&uid="
+ contactIds.join("&uid=");