From d79dcf7ec44ee87d3fbb5fcd7ce111482fb35234 Mon Sep 17 00:00:00 2001 From: Damian Minkov Date: Tue, 18 Sep 2012 07:41:53 +0000 Subject: [PATCH] Fixes some messages using apostrophe and parameters. Fixes an inaccurate message used in OTR. Contributed by Alexandros Papadopoulos. --- resources/languages/resources.properties | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/resources/languages/resources.properties b/resources/languages/resources.properties index ebaf906d4..42cbc2bc7 100644 --- a/resources/languages/resources.properties +++ b/resources/languages/resources.properties @@ -300,7 +300,9 @@ service.gui.MOVE_TO_GROUP=&Move to group service.gui.MOVE_CONTACT=Move Contact service.gui.MOVE_CONTACT_ERROR=&Contact cannot be moved service.gui.MSG_DELIVERY_FAILURE=The above message could not be delivered -service.gui.MSG_DELIVERY_NOT_SUPPORTED=The protocol you are using doesn't support offline messages. You could try to reach {0} through another protocol or wait until he/she becomes online. +service.gui.MSG_DELIVERY_NOT_SUPPORTED=The protocol you are using doesn''t \ +support offline messages. You could try to reach {0} through another \ +protocol or wait until he/she becomes online. service.gui.MSG_DELIVERY_INTERNAL_ERROR=An internal error occurred. This is most probably a bug. Please report it here: http://www.jitsi.org/index.php/Development/BugsAndIssues. service.gui.MSG_DELIVERY_ERROR=Failed to deliver message. service.gui.MSG_DELIVERY_UNKNOWN_ERROR=Unknown error has occurred while delivering your message. @@ -1276,7 +1278,7 @@ impl.media.security.zrtp.SASSIGNATURE=SAS signature processing impl.media.security.zrtp.DESCRIPTION={0} will automatically try to secure all \ your calls and you will both hear and see a notification once a secure \ connection is established. The following button allows ZRTP experts to fine \ -tune the way {0} behaves during ZRTP negotiation and you don't need to modify \ +tune the way {0} behaves during ZRTP negotiation and you don''t need to modify \ any of them in order to have secure calls. You should only change these \ settings if you are well aware of the way ZRTP and encryption in general work. impl.media.security.zrtp.ZRTP_NINJA=ZRTP Ninja @@ -1377,7 +1379,12 @@ plugin.otr.menu.CB_REQUIRE=Require private messaging plugin.otr.menu.CB_RESET=Reset plugin.otr.menu.OTR_TOOLTIP=Encrypt chats with OTR plugin.otr.authbuddydialog.HELP_URI=http://www.jitsi.org/index.php/GSOC2009/OTR -plugin.otr.authbuddydialog.AUTHENTICATION_INFO=Authenticating a buddy helps ensure that the person you are talking to is who he or she claims to be. To verify the fingerprint, contact your buddy via some other authenticated channel, such as the telephone or GPG-signed email. Each of you should tell your fingerprint to the other. If everything matches up, you should indicate in the above dialog that you *have* verified the fingerprint. +plugin.otr.authbuddydialog.AUTHENTICATION_INFO=Authenticating a buddy helps \ +ensure that the person you are talking to is who he or she claims to be. \ +To verify the fingerprint, contact your buddy via some other authenticated \ +channel, such as the telephone or GPG-signed email. Each of you should tell \ +your fingerprint to the other. If everything matches up, you should indicate \ +in the following dialog that you *have* verified the fingerprint. plugin.otr.authbuddydialog.LOCAL_FINGERPRINT=Fingerprint for you, {0}: {1} plugin.otr.authbuddydialog.REMOTE_FINGERPRINT=Purported fingerprint for {0}: {1} plugin.otr.authbuddydialog.CANCEL=Cancel