TipCalc

Merge lp:~anneonyme017/tipcalc/i18n into lp:tipcalc

  1. i18n
  2. Merge into trunk
Proposed by Anne017
Status: Needs review
Proposed branch: lp:~anneonyme017/tipcalc/i18n
Merge into: lp:tipcalc
Diff against target: 221 lines (+144/-30)
3 files modified
po/fr.po (+57/-0)
po/tipcalc.pot (+57/-0)
tipcalc.qml (+30/-30)
To merge this branch: bzr merge lp:~anneonyme017/tipcalc/i18n
Reviewer Review Type Date Requested Status
Marc Deslauriers Pending
Review via email: mp+313785@code.launchpad.net

Description of the change

Hello,

Here is a proposal of internationalization to solve this bug:
https://bugs.launchpad.net/tipcalc/+bug/1639423

I also have attached a translation in French.
Since it is the first time I use Bazaar, let me know if everything is fine.

Best regards.
Anne

To post a comment you must log in.

Unmerged revisions

31. By Anne017

Support for internationalization and French translation added

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added directory 'po'
2=== added file 'po/fr.po'
3--- po/fr.po 1970-01-01 00:00:00 +0000
4+++ po/fr.po 2016-12-22 18:20:27 +0000
5@@ -0,0 +1,57 @@
6+# SOME DESCRIPTIVE TITLE.
7+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
8+# This file is distributed under the same license as the PACKAGE package.
9+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
10+#
11+#, fuzzy
12+msgid ""
13+msgstr ""
14+"Project-Id-Version: PACKAGE VERSION\n"
15+"Report-Msgid-Bugs-To: \n"
16+"POT-Creation-Date: 2016-12-22 19:03+0100\n"
17+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
18+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
19+"Language-Team: LANGUAGE <LL@li.org>\n"
20+"Language: fr\n"
21+"MIME-Version: 1.0\n"
22+"Content-Type: text/plain; charset=CHARSET\n"
23+"Content-Transfer-Encoding: 8bit\n"
24+
25+#. TRANSLATORS: Refers to Clear, keep the translation to 2 characters
26+#: Keyboard.qml:194
27+msgid "C"
28+msgstr "←"
29+
30+#: tipcalc.qml:43
31+msgid "TipCalc"
32+msgstr "Calculatrice de pourboire"
33+
34+#: tipcalc.qml:140
35+msgid "Bill"
36+msgstr "Note"
37+
38+#: tipcalc.qml:153
39+msgid "Tip"
40+msgstr "Pourboire"
41+
42+#: tipcalc.qml:165
43+msgid "Total"
44+msgstr "Total"
45+
46+#: tipcalc.qml:197
47+msgid "total:"
48+msgstr "total[nbsp]:"
49+
50+#: tipcalc.qml:270
51+msgid "split:"
52+msgstr "division[nbsp]:"
53+
54+#: tipcalc.qml:326
55+#, qt-format
56+msgid "# of people: %1"
57+msgstr "# de personnes[nbsp]: %1"
58+
59+#: tipcalc.qml:333
60+#, qt-format
61+msgid "Tip amount: %1%"
62+msgstr "Montant du pourboire[nbsp]: %1%"
63
64=== added file 'po/tipcalc.pot'
65--- po/tipcalc.pot 1970-01-01 00:00:00 +0000
66+++ po/tipcalc.pot 2016-12-22 18:20:27 +0000
67@@ -0,0 +1,57 @@
68+# SOME DESCRIPTIVE TITLE.
69+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
70+# This file is distributed under the same license as the PACKAGE package.
71+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
72+#
73+#, fuzzy
74+msgid ""
75+msgstr ""
76+"Project-Id-Version: PACKAGE VERSION\n"
77+"Report-Msgid-Bugs-To: \n"
78+"POT-Creation-Date: 2016-12-22 19:03+0100\n"
79+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
80+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
81+"Language-Team: LANGUAGE <LL@li.org>\n"
82+"Language: \n"
83+"MIME-Version: 1.0\n"
84+"Content-Type: text/plain; charset=CHARSET\n"
85+"Content-Transfer-Encoding: 8bit\n"
86+
87+#. TRANSLATORS: Refers to Clear, keep the translation to 2 characters
88+#: Keyboard.qml:194
89+msgid "C"
90+msgstr ""
91+
92+#: tipcalc.qml:43
93+msgid "TipCalc"
94+msgstr ""
95+
96+#: tipcalc.qml:140
97+msgid "Bill"
98+msgstr ""
99+
100+#: tipcalc.qml:153
101+msgid "Tip"
102+msgstr ""
103+
104+#: tipcalc.qml:165
105+msgid "Total"
106+msgstr ""
107+
108+#: tipcalc.qml:197
109+msgid "total:"
110+msgstr ""
111+
112+#: tipcalc.qml:270
113+msgid "split:"
114+msgstr ""
115+
116+#: tipcalc.qml:326
117+#, qt-format
118+msgid "# of people: %1"
119+msgstr ""
120+
121+#: tipcalc.qml:333
122+#, qt-format
123+msgid "Tip amount: %1%"
124+msgstr ""
125
126=== modified file 'tipcalc.qml'
127--- tipcalc.qml 2014-11-29 17:57:38 +0000
128+++ tipcalc.qml 2016-12-22 18:20:27 +0000
129@@ -137,32 +137,32 @@
130 Label {
131 width: parent.width
132 horizontalAlignment: Text.AlignHCenter
133- text: "Bill"
134- fontSize: "x-large"
135-
136- }
137- }
138-
139- Rectangle {
140- width: firstRow.width / 4 - firstRow.spacing
141- height: units.gu(4)
142- color: "#ECECEC"
143- Label {
144- width: parent.width
145- horizontalAlignment: Text.AlignHCenter
146- text: "Tip"
147- fontSize: "x-large"
148- }
149- }
150-
151- Rectangle {
152- width: firstRow.width / 4 - firstRow.spacing
153- height: units.gu(4)
154- color: "#ECECEC"
155- Label {
156- width: parent.width
157- horizontalAlignment: Text.AlignHCenter
158- text: "Total"
159+ text: i18n.tr("Bill")
160+ fontSize: "x-large"
161+
162+ }
163+ }
164+
165+ Rectangle {
166+ width: firstRow.width / 4 - firstRow.spacing
167+ height: units.gu(4)
168+ color: "#ECECEC"
169+ Label {
170+ width: parent.width
171+ horizontalAlignment: Text.AlignHCenter
172+ text: i18n.tr("Tip")
173+ fontSize: "x-large"
174+ }
175+ }
176+
177+ Rectangle {
178+ width: firstRow.width / 4 - firstRow.spacing
179+ height: units.gu(4)
180+ color: "#ECECEC"
181+ Label {
182+ width: parent.width
183+ horizontalAlignment: Text.AlignHCenter
184+ text: i18n.tr("Total")
185 fontSize: "x-large"
186 }
187 }
188@@ -194,7 +194,7 @@
189 height: parent.height
190 horizontalAlignment: Text.AlignHCenter
191 verticalAlignment: Text.AlignVCenter
192- text: "total:"
193+ text: i18n.tr("total:")
194 fontSize: "large"
195 color: peopleSlider.value.toFixed() < 2 ? "#FFFFFF" : "#888888"
196 }
197@@ -267,7 +267,7 @@
198 height: parent.height
199 horizontalAlignment: Text.AlignHCenter
200 verticalAlignment: Text.AlignVCenter
201- text: "split:"
202+ text: i18n.tr("split:")
203 fontSize: "large"
204 color: peopleSlider.value.toFixed() < 2 ? "#888888" : "#FFFFFF"
205 }
206@@ -323,14 +323,14 @@
207
208 Label {
209 width: slidersGrid.width / slidersGrid.columns - slidersGrid.spacing
210- text: "# of people: %1".arg(peopleSlider.value.toFixed())
211+ text: i18n.tr("# of people: %1").arg(peopleSlider.value.toFixed())
212 fontSize: "large"
213 }
214
215 Label {
216 //anchors.horizontalCenter: parent.horizontalCenter
217 width: slidersGrid.width / slidersGrid.columns - slidersGrid.spacing
218- text: "Tip amount: %1%".arg(tipSlider.value.toFixed())
219+ text: i18n.tr("Tip amount: %1%").arg(tipSlider.value.toFixed())
220 fontSize: "large"
221 }
222

Subscribers

People subscribed via source and target branches

to all changes: