Xfce Wiki

Sub domains
 

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revisionPrevious revision
Next revisionBoth sides next revision
translations:msgmerge [2011/05/11 23:49] – pjotrtranslations:msgmerge [2011/05/11 23:56] – pjotr
Line 1: Line 1:
 ====== Merge PO files ====== ====== Merge PO files ======
-The command line tool ''msgmerge'' is used to merge two PO files into one. It is really easy to use, here is an example:+The command line tool ''msgmerge'' is used to merge translated strings from two PO files into one. It is really easy to use, here is an example:
  
   msgmerge updated-po-file reference-file > output.po   msgmerge updated-po-file reference-file > output.po
Line 6: Line 6:
 The result in output.po contains the reference-file with the new translated strings from the updated-po-file. The result in output.po contains the reference-file with the new translated strings from the updated-po-file.
  
-This tool can be used to merge strings from the development branch towards a stable branch or vice-versa.+This tool can be used to merge strings from a stable branch into the development branch (or vice versa).
  
-An example is probably handy. Suppose you have a Dutch translation file for a package called "packageW". This is fully translated in the stable "Xfce 4.8" and needs to be merged with an incomplete Dutch translation file in the development branch "master".+An example is probably handy. Suppose you have a Dutch translation file for a package called "packageW".  
 + 
 +This is fully translated in the stable "Xfce 4.8" and needs to be merged with an incomplete Dutch translation file in the development branch "master". Goal: prevent unnecessary work in translating the development branch.
  
 Both files are in the Downloads folder. Both files are in the Downloads folder.
Line 30: Line 32:
 Finally: upload "packageW.master.nl.po" in Transifex. Finally: upload "packageW.master.nl.po" in Transifex.
  
-Note that you cannot send the output directly to "packageW-master.nl.po" as it will fail with an 100% unchanged PO file (because of the name conflict).+Note that you cannot send the output directly to "packageW-master.nl.po", as it will fail with a totally unchanged PO file (because of the name conflict).