[sip-comm-dev] [Fwd: svn commit: r5349 - trunk/resources/languages/resources.properties]


#1

Hey Romain,

Maybe it would be better to commit this to 1.0. I am currently working
on automated merge procedures so all 1.0 changes would eventually end up
in trunk too. The opposite however is not going to happen.

Cheers
Emil

From: rkuntz@dev.java.net

Author: rkuntz
New Revision: 5349

Modified:
   trunk/resources/languages/resources.properties

Log:
Fixed a label typo in the english resource file

Modified: trunk/resources/languages/resources.properties
Url:
https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/resources/languages/resources.properties?view=diff&rev=5349&p1=trunk/resources/languages/resources.properties&p2=trunk/resources/languages/resources.properties&r1=5348&r2=5349

···

-------- Original Message --------
Subject: svn commit: r5349 - trunk/resources/languages/resources.properties
Date: 5 Jun 2009 10:02:13 -0000
Reply-To: commits@sip-communicator.dev.java.net
To: commits@sip-communicator.dev.java.net
Date: 2009-06-05 10:02:11+0000

--- trunk/resources/languages/resources.properties (original)
+++ trunk/resources/languages/resources.properties 2009-06-05 10:02:11+0000
@@ -100,7 +100,7 @@
service.gui.CONNECTING=Connecting...
service.gui.CONNECTION_FAILED_MSG=Connection failed for the following
account: User name: {0}, Server name: {1}. Please check your network
connection or contact your network administrator for more information.
service.gui.CONNECTION_EXPIRED_MSG=You are currently disconnected from
the {0} server.
-service.gui.CONNECTION_REQUIRED_TO_service.gui.JOIN=You have to be
connected in order to join a chat room. Please connect and then try again.
+service.gui.CONNECTION_REQUIRED_TO_JOIN=You have to be connected in
order to join a chat room. Please connect and then try again.
service.gui.CONNECTION_REQUIRED_TO_LEAVE=You have to be connected in
order to leave a chat room.
service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The choosen {0} contact
doesn''t support telephony.
service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net

--
Emil Ivov, Ph.D. 30a rue de la Patrie
Project Lead 67300 Schiltigheim, France
SIP Communicator
emcho@sip-communicator.org FAX: +33.1.77.62.47.31
http://sip-communicator.org PHONE: +33.1.77.62.43.30

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#2

Hi Emil,

Sure, I forgot about this. I'll checkout the 1.0 branch and commit it there too.

romain

···

On 2009/06/05, at 12:07, Emil Ivov wrote:

Hey Romain,

Maybe it would be better to commit this to 1.0. I am currently working
on automated merge procedures so all 1.0 changes would eventually end up
in trunk too. The opposite however is not going to happen.

Cheers
Emil

-------- Original Message --------
Subject: svn commit: r5349 - trunk/resources/languages/resources.properties
Date: 5 Jun 2009 10:02:13 -0000
From: rkuntz@dev.java.net
Reply-To: commits@sip-communicator.dev.java.net
To: commits@sip-communicator.dev.java.net

Author: rkuntz
Date: 2009-06-05 10:02:11+0000
New Revision: 5349

Modified:
  trunk/resources/languages/resources.properties

Log:
Fixed a label typo in the english resource file

Modified: trunk/resources/languages/resources.properties
Url:
https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/resources/languages/resources.properties?view=diff&rev=5349&p1=trunk/resources/languages/resources.properties&p2=trunk/resources/languages/resources.properties&r1=5348&r2=5349

--- trunk/resources/languages/resources.properties (original)
+++ trunk/resources/languages/resources.properties 2009-06-05 10:02:11+0000
@@ -100,7 +100,7 @@
service.gui.CONNECTING=Connecting...
service.gui.CONNECTION_FAILED_MSG=Connection failed for the following
account: User name: {0}, Server name: {1}. Please check your network
connection or contact your network administrator for more information.
service.gui.CONNECTION_EXPIRED_MSG=You are currently disconnected from
the {0} server.
-service.gui.CONNECTION_REQUIRED_TO_service.gui.JOIN=You have to be
connected in order to join a chat room. Please connect and then try again.
+service.gui.CONNECTION_REQUIRED_TO_JOIN=You have to be connected in
order to join a chat room. Please connect and then try again.
service.gui.CONNECTION_REQUIRED_TO_LEAVE=You have to be connected in
order to leave a chat room.
service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The choosen {0} contact
doesn''t support telephony.
service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net

--
Emil Ivov, Ph.D. 30a rue de la Patrie
Project Lead 67300 Schiltigheim, France
SIP Communicator
emcho@sip-communicator.org FAX: +33.1.77.62.47.31
http://sip-communicator.org PHONE: +33.1.77.62.43.30

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#3

Sure, I forgot about this. I'll checkout the 1.0 branch and commit it there too.

By the way, shall I revert the fix on the trunk?

romain

···

On 2009/06/05, at 13:34, Romain KUNTZ wrote:

On 2009/06/05, at 12:07, Emil Ivov wrote:

Hey Romain,

Maybe it would be better to commit this to 1.0. I am currently working
on automated merge procedures so all 1.0 changes would eventually end up
in trunk too. The opposite however is not going to happen.

Cheers
Emil

-------- Original Message --------
Subject: svn commit: r5349 - trunk/resources/languages/resources.properties
Date: 5 Jun 2009 10:02:13 -0000
From: rkuntz@dev.java.net
Reply-To: commits@sip-communicator.dev.java.net
To: commits@sip-communicator.dev.java.net

Author: rkuntz
Date: 2009-06-05 10:02:11+0000
New Revision: 5349

Modified:
trunk/resources/languages/resources.properties

Log:
Fixed a label typo in the english resource file

Modified: trunk/resources/languages/resources.properties
Url:
https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/resources/languages/resources.properties?view=diff&rev=5349&p1=trunk/resources/languages/resources.properties&p2=trunk/resources/languages/resources.properties&r1=5348&r2=5349

--- trunk/resources/languages/resources.properties (original)
+++ trunk/resources/languages/resources.properties 2009-06-05 10:02:11+0000
@@ -100,7 +100,7 @@
service.gui.CONNECTING=Connecting...
service.gui.CONNECTION_FAILED_MSG=Connection failed for the following
account: User name: {0}, Server name: {1}. Please check your network
connection or contact your network administrator for more information.
service.gui.CONNECTION_EXPIRED_MSG=You are currently disconnected from
the {0} server.
-service.gui.CONNECTION_REQUIRED_TO_service.gui.JOIN=You have to be
connected in order to join a chat room. Please connect and then try again.
+service.gui.CONNECTION_REQUIRED_TO_JOIN=You have to be connected in
order to join a chat room. Please connect and then try again.
service.gui.CONNECTION_REQUIRED_TO_LEAVE=You have to be connected in
order to leave a chat room.
service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The choosen {0} contact
doesn''t support telephony.
service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net

--
Emil Ivov, Ph.D. 30a rue de la Patrie
Project Lead 67300 Schiltigheim, France
SIP Communicator
emcho@sip-communicator.org FAX: +33.1.77.62.47.31
http://sip-communicator.org PHONE: +33.1.77.62.43.30

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net


#4

No that should be ok. It would also help me test potential conflicts.

Thanks!
Emil

Romain KUNTZ wrote:

···

On 2009/06/05, at 13:34, Romain KUNTZ wrote:

Sure, I forgot about this. I'll checkout the 1.0 branch and commit
it there too.

By the way, shall I revert the fix on the trunk?

romain

On 2009/06/05, at 12:07, Emil Ivov wrote:

Hey Romain,

Maybe it would be better to commit this to 1.0. I am currently
working
on automated merge procedures so all 1.0 changes would eventually
end up
in trunk too. The opposite however is not going to happen.

Cheers
Emil

-------- Original Message --------
Subject: svn commit: r5349 - trunk/resources/languages/
resources.properties
Date: 5 Jun 2009 10:02:13 -0000
From: rkuntz@dev.java.net
Reply-To: commits@sip-communicator.dev.java.net
To: commits@sip-communicator.dev.java.net

Author: rkuntz
Date: 2009-06-05 10:02:11+0000
New Revision: 5349

Modified:
trunk/resources/languages/resources.properties

Log:
Fixed a label typo in the english resource file

Modified: trunk/resources/languages/resources.properties
Url:
https://sip-communicator.dev.java.net/source/browse/sip-communicator/trunk/resources/languages/resources.properties?view=diff&rev=5349&p1=trunk/resources/languages/resources.properties&p2=trunk/resources/languages/resources.properties&r1=5348&r2=5349

=

=

=

=

=====================================================================
--- trunk/resources/languages/resources.properties (original)
+++ trunk/resources/languages/resources.properties 2009-06-05
10:02:11+0000
@@ -100,7 +100,7 @@
service.gui.CONNECTING=Connecting...
service.gui.CONNECTION_FAILED_MSG=Connection failed for the following
account: User name: {0}, Server name: {1}. Please check your network
connection or contact your network administrator for more
information.
service.gui.CONNECTION_EXPIRED_MSG=You are currently disconnected
from
the {0} server.
-service.gui.CONNECTION_REQUIRED_TO_service.gui.JOIN=You have to be
connected in order to join a chat room. Please connect and then try
again.
+service.gui.CONNECTION_REQUIRED_TO_JOIN=You have to be connected in
order to join a chat room. Please connect and then try again.
service.gui.CONNECTION_REQUIRED_TO_LEAVE=You have to be connected in
order to leave a chat room.
service.gui.CONTACT_NOT_SUPPORTING_TELEPHONY=The choosen {0} contact
doesn''t support telephony.
service.gui.CONTACT_PAUSED_TYPING={0} paused typing the message

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: commits-help@sip-communicator.dev.java.net

--
Emil Ivov, Ph.D. 30a rue de la Patrie
Project Lead 67300 Schiltigheim,
France
SIP Communicator
emcho@sip-communicator.org FAX:
+33.1.77.62.47.31
http://sip-communicator.org PHONE:
+33.1.77.62.43.30

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-
communicator.dev.java.net

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net

--
Emil Ivov, Ph.D. 30a rue de la Patrie
Project Lead 67300 Schiltigheim, France
SIP Communicator
emcho@sip-communicator.org FAX: +33.1.77.62.47.31
http://sip-communicator.org PHONE: +33.1.77.62.43.30

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@sip-communicator.dev.java.net
For additional commands, e-mail: dev-help@sip-communicator.dev.java.net