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

Proposed by Anne017
Status: Needs review
Proposed branch: lp:~anneonyme017/zconverter/i18n
Merge into: lp:zconverter
Diff against target: 305 lines (+130/-138)
5 files modified
po/fr.po (+66/-0)
po/zConverter.pot (+62/-0)
ui/AboutTab.qml (+1/-1)
ui/ConverterTab.qml (+1/-1)
zConverter.qmlproject.user (+0/-136)
To merge this branch: bzr merge lp:~anneonyme017/zconverter/i18n
Reviewer Review Type Date Requested Status
Roman Zonov Pending
Review via email: mp+313884@code.launchpad.net

Description of the change

Hello,

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

I also have attached a translation in French.
Could you host the translations in Launchpad (https://wiki.ubuntu.com/Translations/LpProjectConfiguration), this way the translations could be more easily reviewed by Ubuntu Translators?

Best regards.
Anne

To post a comment you must log in.

Unmerged revisions

2. By Anne017

Support for internationalization and French translation added (+ correction of a typo: a problems > a problem)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== added directory 'po'
=== added file 'po/fr.po'
--- po/fr.po 1970-01-01 00:00:00 +0000
+++ po/fr.po 2016-12-27 11:25:55 +0000
@@ -0,0 +1,66 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-12-27 12:15+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: fr\n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19
20#: ui/AboutTab.qml:6
21msgid "About"
22msgstr "À propos"
23
24#: ui/AboutTab.qml:23
25msgid "Made by Zonov Roman"
26msgstr "Développé par Zonov Roman"
27
28#: ui/ConverterTab.qml:10
29msgid "zConverter"
30msgstr "zConverter"
31
32#: ui/ConverterTab.qml:16
33msgid "Choose currency"
34msgstr "Choisissez une monnaie"
35
36#: ui/ConverterTab.qml:50
37msgid "Currency Converter"
38msgstr "Convertisseur de monnaies"
39
40#: ui/ConverterTab.qml:135
41msgid ""
42"Before first use you must connect to the Internet to fetch information about "
43"currencies."
44msgstr ""
45"Avant la première utilisation, vous devez vous connecter à Internet pour récupérer les informations sur "
46"les taux de change."
47
48#: ui/ConverterTab.qml:146
49msgid "Try again"
50msgstr "Réessayez"
51
52#: ui/ConverterTab.qml:156
53msgid "Quit"
54msgstr "Quitter"
55
56#: ui/ConverterTab.qml:258
57msgid "Clear"
58msgstr "Effacer"
59
60#: ui/ConverterTab.qml:280
61msgid ""
62"Warning! Information may be outdated! We have a problem with connecting to "
63"the Internet."
64msgstr ""
65"Attention[nbsp]! Les informations sont potentiellement obsolètes[nbsp]! Nous avons un problème pour vous connecter à "
66"Internet."
067
=== added file 'po/zConverter.pot'
--- po/zConverter.pot 1970-01-01 00:00:00 +0000
+++ po/zConverter.pot 2016-12-27 11:25:55 +0000
@@ -0,0 +1,62 @@
1# SOME DESCRIPTIVE TITLE.
2# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
3# This file is distributed under the same license as the PACKAGE package.
4# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
5#
6#, fuzzy
7msgid ""
8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2016-12-27 12:15+0100\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"
15"Language: \n"
16"MIME-Version: 1.0\n"
17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"
19
20#: ui/AboutTab.qml:6
21msgid "About"
22msgstr ""
23
24#: ui/AboutTab.qml:23
25msgid "Made by Zonov Roman"
26msgstr ""
27
28#: ui/ConverterTab.qml:10
29msgid "zConverter"
30msgstr ""
31
32#: ui/ConverterTab.qml:16
33msgid "Choose currency"
34msgstr ""
35
36#: ui/ConverterTab.qml:50
37msgid "Currency Converter"
38msgstr ""
39
40#: ui/ConverterTab.qml:135
41msgid ""
42"Before first use you must connect to the Internet to fetch information about "
43"currencies."
44msgstr ""
45
46#: ui/ConverterTab.qml:146
47msgid "Try again"
48msgstr ""
49
50#: ui/ConverterTab.qml:156
51msgid "Quit"
52msgstr ""
53
54#: ui/ConverterTab.qml:258
55msgid "Clear"
56msgstr ""
57
58#: ui/ConverterTab.qml:280
59msgid ""
60"Warning! Information may be outdated! We have a problems with connecting to "
61"the Internet."
62msgstr ""
063
=== modified file 'ui/AboutTab.qml'
--- ui/AboutTab.qml 2013-10-29 18:17:42 +0000
+++ ui/AboutTab.qml 2016-12-27 11:25:55 +0000
@@ -20,7 +20,7 @@
20 }20 }
21 Text {21 Text {
22 anchors.horizontalCenter: parent.horizontalCenter22 anchors.horizontalCenter: parent.horizontalCenter
23 text: "Made by Zonov Roman"23 text: i18n.tr("Made by Zonov Roman")
24 }24 }
25 }25 }
26 }26 }
2727
=== modified file 'ui/ConverterTab.qml'
--- ui/ConverterTab.qml 2013-10-29 18:17:42 +0000
+++ ui/ConverterTab.qml 2016-12-27 11:25:55 +0000
@@ -277,7 +277,7 @@
277 right: parent.right277 right: parent.right
278 verticalCenter: parent.verticalCenter278 verticalCenter: parent.verticalCenter
279 }279 }
280 text: i18n.tr("Warning! Information may be outdated! We have a problems with connecting to the Internet.")280 text: i18n.tr("Warning! Information may be outdated! We have a problem with connecting to the Internet.")
281 horizontalAlignment: Text.AlignHCenter281 horizontalAlignment: Text.AlignHCenter
282 wrapMode: Text.WordWrap282 wrapMode: Text.WordWrap
283 font.pointSize: units.gu(1)283 font.pointSize: units.gu(1)
284284
=== removed file 'zConverter.qmlproject.user'
--- zConverter.qmlproject.user 2013-10-29 18:17:42 +0000
+++ zConverter.qmlproject.user 1970-01-01 00:00:00 +0000
@@ -1,136 +0,0 @@
1<?xml version="1.0" encoding="UTF-8"?>
2<!DOCTYPE QtCreatorProject>
3<!-- Written by QtCreator 2.8.1, 2013-10-26T16:08:57. -->
4<qtcreator>
5 <data>
6 <variable>ProjectExplorer.Project.ActiveTarget</variable>
7 <value type="int">0</value>
8 </data>
9 <data>
10 <variable>ProjectExplorer.Project.EditorSettings</variable>
11 <valuemap type="QVariantMap">
12 <value type="bool" key="EditorConfiguration.AutoIndent">true</value>
13 <value type="bool" key="EditorConfiguration.AutoSpacesForTabs">false</value>
14 <value type="bool" key="EditorConfiguration.CamelCaseNavigation">true</value>
15 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.0">
16 <value type="QString" key="language">Cpp</value>
17 <valuemap type="QVariantMap" key="value">
18 <value type="QString" key="CurrentPreferences">CppGlobal</value>
19 </valuemap>
20 </valuemap>
21 <valuemap type="QVariantMap" key="EditorConfiguration.CodeStyle.1">
22 <value type="QString" key="language">QmlJS</value>
23 <valuemap type="QVariantMap" key="value">
24 <value type="QString" key="CurrentPreferences">QmlJSGlobal</value>
25 </valuemap>
26 </valuemap>
27 <value type="int" key="EditorConfiguration.CodeStyle.Count">2</value>
28 <value type="QByteArray" key="EditorConfiguration.Codec">UTF-8</value>
29 <value type="bool" key="EditorConfiguration.ConstrainTooltips">false</value>
30 <value type="int" key="EditorConfiguration.IndentSize">4</value>
31 <value type="bool" key="EditorConfiguration.KeyboardTooltips">false</value>
32 <value type="bool" key="EditorConfiguration.MouseNavigation">true</value>
33 <value type="int" key="EditorConfiguration.PaddingMode">1</value>
34 <value type="bool" key="EditorConfiguration.ScrollWheelZooming">true</value>
35 <value type="int" key="EditorConfiguration.SmartBackspaceBehavior">0</value>
36 <value type="bool" key="EditorConfiguration.SpacesForTabs">true</value>
37 <value type="int" key="EditorConfiguration.TabKeyBehavior">0</value>
38 <value type="int" key="EditorConfiguration.TabSize">8</value>
39 <value type="bool" key="EditorConfiguration.UseGlobal">true</value>
40 <value type="int" key="EditorConfiguration.Utf8BomBehavior">1</value>
41 <value type="bool" key="EditorConfiguration.addFinalNewLine">true</value>
42 <value type="bool" key="EditorConfiguration.cleanIndentation">true</value>
43 <value type="bool" key="EditorConfiguration.cleanWhitespace">true</value>
44 <value type="bool" key="EditorConfiguration.inEntireDocument">false</value>
45 </valuemap>
46 </data>
47 <data>
48 <variable>ProjectExplorer.Project.PluginSettings</variable>
49 <valuemap type="QVariantMap"/>
50 </data>
51 <data>
52 <variable>ProjectExplorer.Project.Target.0</variable>
53 <valuemap type="QVariantMap">
54 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Desktop</value>
55 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">Desktop</value>
56 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">{b0745206-e542-4893-9c5c-73f6e15b8610}</value>
57 <value type="int" key="ProjectExplorer.Target.ActiveBuildConfiguration">-1</value>
58 <value type="int" key="ProjectExplorer.Target.ActiveDeployConfiguration">0</value>
59 <value type="int" key="ProjectExplorer.Target.ActiveRunConfiguration">0</value>
60 <value type="int" key="ProjectExplorer.Target.BuildConfigurationCount">0</value>
61 <valuemap type="QVariantMap" key="ProjectExplorer.Target.DeployConfiguration.0">
62 <valuemap type="QVariantMap" key="ProjectExplorer.BuildConfiguration.BuildStepList.0">
63 <value type="int" key="ProjectExplorer.BuildStepList.StepsCount">0</value>
64 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy</value>
65 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
66 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.BuildSteps.Deploy</value>
67 </valuemap>
68 <value type="int" key="ProjectExplorer.BuildConfiguration.BuildStepListCount">1</value>
69 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName">Deploy locally</value>
70 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName"></value>
71 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">ProjectExplorer.DefaultDeployConfiguration</value>
72 </valuemap>
73 <value type="int" key="ProjectExplorer.Target.DeployConfigurationCount">1</value>
74 <valuemap type="QVariantMap" key="ProjectExplorer.Target.PluginSettings"/>
75 <valuemap type="QVariantMap" key="ProjectExplorer.Target.RunConfiguration.0">
76 <value type="bool" key="Analyzer.Project.UseGlobal">true</value>
77 <valuelist type="QVariantList" key="Analyzer.Valgrind.AddedSuppressionFiles"/>
78 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectBusEvents">false</value>
79 <value type="bool" key="Analyzer.Valgrind.Callgrind.CollectSystime">false</value>
80 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableBranchSim">false</value>
81 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableCacheSim">false</value>
82 <value type="bool" key="Analyzer.Valgrind.Callgrind.EnableEventToolTips">true</value>
83 <value type="double" key="Analyzer.Valgrind.Callgrind.MinimumCostRatio">0.01</value>
84 <value type="double" key="Analyzer.Valgrind.Callgrind.VisualisationMinimumCostRatio">10</value>
85 <value type="bool" key="Analyzer.Valgrind.FilterExternalIssues">true</value>
86 <value type="int" key="Analyzer.Valgrind.NumCallers">25</value>
87 <valuelist type="QVariantList" key="Analyzer.Valgrind.RemovedSuppressionFiles"/>
88 <value type="bool" key="Analyzer.Valgrind.TrackOrigins">true</value>
89 <value type="QString" key="Analyzer.Valgrind.ValgrindExecutable">valgrind</value>
90 <valuelist type="QVariantList" key="Analyzer.Valgrind.VisibleErrorKinds">
91 <value type="int">0</value>
92 <value type="int">1</value>
93 <value type="int">2</value>
94 <value type="int">3</value>
95 <value type="int">4</value>
96 <value type="int">5</value>
97 <value type="int">6</value>
98 <value type="int">7</value>
99 <value type="int">8</value>
100 <value type="int">9</value>
101 <value type="int">10</value>
102 <value type="int">11</value>
103 <value type="int">12</value>
104 <value type="int">13</value>
105 <value type="int">14</value>
106 </valuelist>
107 <value type="int" key="PE.EnvironmentAspect.Base">0</value>
108 <valuelist type="QVariantList" key="PE.EnvironmentAspect.Changes"/>
109 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DefaultDisplayName"></value>
110 <value type="QString" key="ProjectExplorer.ProjectConfiguration.DisplayName">QML Scene</value>
111 <value type="QString" key="ProjectExplorer.ProjectConfiguration.Id">QmlProjectManager.QmlRunConfiguration.QmlScene</value>
112 <value type="QString" key="QmlProjectManager.QmlRunConfiguration.MainScript">CurrentFile</value>
113 <value type="QString" key="QmlProjectManager.QmlRunConfiguration.QDeclarativeViewerArguments"></value>
114 <value type="uint" key="RunConfiguration.QmlDebugServerPort">3768</value>
115 <value type="bool" key="RunConfiguration.UseCppDebugger">false</value>
116 <value type="bool" key="RunConfiguration.UseCppDebuggerAuto">true</value>
117 <value type="bool" key="RunConfiguration.UseMultiProcess">false</value>
118 <value type="bool" key="RunConfiguration.UseQmlDebugger">true</value>
119 <value type="bool" key="RunConfiguration.UseQmlDebuggerAuto">false</value>
120 </valuemap>
121 <value type="int" key="ProjectExplorer.Target.RunConfigurationCount">1</value>
122 </valuemap>
123 </data>
124 <data>
125 <variable>ProjectExplorer.Project.TargetCount</variable>
126 <value type="int">1</value>
127 </data>
128 <data>
129 <variable>ProjectExplorer.Project.Updater.EnvironmentId</variable>
130 <value type="QByteArray">{ccf21c73-cc82-4546-ae0f-a5b826de20c0}</value>
131 </data>
132 <data>
133 <variable>ProjectExplorer.Project.Updater.FileVersion</variable>
134 <value type="int">14</value>
135 </data>
136</qtcreator>

Subscribers

People subscribed via source and target branches

to all changes: