Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
M
merge-po
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Hefee
merge-po
Commits
9b830cd5
Commit
9b830cd5
authored
7 years ago
by
Hefee
Browse files
Options
Downloads
Patches
Plain Diff
more README :D
parent
a6700731
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
README
+54
-0
54 additions, 0 deletions
README
with
54 additions
and
0 deletions
README
+
54
−
0
View file @
9b830cd5
### Installing
* copy mergetool to a locaton `<pathto>`
* Add this to your .git/config or ~/.gitconfig:
[merge "po-merge"]
name = Gettext merge driver
driver = <patho> %O %A %B
Add this to .gitattributes in some dir:
*.po merge=po-merge
*.pot merge=po-merge
### Testing
run: ipython3 -i runtests.py
In [18]: runTest("translated-remote")
Using custom PO merge driver (local; /tmp/merge-po.JIyZ)
0
0
In [19]: runTest("translated-local-and-remote")
Using custom PO merge driver (local; /tmp/merge-po.lZsH)
0
0
In [22]: runTest("confict")
Using custom PO merge driver (local; /tmp/merge-po.7FoH)
Conflict(s) detected
between /tmp/merge-po.7FoH.local and /tmp/merge-po.7FoH.remote
1
--- /tmp/tmp5cbetvbs/local 2018-03-22 16:40:55.000000000 +0100
+++ tests/confict/merged 2018-03-22 16:40:51.954196950 +0100
@@ -27,9 +27,9 @@
"> **amnesia**, *noun*:<br/>\n"
"> forgetfulness; loss of long-term memory.\n"
msgstr ""
-"#-#-#-#-# merge-po.7FoH.local-only (Tails) #-#-#-#-#\n"
+"#-#-#-#-# merge-po.PE9w.local-only (Tails) #-#-#-#-#\n"
"> Je ne sais pas \n"
-"#-#-#-#-# merge-po.7FoH.remote-only (Tails) #-#-#-#-#\n"
+"#-#-#-#-# merge-po.PE9w.remote-only (Tails) #-#-#-#-#\n"
"Un deuxième traduction."
#. type: Plain text
1
### Documentation
I didn't have written the different po merge tools. I found them at the internet :D
https://stackoverflow.com/questions/16214067/wheres-the-3-way-git-merge-driver-for-po-gettext-files
https://github.com/mezis/git-whistles/blob/master/libexec/git-merge-po.sh
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment