diff options
author | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
---|---|---|
committer | Michael <icarus@dabo.de> | 2012-02-23 20:53:22 +0100 |
commit | 0409b5cdba003b6ce90d5ad0181e81c06af95ab1 (patch) | |
tree | c677adb7c0e8140bdb1e115a95d1aa23fdf734ed /util | |
parent | 311e35731c52102cbce3befc6343f179080ad38c (diff) | |
parent | 8cacff69858c2ad097bafb80c93405e79c311edf (diff) | |
download | volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.gz volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.tar.bz2 volse-hubzilla-0409b5cdba003b6ce90d5ad0181e81c06af95ab1.zip |
Merge remote branch 'upstream/master'
Conflicts:
include/bbcode.php
Diffstat (limited to 'util')
-rwxr-xr-x | util/README | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/util/README b/util/README index b8fd7c9ee..aceade3e2 100755 --- a/util/README +++ b/util/README @@ -115,7 +115,7 @@ When strings are added or modified in source, you could run to extract strings from source files and join them with the existing .po file: new strings are added, the existing are not overwritten. -If you already translated Friendika using strings.php, you could import your old +If you already translated Friendica using strings.php, you could import your old translation to messages.po. Run: $ php util/php2po.php view/<language>/strings.php |