[kupfer] plugins.google_mail: rename to gmail, update strings

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 0ab622943e3ed9ce33bd44c1070db17fe421e555
Author: Karol BÄ?dkowski <karol bedkowski gmail com>
Date:   Thu Mar 4 21:09:13 2010 +0100

    plugins.google_mail: rename to gmail, update strings

 kupfer/plugin/{google_mail => gmail}/COPYING     |    0
 kupfer/plugin/{google_mail => gmail}/__init__.py |   16 +++++++-------
 kupfer/plugin/{google_mail => gmail}/gmail.svg   |    0
 kupfer/plugin/{google_mail => gmail}/icon-list   |    0
 po/POTFILES.in                                   |    2 +-
 po/pl.po                                         |   23 ++++++++++++---------
 6 files changed, 22 insertions(+), 19 deletions(-)
---
diff --git a/kupfer/plugin/google_mail/COPYING b/kupfer/plugin/gmail/COPYING
similarity index 100%
rename from kupfer/plugin/google_mail/COPYING
rename to kupfer/plugin/gmail/COPYING
diff --git a/kupfer/plugin/google_mail/__init__.py b/kupfer/plugin/gmail/__init__.py
similarity index 93%
rename from kupfer/plugin/google_mail/__init__.py
rename to kupfer/plugin/gmail/__init__.py
index e5bf03a..8b6744e 100644
--- a/kupfer/plugin/google_mail/__init__.py
+++ b/kupfer/plugin/gmail/__init__.py
@@ -1,9 +1,9 @@
 # -*- coding: UTF-8 -*-
-__kupfer_name__ = _("Google Mail")
+__kupfer_name__ = _("Gmail")
 __kupfer_sources__ = ("GoogleContactsSource", )
 __kupfer_actions__ = ('NewMailAction', )
-__description__ = _("Load contacts and compose new email in Google Mail")
-__version__ = "2010-02-04"
+__description__ = _("Load contacts and compose new email in Gmail")
+__version__ = "2010-03-04"
 __author__ = "Karol BÄ?dkowski <karol bedkowski gmail com>"
 
 import urllib
@@ -28,7 +28,7 @@ __kupfer_settings__ = plugin_support.PluginSettings(
 	},
 	{
 		'key': 'loadicons',
-		'label': _('Load contacts icons'),
+		'label': _("Load contacts' pictures"),
 		'type': bool,
 		'value': True,
 	}
@@ -83,14 +83,14 @@ def get_gclient():
 	gd_client = gdata.contacts.service.ContactsService()
 	gd_client.email = upass.username
 	gd_client.password = upass.password
-	gd_client.source = 'kupfer-google_mail'
+	gd_client.source = 'kupfer.gmail'
 	gd_client.ProgrammaticLogin()
 	return gd_client
 
 
 # background loader
 @background_loader(interval=UPDATE_INTERVAL_S, delay=UPDATE_STARTU_DELAY_S,
-		name='google-contacts')
+		name='gmail-contacts')
 def get_contacts():
 	''' load all contacts '''
 	pretty.print_debug(__name__, 'get_contacts start')
@@ -143,7 +143,7 @@ class GoogleContact(EmailContact):
 
 
 class GoogleContactsSource(ToplevelGroupingSource):
-	def __init__(self, name=_("Google Mail")):
+	def __init__(self, name=_("Gmail")):
 		super(GoogleContactsSource, self).__init__(name, "Contacts")
 		self._version = 3
 
@@ -167,7 +167,7 @@ class GoogleContactsSource(ToplevelGroupingSource):
 		yield PleaseConfigureLeaf
 
 	def get_description(self):
-		return _("Contacts from Google services (Google Mail)")
+		return _("Contacts from Google services (Gmail)")
 
 	def get_icon_name(self):
 		return "gmail"
diff --git a/kupfer/plugin/google_mail/gmail.svg b/kupfer/plugin/gmail/gmail.svg
similarity index 100%
rename from kupfer/plugin/google_mail/gmail.svg
rename to kupfer/plugin/gmail/gmail.svg
diff --git a/kupfer/plugin/google_mail/icon-list b/kupfer/plugin/gmail/icon-list
similarity index 100%
rename from kupfer/plugin/google_mail/icon-list
rename to kupfer/plugin/gmail/icon-list
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 62cf089..d61836e 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -71,7 +71,7 @@ kupfer/plugin/devhelp.py
 kupfer/plugin/evolution.py
 kupfer/plugin/gajim.py
 kupfer/plugin/gnome_terminal.py
-kupfer/plugin/google_mail/__init__.py
+kupfer/plugin/gmail/__init__.py
 kupfer/plugin/google_picasa/__init__.py
 kupfer/plugin/google_search.py
 kupfer/plugin/google_translate.py
diff --git a/po/pl.po b/po/pl.po
index 20e29fe..5f9128f 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -6,8 +6,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: kupfer\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-03-04 20:58+0100\n"
-"PO-Revision-Date: 2010-03-04 20:58+0100\n"
+"POT-Creation-Date: 2010-03-04 21:04+0100\n"
+"PO-Revision-Date: 2010-03-04 21:05+0100\n"
 "Last-Translator: Maciej Kwiatkowski <kfiadeg gmail com>\n"
 "Language-Team: Polish\n"
 "MIME-Version: 1.0\n"
@@ -1152,13 +1152,13 @@ msgid "Launch Gnome Terminal profiles"
 msgstr "Uruchomianie profili Terminala Gnome"
 
 #. -*- coding: UTF-8 -*-
-msgid "Google Mail"
-msgstr "Poczta Google"
+msgid "Gmail"
+msgstr "Gmail"
 
-msgid "Load contacts and compose new email in Google Mail"
-msgstr "Kontakty i akcje Google Mail"
+msgid "Load contacts and compose new email in Gmail"
+msgstr "Kontakty i akcje poczty Google (Gmail)"
 
-msgid "Load contacts icons"
+msgid "Load contacts' pictures"
 msgstr "Pokazywanie ikonek kontaktów"
 
 msgid "Compose Email in GMail"
@@ -1167,8 +1167,8 @@ msgstr "Utwórz email w GMail"
 msgid "Open web browser and compose new email in GMail"
 msgstr "Otwiera przeglÄ?darkÄ? i tworzy nowÄ? wiadomoÅ?Ä? w GMail"
 
-msgid "Contacts from Google services (Google Mail)"
-msgstr "Kontakty Google (Poczta Google)"
+msgid "Contacts from Google services (Gmail)"
+msgstr "Kontakty z usÅ?ug Google (Gmail)"
 
 #. -*- coding: UTF-8 -*-
 msgid "Google Picasa"
@@ -1400,7 +1400,7 @@ msgstr "Przyjaciele z Twittera"
 
 #, python-format
 msgid "Timeline for %s"
-msgstr ""
+msgstr "Linia czasu %s"
 
 #, python-format
 msgid "%s (%d character)"
@@ -1840,6 +1840,9 @@ msgstr "Strony Zima"
 msgid "Pages stored in Zim Notebooks"
 msgstr "Strony w notatnikach Zima"
 
+#~ msgid "Google Mail"
+#~ msgstr "Poczta Google"
+
 #~ msgid "label"
 #~ msgstr "etykieta"