From ed09c77cdc0873b378bba66d173dca80d79eb841 Mon Sep 17 00:00:00 2001 From: Nikolay Pultsin Date: Thu, 24 Sep 2015 18:59:00 +0100 Subject: [PATCH] settings dialog title --- assets/resources/application/ar.xml | 2 +- assets/resources/application/be.xml | 2 +- assets/resources/application/bg.xml | 2 +- assets/resources/application/ca.xml | 2 +- assets/resources/application/cs.xml | 2 +- assets/resources/application/da.xml | 2 +- assets/resources/application/de.xml | 2 +- assets/resources/application/el.xml | 2 +- assets/resources/application/en.xml | 2 +- assets/resources/application/en_US.xml | 2 +- assets/resources/application/es.xml | 2 +- assets/resources/application/eu.xml | 2 +- assets/resources/application/fa.xml | 2 +- assets/resources/application/fr.xml | 2 +- assets/resources/application/gl.xml | 2 +- assets/resources/application/hu.xml | 2 +- assets/resources/application/hy.xml | 2 +- assets/resources/application/it.xml | 2 +- assets/resources/application/ja.xml | 2 +- assets/resources/application/ka.xml | 2 +- assets/resources/application/ko.xml | 2 +- assets/resources/application/nb.xml | 2 +- assets/resources/application/nl.xml | 2 +- assets/resources/application/pl.xml | 2 +- assets/resources/application/ro.xml | 2 +- assets/resources/application/ru.xml | 2 +- assets/resources/application/sr.xml | 2 +- assets/resources/application/th.xml | 2 +- assets/resources/application/tr.xml | 2 +- assets/resources/application/uk.xml | 2 +- assets/resources/application/vi.xml | 2 +- assets/resources/application/zh.xml | 2 +- assets/resources/application/zh_TW.xml | 2 +- scripts/resources/repair.py | 8 ++++++-- 34 files changed, 39 insertions(+), 35 deletions(-) diff --git a/assets/resources/application/ar.xml b/assets/resources/application/ar.xml index 7e0ed78c3..28d2a4769 100644 --- a/assets/resources/application/ar.xml +++ b/assets/resources/application/ar.xml @@ -339,7 +339,7 @@ - + diff --git a/assets/resources/application/be.xml b/assets/resources/application/be.xml index 5770441a2..ecb6eb40f 100644 --- a/assets/resources/application/be.xml +++ b/assets/resources/application/be.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/bg.xml b/assets/resources/application/bg.xml index 4e89f4a2b..8d135ea12 100644 --- a/assets/resources/application/bg.xml +++ b/assets/resources/application/bg.xml @@ -347,7 +347,7 @@ - + diff --git a/assets/resources/application/ca.xml b/assets/resources/application/ca.xml index baeaf6371..5a9342dc2 100644 --- a/assets/resources/application/ca.xml +++ b/assets/resources/application/ca.xml @@ -347,7 +347,7 @@ - + diff --git a/assets/resources/application/cs.xml b/assets/resources/application/cs.xml index 98a46bd38..264b845c1 100644 --- a/assets/resources/application/cs.xml +++ b/assets/resources/application/cs.xml @@ -350,7 +350,7 @@ - + diff --git a/assets/resources/application/da.xml b/assets/resources/application/da.xml index 45d8d1467..ad662387c 100644 --- a/assets/resources/application/da.xml +++ b/assets/resources/application/da.xml @@ -340,7 +340,7 @@ - + diff --git a/assets/resources/application/de.xml b/assets/resources/application/de.xml index a1c0c09b8..7e0738b2a 100644 --- a/assets/resources/application/de.xml +++ b/assets/resources/application/de.xml @@ -346,7 +346,7 @@ - + diff --git a/assets/resources/application/el.xml b/assets/resources/application/el.xml index 0ac91217c..f6e69b7f6 100644 --- a/assets/resources/application/el.xml +++ b/assets/resources/application/el.xml @@ -331,7 +331,7 @@ - + diff --git a/assets/resources/application/en.xml b/assets/resources/application/en.xml index c929a2e3f..3651102e0 100644 --- a/assets/resources/application/en.xml +++ b/assets/resources/application/en.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/en_US.xml b/assets/resources/application/en_US.xml index 9bd1d92b1..0a7b8ae9d 100644 --- a/assets/resources/application/en_US.xml +++ b/assets/resources/application/en_US.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/es.xml b/assets/resources/application/es.xml index 055864b82..88c7d36e5 100644 --- a/assets/resources/application/es.xml +++ b/assets/resources/application/es.xml @@ -347,7 +347,7 @@ - + diff --git a/assets/resources/application/eu.xml b/assets/resources/application/eu.xml index d069a8f52..2945ac1ac 100644 --- a/assets/resources/application/eu.xml +++ b/assets/resources/application/eu.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/fa.xml b/assets/resources/application/fa.xml index 1e8b0da05..cfb31135a 100644 --- a/assets/resources/application/fa.xml +++ b/assets/resources/application/fa.xml @@ -340,7 +340,7 @@ - + diff --git a/assets/resources/application/fr.xml b/assets/resources/application/fr.xml index 14ccbca0f..d5de7c20a 100644 --- a/assets/resources/application/fr.xml +++ b/assets/resources/application/fr.xml @@ -334,7 +334,7 @@ - + diff --git a/assets/resources/application/gl.xml b/assets/resources/application/gl.xml index c790415f0..a728f4dee 100644 --- a/assets/resources/application/gl.xml +++ b/assets/resources/application/gl.xml @@ -331,7 +331,7 @@ - + diff --git a/assets/resources/application/hu.xml b/assets/resources/application/hu.xml index 59b975f80..1ad468d68 100644 --- a/assets/resources/application/hu.xml +++ b/assets/resources/application/hu.xml @@ -331,7 +331,7 @@ - + diff --git a/assets/resources/application/hy.xml b/assets/resources/application/hy.xml index 7142cf2f2..31c701d40 100644 --- a/assets/resources/application/hy.xml +++ b/assets/resources/application/hy.xml @@ -347,7 +347,7 @@ - + diff --git a/assets/resources/application/it.xml b/assets/resources/application/it.xml index 7da617bea..497d72f48 100644 --- a/assets/resources/application/it.xml +++ b/assets/resources/application/it.xml @@ -332,7 +332,7 @@ - + diff --git a/assets/resources/application/ja.xml b/assets/resources/application/ja.xml index 2c1f9903d..6a90c129e 100644 --- a/assets/resources/application/ja.xml +++ b/assets/resources/application/ja.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/ka.xml b/assets/resources/application/ka.xml index 5beb22248..6fec7c5f0 100644 --- a/assets/resources/application/ka.xml +++ b/assets/resources/application/ka.xml @@ -346,7 +346,7 @@ - + diff --git a/assets/resources/application/ko.xml b/assets/resources/application/ko.xml index c763df3c4..6906411d1 100644 --- a/assets/resources/application/ko.xml +++ b/assets/resources/application/ko.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/nb.xml b/assets/resources/application/nb.xml index d36c14545..78b01319d 100644 --- a/assets/resources/application/nb.xml +++ b/assets/resources/application/nb.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/nl.xml b/assets/resources/application/nl.xml index 1de088def..91caf4cf1 100644 --- a/assets/resources/application/nl.xml +++ b/assets/resources/application/nl.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/pl.xml b/assets/resources/application/pl.xml index 8d0eb5200..aad0396b1 100644 --- a/assets/resources/application/pl.xml +++ b/assets/resources/application/pl.xml @@ -331,7 +331,7 @@ - + diff --git a/assets/resources/application/ro.xml b/assets/resources/application/ro.xml index 89bd60d07..8730b9f85 100644 --- a/assets/resources/application/ro.xml +++ b/assets/resources/application/ro.xml @@ -334,7 +334,7 @@ - + diff --git a/assets/resources/application/ru.xml b/assets/resources/application/ru.xml index 95e8ad5a9..27e7c9faa 100644 --- a/assets/resources/application/ru.xml +++ b/assets/resources/application/ru.xml @@ -346,7 +346,7 @@ - + diff --git a/assets/resources/application/sr.xml b/assets/resources/application/sr.xml index 955afc924..4f7185835 100644 --- a/assets/resources/application/sr.xml +++ b/assets/resources/application/sr.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/th.xml b/assets/resources/application/th.xml index 2624883cc..70a2fe43d 100644 --- a/assets/resources/application/th.xml +++ b/assets/resources/application/th.xml @@ -331,7 +331,7 @@ - + diff --git a/assets/resources/application/tr.xml b/assets/resources/application/tr.xml index 994bdef25..ff9039b22 100644 --- a/assets/resources/application/tr.xml +++ b/assets/resources/application/tr.xml @@ -341,7 +341,7 @@ - + diff --git a/assets/resources/application/uk.xml b/assets/resources/application/uk.xml index 46ed3b741..3bda73092 100644 --- a/assets/resources/application/uk.xml +++ b/assets/resources/application/uk.xml @@ -331,7 +331,7 @@ - + diff --git a/assets/resources/application/vi.xml b/assets/resources/application/vi.xml index ea97dd6ba..df99aabc6 100644 --- a/assets/resources/application/vi.xml +++ b/assets/resources/application/vi.xml @@ -332,7 +332,7 @@ - + diff --git a/assets/resources/application/zh.xml b/assets/resources/application/zh.xml index 8732aefd7..2a088496b 100644 --- a/assets/resources/application/zh.xml +++ b/assets/resources/application/zh.xml @@ -331,7 +331,7 @@ - + diff --git a/assets/resources/application/zh_TW.xml b/assets/resources/application/zh_TW.xml index e60e7f193..24243159d 100644 --- a/assets/resources/application/zh_TW.xml +++ b/assets/resources/application/zh_TW.xml @@ -331,7 +331,7 @@ - + diff --git a/scripts/resources/repair.py b/scripts/resources/repair.py index 6ce4eef33..ca8a6b784 100755 --- a/scripts/resources/repair.py +++ b/scripts/resources/repair.py @@ -22,8 +22,12 @@ def process_nodes(base, custom): new_node.setAttribute('value', value) new_node.setAttribute('toBeTranslated', 'true') custom_child = custom.insertBefore(new_node, custom_child) - elif custom_child and custom_child.getAttribute('toBeTranslated') == 'true': - custom_child.setAttribute('value', base_child.getAttribute('value')) + elif custom_child: + if base_child.getAttribute('value') and not custom_child.getAttribute('value'): + custom_child.setAttribute('value', base_child.getAttribute('value')) + custom_child.setAttribute('toBeTranslated', 'true') + elif custom_child.getAttribute('toBeTranslated') == 'true': + custom_child.setAttribute('value', base_child.getAttribute('value')) if custom_child is not None: process_nodes(base_child, custom_child) custom_child = first_after(custom_child.nextSibling)