[meego-commits] 8732: Changes to MeeGo:1.1:Handset/meego-handset-dialer-translations
Shane Bryan
no_reply at build.meego.com
Fri Oct 22 01:35:23 UTC 2010
Hi,
I have made the following changes to meego-handset-dialer-translations in project MeeGo:1.1:Handset. Please review and accept ASAP.
Thank You,
Shane Bryan
[This message was auto-generated]
---
Request #8732:
submit: devel:ux:handset:MeeGo:1.1/meego-handset-dialer-translations(r2) -> MeeGo:1.1:Handset/meego-handset-dialer-translations
Message:
Fixes: MeeGo 1.1 blocker BMC's #8399
State: new 2010-10-21T18:35:22 sbryan
Comment: None
changes files:
--------------
--- meego-handset-dialer-translations.changes
+++ meego-handset-dialer-translations.changes
@@ -1,0 +2,9 @@
+Fri Oct 22 01:27:06 UTC 2010 - shane.bryan at linux.intel.com
+
+- Fixes: MeeGo 1.1 blocker BMC's #8399
+ - BMC#8399 - The title displayed in dialer are all with "!!"
+
+- Partial Fix for MeeGo 1.1 blocker BMC's #8773, Dialer en_US translations
+ - BMC#8773 - Missing English Translations
+
+-------------------------------------------------------------------
new:
----
0001-Fixed-BMC-s-8399-8773.patch
spec files:
-----------
--- meego-handset-dialer-translations.spec
+++ meego-handset-dialer-translations.spec
@@ -1,6 +1,6 @@
#
-# Do not Edit! Generated by:
-# spectacle version 0.18
+# Do NOT Edit the Auto-generated Part!
+# Generated by: spectacle version 0.20
#
# >> macros
# << macros
@@ -14,6 +14,7 @@
URL: http://gitorious.org/meego-handset-ux/meego-handset-dialer-translations
Source0: %{name}-%{version}.tar.bz2
Source100: meego-handset-dialer-translations.yaml
+Patch0: 0001-Fixed-BMC-s-8399-8773.patch
Requires: meego-handset-dialer >= 0.1.16
BuildRequires: pkgconfig(QtCore) >= 4.6.0
BuildRequires: pkgconfig(meegotouch)
@@ -160,6 +161,8 @@
%prep
%setup -q -n %{name}-%{version}
+# 0001-Fixed-BMC-s-8399-8773.patch
+%patch0 -p1
# >> setup
# << setup
@@ -167,7 +170,8 @@
# >> build pre
# << build pre
-qmake install_prefix=/usr
+%qmake
+
make %{?jobs:-j%jobs}
# >> build post
@@ -176,7 +180,7 @@
rm -rf %{buildroot}
# >> install pre
# << install pre
-%make_install INSTALL_ROOT=%{buildroot}
+%qmake_install
# >> install post
# << install post
other changes:
--------------
++++++ 0001-Fixed-BMC-s-8399-8773.patch (new)
--- 0001-Fixed-BMC-s-8399-8773.patch
+++ 0001-Fixed-BMC-s-8399-8773.patch
+From dc86a7d9cbfa9f39bc83940a288980bea4481e88 Mon Sep 17 00:00:00 2001
+From: Shane Bryan <shane.bryan at linux.intel.com>
+Date: Fri, 22 Oct 2010 01:12:29 +0000
+Subject: [PATCH] Fixed: BMC's #8399, #8773
+
+- BMC#8399 - The title displayed in dialer are all with "!!"
+- BMC#8773 - Missing English Translations
+
+Signed-off-by: Shane Bryan <shane.bryan at linux.intel.com>
+---
+ dialer_de.ts | 17 +++++---
+ dialer_en.ts | 19 +++++---
+ dialer_en_GB.ts | 17 +++++---
+ dialer_en_US.ts | 133 ++++++++++++++++++++++++++++--------------------------
+ dialer_es.ts | 17 +++++---
+ dialer_fi.ts | 17 +++++---
+ dialer_fr.ts | 17 +++++---
+ dialer_fr_CA.ts | 17 +++++---
+ dialer_it.ts | 17 +++++---
+ dialer_ja.ts | 17 +++++---
+ dialer_ko.ts | 17 +++++---
+ dialer_nl.ts | 17 +++++---
+ dialer_pl.ts | 17 +++++---
+ dialer_pt.ts | 17 +++++---
+ dialer_pt_BR.ts | 17 +++++---
+ dialer_ru.ts | 17 +++++---
+ dialer_sv.ts | 17 +++++---
+ dialer_zh_CN.ts | 17 +++++---
+ dialer_zh_TW.ts | 17 +++++---
+ 19 files changed, 268 insertions(+), 173 deletions(-)
+
+diff --git a/dialer_de.ts b/dialer_de.ts
+index dd74e4f..76bfa9a 100644
+--- a/dialer_de.ts
++++ b/dialer_de.ts
+@@ -19,19 +19,19 @@
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_unknown_caller">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="150"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="167"/>
+ <source>Unknown Caller</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_private">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="153"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="170"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="80"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="205"/>
+ <source>Private</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_full_name">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="168"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="184"/>
+ <location filename="../meego-handset-dialer/src/dialerpage.cpp" line="157"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="99"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="224"/>
+@@ -41,7 +41,7 @@
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_unavailable">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="174"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="190"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="110"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="231"/>
+ <location filename="../meego-handset-dialer/src/recentpage.cpp" line="320"/>
+@@ -168,12 +168,17 @@
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_no_ofono_error">
+- <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="124"/>
++ <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="125"/>
+ <source>Failed to connect to org.ofono.Manager: is ofonod running?</source>
+ <translation type="unfinished"></translation>
+ </message>
++ <message id="xx_messages_waiting">
++ <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="195"/>
++ <source>You have %1 voice messages</source>
++ <translation type="unfinished"></translation>
++ </message>
+ <message id="xx_error">
+- <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="202"/>
++ <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="226"/>
+ <source>Error</source>
+ <translation type="unfinished"></translation>
+ </message>
+diff --git a/dialer_en.ts b/dialer_en.ts
+index 8031da1..85281a8 100644
+--- a/dialer_en.ts
++++ b/dialer_en.ts
+@@ -19,19 +19,19 @@
+ <translation>Decline</translation>
+ </message>
+ <message id="xx_unknown_caller">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="150"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="167"/>
+ <source>Unknown Caller</source>
+ <translation>Unknown Caller</translation>
+ </message>
+ <message id="xx_private">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="153"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="170"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="80"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="205"/>
+ <source>Private</source>
+ <translation>Private</translation>
+ </message>
+ <message id="xx_full_name">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="168"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="184"/>
+ <location filename="../meego-handset-dialer/src/dialerpage.cpp" line="157"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="99"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="224"/>
+@@ -41,7 +41,7 @@
+ <translation>%1, %2</translation>
+ </message>
+ <message id="xx_unavailable">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="174"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="190"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="110"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="231"/>
+ <location filename="../meego-handset-dialer/src/recentpage.cpp" line="320"/>
+@@ -168,12 +168,17 @@
+ <translation>Calls:</translation>
+ </message>
+ <message id="xx_no_ofono_error">
+- <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="124"/>
++ <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="125"/>
+ <source>Failed to connect to org.ofono.Manager: is ofonod running?</source>
+ <translation>Failed to connect to org.ofono.Manager: is ofonod running?</translation>
+ </message>
++ <message id="xx_messages_waiting">
++ <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="195"/>
++ <source>You have %1 voice messages</source>
++ <translation>You have %1 voice messages</translation>
++ </message>
+ <message id="xx_error">
+- <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="202"/>
++ <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="226"/>
+ <source>Error</source>
+ <translation>Error</translation>
+ </message>
+@@ -333,7 +338,7 @@
+ <message id="xx_first_name">
+ <location filename="../meego-handset-dialer/src/peopleitem.cpp" line="202"/>
+ <source>%1</source>
+- <translation type="unfinished"></translation>
++ <translation>%1</translation>
+ </message>
+ </context>
+ </TS>
+diff --git a/dialer_en_GB.ts b/dialer_en_GB.ts
+index fe1a427..2e6044a 100644
+--- a/dialer_en_GB.ts
++++ b/dialer_en_GB.ts
+@@ -19,19 +19,19 @@
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_unknown_caller">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="150"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="167"/>
+ <source>Unknown Caller</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_private">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="153"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="170"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="80"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="205"/>
+ <source>Private</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_full_name">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="168"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="184"/>
+ <location filename="../meego-handset-dialer/src/dialerpage.cpp" line="157"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="99"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="224"/>
+@@ -41,7 +41,7 @@
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_unavailable">
+- <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="174"/>
++ <location filename="../meego-handset-dialer/src/alertdialog.cpp" line="190"/>
+ <location filename="../meego-handset-dialer/src/mainwindow.cpp" line="110"/>
+ <location filename="../meego-handset-dialer/src/managerproxy.cpp" line="231"/>
+ <location filename="../meego-handset-dialer/src/recentpage.cpp" line="320"/>
+@@ -168,12 +168,17 @@
+ <translation type="unfinished"></translation>
+ </message>
+ <message id="xx_no_ofono_error">
+- <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="124"/>
++ <location filename="../meego-handset-dialer/src/dialerapplication.cpp" line="125"/>
+ <source>Failed to connect to org.ofono.Manager: is ofonod running?</source>
+ <translation type="unfinished"></translation>
+ </message>
++ <message id="xx_messages_waiting">
(1255 more lines skipped)
++++++ meego-handset-dialer-translations.yaml
--- meego-handset-dialer-translations.yaml
+++ meego-handset-dialer-translations.yaml
@@ -7,6 +7,8 @@
URL: http://gitorious.org/meego-handset-ux/meego-handset-dialer-translations
Sources:
- "%{name}-%{version}.tar.bz2"
+Patches:
+ - "0001-Fixed-BMC-s-8399-8773.patch"
Description: Translation files for meego-handset-dialer
Requires:
- meego-handset-dialer >= 0.1.16
More information about the MeeGo-commits
mailing list