dhis2-devs team mailing list archive
-
dhis2-devs team
-
Mailing list archive
-
Message #32730
[Branch ~dhis2-devs-core/dhis2/trunk] Rev 16689: PT DV GIS ER EV ou tree i18n.
Merge authors:
Jan Henrik Øverland (janhenrik-overland)
------------------------------------------------------------
revno: 16689 [merge]
committer: Jan Henrik Overland <janhenrik.overland@xxxxxxxxx>
branch nick: dhis2
timestamp: Wed 2014-09-10 22:34:40 +0200
message:
PT DV GIS ER EV ou tree i18n.
modified:
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties
dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties 2014-09-09 12:37:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/i18n/en.properties 2014-09-10 20:32:01 +0000
@@ -165,3 +165,4 @@
show_dimension_labels=Show dimension labels
show_col_totals=Show column totals
show_row_totals=Show row totals
+select_sub_units=Select sub-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-09 12:37:59 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-reports/scripts/app.js 2014-09-10 20:32:01 +0000
@@ -4791,7 +4791,7 @@
if (!r.data.leaf) {
v.menu.add({
id: 'treepanel-contextmenu-item',
- text: NS.i18n.select_all_children,
+ text: NS.i18n.select_sub_units,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-08-27 11:24:29 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/i18n/en.properties 2014-09-10 20:32:01 +0000
@@ -191,3 +191,4 @@
open_this_chart_as_table=Open this chart as table
open_last_table=Open last table
chart_options=Chart options
+select_sub_units=Select sub-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-08 14:48:14 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-event-visualizer/scripts/app.js 2014-09-10 20:32:01 +0000
@@ -4412,7 +4412,7 @@
if (!r.data.leaf) {
v.menu.add({
id: 'treepanel-contextmenu-item',
- text: NS.i18n.select_all_children,
+ text: NS.i18n.select_sub_units,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties 2014-08-27 11:00:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/i18n/en.properties 2014-09-10 20:32:01 +0000
@@ -410,4 +410,5 @@
go_to_charts=Go to charts
open_this_map_as_chart=Open this map as chart
open_last_chart=Open last chart
-clear=Clear
\ No newline at end of file
+clear=Clear
+select_sub_units=Select sub-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-08 14:52:28 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-mapping/scripts/app.js 2014-09-10 20:32:01 +0000
@@ -4834,14 +4834,12 @@
v.menu.destroy();
}
v.menu = Ext.create('Ext.menu.Menu', {
- id: 'treepanel-contextmenu',
showSeparator: false,
shadow: false
});
if (!r.data.leaf) {
v.menu.add({
- id: 'treepanel-contextmenu-item',
- text: gis.i18n.select_all_children,
+ text: GIS.i18n.select_sub_units,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {
@@ -5546,14 +5544,12 @@
v.menu.destroy();
}
v.menu = Ext.create('Ext.menu.Menu', {
- id: 'treepanel-contextmenu',
showSeparator: false,
shadow: false
});
if (!r.data.leaf) {
v.menu.add({
- id: 'treepanel-contextmenu-item',
- text: gis.i18n.select_all_children,
+ text: GIS.i18n.select_sub_units,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {
@@ -6302,14 +6298,12 @@
v.menu.destroy();
}
v.menu = Ext.create('Ext.menu.Menu', {
- id: 'treepanel-contextmenu',
showSeparator: false,
shadow: false
});
if (!r.data.leaf) {
v.menu.add({
- id: 'treepanel-contextmenu-item',
- text: gis.i18n.select_all_children,
+ text: GIS.i18n.select_sub_units,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {
@@ -7639,14 +7633,12 @@
v.menu.destroy();
}
v.menu = Ext.create('Ext.menu.Menu', {
- id: 'treepanel-contextmenu',
showSeparator: false,
shadow: false
});
if (!r.data.leaf) {
v.menu.add({
- id: 'treepanel-contextmenu-item',
- text: gis.i18n.select_all_children,
+ text: GIS.i18n.select_sub_units,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties 2014-09-10 14:50:20 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/i18n/en.properties 2014-09-10 20:32:01 +0000
@@ -164,3 +164,4 @@
show_dimension_labels=Show dimension labels
min=Min
max=Max
+select_sub_units=Select sub-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-09 12:01:30 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-pivot/scripts/app.js 2014-09-10 20:32:01 +0000
@@ -4531,7 +4531,7 @@
if (!r.data.leaf) {
v.menu.add({
id: 'treepanel-contextmenu-item',
- text: NS.i18n.select_all_children,
+ text: NS.i18n.select_sub_units,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties 2014-09-10 11:56:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/i18n/en.properties 2014-09-10 20:32:01 +0000
@@ -228,3 +228,4 @@
assigned_categories=Assigned categories
table_layout=Table layout
type=Type
+select_sub_units=Select sub-units
=== modified file 'dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js'
--- dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-10 11:56:42 +0000
+++ dhis-2/dhis-web/dhis-web-apps/src/main/webapp/dhis-web-visualizer/scripts/app.js 2014-09-10 20:32:01 +0000
@@ -4504,7 +4504,7 @@
if (!r.data.leaf) {
v.menu.add({
id: 'treepanel-contextmenu-item',
- text: NS.i18n.select_all_children,
+ text: NS.i18n.select_sub_units,
icon: 'images/node-select-child.png',
handler: function() {
r.expand(false, function() {