Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pidgin-otr
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
39
Issues
39
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Plugins
pidgin-otr
Commits
4bcddf90
Commit
4bcddf90
authored
Aug 27, 2018
by
Jurre van Bergen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gender neutral pronouns are now being used
parent
ca287470
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
809 additions
and
3 deletions
+809
-3
gtk-dialog.c
gtk-dialog.c
+1
-1
otr-plugin.c
otr-plugin.c
+2
-2
po/pidgin-otr.pot
po/pidgin-otr.pot
+806
-0
No files found.
gtk-dialog.c
View file @
4bcddf90
...
...
@@ -1636,7 +1636,7 @@ static void otrg_gtk_dialog_finished(const char *accountname,
username
,
account
);
if
(
!
conv
)
return
;
buf
=
g_strdup_printf
(
_
(
"%s has ended
his/he
r private conversation with "
buf
=
g_strdup_printf
(
_
(
"%s has ended
thei
r private conversation with "
"you; you should do the same."
),
purple_conversation_get_name
(
conv
));
...
...
otr-plugin.c
View file @
4bcddf90
...
...
@@ -483,7 +483,7 @@ static void handle_msg_event_cb(void *opdata, OtrlMessageEvent msg_event,
_
(
"The message was not sent."
));
break
;
case
OTRL_MSGEVENT_CONNECTION_ENDED
:
buf
=
g_strdup_printf
(
_
(
"%s has already closed
his/he
r private "
buf
=
g_strdup_printf
(
_
(
"%s has already closed
thei
r private "
"connection to you"
),
context
->
username
);
display_otr_message_or_notify
(
opdata
,
context
->
accountname
,
context
->
protocol
,
context
->
username
,
_
(
"Your message "
...
...
@@ -491,7 +491,7 @@ static void handle_msg_event_cb(void *opdata, OtrlMessageEvent msg_event,
"or restart it."
),
1
,
OTRL_NOTIFY_ERROR
,
_
(
"Private connection closed"
),
buf
,
_
(
"Your message was not sent. Either close your "
"private connection to
hi
m, or refresh it."
));
"private connection to
the
m, or refresh it."
));
g_free
(
buf
);
break
;
case
OTRL_MSGEVENT_SETUP_ERROR
:
...
...
po/pidgin-otr.pot
0 → 100644
View file @
4bcddf90
# SOME DESCRIPTIVE TITLE.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
# This file is distributed under the same license as the PACKAGE package.
# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
#
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-27 11:50-0400\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"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=CHARSET\n"
"Content-Transfer-Encoding: 8bit\n"
#: ../gtk-dialog.c:338 ../gtk-dialog.c:1146 ../gtk-dialog.c:1150
#: ../gtk-dialog.c:1547 ../gtk-dialog.c:1584 ../gtk-dialog.c:1675
#: ../gtk-dialog.c:1750 ../gtk-dialog.c:2765
msgid "?lang=en"
msgstr ""
#: ../gtk-dialog.c:486
msgid ""
"Your buddy is attempting to determine if he or she is really talking to you, "
"or if it's someone pretending to be you. Your buddy has asked a question, "
"indicated below. To authenticate to your buddy, enter the answer and click "
"OK."
msgstr ""
#: ../gtk-dialog.c:493
msgid ""
"To authenticate using a question, pick a question whose answer is known only "
"to you and your buddy. Enter this question and this answer, then wait for "
"your buddy to enter the answer too. If the answers don't match, then you "
"may be talking to an imposter."
msgstr ""
#: ../gtk-dialog.c:511
#, c-format
msgid "This is the question asked by your buddy:"
msgstr ""
#: ../gtk-dialog.c:514
#, c-format
msgid "Enter question here:"
msgstr ""
#: ../gtk-dialog.c:546 ../gtk-dialog.c:627
msgid "This buddy is already authenticated."
msgstr ""
#: ../gtk-dialog.c:556
#, c-format
msgid "Enter secret answer here (case sensitive):"
msgstr ""
#: ../gtk-dialog.c:596
msgid ""
"To authenticate, pick a secret known only to you and your buddy. Enter this "
"secret, then wait for your buddy to enter it too. If the secrets don't "
"match, then you may be talking to an imposter."
msgstr ""
#: ../gtk-dialog.c:610
#, c-format
msgid "Enter secret here:"
msgstr ""
#: ../gtk-dialog.c:660 ../gtk-dialog.c:1415
msgid ""
"To verify the fingerprint, contact your buddy via some <i>other</i> "
"authenticated channel, such as the telephone or GPG-signed email. Each of "
"you should tell your fingerprint to the other."
msgstr ""
#: ../gtk-dialog.c:664
msgid ""
"If everything matches up, you should choose <b>I have</b> in the menu below."
msgstr ""
#: ../gtk-dialog.c:675 ../gtk-dialog.c:1403
msgid "[none]"
msgstr ""
#: ../gtk-dialog.c:683 ../gtk-dialog.c:1056 ../gtk-dialog.c:1411
#: ../gtk-ui.c:226 ../otr-plugin.c:132 ../otr-plugin.c:305 ../ui.c:115
msgid "Unknown"
msgstr ""
#: ../gtk-dialog.c:684
#, c-format
msgid ""
"Fingerprint for you, %s (%s):\n"
"%s\n"
"\n"
"Purported fingerprint for %s:\n"
"%s\n"
msgstr ""
#: ../gtk-dialog.c:741
msgid "How would you like to authenticate your buddy?"
msgstr ""
#: ../gtk-dialog.c:750
msgid "Question and answer"
msgstr ""
#: ../gtk-dialog.c:753
msgid "Shared secret"
msgstr ""
#: ../gtk-dialog.c:756
msgid "Manual fingerprint verification"
msgstr ""
#: ../gtk-dialog.c:807
msgid "_Authenticate"
msgstr ""
#: ../gtk-dialog.c:841
msgid ""
"Authenticating a buddy helps ensure that the person you are talking to is "
"who he or she claims to be."
msgstr ""
#. Translators: you are asked to authenticate yourself
#: ../gtk-dialog.c:951
msgid "Authenticating to Buddy"
msgstr ""
#. Translators: you asked your buddy to authenticate him/herself
#: ../gtk-dialog.c:953
msgid "Authenticating Buddy"
msgstr ""
#: ../gtk-dialog.c:980
#, c-format
msgid "Authenticating to %s"
msgstr ""
#: ../gtk-dialog.c:981
#, c-format
msgid "Authenticating %s"
msgstr ""
#: ../gtk-dialog.c:1014
msgid "Waiting for buddy..."
msgstr ""
#: ../gtk-dialog.c:1047
msgid "Generating private key"
msgstr ""
#: ../gtk-dialog.c:1048
msgid "Please wait"
msgstr ""
#. Create the Please Wait... dialog
#: ../gtk-dialog.c:1059
#, c-format
msgid "Generating private key for %s (%s)..."
msgstr ""
#: ../gtk-dialog.c:1104
#, c-format
msgid "%s Done."
msgstr ""
#: ../gtk-dialog.c:1144
#, c-format
msgid ""
"%s is contacting you from an unrecognized computer. You should <a href=\"%s"
"%s\">authenticate</a> this buddy."
msgstr ""
#: ../gtk-dialog.c:1148
#, c-format
msgid ""
"%s has not been authenticated yet. You should <a href=\"%s%s"
"\">authenticate</a> this buddy."
msgstr ""
#: ../gtk-dialog.c:1200 ../gtk-dialog.c:1976 ../gtk-dialog.c:2761
#: ../gtk-ui.c:86
msgid "Finished"
msgstr ""
#: ../gtk-dialog.c:1201 ../gtk-dialog.c:1973 ../gtk-dialog.c:2758
#: ../gtk-ui.c:85
msgid "Private"
msgstr ""
#: ../gtk-dialog.c:1202 ../gtk-dialog.c:1970 ../gtk-dialog.c:2755
#: ../gtk-ui.c:84
msgid "Unverified"
msgstr ""
#: ../gtk-dialog.c:1203 ../gtk-ui.c:83
msgid "Not private"
msgstr ""
#: ../gtk-dialog.c:1206
msgid "OTR"
msgstr ""
#. Translators: the following four messages should give alternative
#. * sentences. The user selects the first or second message in a combo box;
#. * the third message, a new line, a fingerprint, a new line, and
#. * the fourth message will follow it.
#: ../gtk-dialog.c:1356
msgid "I have not"
msgstr ""
#. 2nd message
#: ../gtk-dialog.c:1358
msgid "I have"
msgstr ""
#. 3rd message
#: ../gtk-dialog.c:1361
msgid " verified that this is in fact the correct"
msgstr ""
#. 4th message
#: ../gtk-dialog.c:1371
#, c-format
msgid "fingerprint for %s."
msgstr ""
#: ../gtk-dialog.c:1399
#, c-format
msgid "Verify fingerprint for %s"
msgstr ""
#: ../gtk-dialog.c:1412
#, c-format
msgid ""
"<small><i>%s %s\n"
"\n"
"</i></small>Fingerprint for you, %s (%s):\n"
"%s\n"
"\n"
"Purported fingerprint for %s:\n"
"%s\n"
msgstr ""
#: ../gtk-dialog.c:1419
msgid ""
"If everything matches up, you should indicate in the above dialog that you "
"<b>have</b> verified the fingerprint."
msgstr ""
#: ../gtk-dialog.c:1425 ../gtk-ui.c:858
msgid "Verify fingerprint"
msgstr ""
#: ../gtk-dialog.c:1449
#, c-format
msgid "Authentication from %s"
msgstr ""
#: ../gtk-dialog.c:1452
#, c-format
msgid "Authenticate %s"
msgstr ""
#: ../gtk-dialog.c:1456
msgid "Authenticate Buddy"
msgstr ""
#: ../gtk-dialog.c:1487
msgid "An error occurred during authentication."
msgstr ""
#: ../gtk-dialog.c:1502
msgid "Authentication successful."
msgstr ""
#: ../gtk-dialog.c:1505
msgid ""
"Your buddy has successfully authenticated you. You may want to authenticate "
"your buddy as well by asking your own question."
msgstr ""
#: ../gtk-dialog.c:1511
msgid "Authentication failed."
msgstr ""
#: ../gtk-dialog.c:1541
#, c-format
msgid "Private conversation with %s started.%s%s"
msgstr ""
#: ../gtk-dialog.c:1545
#, c-format
msgid "<a href=\"%s%s\">Unverified</a> conversation with %%s started.%%s%%s"
msgstr ""
#. This last case should never happen, since we know
#. * we're in ENCRYPTED.
#: ../gtk-dialog.c:1553
#, c-format
msgid "Not private conversation with %s started.%s%s"
msgstr ""
#: ../gtk-dialog.c:1559 ../gtk-dialog.c:1688
msgid " Warning: using old protocol version 1."
msgstr ""
#: ../gtk-dialog.c:1561
msgid " Your client is logging this conversation."
msgstr ""
#: ../gtk-dialog.c:1562
msgid " Your client is not logging this conversation."
msgstr ""
#: ../gtk-dialog.c:1581
#, c-format
msgid ""
"Your buddy is logged in multiple times and OTR has established <a href=\"%s%s"
"\">multiple sessions</a>. Use the icon menu above if you wish to select the "
"outgoing session."
msgstr ""
#: ../gtk-dialog.c:1601
#, c-format
msgid "Private conversation with %s lost."
msgstr ""
#: ../gtk-dialog.c:1639
#, c-format
msgid ""
"%s has ended their private conversation with you; you should do the same."
msgstr ""
#: ../gtk-dialog.c:1667
#, c-format
msgid "Successfully refreshed the private conversation with %s.%s"
msgstr ""
#: ../gtk-dialog.c:1672
#, c-format
msgid ""
"Successfully refreshed the <a href=\"%s%s\">unverified</a> conversation with "
"%%s.%%s"
msgstr ""
#. This last case should never happen, since we know
#. * we're in ENCRYPTED.
#: ../gtk-dialog.c:1681
#, c-format
msgid "Successfully refreshed the not private conversation with %s.%s"
msgstr ""
#: ../gtk-dialog.c:1714
#, c-format
msgid "Attempting to refresh the private conversation with %s..."
msgstr ""
#: ../gtk-dialog.c:1716
#, c-format
msgid "Attempting to start a private conversation with %s..."
msgstr ""
#: ../gtk-dialog.c:1906 ../gtk-dialog.c:2028
msgid "Start _private conversation"
msgstr ""
#: ../gtk-dialog.c:1907
msgid "Refresh _private conversation"
msgstr ""
#: ../gtk-dialog.c:1912
msgid "Re_authenticate buddy"
msgstr ""
#: ../gtk-dialog.c:1913 ../gtk-dialog.c:2032
msgid "_Authenticate buddy"
msgstr ""
#: ../gtk-dialog.c:1967 ../gtk-dialog.c:2752
msgid "Not Private"
msgstr ""
#: ../gtk-dialog.c:1989
msgid "_What's this?"
msgstr ""
#: ../gtk-dialog.c:2030
msgid "_End private conversation"
msgstr ""
#: ../gtk-dialog.c:2215 ../gtk-dialog.c:2266
#, c-format
msgid ""
"Warning: The selected outgoing OTR session (%u) is not the most recently "
"active one (%u). Your buddy may not receive your messages. Use the icon menu "
"above to select a different outgoing session."
msgstr ""
#: ../gtk-dialog.c:2282
msgid "Send to most secure"
msgstr ""
#: ../gtk-dialog.c:2284
msgid "Send to most recent"
msgstr ""
#: ../gtk-dialog.c:2388
#, c-format
msgid "Session %u"
msgstr ""
#: ../gtk-dialog.c:2407 ../gtk-dialog.c:2518
msgid "Select"
msgstr ""
#: ../gtk-dialog.c:2422
msgid "Selected"
msgstr ""
#: ../gtk-dialog.c:2747
#, c-format
msgid ""
"The privacy status of the current conversation is now: <a href=\"%s%s\">%s</"
"a>"
msgstr ""
#: ../gtk-dialog.c:2979
msgid "OTR Messaging"
msgstr ""
#: ../gtk-ui.c:106
#, c-format
msgid "Fingerprint: %.80s"
msgstr ""
#: ../gtk-ui.c:110
msgid "No key present"
msgstr ""
#: ../gtk-ui.c:115
msgid "No account available"
msgstr ""
#: ../gtk-ui.c:193
msgid "Unused"
msgstr ""
#: ../gtk-ui.c:222
msgid "Yes"
msgstr ""
#: ../gtk-ui.c:222
msgid "No"
msgstr ""
#: ../gtk-ui.c:487
msgid "Enable private messaging"
msgstr ""
#: ../gtk-ui.c:489
msgid "Automatically initiate private messaging"
msgstr ""
#: ../gtk-ui.c:491
msgid "Require private messaging"
msgstr ""
#: ../gtk-ui.c:494
msgid "Don't log OTR conversations"
msgstr ""
#: ../gtk-ui.c:538
msgid "Show OTR button in toolbar"
msgstr ""
#: ../gtk-ui.c:677
msgid "My private keys"
msgstr ""
#: ../gtk-ui.c:686
msgid "Key for account:"
msgstr ""
#: ../gtk-ui.c:711
msgid "Generate"
msgstr ""
#: ../gtk-ui.c:752
msgid "Default OTR Settings"
msgstr ""
#: ../gtk-ui.c:779
msgid "OTR UI Options"
msgstr ""
#: ../gtk-ui.c:802
msgid "Screenname"
msgstr ""
#: ../gtk-ui.c:803
msgid "Status"
msgstr ""
#: ../gtk-ui.c:804
msgid "Verified"
msgstr ""
#: ../gtk-ui.c:805
msgid "Fingerprint"
msgstr ""
#: ../gtk-ui.c:806
msgid "Account"
msgstr ""
#: ../gtk-ui.c:842
msgid "Start private connection"
msgstr ""
#: ../gtk-ui.c:850
msgid "End private connection"
msgstr ""
#: ../gtk-ui.c:866
msgid "Forget fingerprint"
msgstr ""
#: ../gtk-ui.c:917
msgid "Config"
msgstr ""
#: ../gtk-ui.c:919
msgid "Known fingerprints"
msgstr ""
#: ../gtk-ui.c:1017 ../otr-plugin.c:1002
msgid "OTR Settings"
msgstr ""
#. Set the title
#: ../gtk-ui.c:1035
#, c-format
msgid "OTR Settings for %s"
msgstr ""
#. Make the cascaded checkboxes
#: ../gtk-ui.c:1052
msgid "Use default OTR settings for this buddy"
msgstr ""
#: ../otr-plugin.c:130
#, c-format
msgid "You are not currently connected to account %s (%s)."
msgstr ""
#: ../otr-plugin.c:134
msgid "Not connected"
msgstr ""
#: ../otr-plugin.c:217 ../otr-plugin.c:259
#, c-format
msgid "Out of memory building filenames!\n"
msgstr ""
#: ../otr-plugin.c:229 ../otr-plugin.c:265
#, c-format
msgid "Could not write private key file\n"
msgstr ""
#: ../otr-plugin.c:303
#, c-format
msgid "Unknown account %s (%s)."
msgstr ""
#: ../otr-plugin.c:307
msgid "Unknown account"
msgstr ""
#: ../otr-plugin.c:369
msgid "Error occurred encrypting message."
msgstr ""
#: ../otr-plugin.c:373
#, c-format
msgid "You sent encrypted data to %s, who wasn't expecting it."
msgstr ""
#: ../otr-plugin.c:379
msgid "You transmitted an unreadable encrypted message."
msgstr ""
#: ../otr-plugin.c:382
msgid "You transmitted a malformed data message."
msgstr ""
#: ../otr-plugin.c:395
msgid "[resent]"
msgstr ""
#: ../otr-plugin.c:464
#, c-format
msgid "You attempted to send an unencrypted message to %s"
msgstr ""
#: ../otr-plugin.c:467
msgid "Attempting to start a private conversation..."
msgstr ""
#: ../otr-plugin.c:469
msgid "OTR Policy Violation"
msgstr ""
#: ../otr-plugin.c:470
msgid ""
"Unencrypted messages to this recipient are not allowed. Attempting to start "
"a private conversation.\n"
"\n"
"Your message will be retransmitted when the private conversation starts."
msgstr ""
#: ../otr-plugin.c:479
msgid ""
"An error occurred when encrypting your message. The message was not sent."
msgstr ""
#: ../otr-plugin.c:481
msgid "Error encrypting message"
msgstr ""
#: ../otr-plugin.c:482
msgid "An error occurred when encrypting your message"
msgstr ""
#: ../otr-plugin.c:483
msgid "The message was not sent."
msgstr ""
#: ../otr-plugin.c:486
#, c-format
msgid "%s has already closed their private connection to you"
msgstr ""
#: ../otr-plugin.c:489
msgid ""
"Your message was not sent. Either end your private conversation, or restart "
"it."
msgstr ""
#: ../otr-plugin.c:492
msgid "Private connection closed"
msgstr ""
#: ../otr-plugin.c:493
msgid ""
"Your message was not sent. Either close your private connection to them, or "
"refresh it."
msgstr ""