Permalink
Browse files

Revert "Merge branch 'master' of git+ssh://gitorious.process-one.net/…

…oneteam/oneteam"

This reverts commit b0c8f2c, reversing
changes made to 6138b5e.
  • Loading branch information...
1 parent 0ff94e8 commit 908cd81ccf986f0907cb37ac44211026f64f0f71 @prefiks prefiks committed Aug 18, 2011
View
10 chrome/oneteam/content/JavaScript/history.js
@@ -515,7 +515,6 @@ _DECL_(HistoryManager, null, CallbacksList, Model).prototype =
addMessage: function(msg)
{
-dump("addMessage:\n");
var oldFormatEditMessage = !!oldFormatEditMessageRegex.test(msg.text);
if (oldFormatEditMessage || msg.replaceMessageId) {
var lastMsg = this.getLastMessageFromContact(msg.contact);
@@ -527,11 +526,10 @@ dump("addMessage:\n");
tryToConvertOldFormatEditMessage(msg, lastMsg);
}
- var archivedThread, idx = this._sessionThreads.indexOf(msg.threadID);
+ var archivedThread, idx = this._sessionThreads.indexOf(msg.thread);
if (idx < 0) {
var stmt = this.addThreadStmt;
- //var threadContact = msg.thread.contact;
- var threadContact = msg.messagesManager;
+ var threadContact = msg.thread.contact;
if (threadContact.contact && (!threadContact.contact.exitRoom || !msg.isMucMessage))
threadContact = threadContact.contact;
@@ -543,7 +541,7 @@ dump("addMessage:\n");
archivedThread = this._archivedThreads[rowId] =
new ArchivedMessagesThread(threadContact, rowId, msg.time);
- this._sessionThreads.push(msg.threadID);
+ this._sessionThreads.push(msg.thread);
this._sessionArchivedThreads.push(archivedThread)
for (var observer in this._iterateCallbacks("threads-"+threadContact.jid))
@@ -695,7 +693,6 @@ dump("addMessage:\n");
},
getLastMessagesFromContact: function(contact, count, token) {
-dump("getLastMessagesFromContact:("+contact.jid+", "+count+", "+token+")\n");
var olderThan = Infinity;
if (typeof(token) == "number") {
@@ -724,7 +721,6 @@ dump("getLastMessagesFromContact:("+contact.jid+", "+count+", "+token+")\n");
var lastThread = token.threads[token.threads.length-1];
if (lastThread) {
-dump("lastThread = " + lastThread + "\n");
lastThread.getNewMessages();
token.lastIndex = lastThread.allMessages.length-1;
}
View
52 chrome/oneteam/content/JavaScript/model/account.js
@@ -35,20 +35,7 @@ ML.importMod("filetransfer.js");
function Account()
{
- this.groups = []
- this.allGroups = {}
- this.contacts = {};
- this.allContacts = {};
- this.resources = {};
- this.myResources = {};
- this.conferences = [];
- this.allConferences = {};
- this.gateways = {};
- this._presenceObservers = [];
- this.avatarHash = this.avatar = null;
- this.avatarRetrieved = false;
- this._initConnectionState = 0;
- this.reconnectStep = 0;
+ this._initialize();
this.currentPresence = {show: "unavailable"};
this.cache = new PersistentCache("oneteamCache");
@@ -222,25 +209,20 @@ _DECL_(Account, null, Model, DiscoItem, vCardDataAccessor).prototype =
getOrCreateContact: function(jid, showInRoster, name, groups)
{
-try {
jid = new JID(jid);
+ var normalizedJID = jid.normalizedJID;
- if (jid.resource && this.allConferences[jid.shortJID])
- return this.allContacts[jid.longJID] || new ConferenceMember(jid)
-
- if (this.allContacts[jid.shortJID])
- return this.allContacts[jid.shortJID];
- if (this.allConferences[jid.shortJID])
- return this.allConferences[jid.shortJID];
-
+ if (this.allContacts[normalizedJID])
+ return this.allContacts[normalizedJID];
+ if (this.allConferences[normalizedJID])
+ return this.allConferences[normalizedJID];
if (showInRoster) {
var contact = new Contact(jid, name, groups||[this.notInRosterGroup],
null, null);
contact.newItem = true;
return contact;
- }
- return new Contact(jid, name, groups, null, null, true);
-} catch(ex) {dump("account.getOrCreateContact: " + ex + "\n");}
+ } else
+ return new Contact(jid, name, groups, null, null, true);
},
getOrCreateResource: function(jid)
@@ -973,6 +955,24 @@ try {
this._initConnectionStep(1);
},
+ _initialize: function()
+ {
+ this.groups = []
+ this.allGroups = {}
+ this.contacts = {};
+ this.allContacts = {};
+ this.resources = {};
+ this.myResources = {};
+ this.conferences = [];
+ this.allConferences = {};
+ this.gateways = {};
+ this._presenceObservers = [];
+ this.avatarHash = this.avatar = null;
+ this.avatarRetrieved = false;
+ this._initConnectionState = 0;
+ this.reconnectStep = 0;
+ },
+
_reconnectTimeoutFun: function(token) {
if (token.time == 0) {
token.model.connect();
View
8 chrome/oneteam/content/JavaScript/model/conference.js
@@ -363,7 +363,7 @@ _DECL_(Conference, Contact).prototype =
this.joinRoom(null, newNick);
},
- /*sendMessage: function(msg)
+ sendMessage: function(msg)
{
if (!msg)
return;
@@ -374,7 +374,7 @@ _DECL_(Conference, Contact).prototype =
msg.fillPacket(message);
account.connection.send(message);
- },*/
+ },
changeSubject: function(subject)
{
@@ -530,10 +530,10 @@ _DECL_(Conference, Contact).prototype =
subject = pkt.getChild("subject");
if (!subject)
return true;
- if (subject.textContent == this.subject)
+ if ((subject = subject.textContent) == this.subject)
return false;
- this.subject = subject.textContent;
+ this.subject = subject;
if (!pkt.getBody() || (new JID(pkt.getFrom())).resource) {
var resource = this.getOrCreateResource(pkt.getFrom());
View
44 chrome/oneteam/content/JavaScript/model/messages.js
@@ -5,8 +5,6 @@ ML.importMod("modeltypes.js");
ML.importMod("dateutils.js");
ML.importMod("views/chattabs.js");
-ML.importMod("model/messagesManager.js"); // temporary
-
function MessagesRouter(parentRouter)
{
this.parentRouter = parentRouter; // defined for resources: parentRouter is the Contact
@@ -188,7 +186,7 @@ _DECL_(MessagesRouter).prototype =
return shown;
},
- /*recoverResourceThreads: function(resource)
+ recoverResourceThreads: function(resource)
{
for each (var thr in this.threads) {
if (thr.contact.jid == resource.jid) {
@@ -202,7 +200,7 @@ _DECL_(MessagesRouter).prototype =
if (thr.chatPane)
thr.chatPane.thread = thr;
}
- },*/
+ },
_markThreadAsActive: function(thread, contact)
{
@@ -259,7 +257,7 @@ function MessagesThread(threadID, contact)
this.messages = [];
this._threadID = threadID;
- //this._contactIds = [];
+ this._contactIds = [];
this.unseenCount = 0;
this.contact = contact;
if (contact && contact.hasDiscoFeature) {
@@ -332,7 +330,7 @@ _DECL_(MessagesThread, Model).prototype =
return this.chatState == "gone" || this.peerChatState == "gone";
},
- /*getContactID: function(contact)
+ getContactID: function(contact)
{
if (contact.representsMe)
return 0;
@@ -343,7 +341,7 @@ _DECL_(MessagesThread, Model).prototype =
this._contactIds.push(contact);
return this._contactIds.length;
- },*/
+ },
get peerHandlesHtmlIM() {
if (this.contact instanceof Conference)
@@ -426,7 +424,7 @@ _DECL_(MessagesThread, Model).prototype =
var len = this.messages.length;
- //msg.queues.push(this);
+ msg.queues.push(this);
this.messages.push(msg);
this.modelUpdated("messages", {added: [msg]});
account.historyMgr.addMessage(msg);
@@ -492,7 +490,7 @@ _DECL_(MessagesThread, Model).prototype =
this._afterFirstOurMessage = true;
if (!(this.contact instanceof Conference) && msg.text) {
- //msg.queues.push(this);
+ msg.queues.push(this);
this.messages.push(msg);
this.modelUpdated("messages", {added: [msg]});
account.historyMgr.addMessage(msg);
@@ -528,7 +526,7 @@ _DECL_(MessagesThread, Model).prototype =
}
}
-function Message(body, body_html, contact, type, time, threadID, chatState, myNick, messageId)
+function Message(body, body_html, contact, type, time, thread, chatState, myNick, messageId)
{
this.contact = contact;
this.type = type;
@@ -558,8 +556,8 @@ function Message(body, body_html, contact, type, time, threadID, chatState, myNi
"http://jabber.org/protocol/chatstates", "*")[0];
if (cs)
this.chatState = cs.localName;
- if (!threadID)
- threadID = body.getThread();
+ if (!thread)
+ thread = body.getThread();
var remoteDebug = body.getNode().
getElementsByTagNameNS("http://process-one.net/remote-debug", "enabled")[0];
@@ -608,13 +606,12 @@ function Message(body, body_html, contact, type, time, threadID, chatState, myNi
this.messageId = messageId ? messageId : generateRandomName(12);
}
- /*if (thread instanceof MessagesThread)
+ if (thread instanceof MessagesThread)
this.thread = thread;
else
- this._threadID = thread;*/
- this.threadID = threadID;
+ this._threadID = thread;
- //this.queues = [];
+ this.queues = [];
this.unseen = true;
}
@@ -623,18 +620,18 @@ _DECL_(Message).prototype =
epoch: 0,
dontGroup: false,
- /*get contactId() {
+ get contactId() {
if (this._contactId == null)
this._contactId = this.thread.getContactID(this.contact)
return this._contactId;
- },*/
+ },
- /*get threadID() {
+ get threadID() {
if (!this._threadID && this.thread)
this._threadID = this.thread.threadID;
return this._threadID;
- },*/
+ },
get isNormalMessage() {
return (this.type & 3) == 0;
@@ -782,12 +779,12 @@ _DECL_(Message).prototype =
delete this._msgEl;
},
- /*msgDelivered: function()
+ msgDelivered: function()
{
for (var i = 0; i < this.queues.length; i++)
this.queues[i].removeMessage(this);
this.queues = [];
- },*/
+ },
markAsSeen: function()
{
@@ -796,8 +793,7 @@ _DECL_(Message).prototype =
fillPacket: function(pkt)
{
- //if (!this.isMucMessage && (this.thread || this._threadID))
- if (!this.isMucMessage && this.threadID)
+ if (!this.isMucMessage && (this.thread || this._threadID))
pkt.setThread(this.threadID);
if (this.chatState)
View
25 chrome/oneteam/content/JavaScript/model/roster.js
@@ -105,8 +105,7 @@ _DECL_(Group, null, Model).prototype =
function Contact(jid, name, groups, subscription, subscriptionAsk, newItem)
{
this.init();
- //MessagesRouter.call(this);
- MessagesManager.call(this);
+ MessagesRouter.call(this);
if (jid instanceof Node)
[jid, name, subscription, subscriptionAsk, groups] = this._parseNode(jid);
@@ -145,12 +144,10 @@ function Contact(jid, name, groups, subscription, subscriptionAsk, newItem)
this._checkForJingleResource();
account.allContacts[this.jid.normalizedJID] = this;
-dump("new Contact: account.allContacts["+this.jid.normalizedJID+"] = " + this + "\n");
this.gateway = account.gateways[this.jid.normalizedJID.domain];
}
-//_DECL_(Contact, null, Model, vCardDataAccessor, Comparator, DiscoItem, MessagesRouter).prototype =
-_DECL_(Contact, null, Model, vCardDataAccessor, Comparator, DiscoItem, MessagesManager).prototype =
+_DECL_(Contact, null, Model, vCardDataAccessor, Comparator, DiscoItem, MessagesRouter).prototype =
{
contactContainer: false,
avatar: null,
@@ -351,7 +348,7 @@ _DECL_(Contact, null, Model, vCardDataAccessor, Comparator, DiscoItem, MessagesM
return this.createResource(jid);
},
- /*sendMessage: function(msg)
+ sendMessage: function(msg)
{
var message = new JSJaCMessage();
message.setTo(this.jid);
@@ -360,14 +357,14 @@ _DECL_(Contact, null, Model, vCardDataAccessor, Comparator, DiscoItem, MessagesM
msg.fillPacket(message);
account.connection.send(message);
- },*/
+ },
onMessage: function(packet)
{
if (packet.getType() == "error")
return;
- this.receiveMessage(new Message(packet, null, this));
+ this.routeMessage(new Message(packet, null, this));
},
subscribe: function(reason, allowToSeeMe)
@@ -586,7 +583,7 @@ _DECL_(Contact, null, Model, vCardDataAccessor, Comparator, DiscoItem, MessagesM
var notifyGroups = !this.activeResource;
var oldActiveResource = this.activeResource;
- //this.recoverResourceThreads(resource);
+ this.recoverResourceThreads(resource);
this.resources.push(resource);
@@ -740,7 +737,7 @@ _DECL_(Resource, null, Model, DiscoItem, Comparator,
version: version && version.textContent,
os: os && os.textContent
}
- }), MessagesManager).prototype =
+ }), MessagesRouter).prototype =
{
_registered: false,
presence: new Presence("unavailable"),
@@ -849,7 +846,7 @@ _DECL_(Resource, null, Model, DiscoItem, Comparator,
delete account.resources[this.jid.normalizedJID];
},
- /*sendMessage: function(msg)
+ sendMessage: function(msg)
{
var message = new JSJaCMessage();
message.setTo(this.jid);
@@ -858,14 +855,14 @@ _DECL_(Resource, null, Model, DiscoItem, Comparator,
msg.fillPacket(message);
account.connection.send(message);
- },*/
+ },
onMessage: function(packet)
{
if (packet.getType() == "error")
return;
- this.receiveMessage(new Message(packet, null, this));
+ this.routeMessage(new Message(packet, null, this));
},
onAdHocCommand: function()
@@ -946,7 +943,7 @@ _DECL_(MyResourcesContact, Contact).prototype =
if (packet.getType() == "error")
return;
- this.receiveMessage(new Message(packet, null, this.resources[0]), this.resources[0]);
+ this.routeMessage(new Message(packet, null, this.resources[0]), this.resources[0]);
},
onPresence: function() {
View
4 chrome/oneteam/content/JavaScript/services/manager.js
@@ -314,12 +314,12 @@ _DECL_(ServicesManager).prototype =
}
var item;
- /*if (from.resource) {
+ if (from.resource) {
item = account.getOrCreateResource(from);
if (!item && pkt.getType() != "groupchat")
item = account.getOrCreateContact(from.getShortJID(), true).
createResource(from);
- } else*/
+ } else
item = account.getOrCreateContact(from);
if (item)
View
60 chrome/oneteam/content/JavaScript/views/chattabs.js
@@ -1,6 +1,6 @@
var EXPORTED_SYMBOLS = ["chatTabsController"];
-/*function ChatPane(thread, controller) {
+function ChatPane(thread, controller) {
this._thread = thread;
this._controller = controller;
@@ -49,48 +49,6 @@ _DECL_(ChatPane).prototype = {
if (this._controller._focus == this)
this._content.focus();
}
-}*/
-
-// ai remplacé thread par contact
-function ChatPane(contact, controller) {
- this._contact = contact;
- this._controller = controller;
-
- contact._onChatPaneClosed =
- META.after(new Callback(this._onChatPaneClosed, this));
-}
-
-_DECL_(ChatPane).prototype = {
- get contact() {
- return this._contact;
- },
-
- get closed() {
- this._content ? this._content.closed : true;
- },
-
- close: function() {
- if (this._content)
- this._content.close();
- },
-
- _onChatPaneClosed: function() {
- this._controller._onChatPaneClosed(this);
- },
-
- focus: function() {
- if (!this._content)
- this._controller._focus = this;
- else
- this._content.focus();
- },
-
- _attach: function(controller) {
- this._content = controller.openTab(this._contact);
-
- if (this._controller._focus == this)
- this._content.focus();
- }
}
function ChatTabsController() {
@@ -107,22 +65,22 @@ _DECL_(ChatTabsController, null, Model).prototype = {
return !this._controller
},
- openTab: function(contact) {
- var chatPane = new ChatPane(contact, this);
+ openTab: function(thread) {
+ var chatPane = new ChatPane(thread, this);
if (this._controller && !this._chatWindow.closed) {
- this._chatPanes[contact.jid] = chatPane;
+ this._chatPanes[thread.contact.jid] = chatPane;
chatPane._attach(this._controller);
this.modelUpdated("_chatPanes", {added: [chatPane]});
// remove contact from this._pastChats
- var idx = this._pastChats.indexOf(contact);
+ var idx = this._pastChats.indexOf(thread.contact);
if (idx >= 0)
this._pastChats.splice(idx, 1);
} else {
if (this._chatWindow && this._chatWindow.closed)
this._onChatWindowClosed();
- this._chatPanes[contact.jid] = chatPane;
+ this._chatPanes[thread.contact.jid] = chatPane;
if (!this._chatWindow)
this._chatWindow = openDialogUniq("ot:chats",
"chrome://oneteam/content/chats.xul",
@@ -156,11 +114,11 @@ _DECL_(ChatTabsController, null, Model).prototype = {
if (this._inClose)
return;
- delete this._chatPanes[chatPane.contact.jid];
+ delete this._chatPanes[chatPane.thread.contact.jid];
this.modelUpdated("_chatPanes", {removed: [chatPane]});
- this._pastChats.push(chatPane.contact);
+ this._pastChats.push(chatPane.thread.contact);
for (var key in this._chatPanes)
return; // in order to skip this._chatWindow.close() if there remains chatPanes
@@ -180,7 +138,7 @@ _DECL_(ChatTabsController, null, Model).prototype = {
this._inClose = true;
for each (var chatPane in this._chatPanes) {
- this._pastChats.push(chatPane.contact);
+ this._pastChats.push(chatPane.thread.contact);
chatPane.close();
}
this.modelUpdated("_chatPanes", {removed: this._chatPanes});
View
26 chrome/oneteam/content/bindings/chatpane.xml
@@ -389,15 +389,14 @@
</method>
<method name="_onMessageQueueChanged">
- <!--parameter name="model"/>
+ <parameter name="model"/>
<parameter name="name"/>
- <parameter name="arg"/-->
+ <parameter name="arg"/>
<body><![CDATA[
if (!this._initialized)
return;
- //var newMessages = arg ? arg.added : this._model.messages;
- var newMessages = this._model.messages;
+ var newMessages = arg ? arg.added : this._model.messages;
if (!this._msgs) {
[this.archivedMsgToken, this._msgs, this._hasMoreArchivedMessages] =
@@ -418,8 +417,7 @@
this._appendTimeout = window.setTimeout(function(t, initial){
t._appendMessages(initial)
-// }, 50, this, !model);
- }, 50, this, true);
+ }, 50, this, !model);
]]></body>
</method>
@@ -2075,16 +2073,16 @@
<property name="model" onget="return this._model">
<setter><![CDATA[
- var isConference = val instanceof Conference;
- var hasRoster = val && val.ViewConstructor;
+ var isConference = val && val.contact instanceof Conference;
+ var hasRoster = val && val.contact && val.contact.ViewConstructor;
this._model = val;
- this._contactInfo.model = val;
+ this._contactInfo.model = val && val.contact;
this._output.model = val;
this._output._input = this._input;
this._input._output = this._output;
- this._chatpaneCommands.model = val;
- this.completionEngine = val && val.createCompletionEngine();
+ this._chatpaneCommands.model = val && val.contact;
+ this.completionEngine = val && val.contact.createCompletionEngine();
if (this._regToken) {
this._regToken.unregisterFromAll();
@@ -2096,12 +2094,12 @@
this._rosterView = null;
}
- if (val) {
- this._contactInfo.parentNode.menuModel = val;
+ if (val && val.contact) {
+ this._contactInfo.parentNode.menuModel = val.contact;
this._contactInfo.parentNode.setAttribute("context",
(isConference ? "conference" : "contact")+"-contextmenu");
if (hasRoster)
- this._rosterView = new val.ViewConstructor(val, this._roster);
+ this._rosterView = new val.contact.ViewConstructor(val.contact, this._roster);
if (isConference) {
this._regToken = account.bookmarks.registerView(this._onBookmarksUpdated, this,
View
43 chrome/oneteam/content/bindings/chattabbox.xml
@@ -77,12 +77,10 @@
]]></constructor>
<method name="openTab">
- <parameter name="contact"/>
+ <parameter name="thread"/>
<body><![CDATA[
// Search for tab with this same jid (contact may lost track of chatpane
// after resource disconnection/connection
-dump("openTab\n");
-try {
var tab, tabpanel;
var content = document.createElementNS(XULNS, "chattab-content");
@@ -109,7 +107,7 @@ try {
else
tab.previousSibling.removeAttribute("last-tab");
- content.contact = contact;
+ content.thread = thread;
tabpanel.controller = content;
tab.controller = content;
@@ -123,7 +121,6 @@ try {
content.focus();
return content;
-} catch (ex) {dump("openTab: " + ex + "\n")}
]]></body>
</method>
@@ -300,15 +297,15 @@ try {
</content>
<implementation>
- <property name="contact" onget="return this._contact">
+ <property name="thread" onget="return this._thread">
<setter><![CDATA[
- if (this._contact == val)
+ if (this._thread == val)
return;
- if (this._contact && this._contact.unseenCount)
- this._onUnseenCountChange(null, null, {diff: -this._contact.unseenCount});
+ if (this._thread && this._thread.unseenCount)
+ this._onUnseenCountChange(null, null, {diff: -this._thread.unseenCount});
- this._contact = val;
+ this._thread = val;
this._chatpane.model = val;
if (val && val.unseenCount)
@@ -323,7 +320,7 @@ try {
this._regBundle.unregister();
if (val) {
- this._regBundle.register(val, this._onNameChange, "visibleName");
+ this._regBundle.register(val.contact, this._onNameChange, "visibleName");
this._regBundle.register(val, this._onUnseenCountChange, "unseenCount");
this._regBundle.register(val, this._onPeerChatStateChange, "peerChatState");
}
@@ -354,24 +351,22 @@ try {
<method name="close">
<body><![CDATA[
-try {
this.closed = true;
if (this._activateTimer) {
clearTimeout(this._activateTimer);
delete this._activateTimer;
}
- if (this.contact)
- this.contact._onChatPaneClosed();
+ if (this.thread)
+ this.thread._onChatPaneClosed();
this._updateChatState("gone");
- if (this.contact instanceof Conference)
- this.contact.exitRoom();
+ if (this.thread && this.thread.contact instanceof Conference)
+ this.thread.contact.exitRoom();
this._tabbox._removeTab(this);
-} catch(ex) {dump("chattab-content.close: " + ex);}
]]></body>
</method>
@@ -448,7 +443,7 @@ try {
if (!_this)
_this = this;
- if (!_this.contact || !_this.contact.peerHandlesChatState)
+ if (!_this.thread || !_this.thread.peerHandlesChatState)
return;
if (_this._chatStateTimeout) {
@@ -460,14 +455,14 @@ try {
if (state == "active" || state == "paused")
_this._chatStateTimeout = setTimeout(_this._updateChatState, 30000, "inactive", _this);
- _this.contact.chatState = state;
+ _this.thread.chatState = state;
]]></body>
</method>
<method name="_onPeerChatStateChange">
<body><![CDATA[
if (this._chatpane._contactInfo && this._chatpane._contactInfo.updateChatState)
- this._chatpane._contactInfo.updateChatState((this._contact && this._contact.peerChatState) || "");
+ this._chatpane._contactInfo.updateChatState((this._thread && this._thread.peerChatState) || "");
this._syncTabColor();
]]></body>
</method>
@@ -488,19 +483,19 @@ try {
<method name="_onNameChange">
<body><![CDATA[
- var count = this._contact ? this._contact.unseenCount : 0;
+ var count = this._thread ? this._thread.unseenCount : 0;
var countStr = !count ? "" : count == 1 ?
"* " : "["+count+"] ";
- this._tab.setAttribute("label", countStr + (this._contact ? this._contact.visibleName : ""));
+ this._tab.setAttribute("label", countStr + (this._thread ? this._thread.contact.visibleName : ""));
]]></body>
</method>
<method name="_syncTabColor">
<body><![CDATA[
- if (this._contact.unseenCount)
+ if (this._thread.unseenCount)
this._tab.setAttribute("chatstate", "modified");
- else if (this._contact.peerChatState == "composing")
+ else if (this._thread.peerChatState == "composing")
this._tab.setAttribute("chatstate", "composing");
else
this._tab.removeAttribute("chatstate");
View
2 po/branding/oneteam.pot
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: OneTeam 1.0\n"
-"POT-Creation-Date: 2011-08-17 11:19+0200\n"
+"POT-Creation-Date: 2011-07-22 18:03+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
View
18 po/es.po
@@ -71,9 +71,7 @@ msgstr "Cambiar Apodo"
msgid "New Nick:"
msgstr "Nuevo Apodo:"
-#: ../chrome/oneteam/content/status.xul:8 ../chrome/oneteam/content/test.xul:8
-#: ../chrome/oneteam/content/waveBrowser.xul:8
-#: ../chrome/oneteam/content/waveTest.xul:8
+#: ../chrome/oneteam/content/status.xul:8
msgid "Status Message"
msgstr "Mensaje de Estado"
@@ -1275,11 +1273,11 @@ msgstr "No eres miembro de esta sala"
msgid "(Anonymous)"
msgstr "(Anónimo)"
-#: ../chrome/oneteam/content/JavaScript/model/messages.js:1030
+#: ../chrome/oneteam/content/JavaScript/model/messages.js:1000
msgid "Click to load image"
msgstr "Pulsa para cargar la imagen"
-#: ../chrome/oneteam/content/JavaScript/model/messages.js:1032
+#: ../chrome/oneteam/content/JavaScript/model/messages.js:1002
msgid "Always load images from that contact"
msgstr "Siempre cargar las imágenes de este contacto"
@@ -1596,19 +1594,19 @@ msgstr "Transferencia de fichero aceptada"
msgid "User <b>{0}</b> accepted your <b>\"{1}\\\"</b> file"
msgstr "El usuario <b>{0}</b> ha aceptado tu fichero <b>\"{1}\\\"</b>"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:993
+#: ../chrome/oneteam/content/JavaScript/model/account.js:982
msgid "Reconnecting in {0} {0, plurals, second,seconds}"
msgstr "Reconectando en {0} {0, plurals, segundo,segundos}"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1278
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1267
msgid "Conflict (same account/resource signed in from another client)"
msgstr "Conflicto (otro cliente está conectado a la misma cuenta y recurso)"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1287
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1276
msgid "Invalid username or password"
msgstr "El nombre de usuario o la contraseña no son válidos"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1289
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1278
msgid "Invalid response from server"
msgstr "Respuesta del servidor no válida"
@@ -2363,7 +2361,7 @@ msgstr "Rechazar"
msgid "Ignore"
msgstr "Ignorar"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1106
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1095
msgid "<b>{0}</b> would like to see your status."
msgstr "<b>{0}</b> quiere ver tu estado."
View
18 po/fr.po
@@ -69,9 +69,7 @@ msgstr "Changer le pseudo"
msgid "New Nick:"
msgstr "Nouveau pseudo :"
-#: ../chrome/oneteam/content/status.xul:8 ../chrome/oneteam/content/test.xul:8
-#: ../chrome/oneteam/content/waveBrowser.xul:8
-#: ../chrome/oneteam/content/waveTest.xul:8
+#: ../chrome/oneteam/content/status.xul:8
msgid "Status Message"
msgstr "Message d'état"
@@ -1273,11 +1271,11 @@ msgstr "Vous n'êtes pas membre de ce salon"
msgid "(Anonymous)"
msgstr "(Anonyme)"
-#: ../chrome/oneteam/content/JavaScript/model/messages.js:1030
+#: ../chrome/oneteam/content/JavaScript/model/messages.js:1000
msgid "Click to load image"
msgstr "Cliquer pour charger l'image"
-#: ../chrome/oneteam/content/JavaScript/model/messages.js:1032
+#: ../chrome/oneteam/content/JavaScript/model/messages.js:1002
msgid "Always load images from that contact"
msgstr "Toujours charger les images pour ce contact"
@@ -1594,19 +1592,19 @@ msgstr "Transfert de fichier accepté"
msgid "User <b>{0}</b> accepted your <b>\"{1}\\\"</b> file"
msgstr "L'utilisateur <b>{0}</b> a accepté votre fichier <b>\"{1}\\\"</b>"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:993
+#: ../chrome/oneteam/content/JavaScript/model/account.js:982
msgid "Reconnecting in {0} {0, plurals, second,seconds}"
msgstr "Reconnexion dans {0} {0, plurals, seconde, secondes}"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1278
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1267
msgid "Conflict (same account/resource signed in from another client)"
msgstr "Conflit (le même compte/ressource s'est connecté depuis un autre client)"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1287
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1276
msgid "Invalid username or password"
msgstr "Identifiant ou mot de passe incorrect"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1289
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1278
msgid "Invalid response from server"
msgstr "Réponse invalide du serveur"
@@ -2361,7 +2359,7 @@ msgstr "Refuser"
msgid "Ignore"
msgstr "Ignorer"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1106
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1095
msgid "<b>{0}</b> would like to see your status."
msgstr "<b>{0}</b> souhaite voir votre état."
View
17 po/oneteam.pot
@@ -67,9 +67,6 @@ msgid "New Nick:"
msgstr ""
#: ../chrome/oneteam/content/status.xul:8
-#: ../chrome/oneteam/content/test.xul:8
-#: ../chrome/oneteam/content/waveBrowser.xul:8
-#: ../chrome/oneteam/content/waveTest.xul:8
msgid "Status Message"
msgstr ""
@@ -1271,11 +1268,11 @@ msgstr ""
msgid "(Anonymous)"
msgstr ""
-#: ../chrome/oneteam/content/JavaScript/model/messages.js:1030
+#: ../chrome/oneteam/content/JavaScript/model/messages.js:1000
msgid "Click to load image"
msgstr ""
-#: ../chrome/oneteam/content/JavaScript/model/messages.js:1032
+#: ../chrome/oneteam/content/JavaScript/model/messages.js:1002
msgid "Always load images from that contact"
msgstr ""
@@ -1592,19 +1589,19 @@ msgstr ""
msgid "User <b>{0}</b> accepted your <b>\"{1}\\\"</b> file"
msgstr ""
-#: ../chrome/oneteam/content/JavaScript/model/account.js:993
+#: ../chrome/oneteam/content/JavaScript/model/account.js:982
msgid "Reconnecting in {0} {0, plurals, second,seconds}"
msgstr ""
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1278
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1267
msgid "Conflict (same account/resource signed in from another client)"
msgstr ""
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1287
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1276
msgid "Invalid username or password"
msgstr ""
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1289
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1278
msgid "Invalid response from server"
msgstr ""
@@ -2359,7 +2356,7 @@ msgstr ""
msgid "Ignore"
msgstr ""
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1106
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1095
msgid "<b>{0}</b> would like to see your status."
msgstr ""
View
20 po/pl.po
@@ -70,9 +70,7 @@ msgstr "Zmień pseudonim"
msgid "New Nick:"
msgstr "Nowy pseudonim:"
-#: ../chrome/oneteam/content/status.xul:8 ../chrome/oneteam/content/test.xul:8
-#: ../chrome/oneteam/content/waveBrowser.xul:8
-#: ../chrome/oneteam/content/waveTest.xul:8
+#: ../chrome/oneteam/content/status.xul:8
msgid "Status Message"
msgstr "Komunikat stanu"
@@ -87,7 +85,7 @@ msgstr "Dostępny"
#: ../chrome/oneteam/content/main.xul:452
#: ../chrome/oneteam/content/status.xul:96
msgid "Available for chat"
-msgstr "Chce porozmawiać"
+msgstr "Chciałby pogadać"
#: ../chrome/oneteam/content/JavaScript/model/presence.js:131
#: ../chrome/oneteam/content/main.xul:454
@@ -1274,11 +1272,11 @@ msgstr "Nie jesteś członkiem tego pokoju"
msgid "(Anonymous)"
msgstr "(Anonim)"
-#: ../chrome/oneteam/content/JavaScript/model/messages.js:1030
+#: ../chrome/oneteam/content/JavaScript/model/messages.js:1000
msgid "Click to load image"
msgstr "Kliknij by załadować"
-#: ../chrome/oneteam/content/JavaScript/model/messages.js:1032
+#: ../chrome/oneteam/content/JavaScript/model/messages.js:1002
msgid "Always load images from that contact"
msgstr "Zawsze wyświetlaj obrazki od tego kontaktu"
@@ -1595,19 +1593,19 @@ msgstr "Prośba przesłania pliku zaakceptowana"
msgid "User <b>{0}</b> accepted your <b>\"{1}\\\"</b> file"
msgstr "Kontakt <b>{0}</b> zaakceptował twój plik <b>\"{1}\\\"</b>"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:993
+#: ../chrome/oneteam/content/JavaScript/model/account.js:982
msgid "Reconnecting in {0} {0, plurals, second,seconds}"
msgstr "Ponowne łączenia za {0} {0, plurals, sekunda, sekundy, sekund}"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1278
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1267
msgid "Conflict (same account/resource signed in from another client)"
msgstr "Konflikt (klient z tym samym zasobem zalogował się)"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1287
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1276
msgid "Invalid username or password"
msgstr "Nieprawidłowa nazwa użytkownika lub hasło"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1289
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1278
msgid "Invalid response from server"
msgstr "Nieprawidłowa odpowiedz z serwera"
@@ -2362,7 +2360,7 @@ msgstr "Odmów"
msgid "Ignore"
msgstr "Ignoruj"
-#: ../chrome/oneteam/content/JavaScript/model/account.js:1106
+#: ../chrome/oneteam/content/JavaScript/model/account.js:1095
msgid "<b>{0}</b> would like to see your status."
msgstr "<b>{0}</b> chciałby widzieć twój status"

0 comments on commit 908cd81

Please sign in to comment.