7:49 a.m.
I was unable to apply those patches on top of master branch.
[alinefm@alinefm-TP440 kimchi]$ git am -3
/home/alinefm/mail-patches/\[PATCH\]\ \[Kimchi\ *
Applying: Issue #998 Not all static strings are externalized
Using index info to reconstruct a base tree...
M ui/js/src/kimchi.guest_storage_add.main.js
M ui/pages/i18n.json.tmpl
Falling back to patching base and 3-way merge...
Auto-merging ui/pages/i18n.json.tmpl
CONFLICT (content): Merge conflict in ui/pages/i18n.json.tmpl
Auto-merging ui/js/src/kimchi.guest_storage_add.main.js
error: Failed to merge in the changes.
Patch failed at 0001 Issue #998 Not all static strings are externalized
The copy of the patch that failed is found in:
/home/alinefm/wok/.git/modules/src/wok/plugins/kimchi/rebase-apply/patch
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".
Could you rebase and resend, please?
On 10/12/2016 06:22 AM, pkulkark(a)linux.vnet.ibm.com wrote:
From: Pooja Kulkarni <pkulkark(a)linux.vnet.ibm.com>
This patch set externalizes all the
static string that should be externalized
to support globalization. Also contains
the updated .pot and .po files
Pooja Kulkarni (2):
Issue #998 Not all static strings are externalized
Issue #998 Updated .pot and .po files
po/POTFILES.in | 1 +
po/de_DE.po | 254 ++++++++++++++++++++++++++--
po/en_US.po | 239 +++++++++++++++++++++++++--
po/es_ES.po | 254 ++++++++++++++++++++++++++--
po/fr_FR.po | 254 ++++++++++++++++++++++++++--
po/it_IT.po | 255 +++++++++++++++++++++++++++--
po/ja_JP.po | 254 ++++++++++++++++++++++++++--
po/kimchi.pot | 239 +++++++++++++++++++++++++--
po/ko_KR.po | 254 ++++++++++++++++++++++++++--
po/pt_BR.po | 254 ++++++++++++++++++++++++++--
po/ru_RU.po | 254 ++++++++++++++++++++++++++--
po/zh_CN.po | 254 ++++++++++++++++++++++++++--
po/zh_TW.po | 254 ++++++++++++++++++++++++++--
ui/js/src/kimchi.guest_storage_add.main.js | 12 +-
ui/js/src/kimchi.storagepool_add_main.js | 12 +-
ui/pages/guest-edit.html.tmpl | 14 +-
ui/pages/i18n.json.tmpl | 18 ++
17 files changed, 2937 insertions(+), 139 deletions(-)