[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [16935] Stable: Merge 16933:16934 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [16935] Stable: Merge 16933:16934 from trunk |
|
Date: |
Mon, 31 Jul 2017 09:47:58 -0400 (EDT) |
Revision: 16935
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=16935
Author: sigurdne
Date: 2017-07-31 09:47:58 -0400 (Mon, 31 Jul 2017)
Log Message:
-----------
Stable: Merge 16933:16934 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
branches/Version-2_0-branch/property/inc/class.uigab.inc.php
branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
branches/Version-2_0-branch/property/setup/phpgw_no.lang
branches/Version-2_0-branch/property/setup/phpgw_no_bh.lang
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2017-07-31 13:47:06 UTC (rev 16934)
+++ branches/Version-2_0-branch 2017-07-31 13:47:58 UTC (rev 16935)
Property changes on: branches/Version-2_0-branch
___________________________________________________________________
Modified: svn:mergeinfo
## -1,4 +1,4 ##
/branches/dev-syncromind:13653
/branches/dev-syncromind-2:14933-16846
/branches/stavangerkommune:12743-12875,12986
-/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932
\ No newline at end of property
+/trunk:14721-14732,14734-14735,14737,14739,14741,14743-14744,14746-14749,14751,14753,14755-14757,14759,14761-14764,14766-14768,14770-14783,14785-14792,14794-14813,14815-14816,14818,14820-14822,14824-14825,14827-14829,14831-14834,14836,14838,14840-14842,14844-14845,14847,14849-14866,14868-14869,14871,14873-14875,14877-14878,14880-14884,14886-14896,14898,14900-14902,14904,14906-14909,14911-14915,14917-14919,14921-14922,14924-14978,14980-15258,15260-15261,15263-15264,15266-15285,15287-15288,15290-15291,15293,15295,15297,15299-15305,15307-15310,15312-15335,15337-15352,15354,15356,15358,15360-15541,15543-15566,15568-15569,15571,15573-15581,15583,15585-15617,15619,15621-15630,15632-15635,15637-15639,15641-15643,15645,15647-15665,15667-15668,15670-15671,15673-15693,15695-15712,15714-15764,15766-15767,15769-15787,15789-15802,15804-15811,15813-15814,15816-15818,15820-15849,15851-15887,15889-15900,15902-16046,16048-16051,16053,16055,16057-16063,16065-16071,16073-16077,16079-16081,16083-16099,16101-16130,16132-16140,16142,16144-16212,16214-16219,16221,16223-16224,16226,16228-16229,16231,16233,16235,16237,16239-16240,16242,16244-16246,16248,16250-16251,16253-16255,16257-16259,16261,16263,16265,16267,16269-16276,16278,16280-16283,16285,16287-16288,16290,16292-16295,16297-16305,16307-16314,16316-16318,16320-16322,16324,16326-16330,16332,16334,16336,16338-16339,16341-16342,16344,16346,16348,16350,16352-16353,16355-16358,16360,16362,16364-16369,16371,16373,16375-16378,16380,16382-16383,16385,16387,16389,16391,16393-16395,16397,16399-16402,16404,16406,16408,16410-16415,16417,16419-16420,16422-16425,16427,16429-16440,16442,16444,16446,16448-16449,16451,16453,16455-16463,16465-16472,16474-16475,16477-16484,16486,16488,16490-16497,16499,16501-16503,16505-16512,16514-16517,16519,16521,16523,16525,16527-16532,16534,16536-16541,16543,16545-16554,16556,16558-16565,16567-16575,16577-16584,16586-16588,16590,16592-16593,16595-16596,16598,16600-16601,16603-16608,16610-16614,16616-16618,16620-16621,16623-16624,16626,16628,16630,16632-16638,16640,16642,16644,16646-16651,16653-16663,16665,16667,16669,16671,16673,16675,16677,16679-16680,16682,16684,16686,16688-16692,16694-16695,16697-16699,16701,16703,16705-16706,16708,16710,16712,16714,16716-16718,16720-16728,16730-16732,16734-16739,16741,16743-16746,16748-16750,16752-16755,16757,16759-16761,16763,16765,16767,16769-16774,16776,16778-16783,16785-16788,16790,16792,16794,16796-16802,16804-16807,16809,16811-16817,16819,16821-16825,16827-16831,16833,16835-16836,16838,16840-16844,16846-16847,16849,16851,16853-16854,16856-16859,16861,16863-16865,16867,16869-16871,16873,16875-16876,16878,16880-16881,16883,16885,16887-16888,16890,16892,16894-16900,16902,16904,16906,16908-16909,16911-16916,16918-16919,16921,16923,16925,16927,16929-16930,16932,16934
\ No newline at end of property
Modified: branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2017-07-31
13:47:06 UTC (rev 16934)
+++ branches/Version-2_0-branch/phpgwapi/setup/phpgw_no.lang 2017-07-31
13:47:58 UTC (rev 16935)
@@ -111,7 +111,7 @@
search common no Søk
september common no September
session has been killed common no Session har blitt avsluttet
-show all common no vis alle
+show all common no Vis alle
showing %1 common no showing %1
showing %1 - %2 of %3 common no showing %1 - %2 of %3
showing items common no Viser
@@ -214,4 +214,5 @@
varchar common no Varchar
vendor common no Leverandør
remark home no Merknad
-about %1 about no Om %1
\ No newline at end of file
+about %1 about no Om %1
+group common no Gruppe
Modified: branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
2017-07-31 13:47:06 UTC (rev 16934)
+++ branches/Version-2_0-branch/property/inc/class.sogeneric.inc.php
2017-07-31 13:47:58 UTC (rev 16935)
@@ -534,7 +534,7 @@
array
(
'name' =>
'contact_email',
- 'descr' =>
lang('contact_email'),
+ 'descr' =>
lang('contact email'),
'type' =>
'varchar',
'sortable' =>
true,
),
Modified: branches/Version-2_0-branch/property/inc/class.uigab.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uigab.inc.php
2017-07-31 13:47:06 UTC (rev 16934)
+++ branches/Version-2_0-branch/property/inc/class.uigab.inc.php
2017-07-31 13:47:58 UTC (rev 16935)
@@ -348,6 +348,8 @@
$code = "var inputFilters = " .
json_encode($inputFilters);
+ $lang_search = lang('search');
+
$code .= <<<JS
function initCompleteDatatable(oSettings, json,
oTable)
@@ -355,7 +357,7 @@
$('#datatable-container_filter').empty();
$.each(inputFilters, function(i, val)
{
-
$('#datatable-container_filter').append('<input type="text" placeholder="Search
'+val+'" id="'+i+'" />');
+
$('#datatable-container_filter').append('<input type="text"
placeholder="{$lang_search} '+val+'" id="'+i+'" />');
});
{$set_location_code}
@@ -449,6 +451,12 @@
'className' => array('', '', '', '', '', '',
'', '', '', '', '')
);
+ $lang_yes_no = array(
+ 'yes' => lang('yes'),
+ 'no' => lang('no'),
+ '' => lang('no'),
+ );
+
$values = array();
$j = 0;
if (isset($gab_list) && is_array($gab_list))
@@ -477,6 +485,10 @@
$value_seksjons_nr =
substr($gab['gab_id'], 17, 3);
$value =
$value_seksjons_nr;
}
+ else if ($uicols['name'][$i] ==
'owner')
+ {
+ $value =
$lang_yes_no[$gab[$uicols['name'][$i]]];
+ }
else
{
$value =
isset($gab[$uicols['name'][$i]]) ? $gab[$uicols['name'][$i]] : '';
Modified: branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
2017-07-31 13:47:06 UTC (rev 16934)
+++ branches/Version-2_0-branch/property/inc/class.uilocation.inc.php
2017-07-31 13:47:58 UTC (rev 16935)
@@ -1021,7 +1021,7 @@
}
else
{
- $function_msg =
$uicols['descr'][($type_id)];
+ $function_msg =
$uicols['descr'][($type_id+1)];
}
}
Modified: branches/Version-2_0-branch/property/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-07-31
13:47:06 UTC (rev 16934)
+++ branches/Version-2_0-branch/property/setup/phpgw_no.lang 2017-07-31
13:47:58 UTC (rev 16935)
@@ -361,7 +361,7 @@
column description property no Beskrivelse av kolonne
column name property no Kolonnenavn
column name not entered! property no Manglende kolonnenavn
-columns common no kolonner
+columns common no Kolonner
columns is updated property no Kolonner er oppdatert
common costs property no Fellsekostnader
communication descriptions manager property no
Kommunikasjonsbeskrivelse
@@ -406,10 +406,10 @@
check all common no Merk alle
contact property no Kontakt
contact email property no Epost
-contact phone property no kontakt telefon
+contact phone property no Kontakttelefon
contacts common no Kontakter
-content property no innhold
-contractual obligations property no regnskap
+content property no Innhold
+contractual obligations property no Regnskap
contracts property no Kontrakter
contract sum property no Kontraktsum
conversion property no format
@@ -441,7 +441,7 @@
custom functions for the entity category property no
Egendefinert funksjoner for entitet-kategori
custom queries property no Egendefinerte spørringer
daily property no Daglig
-data property no data
+data property no Data
datatype property no datatype
datatype type not chosen! property no datatype er ikke valgt
date closed property no dato avsluttet
@@ -682,7 +682,7 @@
enable link from location detail property no Aktiver link
fra detaljer for areal
enables help message for this attribute property no
Hjelpetekst for denne attributten
enable start project from this category property no
Aktiviser mulighet for å starte prosjekt herfra
-end property no slutt
+end property no Slutt
end date property no sluttdato
enter additional remarks to the description - if any property no
gi en merknad - om noen
enter a descr for the custom function property no Angi en
beskrivelse av egendefinert funksjon
@@ -1196,7 +1196,7 @@
of property no av
on behalf of assigned property no På vegne av tildelt
on behalf of assigned - vacation mode property no På vegne av
tildelt - feriemodus
-old value property no opprinnelig verdi
+old value property no Opprinnelig verdi
only private property no Bare privat
open property no Åpen
open date property no Startet dato
@@ -1224,7 +1224,7 @@
override fraction property no Overstyrt faktor
override fraction of common costs property no
Overstyringsfaktor for felleskostnader
overview property no Oversikt
-owner property no eier
+owner property no Eier
owner attributes property no Eier attributter
owner categories property no Eier kategorier
owner type property no Eiertype
@@ -1853,7 +1853,7 @@
transfer time property no Overført
true property no True
tts property no Melding
-type property no type
+type property no Type
type invoice ii property no Type
type of changes property no Type av endring
uncheck to debug the result property no Ta vekk avkryssning for
debugging
@@ -2219,4 +2219,6 @@
ticket status property no Meldingsstatus
vendor category property no Leverandør kategori
workorder recalculate actual cost property no Rekalkuler
faktisk kostnad for bestillinger
-none selected property no Ingen valgt
\ No newline at end of file
+none selected property no Ingen valgt
+direction property no Retning
+directory property no Katalog
\ No newline at end of file
Modified: branches/Version-2_0-branch/property/setup/phpgw_no_bh.lang
===================================================================
--- branches/Version-2_0-branch/property/setup/phpgw_no_bh.lang 2017-07-31
13:47:06 UTC (rev 16934)
+++ branches/Version-2_0-branch/property/setup/phpgw_no_bh.lang 2017-07-31
13:47:58 UTC (rev 16935)
@@ -974,7 +974,7 @@
Override fraction property no Overstyringsfaktor
Override fraction of common costs property no
Overstyringsfaktor for felleskostnader
overview property no oversikt
-owner property no eier
+owner property no Eier
Owner type property no Eiertype
Paid property no Betalt
Part of town property no Bydel
@@ -1356,7 +1356,7 @@
Shared use property no Delt bruk
shift down property no Skift ned
shift up property no Skift opp
-Show all property no vis alle
+Show all property no Vis alle
Show calculated cost property no Vis sum
Show calculated cost on the printview property no Vis sum på
utskrift
Show details property no Vis detaljer
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [16935] Stable: Merge 16933:16934 from trunk,
sigurdne <=