[seahorse/nielsdg/wip/killing-intltool] Deprecating intltool in favor of gettext.

[Niels De Graef <nielsdg src gnome org>]

commit 0a9801cd9dc0f75e5ad5637fe7930558fc9e6d9f
Author: Niels De Graef <nielsdegraef gmail com>
Date:   Wed Apr 26 22:39:46 2017 +0200

    Deprecating intltool in favor of gettext.

 Makefile.am                  |   10 +--
 Makefile.decl                |    4 +-
 configure.ac                 |    4 +-
 data/Makefile.am             |    6 +-
 data/seahorse.appdata.xml    |  218 ++++++++++++++++++++++++++++++++++++++++++
 data/seahorse.appdata.xml.in |   12 +-
 data/seahorse.desktop.in.in  |    6 +-
 po/Makevars                  |   78 +++++++++++++++
 po/POTFILES.in               |   54 +++++-----
 9 files changed, 340 insertions(+), 52 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 4028df5..e72326f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -22,15 +22,7 @@ EXTRA_DIST = \
     NEWS \
     README \
     THANKS \
-    TODO \
-    intltool-extract.in \
-    intltool-merge.in \
-    intltool-update.in
-
-DISTCLEANFILES = \
-    intltool-extract \
-    intltool-merge \
-    intltool-update
+    TODO
 
 DISTCHECK_CONFIGURE_FLAGS = \
     --disable-scrollkeeper \
diff --git a/Makefile.decl b/Makefile.decl
index e086f0d..1a160b5 100644
--- a/Makefile.decl
+++ b/Makefile.decl
@@ -22,9 +22,7 @@ SED_SUBST = sed \
 .desktop.in.in.desktop.in:
        $(V_SED) $(SED_SUBST) $< > $@
 
-@INTLTOOL_DESKTOP_RULE@
-
 .service.in.service:
        $(V_SED) $(SED_SUBST) $< > $@
 
-SUFFIXES = .desktop.in .desktop.in.in .service .service.in
\ No newline at end of file
+SUFFIXES = .desktop.in .desktop.in.in .service .service.in
diff --git a/configure.ac b/configure.ac
index fc4493c..d68a38f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,10 +28,11 @@ AC_CONFIG_MACRO_DIR([build/m4])
 AC_PROG_CC
 AC_PROG_CXX
 AM_PROG_CC_C_O
-AC_PROG_INTLTOOL([0.35.0])
 AC_PROG_RANLIB
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 
+AM_GNU_GETTEXT([external])
+AM_GNU_GETTEXT_VERSION([0.19.8])
 GETTEXT_PACKAGE=seahorse
 AC_SUBST(GETTEXT_PACKAGE)
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of the gettext domain.])
@@ -96,7 +97,6 @@ AC_SUBST(GLIB_COMPILE_RESOURCES)
 YELP_HELP_INIT
 
 GLIB_GSETTINGS
-AM_GLIB_GNU_GETTEXT
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
 PKG_CHECK_MODULES(EGG, gtk+-3.0 >= $GTK_REQ)
diff --git a/data/Makefile.am b/data/Makefile.am
index d9602bc..a2c43b9 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -23,12 +23,14 @@ service_in_files =                          \
 appdatadir = $(datadir)/appdata
 appdata_in_files = seahorse.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
-@INTLTOOL_XML_RULE@
+$(appdata_DATA): $(appdata_in_files)
+       $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 desktopdir = $(datadir)/applications
 desktop_in_files = seahorse.desktop.in
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(desktop_DATA): $(desktop_in_files)
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 searchproviderdir = $(datadir)/gnome-shell/search-providers
 dist_searchprovider_DATA = seahorse-search-provider.ini
diff --git a/data/seahorse.appdata.xml b/data/seahorse.appdata.xml
new file mode 100644
index 0000000..a884717
--- /dev/null
+++ b/data/seahorse.appdata.xml
@@ -0,0 +1,218 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop">
+  <id>seahorse.desktop</id>
+  <metadata_license>CC0-1.0</metadata_license>
+  <project_license>GPL-2.0+ and LGPL-2.0+</project_license>
+  <name>Seahorse</name>
+  <name xml:lang="zh_TW">Seahorse</name>
+  <name xml:lang="zh_CN">Seahorse</name>
+  <name xml:lang="vi">Seahorse</name>
+  <name xml:lang="uk">Seahorse</name>
+  <name xml:lang="tr">Seahorse</name>
+  <name xml:lang="sv">Seahorse</name>
+  <name xml:lang="sr@latin">Morski konjić</name>
+  <name xml:lang="sr">Морски коњић</name>
+  <name xml:lang="sl">Seahorse</name>
+  <name xml:lang="sk">Seahorse</name>
+  <name xml:lang="ru">Seahorse</name>
+  <name xml:lang="pt_BR">Seahorse</name>
+  <name xml:lang="pt">Seahorse</name>
+  <name xml:lang="pl">Seahorse</name>
+  <name xml:lang="nl">Seahorse</name>
+  <name xml:lang="nb">Seahorse</name>
+  <name xml:lang="lv">Seahorse</name>
+  <name xml:lang="lt">Seahorse</name>
+  <name xml:lang="ko">시호스</name>
+  <name xml:lang="kk">Seahorse</name>
+  <name xml:lang="ja">Seahorse</name>
+  <name xml:lang="it">Seahorse</name>
+  <name xml:lang="is">Seahorse</name>
+  <name xml:lang="id">Seahorse</name>
+  <name xml:lang="hu">Seahorse</name>
+  <name xml:lang="hr">Seahorse</name>
+  <name xml:lang="he">Seahorse</name>
+  <name xml:lang="gl">Seahorse</name>
+  <name xml:lang="fur">Seahorse</name>
+  <name xml:lang="fr">Seahorse</name>
+  <name xml:lang="fi">Seahorse</name>
+  <name xml:lang="eu">Seahorse</name>
+  <name xml:lang="es">Seahorse</name>
+  <name xml:lang="en_GB">Seahorse</name>
+  <name xml:lang="el">Seahorse</name>
+  <name xml:lang="de">Seahorse</name>
+  <name xml:lang="da">Seahorse</name>
+  <name xml:lang="cs">Seahorse</name>
+  <name xml:lang="ca">Seahorse</name>
+  <summary>Manage your passwords and encryption keys</summary>
+  <summary xml:lang="zh_TW">管理密碼及金鑰</summary>
+  <summary xml:lang="zh_HK">管理密碼及密碼匙</summary>
+  <summary xml:lang="zh_CN">管理您的密码和加密密钥</summary>
+  <summary xml:lang="vi">Quản lý các mật khẩu và khóa mã hóa của bạn</summary>
+  <summary xml:lang="uk">Керування паролями та ключами шифрування</summary>
+  <summary xml:lang="ug">ئىم ۋە شىفىرلاش ئاچقۇچلىرىنى باشقۇرىدۇ</summary>
+  <summary xml:lang="tr">Parolalarınızı ve şifreleme anahtarlarınızı yönetin</summary>
+  <summary xml:lang="th">จัดการรหัสผ่านและกุญแจเข้ารหัสลับของคุณ</summary>
+  <summary xml:lang="te">మీ సంకేతపదాలను మరియు రహస్యపరచే మీటలను నిర్వహించండి</summary>
+  <summary xml:lang="ta">உங்கள் கடவுச்சொற்கள் மற்றும் மறையாக்க விசைகளை மேலாளுங்கள்</summary>
+  <summary xml:lang="sv">Hantera dina lösenord och krypteringsnycklar</summary>
+  <summary xml:lang="sr@latin">Uredite vaše lozinke i ključeve šifrovanja</summary>
+  <summary xml:lang="sr">Уредите ваше лозинке и кључеве шифровања</summary>
+  <summary xml:lang="sl">Upravljanje z gesli in šifrirnimi ključi</summary>
+  <summary xml:lang="sk">Spravuje vaše heslá a šifrovacie kľúče</summary>
+  <summary xml:lang="ru">Управление паролями и ключами шифрования</summary>
+  <summary xml:lang="ro">Administează parolele și cheile de criptare</summary>
+  <summary xml:lang="pt_BR">Gerenciar suas senhas e chaves de criptografia</summary>
+  <summary xml:lang="pt">Efetue a gestão das suas senhas e chaves de encriptação</summary>
+  <summary xml:lang="pl">Zarządzanie hasłami i kluczami szyfrującymi</summary>
+  <summary xml:lang="pa">ਆਪਣੇ ਪਾਸਵਰਡ ਅਤੇ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੀ ਦੇਖਭਾਲ ਕਰੋ</summary>
+  <summary xml:lang="or">ଆପଣଙ୍କର ପ୍ରବେଶ ସଂକେତ ଏବଂ ସଂଗୁପ୍ତ କି କୁ ପରିଚାଳନା କରନ୍ତୁ</summary>
+  <summary xml:lang="oc">Permet de gerir vòstres senhals e vòstras claus de chiframent</summary>
+  <summary xml:lang="nn">Handter dine passord og krypteringsnøklar</summary>
+  <summary xml:lang="nl">Uw cryptografische sleutels en wachtwoorden beheren</summary>
+  <summary xml:lang="ne">तपाईँको पासवर्ड र गुप्तिकरण कुञ्जीहरू प्रबन्ध गर्नुहोस्</summary>
+  <summary xml:lang="nb">Håndter dine passord og krypteringsnøkler</summary>
+  <summary xml:lang="mr">तुमचे पासवर्ड व ऐंक्रीप्शन किल्ली नियंत्रीत करा</summary>
+  <summary xml:lang="ml">നിങ്ങളുടെ രഹസ്യവാക്കും എന്‍ക്രിപ്ഷന്‍ കീകളും കൈകാര്യം ചെയ്യുക</summary>
+  <summary xml:lang="mk">Менаџирајте ги Вашите лозинки и клучеви за енкриптирање</summary>
+  <summary xml:lang="lv">Pārvaldīt paroles un šifrēšanas atslēgas</summary>
+  <summary xml:lang="lt">Tvarkyti Jūsų slaptažodžius ir šifravimo raktus</summary>
+  <summary xml:lang="ko">암호 및 암호화 키를 관리합니다</summary>
+  <summary xml:lang="kn">ನಿಮ್ಮ ಗುಪ್ತಪದ ಮತ್ತು ಗೂಢಲಿಪೀಕರಣ ಕೀಲಿಯನ್ನು ನಿರ್ವಹಿಸಿ</summary>
+  <summary xml:lang="kk">Парольдерді және шифрлеу кілттерін басқару</summary>
+  <summary xml:lang="ja">パスワードや暗号鍵を管理します</summary>
+  <summary xml:lang="it">Gestisce le proprie password e chiavi di cifratura</summary>
+  <summary xml:lang="is">Halda utan um lykilorð og dulritunarlykla</summary>
+  <summary xml:lang="id">Kelola sandi dan kunci penyandian Anda</summary>
+  <summary xml:lang="hu">Jelszavak és titkosítási kulcsok kezelése</summary>
+  <summary xml:lang="hr">Upravljajte svojim lozinkama i ključevima šifriranja</summary>
+  <summary xml:lang="hi">अपना कूटशब्द और गोपन कुंजी प्रबंधित करें</summary>
+  <summary xml:lang="he">ניהול הססמאות ומפתחות ההצפנה שלך</summary>
+  <summary xml:lang="gu">તમારા પાસવર્ડો અને એનક્રિપ્શન કીઓની વ્યવસ્થા કરો</summary>
+  <summary xml:lang="gl">Xestione os seus contrasinais e chaves de cifrado</summary>
+  <summary xml:lang="gd">Stiùirich na faclan-faire is iuchraichean crioptachaidh agad</summary>
+  <summary xml:lang="ga">Bainistigh d'fhocail faire agus eochracha criptithe</summary>
+  <summary xml:lang="fur">Ministre lis tôs password e clâfs di cifradure</summary>
+  <summary xml:lang="fr">Gérer vos mots de passe et vos clés de chiffrement</summary>
+  <summary xml:lang="fi">Hallitse salasanoja ja salausavaimia</summary>
+  <summary xml:lang="eu">Kudeatu pasahitzak eta enkriptatze-gakoak</summary>
+  <summary xml:lang="et">Sinu paroolide ja krüptimisvõtmete haldamine</summary>
+  <summary xml:lang="es">Administre sus claves y contraseñas de cifrado</summary>
+  <summary xml:lang="en@shaw">𐑥𐑨𐑯𐑦𐑡 𐑿𐑼 𐑐𐑭𐑕𐑢𐑼𐑛𐑟 𐑯 𐑦𐑯𐑒𐑮𐑦𐑐𐑖𐑩𐑯 𐑒𐑰𐑟</summary>
+  <summary xml:lang="en_GB">Manage your passwords and encryption keys</summary>
+  <summary xml:lang="el">Διαχειριστείτε τους κωδικούς πρόσβασης και τα κλειδιά κρυπτογράφησης σας</summary>
+  <summary xml:lang="dz">ཁྱོད་རའི་ཆོག་ཡིག་དང་གསང་བཟོ་ལྡེ་མིག་ཚུ་ འཛིན་སྐྱོང་འཐབ་</summary>
+  <summary xml:lang="de">Verwalten Sie Ihre Passwörter und Schlüssel</summary>
+  <summary xml:lang="da">Håndtér dine adgangskoder og krypteringsnøgler</summary>
+  <summary xml:lang="cs">Spravujte svá hesla a šifrovací klíče</summary>
+  <summary xml:lang="ca@valencia">Gestioneu les contrasenyes i claus d'encriptació</summary>
+  <summary xml:lang="ca">Gestioneu les contrasenyes i claus d'encriptació</summary>
+  <summary xml:lang="bs">Uredite vaše lozinke i ključeve šifrovanja</summary>
+  <summary xml:lang="br">Ardeiñ ho tremengerioù hag alc'hwezioù enrinegañ</summary>
+  <summary xml:lang="bn_IN">পাসওয়ার্ড ও এনক্রিপশন-কি পরিচালনা করুন</summary>
+  <summary xml:lang="bn">পাসওয়ার্ড ও এনক্রিপশন-কী পরিচালনা করুন</summary>
+  <summary xml:lang="bg">Управление на паролите и ключовете за шифриране</summary>
+  <summary xml:lang="be@latin">Kiruj parolami j klučami šyfravańnia</summary>
+  <summary xml:lang="be">Кіраванне паролямі і ключамі шыфравання</summary>
+  <summary xml:lang="ast">Alministra tos contraseñes y claves de cifráu</summary>
+  <summary xml:lang="as">পাছৱৰ্ড আৰু এনক্ৰিপশন-কি' ব্যৱস্থাপনা কৰক</summary>
+  <summary xml:lang="ar">أدِر كلمات سرّك ومفاتيح تعميتك</summary>
+  <description>
+    <p>
+      Seahorse is a GNOME application for managing encryption keys.
+      It also integrates with nautilus, gedit and other places for encryption operations.
+    </p>
+    <p xml:lang="zh_TW">Seahorse 是管理加密金鑰的 GNOME 應用程式。它也與 nautilus、gedit 與其他地方整合提供加密操作。</p>
+    <p xml:lang="zh_HK">Seahorse 是管理加密密碼匙的 GNOME 應用程式。它也與 nautilus、gedit 與其他地方整合提供加密操作。</p>
+    <p xml:lang="zh_CN">Seahorse 是一款用于管理加密密钥的 GNOME 应用程序。它也与 nautilus、gedit 和其他地方集成，处理加密操作。</p>
+    <p xml:lang="vi">Seahorse là ứng dụng của GNOME dùng để quản lý các khóa mã hóa. Nó cũng được tổ hợp 
cùng với nautilus, gedit và một số cái khác nữa để thực hiện các thao tác mã hóa.</p>
+    <p xml:lang="uk">Seahorse — програма GNOME для керування ключами шифрування. Вона інтегрується з іншими 
програмами для шифрувальних операцій.</p>
+    <p xml:lang="tr">Seahorse, şifreleme anahtarlarını yönetmek için kullanabileceğiniz bir GNOME 
uygulamasıdır. Ayrıca şifreleme işlemleri için nautilus, gedit ve diğer uygulamalarla bütünleşir.</p>
+    <p xml:lang="th">Seahorse เป็นโปรแกรมของ GNOME สำหรับจัดการกุญแจเข้ารหัสลับ โดยยังเชื่อมรวมกับ nautilus, 
gedit และที่อื่นๆ สำหรับการเข้ารหัสลับ</p>
+    <p xml:lang="sv">Seahorse är ett GNOME-program för att hantera kryptonycklar. Det integrerar med 
nautilus, gedit och andra ställen för krypteringsoperationer.</p>
+    <p xml:lang="sr@latin">Morski konjić je Gnomov program za upravljanje ključevima šifrovanja. Takođe se 
sjedinjuje sa nautilusom, vilenjakovom beležnicom i drugim mestima za radnje šifrovanja.</p>
+    <p xml:lang="sr">Морски коњић је Гномов програм за управљање кључевима шифровања. Такође се сједињује са 
наутилусом, вилењаковом бележницом и другим местима за радње шифровања.</p>
+    <p xml:lang="sl">Seahorse je program, ki omogoča šifriranje ključev v okolju GNOME. Delovanje je 
vgrajeno v programe nautilus, gedit in v drugih, ki zahtevajo podporo šifriranja.</p>
+    <p xml:lang="sk">Seahorse je aplikáciou pre prostredie GNOME na spravovanie šifrovacích kľúčov. Taktiež 
je integrovaný v programoch nautilus, gedit a na iných miestach, kde sa vykonávajú šifrovacie operácie.</p>
+    <p xml:lang="ru">Seahorse — приложение GNOME для управления ключами шифрования. Приложение интегрируется 
с nautilus, gedit и прочими приложениями, где требуется шифрование.</p>
+    <p xml:lang="pt_BR">O Seahorse é um aplicativo do GNOME para gerenciamento de chaves de criptografia. 
Ele também se integra com o nautilus, gedit e outros locais para operações de criptografia.</p>
+    <p xml:lang="pt">O Seahorse é uma aplicação do GNOME para gerir chaves de encriptação. Ela integra-se no 
nautilus, gedit e outros locais para as operações de encriptação.</p>
+    <p xml:lang="pl">Seahorse to program dla środowiska GNOME do zarządzania kluczami szyfrującymi, 
zintegrowany z programami, takimi jak Nautilus, gedit oraz wieloma innymi, które korzystają z szyfrowania.</p>
+    <p xml:lang="pa">ਸੀ-ਹਾਰਸ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕੁੰਜੀਆਂ ਦੇ ਪ੍ਰਬੰਧ ਲਈ ਗਨੋਮ ਐਪਲੀਕੇਸ਼ਨ ਹੈ। ਇਹ ਇੰਕ੍ਰਿਪਸ਼ਨ ਕਾਰਵਾਈਆਂ ਲਈ 
ਨਟੀਲਸ, ਜੀ-ਸੰਪਾਦਕ ਅਤੇ ਹੋਰ ਥਾਵਾਂ ਨਾਲ ਵੀ ਜੁੜੀ ਹੋਈ ਹੈ।</p>
+    <p xml:lang="nl">Seahorse is een Gnome-toepassing voor het beheren van encryptiesleutels. Het integreert 
ook met nautilus, gedit en andere plaatsen waar men encryptiehandelingen kan verrichten.</p>
+    <p xml:lang="nb">Seahorse er et GNOME program for å håndtere krypteringsnøkler. Det er også integrert 
med nautilus, gedit og andre programmer for krypteringsoperasjoner.</p>
+    <p xml:lang="lv">Seahorse ir GNOME lietotne, kas pārvalda šifrēšanas atslēgas. Tā arī ir integrēta ar 
nautilus, gedit un citām vietām šifrēšanas darbībām.</p>
+    <p xml:lang="lt">Seahorse yra GNOME programa šifravimo raktų tvarkymui. Ji taip pat integruojasi su 
nautilus, gedit ir kitomis vietomis šifravimo veiksmams atlikti.</p>
+    <p xml:lang="ko">시호스는 암호화 키를 관리하는 그놈 프로그램입니다. 노틸러스, 지에디트 등에서 암호화 관련 동작에 연동해서 동작합니다.</p>
+    <p xml:lang="kk">Seahorse - бұл шифрлеу кілттерін басқаруға арналған GNOME қолданбасы. Сонымен қатар, ол 
шифрлеу әрекеттері үшін nautilus, gedit және т.б. жерлермен интеграцияланады.</p>
+    <p xml:lang="ja">Seahorse は 暗号化の鍵の管理を行うための GNOME アプリケーションです。Nautilus や Gedit 
などのアプリケーションと暗号化操作を統合化します。</p>
+    <p xml:lang="it">Seahorse è un'applicazione GNOME per la gestione di chiavi di cifratura. Si integra con 
nautilus, gedit e altre applicazioni per fornire operazioni di cifratura.</p>
+    <p xml:lang="is">Seahorse er GNOME-forrit til umsýslu með dulritunarlykla. Það virkar saman með 
nautilus, gedit og öðrum forritum þar sem dulritunaraðgerða er þörf.</p>
+    <p xml:lang="id">Seahorse adalah aplikasi GNOME untuk mengelola kunci-kunci enkripsi. Ini juga 
terintegrasi dengan nautilus, gedit, dan tempat-tempat lain untuk operasi enkripsi.</p>
+    <p xml:lang="hu">A Seahorse egy GNOME alkalmazás titkosító kulcsok kezeléséhez. Integrálódik a Nautilus, 
gedit és egyéb alkalmazásokba a titkosítási műveletekhez.</p>
+    <p xml:lang="hr">Seahorse je GNOME aplikacija za upravljanje ključevima šifriranja. Može se integrirati 
u nautilus, gedit i ostale lokacije za radnje šifiranja.</p>
+    <p xml:lang="he">Seahorse הנו יישום מבית GNOME לניהול מפתחות הצפנה. היישום גם משתלב בתוך נוטילוס, gedit 
ומקומות אחרים הדורשים פעולות הצפנה.</p>
+    <p xml:lang="gl">Seahorse é un aplicativo de GNOME para a xestión de chaves de cifrado. Tamén se integra 
con nautilus, gedit e outros lugares para as operacións de cifrado.</p>
+    <p xml:lang="fur">Seahorse e je une aplicazion GNOME par gjestî lis clâfs di cifradure. Si integre cun 
nautilus, gedit e altris aplicazions par ufrî operazions di cifradure.</p>
+    <p xml:lang="fr">Seahorse est une application GNOME pour la gestion des clés de chiffrement. Elle 
s'intègre également avec Nautilus, Gedit et d'autres applications pour se charger des opérations de 
chiffrement.</p>
+    <p xml:lang="fi">Seahorse on Gnome-sovellus salausavainten hallintaan. Se integroituu 
tiedostonhallintaan, tekstimuokkaimeen ja monien muiden sovellusten salaustoimintoihin.</p>
+    <p xml:lang="eu">Seahorse enkriptatutako gakoak kudeatzeko aplikazio bat da GNOME mahaigainerako. 
Nautilus, gedit eta enkriptazio-eragiketen beste lekuekin bateragarria da.</p>
+    <p xml:lang="et">Seahorse on GNOME rakendus krüpteeritud võtmete haldamiseks. See on integreeritud 
nautiluse, gediti ja teiste rakendustega.</p>
+    <p xml:lang="es">Seahorse es una aplicación de GNOME application para gestionar claves de cifrado. 
También se integra con Nautilus, gedit y otros lugares para operaciones de cifrado.</p>
+    <p xml:lang="en_GB">Seahorse is a GNOME application for managing encryption keys. It also integrates 
with nautilus, gedit and other places for encryption operations.</p>
+    <p xml:lang="el">Το Seahorse είναι μια εφαρμογή του GNOME για διαχείριση κλειδιών κρυπτογράφησης. Επίσης 
συνεργάζεται με τον ναυτίλο, το gedit και άλλες εφαρμογές για λειτουργίες κρυπτογράφησης.</p>
+    <p xml:lang="de">Seahorse ist eine Anwendung für GNOME zum Verwalten von Kryptografie-Schlüsseln. Es 
erweitert nautilus, gedit und andere um Verschlüsselungsvorgänge.</p>
+    <p xml:lang="da">Seahorse er et GNOME-program til håndtering af krypteringsnøgler. Det integrerer også 
med nautilus, gedit og andre steder med henblik på kryptering.</p>
+    <p xml:lang="cs">Seahorse je aplikace GNOME pro správu šifrovacích klíčů. Je integrovaná s aplikacemi 
nautilus, gedit a dalšími, které využívají šifrovací funkce.</p>
+    <p xml:lang="ca@valencia">El Seahorse és una aplicació del GNOME per gestionar les claus d'encriptació. 
S'integra amb el Nautilus, el gedit i altres programes per realitzar-hi operacions d'encriptació.</p>
+    <p xml:lang="ca">El Seahorse és una aplicació del GNOME per gestionar les claus d'encriptació. S'integra 
amb el Nautilus, el gedit i altres programes per realitzar-hi operacions d'encriptació.</p>
+    <p xml:lang="bs">Seahorse je GNOME aplikacija za upravljanje ključevima za šifriranje. Takođe se 
integrira sa nautilusom, geditom i ostalim mjestima za operacije šifriranja.</p>
+    <p xml:lang="be">Seahorse, праграма для асяроддзя GNOME для кіравання ключамі шыфравання. Яна 
інтэгруецца з Наўтылусам, рэдактарам gedit ды іншымі праграмамі, якія патрабуюць доступ да шыфравання.</p>
+    <p xml:lang="as">Seahorse হল এটা GNOME এপ্লিকেচন যাৰ সহায়ত ইনক্ৰিপষণ কি'সমূহ ব্যৱস্থাপনা কৰিব পাৰি। ই 
লগতে ইনক্ৰিপষণ কাৰ্য্যসমূহ কৰিবলৈ nautilus, gedit আৰু অন্য স্থানৰ সৈতে অনুকূলন কৰে।</p>
+    <p>
+      With seahorse you can create and manage PGP keys, create and manage SSH keys,
+      publish and retrieve keys from key servers, cache your passphrase so you
+      don’t have to keep typing it and backup your keys and keyring.
+    </p>
+    <p xml:lang="zh_TW">使用 seahorse 您可以建立與管理 PGP 金鑰、建立與管理 SSH 
金鑰，從金鑰伺服器發布與取回金鑰，快取您的密語讓您不用每次都輸入它，還可以備份您的金鑰與鑰匙圈。</p>
+    <p xml:lang="tr">Seahorse ile PGP ve SSH anahtarlarını oluşturabilir ve yönetebilirsiniz, anahtar 
sunucularına anahtar gönderip alabilirsiniz, yeniden girmenize gerek kalmaması için parolanızı ön belleğe 
alabilir ve anahtarlarınızı ve anahtarlığınızı yedekleyebilirsiniz.</p>
+    <p xml:lang="sv">Med Seahorse kan du skapa och hantera PGP-nycklar, skapa och hantera SSH-nycklar, 
publicera och hämta nycklar från nyckelservrar, mellanlagra dina lösenfraser så du inte behöver ange dem och 
säkerhetskopiera dina nycklar och din nyckelring.</p>
+    <p xml:lang="sr@latin">Sa morskim konjićem možete da stvarate i da upravljate PGP ključevima, da 
stvarate i upravljate ključevima bezbedne školjke, objavljujete i dovlačite ključeve sa servera ključeva, da 
smestite vašu lozinku tako da ne morate stalno da je kucate i da napravite rezerve vaših ključeva i priveska 
ključeva.</p>
+    <p xml:lang="sr">Са морским коњићем можете да стварате и да управљате ПГП кључевима, да стварате и 
управљате кључевима безбедне шкољке, објављујете и довлачите кључеве са сервера кључева, да сместите вашу 
лозинку тако да не морате стално да је куцате и да направите резерве ваших кључева и привеска кључева.</p>
+    <p xml:lang="sk">S aplikáciou seahorse môžete vytvoriť a spravovať kľúce PGP, vytvárať a spravovať kľúče 
SSH, zverejňovať a získavať kľúče zo servera kľúčov, ukladať vaše heslo, aby ste ho už nemuseli zadávať a 
zálohovať vaše kľúče a zväzky kľúčov.</p>
+    <p xml:lang="ru">С помощью seahorse можно создавать и управлять ключами PGP, создавать и управлять 
ключами SSH, публиковать и получать ключи с серверов, кэшировать парольные фразы, создавать резервные копии 
ключей и связок с ключами.</p>
+    <p xml:lang="pt_BR">Com o Seahorse você pode criar e gerenciar chaves PGP e chaves SSH, publicar e 
recuperar chaves de servidores de chaves, armazenar em cache sua frase secreta para que você não precise 
continuar digitando-a e efetuar cópia de segurança (backup) de suas chaves e chaveiro.</p>
+    <p xml:lang="pl">Program Seahorse umożliwia tworzenie i zarządzanie kluczami PGP i kluczami SSH, 
publikowanie i pobieranie kluczy z serwerów, zapamiętywanie haseł oraz tworzenie kopii zapasowych kluczy i 
baz kluczy.</p>
+    <p xml:lang="nb">Med Seahorse kan du lage og håndtere PGP-nøkler, lage og håndtere SSH-nøkler, publisere 
og hente nøkler fra nøkkeltjenere, mellomlagre passordet ditt slik at du ikke må skrive det hver gang, og 
sikkerhetskopiere nøkler og nøkkelring.</p>
+    <p xml:lang="lv">Ar seahorse jūs varat izveidot un pārvaldīt PGP atslēgas, izveidot un pārvaldīt SSH 
atslēgas, publicēt un saņemt atslēgas no atslēgu serveriem, glabāt paroles, lai tās nevajadzētu rakstīt un 
dublēt atslēgas un atslēgu saišķus.</p>
+    <p xml:lang="lt">Su seahorse galite sukurti bei tvarkyti PGP ir SSH raktus, paskelbti ir gauti raktus iš 
raktų serverių, įrašyti savo slaptažodį, kad nebereikėtų jo rašyti, bei padaryti atsargines savo raktų bei 
raktinių kopijas.</p>
+    <p xml:lang="ko">시호스에서 PGP 키를 만들고 관리할 수 있고, SSH 키를 만들고 관리할 수 있고, 키 서버에 키를 공개하거나 가져올 수 있고, 암호를 임시 저장해서 
반복해서 타이핑할 필요가 없게 해 주고, 키와 키 모음을 백업할 수 있습니다.</p>
+    <p xml:lang="kk">Seahorse көмегімен сіз PGP кілттерін жасау және басқару, SSH кілттерін жасау және 
басқару, кілттер серверлеріне кілттерді жариялау және олардан алу, кілттік фразаны қайта-қайта тере бермеу 
үшін оны кэштеу, кілттер және кілттер бауының қор көшірмелерін жасау әрекеттерін жасай аласыз.</p>
+    <p xml:lang="it">Con seahorse è possibile creare e gestire chiavi PGP, SSH, pubblicare e recuperare 
chiavi da diversi server di chiavi, mantenere in memoria le passphrase in modo da non doverle ripetere ed è 
in grado di eseguire backup delle proprie chiavi e del portachiavi.</p>
+    <p xml:lang="id">Dengan seahorse Anda dapat membuat dan mengelola kunci PGP, membuat dan mengelola kunci 
SSH, menerbitkan dan mengambil kunci dari server kunci, menyinggahkan frasa sandi Anda sehingga Anda tak 
perlu setiap kali mengetikkannya, dan membuat cadangan kunci dan ring kunci Anda.</p>
+    <p xml:lang="hu">A Seahorse programmal létrehozhat és kezelhet PGP kulcsokat, létrehozhat és kezelhet 
SSH kulcsokat, közzétehet és lekérhet kulcsokat a kulcskiszolgálókról, eltárolhatja a jelszavát, így nem kell 
állandóan begépelnie azt, valamint biztonsági mentést készíthet a kulcsairól és a kulcstartóról.</p>
+    <p xml:lang="hr">Sa seahorsom možete stvarati i upravljati PGP ključevima, stvarati i upravljati SSH 
ključevima, objavljivati i preuzimati ključeve s poslužitelja, spremati vaše lozinke tako da ih ne morate 
stalno upisivati i sigurnosno kopira vaše ključeve i skupove ključeva.</p>
+    <p xml:lang="gl">Con seahorse pode crear e xestionar chaves PGP, crear e xestionar chaves SSH, publicar 
e obter chaves desde servidores de chaves, almacenar na caché a súa frase de paso deste xeito non terá que 
escribila continuamente e facer un respaldo das súas chaves e do anel de chaves.</p>
+    <p xml:lang="fur">Cun seahorse tu puedis creâ e gjestî clâfs PGP, creâ e ministrâ clâfs SSH, publicâ e 
recuperâ clâfs dai servidôrs di clâfs, tignî in memorie lis tôs passphrase cussì no tu âs di tornâ a 
scrivilis e tu puedis fâ il backup des tôs clâfs e dai puarteclâfs.</p>
+    <p xml:lang="fr">Seahorse permet de créer et de gérer des clés PGP et SSH, de publier et d'obtenir des 
clés à partir de serveurs de clés, de mettre en cache sa phrase de passe pour ne pas devoir la ressaisir de 
multiples fois et de sauvegarder les clés et les trousseaux de clés.</p>
+    <p xml:lang="fi">Voit luoda sekä hallita PGP- ja SSH-avaimia, julkaista ja noutaa avaimia 
avainpalvelimilta sekä varmuuskopioida avaimet ja avainnipun.</p>
+    <p xml:lang="eu">Seahorse-rekin PGP eta SSH gakoak sor eta kudea ditzakezu, gako-zerbitzarietatik gakoak 
eskuratu eta argitara ditzakezu. Zure pasaesaldia gorde zuk hura berriro ez idazteko eta zure gako eta 
gako-sorten babeskopia egiten du.</p>
+    <p xml:lang="es">Con Seahorse puede crear y gestionar claves PGP y SSH, publicar y obtener claves de 
servidores de claves, almacenar en la caché su contraseña para no tener que escribirla y hacer una copia de 
seguridad de sus claves y de su anillo de claves.</p>
+    <p xml:lang="el">Με το seahorse μπορείτε να δημιουργήσετε και να διαχειρισθείτε κλειδιά PGP, να 
δημιουργήσετε και να διαχειριστείτε κλειδιά SSH, να δημοσιεύσετε και να ανακτήσετε κλειδιά από διακομιστές 
κλειδιών, να αποκρύψετε τον κωδικό σας, ώστε να μη χρειάζεστε να τον δακτυλογραφείτε συνεχώς και να λάβετε 
αντίγραφο ασφαλείας των κλειδιών και της κλειδοθήκης.</p>
+    <p xml:lang="de">Mit Seahorse erstellen und verwalten Sie PGP-Schlüssel, SSH-Schlüssel, veröffentlichen 
und rufen Sie Schlüssel von Schlüssel-Servern ab, speichern Sie Ihre Kennwörter zwischen, um diese nicht 
wiederholt eintippen zu müssen, und sichern Sie Ihre Schlüssel und den Schlüsselbund.</p>
+    <p xml:lang="da">Med seahorse kan du oprette og håndtere PGP-nøgler, oprette og håndtere SSH-nøgler, 
offentliggøre og hente nøgler fra nøgleservere, lagre din adgangsfrase så du ikke behøver blive ved med at 
skrive den, samt sikkerhedskopiere dine nøgler og nøglering.</p>
+    <p xml:lang="cs">Pomocí aplikace seahorse můžete vytvářet a spravovat klíče PGP, vytvářet a spravovat 
klíče SSH, zveřejňovat a získávat klíče ze serverů, ukládat své heslové fráze do mezipaměti (abste je 
nemuseli pořád dokola psát) a zálohovat své klíče a klíčenku.</p>
+    <p xml:lang="ca">Amb el Seahorse podeu crear i gestionar claus PGP i SSH, publicar i recuperar claus des 
de servidors, desar amagada la contrasenya per no haver-la d'introduir i també per crear una còpia de 
seguretat de les vostres claus i anell de claus.</p>
+  </description>
+  <!--
+  <screenshots>
+    <screenshot type="default">https://projects.gnome.org/seahorse/images/main.png</screenshot>
+  </screenshots>
+  -->
+  <url type="homepage">https://wiki.gnome.org/Apps/Seahorse</url>
+  <url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=seahorse</url>
+  <url type="donation">http://www.gnome.org/friends/</url>
+  <url type="help">https://help.gnome.org/users/seahorse/stable/</url>
+  <update_contact>seahorse-list gnome org</update_contact>
+  <project_group>GNOME</project_group>
+  <translation type="gettext">seahorse</translation>
+</component>
diff --git a/data/seahorse.appdata.xml.in b/data/seahorse.appdata.xml.in
index 68bbbbf..c85e5c7 100644
--- a/data/seahorse.appdata.xml.in
+++ b/data/seahorse.appdata.xml.in
@@ -3,18 +3,18 @@
   <id>seahorse.desktop</id>
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-2.0+ and LGPL-2.0+</project_license>
-  <_name>Seahorse</_name>
-  <_summary>Manage your passwords and encryption keys</_summary>
+  <name>Seahorse</name>
+  <summary>Manage your passwords and encryption keys</summary>
   <description>
-    <_p>
+    <p>
       Seahorse is a GNOME application for managing encryption keys.
       It also integrates with nautilus, gedit and other places for encryption operations.
-    </_p>
-    <_p>
+    </p>
+    <p>
       With seahorse you can create and manage PGP keys, create and manage SSH keys,
       publish and retrieve keys from key servers, cache your passphrase so you
       don’t have to keep typing it and backup your keys and keyring.
-    </_p>
+    </p>
   </description>
 
   <!--
diff --git a/data/seahorse.desktop.in.in b/data/seahorse.desktop.in.in
index d3ba30c..2bc76d7 100644
--- a/data/seahorse.desktop.in.in
+++ b/data/seahorse.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=Passwords and Keys
-_Comment=Manage your passwords and encryption keys
-_Keywords=keyring;encryption;security;sign;ssh;
+Name=Passwords and Keys
+Comment=Manage your passwords and encryption keys
+Keywords=keyring;encryption;security;sign;ssh;
 Exec=@bindir@/seahorse
 Terminal=false
 Type=Application
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..6f31bd1
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 
--keyword=g_dngettext:2,3
+
+# This is the copyright holder that gets inserted into the header of the
+# $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding
+# package.  (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.)  Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright.  The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = Free Software Foundation, Inc.
+
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
+# This is the email address or URL to which the translators shall report
+# bugs in the untranslated strings:
+# - Strings which are not entire sentences, see the maintainer guidelines
+#   in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+#   understood.
+# - Strings which make invalid assumptions about notation of date, time or
+#   money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# It can be your email address, or a mailing list address where translators
+# can write to without being subscribed, or the URL of a web page through
+# which the translators can contact you.
+MSGID_BUGS_ADDRESS =
+
+# This is the list of locale categories, beyond LC_MESSAGES, for which the
+# message catalogs shall be used.  It is usually empty.
+EXTRA_LOCALE_CATEGORIES =
+
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
+PO_DEPENDS_ON_POT = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 470bcf3..df891f3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -12,27 +12,27 @@ gkr/gkr-item.vala
 gkr/gkr-keyring-add.vala
 gkr/gkr-keyring-properties.vala
 gkr/gkr-keyring.vala
-[type: gettext/glade]gkr/seahorse-add-keyring.xml
-[type: gettext/glade]gkr/seahorse-gkr-add-item.xml
-[type: gettext/glade]gkr/seahorse-gkr-item-properties.xml
-[type: gettext/glade]gkr/seahorse-gkr-keyring.xml
+gkr/seahorse-add-keyring.xml
+gkr/seahorse-gkr-add-item.xml
+gkr/seahorse-gkr-item-properties.xml
+gkr/seahorse-gkr-keyring.xml
 libegg/egg-datetime.c
-[type: gettext/glade]libseahorse/seahorse-add-keyserver.xml
+libseahorse/seahorse-add-keyserver.xml
 libseahorse/seahorse-application.c
 libseahorse/seahorse-interaction.c
 libseahorse/seahorse-key-manager-store.c
 libseahorse/seahorse-object.c
 libseahorse/seahorse-passphrase.c
 libseahorse/seahorse-prefs.c
-[type: gettext/glade]libseahorse/seahorse-prefs.xml
-[type: gettext/glade]libseahorse/seahorse-progress.xml
+libseahorse/seahorse-prefs.xml
+libseahorse/seahorse-progress.xml
 libseahorse/seahorse-search-provider.c
 libseahorse/seahorse-util.c
 libseahorse/seahorse-validity.c
 libseahorse/seahorse-widget.c
-[type: gettext/glade]pgp/seahorse-add-subkey.xml
-[type: gettext/glade]pgp/seahorse-add-uid.xml
-[type: gettext/glade]pgp/seahorse-expires.xml
+pgp/seahorse-add-subkey.xml
+pgp/seahorse-add-uid.xml
+pgp/seahorse-expires.xml
 pgp/seahorse-gpgme-add-subkey.c
 pgp/seahorse-gpgme-add-uid.c
 pgp/seahorse-gpgme.c
@@ -51,25 +51,25 @@ pgp/seahorse-gpgme-subkey.c
 pgp/seahorse-gpg-options.c
 pgp/seahorse-hkp-source.c
 pgp/seahorse-keyserver-results.c
-[type: gettext/glade]pgp/seahorse-keyserver-results.xml
+pgp/seahorse-keyserver-results.xml
 pgp/seahorse-keyserver-search.c
-[type: gettext/glade]pgp/seahorse-keyserver-search.xml
+pgp/seahorse-keyserver-search.xml
 pgp/seahorse-keyserver-sync.c
-[type: gettext/glade]pgp/seahorse-keyserver-sync.xml
+pgp/seahorse-keyserver-sync.xml
 pgp/seahorse-ldap-source.c
 pgp/seahorse-pgp-actions.c
 pgp/seahorse-pgp-backend.c
-[type: gettext/glade]pgp/seahorse-pgp-generate.xml
+pgp/seahorse-pgp-generate.xml
 pgp/seahorse-pgp-key.c
 pgp/seahorse-pgp-key-properties.c
-[type: gettext/glade]pgp/seahorse-pgp-private-key-properties.xml
-[type: gettext/glade]pgp/seahorse-pgp-public-key-properties.xml
+pgp/seahorse-pgp-private-key-properties.xml
+pgp/seahorse-pgp-public-key-properties.xml
 pgp/seahorse-pgp-subkey.c
-[type: gettext/glade]pgp/seahorse-revoke.xml
+pgp/seahorse-revoke.xml
 pgp/seahorse-server-source.c
 pgp/seahorse-signer.c
-[type: gettext/glade]pgp/seahorse-signer.xml
-[type: gettext/glade]pgp/seahorse-sign.xml
+pgp/seahorse-signer.xml
+pgp/seahorse-sign.xml
 pgp/seahorse-transfer.c
 pgp/seahorse-unknown.c
 pgp/seahorse-unknown-source.c
@@ -78,19 +78,19 @@ pkcs11/pkcs11-certificate.vala
 pkcs11/seahorse-pkcs11-backend.c
 pkcs11/pkcs11-deleter.vala
 pkcs11/seahorse-pkcs11-generate.c
-[type: gettext/glade]pkcs11/seahorse-pkcs11-generate.xml
+pkcs11/seahorse-pkcs11-generate.xml
 pkcs11/pkcs11-key-deleter.vala
 pkcs11/pkcs11-properties.vala
 pkcs11/pkcs11-request.vala
-[type: gettext/glade]pkcs11/seahorse-pkcs11-request.xml
+pkcs11/seahorse-pkcs11-request.xml
 pkcs11/pkcs11-private-key.vala
 pkcs11/pkcs11-token.vala
-[type: gettext/glade]src/seahorse-change-passphrase.xml
+src/seahorse-change-passphrase.xml
 src/seahorse-generate-select.c
-[type: gettext/glade]src/seahorse-generate-select.xml
+src/seahorse-generate-select.xml
 src/seahorse-import-dialog.c
 src/seahorse-key-manager.c
-[type: gettext/glade]src/seahorse-key-manager.xml
+src/seahorse-key-manager.xml
 src/seahorse-main.c
 src/seahorse-sidebar.c
 ssh/seahorse-ssh-actions.c
@@ -99,11 +99,11 @@ ssh/seahorse-ssh-backend.c
 ssh/seahorse-ssh-deleter.c
 ssh/seahorse-ssh-exporter.c
 ssh/seahorse-ssh-generate.c
-[type: gettext/glade]ssh/seahorse-ssh-generate.xml
+ssh/seahorse-ssh-generate.xml
 ssh/seahorse-ssh-key.c
 ssh/seahorse-ssh-key-properties.c
-[type: gettext/glade]ssh/seahorse-ssh-key-properties.xml
+ssh/seahorse-ssh-key-properties.xml
 ssh/seahorse-ssh-operation.c
 ssh/seahorse-ssh-source.c
 ssh/seahorse-ssh-upload.c
-[type: gettext/glade]ssh/seahorse-ssh-upload.xml
+ssh/seahorse-ssh-upload.xml