po-merge.py

Checkout Tools
  • last updated 45 mins ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates

Changeset 904301 is being indexed.

Update every occurence of the Subversion repository URL to apache.org,

except in CHANGES (for sentimental reasons, I guess).

* contrib/cgi/mirror_dir_through_svn.README,

* contrib/client-side/emacs/psvn.el,

* contrib/client-side/svnmerge/svnmerge_test.py,

* contrib/hook-scripts/commit-email.pl.in,

* contrib/server-side/svn-fast-backup,

* contrib/server-side/svnmirror.sh,

* contrib/server-side/svnmirror-test.sh,

* doc/user/cvs-crossover-guide.html,

* notes/fs_dumprestore.txt,

* notes/http-and-webdav/webdav-usage.html,

* notes/interactive-conflict-resolution.txt,

* notes/merge-tracking/func-spec.html,

* notes/merge-tracking/requirements.html,

* notes/merge-tracking/summit.html,

* notes/object-model.txt,

* notes/obliterate/hooks/post-obliterate.tmpl,

* notes/obliterate/hooks/pre-obliterate.tmpl,

* notes/obliterate/plan-milestones.html,

* notes/subversion-design.html,

* notes/variance-adjusted-patching.html,

* packages/windows-innosetup/Pre.rtf,

* packages/windows-WiX/BuildSubversion/WixDialog/loc/en-us/Pre.rtf,

* subversion/bindings/javahl/native/JNIUtil.cpp,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/ISVNClient.java,

* subversion/bindings/javahl/src/org/apache/subversion/javahl/Version.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientInterface.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/SVNClientSynchronized.java,

* subversion/bindings/javahl/src/org/tigris/subversion/javahl/Version.java,

* subversion/bindings/swig/perl/native/Client.pm,

* subversion/libsvn_repos/repos.c,

* subversion/libsvn_wc/wc_db.h,

* subversion/tests/cmdline/merge_tests.py,

* subversion/tests/libsvn_subr/path-test.c,

* tools/buildbot/slaves/README,

* tools/client-side/change-svn-wc-format.py,

* tools/client-side/svn-graph.pl,

* tools/client-side/svn-viewspec.py,

* tools/dev/contribulyze.py,

* tools/dev/po-merge.py,

* tools/dev/svn-merge-revs.py,

* tools/dist/gen_nightly_ann.py: Update Subversion repository URL to apache.

  1. … 40 more files in changeset.
Apply ASF license headers to a number of files included under that license

but lacking said header.

Patch by: Niall Pemberton <niallp{_AT_}apache.org>

  1. … 175 more files in changeset.
Use 'while True' instead of 'while 1'.

* build/generator/ezt.py:

* build/generator/gen_base.py:

* subversion/bindings/swig/python/svn/core.py:

* subversion/bindings/swig/python/svn/fs.py:

* subversion/tests/cmdline/info_tests.py:

* subversion/tests/cmdline/log_tests.py:

* subversion/tests/cmdline/svntest/tree.py:

* tools/bdb/skel.py:

* tools/dev/normalize-dump.py:

* tools/dev/po-merge.py:

* tools/dev/svn-merge-revs.py:

* tools/dev/verify-history.py:

* tools/dev/which-error.py:

* tools/examples/blame.py:

* tools/examples/getfile.py:

* tools/examples/svnlook.py:

* tools/examples/svnshell.py:

* tools/hook-scripts/mailer/mailer.py:

* tools/hook-scripts/verify-po.py: Use 'while True' instead of 'while 1'.

  1. … 18 more files in changeset.
po-merge.py: Fix traceback which occurs when obsolete messages are found:

Traceback (most recent call last):

File "../../tools/dev/po-merge.py", line 171, in <module>

main(sys.argv)

File "../../tools/dev/po-merge.py", line 160, in main

for m in msgstr:

TypeError: 'NoneType' object is not iterable

* tools/dev/po-merge.py

(parse_translation): Ignore obsolete messages.

Python 3 compatibility:

Update calls to print() in 'tools' directory.

* tools/backup/hot-backup.py.in:

* tools/bdb/erase-all-text-data.py:

* tools/bdb/svn-bdb-view.py:

* tools/bdb/whatis-rep.py:

* tools/client-side/change-svn-wc-format.py:

* tools/client-side/server-version.py:

* tools/dev/check-license.py:

* tools/dev/contribulyze.py:

* tools/dev/datecheck.py:

* tools/dev/gen-javahl-errors.py:

* tools/dev/graph-dav-servers.py:

* tools/dev/iz/ff2csv.py:

* tools/dev/iz/find-fix.py:

* tools/dev/mlpatch.py:

* tools/dev/normalize-dump.py:

* tools/dev/po-merge.py:

* tools/dev/random-commits.py:

* tools/dev/scramble-tree.py:

* tools/dev/svn-merge-revs.py:

* tools/dev/verify-history.py:

* tools/dev/which-error.py:

* tools/dist/gen_nightly_ann.py:

* tools/dist/getsigs.py:

* tools/dist/post-to-tigris.py:

* tools/dist/write-announcement.py:

* tools/examples/blame.py:

* tools/examples/check-modified.py:

* tools/examples/dumpprops.py:

* tools/examples/getfile.py:

* tools/examples/get-location-segments.py:

* tools/examples/geturl.py:

* tools/examples/putfile.py:

* tools/examples/revplist.py:

* tools/examples/svnlook.py:

* tools/examples/svnshell.py:

* tools/hook-scripts/mailer/tests/mailer-tweak.py:

* tools/hook-scripts/svn2feed.py:

* tools/po/l10n-report.py:

* tools/server-side/fsfs-reshard.py:

* tools/server-side/svn-backup-dumps.py: Call print() or file.write().

  1. … 39 more files in changeset.
Follow-up to r34141:

* tools/dev/po-merge.py

(parse_translation, main): Support msgid_plural and msgstr[\d+].

* tools/dev/po-merge.py: Fix typo in po-merge.py usage string.

Patch by: Marcel Gosselin <marcel.gosselin@polymtl.ca>

Set svn:eol-style='native' on some text files that were lacking it.

  1. … 44 more files in changeset.
Make the po-merge tool overwrite translations from the source because

the source is authorative, and also avoid updating the header.

* tools/dev/po-merge.py

(main): Just do it, and rename a couple of local variables

to improve code readability.

Add a new development tool to merge strings from one po file to another

to be used when merging translations from trunk to branches.

* tools/dev/po-merge.py: New file.