[SCM] UNNAMED PROJECT branch, master, updated. 0.36-1149-gd4cfe3d

[Michal Cihar]

The following commit has been merged in the master branch:
commit 7d504382456e2661dee766d6170240c94ffc2b8e
Author: Michal Čihař <***@cihar.com>
Date: Mon Mar 26 15:39:30 2012 +0200

Consistent terminology with Gammu

diff --git a/Wammu/Browser.py b/Wammu/Browser.py
index 70917fc..861b981 100644
--- a/Wammu/Browser.py
+++ b/Wammu/Browser.py
@@ -81,7 +81,7 @@ COLUMN_INFO = {
(
(
_('Location'),
- _('State'),
+ _('Status'),
_('Number'),
_('Date'),
_('Text')
diff --git a/Wammu/Main.py b/Wammu/Main.py
index a3e7be9..d4f9810 100644
--- a/Wammu/Main.py
+++ b/Wammu/Main.py
@@ -994,7 +994,7 @@ class WammuFrame(wx.Frame):
(_('Folder'), StrConv(v['SMS'][0]['Folder'])),
(_('Memory'), StrConv(v['SMS'][0]['Memory'])),
(_('SMSC'), Wammu.Utils.GetNumberLink([] + self.values['contact']['ME'] + self.values['contact']['SM'], v['SMS'][0]['SMSC']['Number'])),
- (_('State'), StrConv(v['State']))]
+ (_('Status'), StrConv(v['State']))]
if v['Name'] != '':
data.append((_('Name'), StrConv(v['Name'])))
data.append((Wammu.MessageDisplay.SmsToHtml(self.cfg, v),))

[Michal Cihar]

The following commit has been merged in the master branch:
commit d4cfe3d0da14b01d06434bb121a181bc69d599e3
Author: Michal Čihař <***@cihar.com>
Date: Mon Mar 26 15:41:35 2012 +0200

Update po files

diff --git a/locale/af/wammu.po b/locale/af/wammu.po
index ab4d2db..8d43667 100644
--- a/locale/af/wammu.po
+++ b/locale/af/wammu.po
@@ -97,7 +97,7 @@ msgid "Date"
msgstr "Datum"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Toestand"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/ar/wammu.po b/locale/ar/wammu.po
index efb0979..f035dd0 100644
--- a/locale/ar/wammu.po
+++ b/locale/ar/wammu.po
@@ -107,7 +107,7 @@ msgid "Date"
msgstr "تاريخ"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "حالة"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/bg/wammu.po b/locale/bg/wammu.po
index e975557..bbd2da8 100644
--- a/locale/bg/wammu.po
+++ b/locale/bg/wammu.po
@@ -101,7 +101,7 @@ msgid "Date"
msgstr "Дата"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Състояние"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/ca/wammu.po b/locale/ca/wammu.po
index 1405122..4dbf16c 100644
--- a/locale/ca/wammu.po
+++ b/locale/ca/wammu.po
@@ -107,7 +107,7 @@ msgid "Date"
msgstr "Data"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Estat"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/cs/wammu.po b/locale/cs/wammu.po
index c61e0e9..b47b50d 100644
--- a/locale/cs/wammu.po
+++ b/locale/cs/wammu.po
@@ -106,7 +106,7 @@ msgid "Date"
msgstr "Datum"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Stav"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/da/wammu.po b/locale/da/wammu.po
index 5d19e35..6d200a4 100644
--- a/locale/da/wammu.po
+++ b/locale/da/wammu.po
@@ -108,7 +108,7 @@ msgid "Date"
msgstr "Dato"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Status"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/de/wammu.po b/locale/de/wammu.po
index 46ee9ce..36a3cc8 100644
--- a/locale/de/wammu.po
+++ b/locale/de/wammu.po
@@ -110,7 +110,7 @@ msgid "Date"
msgstr "Datum"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Status"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/el/wammu.po b/locale/el/wammu.po
index 8e46d25..fc01621 100644
--- a/locale/el/wammu.po
+++ b/locale/el/wammu.po
@@ -106,7 +106,7 @@ msgid "Date"
msgstr "Ημερομηνία"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Κατάσταση"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/en_GB/wammu.po b/locale/en_GB/wammu.po
index 3937fe4..5c4f1aa 100644
--- a/locale/en_GB/wammu.po
+++ b/locale/en_GB/wammu.po
@@ -107,8 +107,8 @@ msgid "Date"
msgstr "Date"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
-msgstr "State"
+msgid "Status"
+msgstr "Status"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
#: Wammu/Composer.py:312 Wammu/Main.py:251
diff --git a/locale/es/wammu.po b/locale/es/wammu.po
index 438039b..e56495d 100644
--- a/locale/es/wammu.po
+++ b/locale/es/wammu.po
@@ -108,7 +108,7 @@ msgstr "Fecha"

# Puede leerse también "País"
#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Estado"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/et/wammu.po b/locale/et/wammu.po
index c722fd9..175a03e 100644
--- a/locale/et/wammu.po
+++ b/locale/et/wammu.po
@@ -101,7 +101,7 @@ msgid "Date"
msgstr "Kuupäev"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Olek"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/fi/wammu.po b/locale/fi/wammu.po
index 6ef62d4..ac325bd 100644
--- a/locale/fi/wammu.po
+++ b/locale/fi/wammu.po
@@ -107,7 +107,7 @@ msgid "Date"
msgstr "Päiväys"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Tila"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/fr/wammu.po b/locale/fr/wammu.po
index 66a33c3..8dd116e 100644
--- a/locale/fr/wammu.po
+++ b/locale/fr/wammu.po
@@ -111,7 +111,7 @@ msgid "Date"
msgstr "Date"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "État"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/gl/wammu.po b/locale/gl/wammu.po
index 96d055b..3914da0 100644
--- a/locale/gl/wammu.po
+++ b/locale/gl/wammu.po
@@ -101,7 +101,7 @@ msgid "Date"
msgstr "Data"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Estado"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/he/wammu.po b/locale/he/wammu.po
index 562045f..ffa3bcc 100644
--- a/locale/he/wammu.po
+++ b/locale/he/wammu.po
@@ -98,7 +98,7 @@ msgid "Date"
msgstr "תאריך"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "מצב"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/hu/wammu.po b/locale/hu/wammu.po
index d986fd0..ff1e2d8 100644
--- a/locale/hu/wammu.po
+++ b/locale/hu/wammu.po
@@ -110,7 +110,7 @@ msgid "Date"
msgstr "Dátum"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Állapot"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/id/wammu.po b/locale/id/wammu.po
index b2d3aa4..c826ddd 100644
--- a/locale/id/wammu.po
+++ b/locale/id/wammu.po
@@ -108,7 +108,7 @@ msgid "Date"
msgstr "Tanggal"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Kondisi"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/it/wammu.po b/locale/it/wammu.po
index 3f00b20..f9652f2 100644
--- a/locale/it/wammu.po
+++ b/locale/it/wammu.po
@@ -105,7 +105,7 @@ msgid "Date"
msgstr "Data"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Stato"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/ko/wammu.po b/locale/ko/wammu.po
index 55aa76c..aa5b9b5 100644
--- a/locale/ko/wammu.po
+++ b/locale/ko/wammu.po
@@ -103,7 +103,7 @@ msgid "Date"
msgstr "날짜"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "상태"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/nl/wammu.po b/locale/nl/wammu.po
index b1e6a32..d35eb83 100644
--- a/locale/nl/wammu.po
+++ b/locale/nl/wammu.po
@@ -107,7 +107,7 @@ msgid "Date"
msgstr "Datum"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Status"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/pl/wammu.po b/locale/pl/wammu.po
index 4920b35..862c219 100644
--- a/locale/pl/wammu.po
+++ b/locale/pl/wammu.po
@@ -109,7 +109,7 @@ msgid "Date"
msgstr "Data"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Stan"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/pt_BR/wammu.po b/locale/pt_BR/wammu.po
index 434c52c..a8f5ea1 100644
--- a/locale/pt_BR/wammu.po
+++ b/locale/pt_BR/wammu.po
@@ -108,7 +108,7 @@ msgid "Date"
msgstr "Data"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Estado"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/ru/wammu.po b/locale/ru/wammu.po
index 140508b..89afb8e 100644
--- a/locale/ru/wammu.po
+++ b/locale/ru/wammu.po
@@ -109,7 +109,7 @@ msgid "Date"
msgstr "Дата"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Состояние"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/sk/wammu.po b/locale/sk/wammu.po
index 91ca788..e2a1ceb 100644
--- a/locale/sk/wammu.po
+++ b/locale/sk/wammu.po
@@ -107,7 +107,7 @@ msgid "Date"
msgstr "Dátum"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Stav"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/sv/wammu.po b/locale/sv/wammu.po
index 7aad04e..267fc11 100644
--- a/locale/sv/wammu.po
+++ b/locale/sv/wammu.po
@@ -108,7 +108,7 @@ msgid "Date"
msgstr "Datum"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Tillstånd"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/sw/wammu.po b/locale/sw/wammu.po
index 8adb010..6a28bb7 100644
--- a/locale/sw/wammu.po
+++ b/locale/sw/wammu.po
@@ -96,7 +96,7 @@ msgid "Date"
msgstr ""

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr ""

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/tr/wammu.po b/locale/tr/wammu.po
index e5072a1..d05f31e 100644
--- a/locale/tr/wammu.po
+++ b/locale/tr/wammu.po
@@ -103,7 +103,7 @@ msgid "Date"
msgstr "Tarih"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "Estado"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/wammu.pot b/locale/wammu.pot
index 218b9b1..295cb74 100644
--- a/locale/wammu.pot
+++ b/locale/wammu.pot
@@ -1,5 +1,5 @@
# Wammu translation.
-# Copyright (C) 2003 - 2011 Michal Čihař
+# Copyright (C) 2003 - 2012 Michal Čihař
# This file is distributed under the same license as the Wammu package.
# FIRST AUTHOR <***@ADDRESS>, YEAR.
#
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Wammu 0.37\n"
"Report-Msgid-Bugs-To: ***@cihar.com\n"
-"POT-Creation-Date: 2011-12-06 10:10+0100\n"
+"POT-Creation-Date: 2012-03-26 15:41+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <***@ADDRESS>\n"
"Language-Team: LANGUAGE <***@li.org>\n"
@@ -97,7 +97,7 @@ msgid "Date"
msgstr ""

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr ""

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/zh_CN/wammu.po b/locale/zh_CN/wammu.po
index ac7ca21..8f5fae2 100644
--- a/locale/zh_CN/wammu.po
+++ b/locale/zh_CN/wammu.po
@@ -106,7 +106,7 @@ msgid "Date"
msgstr "日期"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "状态"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121
diff --git a/locale/zh_TW/wammu.po b/locale/zh_TW/wammu.po
index 57d2bd1..834f867 100644
--- a/locale/zh_TW/wammu.po
+++ b/locale/zh_TW/wammu.po
@@ -106,7 +106,7 @@ msgid "Date"
msgstr "日期"

#: Wammu/Browser.py:84 Wammu/Main.py:997
-msgid "State"
+msgid "Status"
msgstr "狀態"

#: Wammu/Browser.py:87 Wammu/Browser.py:103 Wammu/Browser.py:121