[gnome-keysign: 43/75] Merge translatable strings
- From: Gitlab System User <gitlab src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gnome-keysign: 43/75] Merge translatable strings
- Date: Fri, 29 Sep 2017 11:25:57 +0000 (UTC)
commit 0ccd243c53a5a76643e73acfb1242357848f47b8
Merge: 0fe6e3f 0674ea8
Author: Tobias Mueller <muelli cryptobitch de>
Date: Sun Jul 23 14:31:18 2017 +0200
Merge translatable strings
Because merging with current master causes a conflic in avahioffer.
We resolved that by marking the strings as translatable and keeping the
raw_input hack.
keysign/app.py | 4 +++-
keysign/avahioffer.py | 7 +++++--
keysign/receive.py | 3 ++-
keysign/receive.ui | 4 ++--
keysign/send.py | 4 +++-
keysign/send.ui | 2 +-
6 files changed, 16 insertions(+), 8 deletions(-)
---
diff --cc keysign/avahioffer.py
index 7adbbad,d70bbe2..fe5f143
--- a/keysign/avahioffer.py
+++ b/keysign/avahioffer.py
@@@ -79,11 -82,10 +81,12 @@@ def main(args)
key = get_usable_keys(pattern=args[0])[0]
offer = AvahiHTTPOffer(key)
discovery_info = offer.start()
- print ("Offering key: {}".format(key))
- print ("Discovery info: {}".format(discovery_info))
+ print (_("Offering key: {}").format(key))
+ print (_("Discovery info: {}").format(discovery_info))
+ print (_("Press Enter to stop"))
- raw_input()
+ try: input_ = raw_input
+ except NameError: input_ = input
+ input_("Press Enter to stop")
offer.stop()
if __name__ == "__main__":
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]