pool/translation-update-upstream
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 231392 from home:AndreasSchwab:f

Browse Source 
- Only process PO header in msgheadermerge

OBS-URL: https://build.opensuse.org/request/show/231392
OBS-URL: https://build.opensuse.org/package/show/Base:System/translation-update-upstream?expand=0&rev=55
This commit is contained in:
Dirk Mueller 2014-04-25 11:49:41 +00:00 committed by Git OBS Bridge
parent cbd57bc6dc
commit 16ddb6dac5
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
msgheadermerge
View File

@ -10,8 +10,8 @@ trap "rm -rf {${1%.po},${2%.po}}-msgheadermerge-temp.{merge-dir,order} ${2%.po}-
RC=0 RC=0
# Broken pipe is an expected behavior. Redirect stderr to /dev/null. # Broken pipe is an expected behavior. Redirect stderr to /dev/null.
msggrep --force-po --msgid -e '^$' $1 | msgexec $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null msggrep --force-po $1 | msgexec $0-parse ${1%.po}-msgheadermerge-temp 2>/dev/null
msggrep --force-po --msgid -e '^$' $2 | msgexec $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null msggrep --force-po $2 | msgexec $0-parse ${2%.po}-msgheadermerge-temp 2>/dev/null
# If --swap-plural-forms was used, use plural definition from the other header. # If --swap-plural-forms was used, use plural definition from the other header.
if test "$6" = --old-plural-forms ; then if test "$6" = --old-plural-forms ; then

5
translation-update-upstream.changes
View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Fri Apr 25 09:58:27 UTC 2014 - schwab@linux-m68k.org
- Only process PO header in msgheadermerge
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Apr 23 09:22:19 UTC 2014 - dmueller@suse.com Wed Apr 23 09:22:19 UTC 2014 - dmueller@suse.com