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 revision		Previous revision
Next revisionBoth sides next revision
translations:msgmerge [2011/05/12 00:18] – pjotrtranslations:msgmerge [2011/05/20 14:42] – pjotr
Line 1: Line 1:
 ====== Merge PO files ====== ====== Merge PO files ======
-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:+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 a generic example:
  
-  msgmerge updated-po-file reference-file > output.po+  msgmerge up_to_date_po-file target_po-file > output.po
  
-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 target_po-file with the new translated strings from the up_to_date_po-file.
  
 This tool can be used to merge strings from a stable branch into the development 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". +A specific 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. 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.
Line 22: Line 22:
 Now copy/paste the following command in your terminal: Now copy/paste the following command in your terminal:
  
-  msgmerge packageW-xfce-4-8.nl.po packageW-master.nl.po > NEWpackageW.master.nl.po+  msgmerge packageW-xfce-4-8.nl.po packageW-master.nl.po > NEWpackageW-master.nl.po
  
 (press Enter) (press Enter)
Line 28: Line 28:
 Then delete both "packageW-xfce-4-8.nl.po" (you don't need it anymore) and "packageW-master.nl.po" (you don't want a name conflict in the next step). Then delete both "packageW-xfce-4-8.nl.po" (you don't need it anymore) and "packageW-master.nl.po" (you don't want a name conflict in the next step).
  
-Then rename "NEWpackageW.master.nl.po" to "packageW.master.nl.po".+Then rename "NEWpackageW-master.nl.po" to "packageW-master.nl.po".
  
-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 a totally 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).