Points2One

Merge lp://qastaging/points2one into lp://qastaging/~anatoly-g/points2one/0.2.15

  1. trunk
  2. Merge into 0.2.15
Proposed by ANAT01
Status: Merged
Merge reported by: Goyo
Merged at revision: not available
Proposed branch: lp://qastaging/points2one
Merge into: lp://qastaging/~anatoly-g/points2one/0.2.15
Diff against target: 2182 lines (+2089/-0) (has conflicts)
17 files modified
LICENSE.txt (+339/-0)
build-dist.py (+64/-0)
build.sh (+13/-0)
points2one/__init__.py (+56/-0)
points2one/frmPoints2One.ui (+313/-0)
points2one/i18n/points2one_es_ES.ts (+127/-0)
points2one/i18n/points2one_fr_FR.ts (+127/-0)
points2one/i18n/points2one_ru_RU.ts (+117/-0)
points2one/metadata.txt (+49/-0)
points2one/p2o_encodings.py (+45/-0)
points2one/p2o_engine.py (+161/-0)
points2one/points2one_gui.py (+277/-0)
points2one/points2one_plugin.py (+74/-0)
points2one/resources.py (+76/-0)
points2one/resources.qrc (+21/-0)
points2one/ui_frmPoints2One.py (+163/-0)
test/test_encodings.py (+67/-0)
Conflict adding file LICENSE.txt.  Moved existing file to LICENSE.txt.moved.
Conflict adding file build-dist.py.  Moved existing file to build-dist.py.moved.
Conflict adding file points2one.  Moved existing file to points2one.moved.
Conflict adding file test.  Moved existing file to test.moved.
To merge this branch: bzr merge lp://qastaging/points2one
Reviewer Review Type Date Requested Status
ANAT01 Abstain
Goyo (community) Approve
Review via email: mp+252209@code.qastaging.launchpad.net

Description of the change

In branch was add checkbox for closing polylines and add Russian translation (translated only dialog)

To post a comment you must log in.
lp://qastaging/points2one updated
75. By Goyo

Better handling of paths with non ASCII characters.

Revision history for this message
Goyo (goyodiaz) wrote :

Thanks for this. The changes are OK but I am not sure what exactly I am expected to do (sorry I never did this before in launchpad).

The header says "Merge lp:points2one into lp:~anatoly-g/points2one/0.2.15" but should it not be the other way?

And I do not understand the large "DIFF against target" (which target? the diffs against rev. 74 look fine) and the conflicts.

Of course I can commit your changes into trunk under your name but I do not think that is the expected workflow.

review: Approve
Revision history for this message
ANAT01 (anatoly-g) wrote :

Sorry, I don't understand what happend.
I'm not programmer and had never used launchpad.

I choose strange way to do this.
(bazaar repo was cloned and converted to git. After, was pushed to github and imported to launchpad from github)

Don't known how can i do this right.

I done some changes frmPoints2One.ui, p2o_engine.py and points2one_gui.py (https://github.com/ANAT01/qgis-plugin-point2one/commit/277d7d02c05409f5f2979911b35fc157f1972fab)

and added translate (https://github.com/ANAT01/qgis-plugin-point2one/blob/master/points2one/i18n/points2one_ru_RU.ts)

review: Abstain
Revision history for this message
Goyo (goyodiaz) wrote :

Ok, I will commit the changes manually using your name.

lp://qastaging/points2one updated
76. By ANAT01

Add polilines close

77. By ANAT01

Add Russian translation

78. By Goyo

Simplify polyline_closed() and fix docstring.

79. By Goyo

Update changelog.

80. By Goyo

Release 0.2.15

81. By Goyo

Fix metadata.txt

82. By Goyo

Update bulid-dist.py to include russian translation.

83. By Goyo

Updated spanish translation.

84. By Goyo

New build script.

85. By Goyo

Updated french translation.

Revision history for this message
Goyo (goyodiaz) wrote :

Done. A new version has been released in the QGIS plugin repository including these changes. Please let me know if you find any problems.

Thank you for contributing.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches

to all changes: