[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Fmsystem-commits] [17597] Stable: Merge 17585:17596 from trunk
|
From: |
sigurdne |
|
Subject: |
[Fmsystem-commits] [17597] Stable: Merge 17585:17596 from trunk |
|
Date: |
Tue, 16 Jan 2018 11:35:44 -0500 (EST) |
Revision: 17597
http://svn.sv.gnu.org/viewvc/?view=rev&root=fmsystem&revision=17597
Author: sigurdne
Date: 2018-01-16 11:35:44 -0500 (Tue, 16 Jan 2018)
Log Message:
-----------
Stable: Merge 17585:17596 from trunk
Modified Paths:
--------------
branches/Version-2_0-branch/admin/setup/phpgw_no.lang
branches/Version-2_0-branch/phpgwapi/inc/class.setup_translation.inc.php
branches/Version-2_0-branch/property/inc/class.uiimport.inc.php
branches/Version-2_0-branch/property/setup/default_records.inc.php
branches/Version-2_0-branch/setup/index.php
branches/Version-2_0-branch/setup/lang/phpgw_no.lang
branches/Version-2_0-branch/setup/templates/base/head.tpl
branches/Version-2_0-branch/setup/templates/base/login_main.tpl
Property Changed:
----------------
branches/Version-2_0-branch/
Index: branches/Version-2_0-branch
===================================================================
--- branches/Version-2_0-branch 2018-01-16 16:34:00 UTC (rev 17596)
+++ branches/Version-2_0-branch 2018-01-16 16:35:44 UTC (rev 17597)
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,16934,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430,17432-17477,17479,17481-17487,17489,17491,17493-17509,17511-17512,17514,17516-17581,17583-17584
\ 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,16936-16937,16939-16942,16944,16946,16948,16950,16952-16953,16955-16959,16961,16963,16965-16970,16972,16974-16977,16979-16982,16984,16986,16988-16999,17001,17003,17005-17018,17020-17023,17025-17026,17028-17033,17035,17037,17039-17040,17042-17050,17052-17053,17055,17057-17058,17060,17062-17064,17066,17068-17074,17076-17088,17090,17092,17094,17096,17098,17100-17101,17103-17104,17106-17108,17110-17121,17123-17124,17126-17132,17134-17143,17145-17150,17152-17157,17159,17161-17162,17164,17166-17167,17169-17173,17175-17188,17190-17195,17197-17205,17207-17212,17214,17216-17277,17279,17281,17283-17285,17287-17288,17290-17301,17303-17311,17313-17314,17316-17317,17319,17321-17330,17332-17333,17335-17340,17342,17344-17346,17349-17351,17353-17354,17356-17357,17359,17361,17363-17366,17368,17370,17372-17378,17380,17382-17392,17394-17424,17426-17430,17432-17477,17479,17481-17487,17489,17491,17493-17509,17511-17512,17514,17516-17581,17583-17584,17586-17596
\ No newline at end of property
Modified: branches/Version-2_0-branch/admin/setup/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/admin/setup/phpgw_no.lang 2018-01-16
16:34:00 UTC (rev 17596)
+++ branches/Version-2_0-branch/admin/setup/phpgw_no.lang 2018-01-16
16:35:44 UTC (rev 17597)
@@ -139,3 +139,4 @@
color selector admin no Farge velger
would you like to check for a new version when admins login admin no
Vil du sjekke om det finnes ny versjon når administratorer logger inn
view error log common no Vis feilmeldingslogg
+please set a site name in admin > siteconfig common no
Venligst angi tittelen for systemet i Administrasjon > Admin > Global
konfigurasjon
\ No newline at end of file
Modified:
branches/Version-2_0-branch/phpgwapi/inc/class.setup_translation.inc.php
===================================================================
--- branches/Version-2_0-branch/phpgwapi/inc/class.setup_translation.inc.php
2018-01-16 16:34:00 UTC (rev 17596)
+++ branches/Version-2_0-branch/phpgwapi/inc/class.setup_translation.inc.php
2018-01-16 16:35:44 UTC (rev 17597)
@@ -30,6 +30,9 @@
public function __construct()
{
$ConfigLang = phpgw::get_var('ConfigLang', 'string',
'POST');
+
+ $ConfigLang = $ConfigLang ? $ConfigLang :
$GLOBALS['phpgw_info']['server']['default_lang'];
+
$this->set_userlang($ConfigLang);
$fn = PHPGW_SERVER_ROOT .
"/setup/lang/phpgw_{$this->userlang}.lang";
@@ -160,6 +163,11 @@
$langs[] = 'en';
}
+
if(!empty($GLOBALS['phpgw_info']['server']['default_lang']) && $force_en &&
address@hidden($GLOBALS['phpgw_info']['server']['default_lang'],$langs))
+ {
+ $langs[] =
$GLOBALS['phpgw_info']['server']['default_lang'];
+ }
+
if($DEBUG)
{
echo '<br>add_langs(): chose these langs: ';
Modified: branches/Version-2_0-branch/property/inc/class.uiimport.inc.php
===================================================================
--- branches/Version-2_0-branch/property/inc/class.uiimport.inc.php
2018-01-16 16:34:00 UTC (rev 17596)
+++ branches/Version-2_0-branch/property/inc/class.uiimport.inc.php
2018-01-16 16:35:44 UTC (rev 17597)
@@ -415,6 +415,14 @@
$metadata = $this->db->metadata($this->table);
+ /**
+ * Remove id-column from fm_location-tables
+ */
+ if(!empty($metadata['location_code']) &&
$metadata['loc1']->primary_key && !$metadata['id']->primary_key)
+ {
+ unset($metadata['id']);
+ }
+
foreach ($metadata as $field => $info)
{
$_fields[$field] = true;
Modified: branches/Version-2_0-branch/property/setup/default_records.inc.php
===================================================================
--- branches/Version-2_0-branch/property/setup/default_records.inc.php
2018-01-16 16:34:00 UTC (rev 17596)
+++ branches/Version-2_0-branch/property/setup/default_records.inc.php
2018-01-16 16:35:44 UTC (rev 17597)
@@ -24,25 +24,112 @@
# phpgw_locations
#
+
+ function p_setup_translate( $key )
+ {
+ $lang = $GLOBALS['phpgw_info']['server']['default_lang'] ==
'no' ? 'no' : 'en' ;
+
+ static $translations = array();
+ if(!$translations)
+ {
+ $translations['no'] = array(
+ 'Admin entity' => 'Admin entity',
+ 'Admin location' => 'Admin location',
+ 'Location' => 'Lokasjon',
+ 'Property' => 'Eiendom',
+ 'Building' => 'Bygning',
+ 'Entrance' => 'Inngang',
+ 'Apartment' => 'Leilighet',
+ 'custom queries'=> 'Tilpassede spørringer',
+ 'Demand -> Workorder'=> 'Behov -> bestilling',
+ 'Workorder' => 'Bestilling',
+ 'Transfer Workorder'=> 'Overfør bestilling',
+ 'Request' => 'Behov',
+ 'Helpdesk' => 'Meldinger',
+ 'Helpdesk ad hock order'=> 'Melding::forenklet
bestilling',
+ 'Helpdesk External user' => 'Melding::extern
bruker',
+ 'Invoice' => 'Faktura',
+ 'Documents' => 'Dokumenter',
+ 'Drawing' => 'Tegning',
+ 'Budget account'=> 'Budsjettkonto(art)',
+ 'Tenant claim' => 'Leietaker krav',
+ 'Budget' => 'Budsjett',
+ 'Obligations' => 'Forpliktelser',
+ 'Basis for high level lazy budgeting'=> 'basis
for forenklet budsjettering',
+ 'ifc integration' => 'IFC integrasjon',
+ 'Agreement' => 'Avtale',
+ 'Service agreement' =>
'Serviceavtale',
+ 'Service agreement detail' =>
'Serviceavtale::detaljer',
+ 'Tenant' => 'Leietaker',
+ 'Owner' => 'Eier',
+ 'Vendor' => 'Leverandør',
+ 'A dimension for accounting' =>
'Dimensjon for kontering',
+ 'Scheduled events' => 'Planlagte
hendelser',
+ 'Condition Survey' =>
'Tilstandsanalyse',
+ 'Org unit' => 'Organisasjonsenhet',
+ 'Categories' => 'Kategorier',
+ 'Generic report' => 'Generisk
rapport',
+ 'location exception' => 'Obsvarsel
på lokasjon',
+ 'District' => 'Område',
+ 'Part of town' => 'Bydel',
+ 'Highest' => 'Høyest',
+ 'Lowest' => 'Lavest',
+ 'male' => 'Mann',
+ 'female' => 'Kvinne',
+ 'organization' => 'Organisasjon',
+ 'SOMETHING' => 'Konfigurer meg',
+ 'not active' => 'Utgått',
+ 'Owner category' => 'Eierkategori',
+ 'Admin location' => 'Administrer
lokasjon'
+ );
+ }
+
+ if(empty($translations[$lang][$key]))
+ {
+ return $key;
+ }
+ else
+ {
+ return $translations[$lang][$key];
+ }
+ }
+
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant) VALUES ({$app_id}, '.', 'Top', 1)");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.admin', 'Admin')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.admin.entity', 'Admin entity')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.admin.location', 'Admin location')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location', 'Location')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location.1', 'Property')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location.2', 'Building')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location.3', 'Entrance')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location.4', 'Apartment')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.custom', 'custom queries')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib,
c_attrib_table) VALUES ({$app_id}, '.project', 'Demand -> Workorder', 1, 1, 1,
'fm_project')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib,
c_attrib_table) VALUES ({$app_id}, '.project.workorder', 'Workorder', 1, 1 ,1,
'fm_workorder')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_function) VALUES ({$app_id},
'.project.workorder.transfer', 'Transfer Workorder', 1)");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib,
c_attrib_table) VALUES ({$app_id}, '.project.request', 'Request', 1, 1 ,1,
'fm_request')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib,
c_attrib_table) VALUES ({$app_id}, '.ticket', 'Helpdesk', 1, 1, 1,
'fm_tts_tickets')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib, c_attrib_table) VALUES ({$app_id},
'.ticket.order', 'Helpdesk ad hock order', 1, 'fm_tts_tickets')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.ticket.external', 'Helpdesk External
user')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.invoice', 'Invoice')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.document', 'Documents')");
+ $translation = p_setup_translate('Admin location');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.admin.location', '{$translation}')");
+ $translation = p_setup_translate('Location');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location', '{$translation}')");
+ $translation = p_setup_translate('Property');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location.1', '{$translation}')");
+ $translation = p_setup_translate('Building');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location.2', '{$translation}')");
+ $translation = p_setup_translate('Entrance');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location.3', '{$translation}')");
+ $translation = p_setup_translate('Apartment');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.location.4', '$translation')");
+ $translation = p_setup_translate('custom queries');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.custom', '{$translation}')");
+ $translation = p_setup_translate('Demand -> Workorder');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib,
c_attrib_table) VALUES ({$app_id}, '.project', '{$translation}', 1, 1, 1,
'fm_project')");
+ $translation = p_setup_translate('Workorder');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib,
c_attrib_table) VALUES ({$app_id}, '.project.workorder', '{$translation}', 1, 1
,1, 'fm_workorder')");
+ $translation = p_setup_translate('Transfer Workorder');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_function) VALUES ({$app_id},
'.project.workorder.transfer', '{$translation}', 1)");
+ $translation = p_setup_translate('Request');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib,
c_attrib_table) VALUES ({$app_id}, '.project.request', '{$translation}', 1, 1
,1, 'fm_request')");
+ $translation = p_setup_translate('Helpdesk');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function, allow_c_attrib,
c_attrib_table) VALUES ({$app_id}, '.ticket', '{$translation}', 1, 1, 1,
'fm_tts_tickets')");
+ $translation = p_setup_translate('Helpdesk ad hock order');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib, c_attrib_table) VALUES ({$app_id},
'.ticket.order', '{$translation}', 1, 'fm_tts_tickets')");
+ $translation = p_setup_translate('Helpdesk External user');
+// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.ticket.external',
'{$translation}')");
+ $translation = p_setup_translate('Invoice');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.invoice', '{$translation}')");
+ $translation = p_setup_translate('Documents');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.document', '{$translation}')");
+ $translation = p_setup_translate('Drawing');
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.drawing', 'Drawing')");
// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant) VALUES ({$app_id}, '.entity.1', 'Equipment',
1)");
// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function,
allow_c_attrib,c_attrib_table) VALUES ({$app_id}, '.entity.1.1', 'Meter', 1, 1,
1, 'fm_entity_1_1')");
@@ -51,28 +138,46 @@
// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant) VALUES ({$app_id}, '.entity.2', 'Report',
1)");
// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function,
allow_c_attrib,c_attrib_table) VALUES ({$app_id}, '.entity.2.1', 'Report type
1', 1, 1, 1, 'fm_entity_2_1')");
// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_function,
allow_c_attrib,c_attrib_table) VALUES ({$app_id}, '.entity.2.2', 'Report type
2', 1, 1, 1, 'fm_entity_2_2')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.b_account', 'Budget account')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.tenant_claim', 'Tenant claim')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.budget', 'Budet')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.budget.obligations',
'Obligations')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.budget.basis', 'Basis for high level
lazy budgeting')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.ifc', 'ifc integration')");
+ $translation = p_setup_translate('Budget account');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.b_account', '$translation')");
+ $translation = p_setup_translate('Tenant claim');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.tenant_claim', '{$translation}')");
+ $translation = p_setup_translate('Budget');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.budget', '{$translation}')");
+ $translation = p_setup_translate('Obligations');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.budget.obligations',
'{$translation}')");
+ $translation = p_setup_translate('Basis for high level lazy budgeting');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.budget.basis', '{$translation}')");
+ $translation = p_setup_translate('ifc integration');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr) VALUES ({$app_id}, '.ifc', '{$translation}')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.agreement', 'Agreement',1,'fm_agreement')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.s_agreement', 'Service agreement',1,'fm_s_agreement')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.s_agreement.detail', 'Service agreement detail',1,'fm_s_agreement_detail')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.r_agreement', 'Rental agreement',1,'fm_r_agreement')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.r_agreement.detail', 'Rental agreement detail',1,'fm_r_agreement_detail')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_attrib,c_attrib_table) VALUES
({$app_id}, '.tenant', 'Tenant',1,1,'fm_tenant')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_attrib,c_attrib_table) VALUES
({$app_id}, '.owner', 'Owner',1,1,'fm_owner')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_attrib,c_attrib_table) VALUES
({$app_id}, '.vendor', 'Vendor',1,1,'fm_vendor')");
+ $translation = p_setup_translate('Agreement');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.agreement', '{$translation}',1,'fm_agreement')");
+ $translation = p_setup_translate('Service agreement');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.s_agreement', '{$translation}',1,'fm_s_agreement')");
+ $translation = p_setup_translate('Service agreement detail');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.s_agreement.detail', '{$translation}',1,'fm_s_agreement_detail')");
+// $translation = p_setup_translate('Rental agreement');
+// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.r_agreement', 'Rental agreement',1,'fm_r_agreement')");
+// $translation = p_setup_translate('Rental agreement detail');
+// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_c_attrib,c_attrib_table) VALUES ({$app_id},
'.r_agreement.detail', 'Rental agreement detail',1,'fm_r_agreement_detail')");
+ $translation = p_setup_translate('Tenant');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_attrib,c_attrib_table) VALUES
({$app_id}, '.tenant', '{$translation}',1,1,'fm_tenant')");
+ $translation = p_setup_translate('Owner');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_attrib,c_attrib_table) VALUES
({$app_id}, '.owner', '{$translation}',1,1,'fm_owner')");
+ $translation = p_setup_translate('Vendor');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_locations
(app_id, name, descr, allow_grant, allow_c_attrib,c_attrib_table) VALUES
({$app_id}, '.vendor', '{$translation}',1,1,'fm_vendor')");
$GLOBALS['phpgw']->locations->add('.jasper', 'JasperReport',
'property', $allow_grant = true);
- $GLOBALS['phpgw']->locations->add('.invoice.dimb', 'A dimension for
accounting', 'property');
- $GLOBALS['phpgw']->locations->add('.scheduled_events', 'Scheduled
events', 'property');
- $GLOBALS['phpgw']->locations->add('.project.condition_survey',
'Condition Survey', 'property', true, 'fm_condition_survey', true);
- $GLOBALS['phpgw']->locations->add('.org_unit', 'Org unit', 'property',
false, 'fm_org_unit', false, true);
+ $translation = p_setup_translate('A dimension for accounting');
+ $GLOBALS['phpgw']->locations->add('.invoice.dimb', $translation,
'property');
+ $translation = p_setup_translate('Scheduled events');
+ $GLOBALS['phpgw']->locations->add('.scheduled_events', $translation,
'property');
+ $translation = p_setup_translate('Condition Survey');
+ $GLOBALS['phpgw']->locations->add('.project.condition_survey',
$translation, 'property', true, 'fm_condition_survey', true);
+ $translation = p_setup_translate('Org unit');
+ $GLOBALS['phpgw']->locations->add('.org_unit', $translation,
'property', false, 'fm_org_unit', false, true);
$locations = array(
'property.ticket' => '.ticket',
@@ -83,14 +188,17 @@
'fm_owner' => '.owner'
);
+ $translation = p_setup_translate('Categories');
foreach ($locations as $dummy => $location)
{
- $GLOBALS['phpgw']->locations->add("{$location}.category",
'Categories', 'property');
+ $GLOBALS['phpgw']->locations->add("{$location}.category",
$translation, 'property');
}
- $GLOBALS['phpgw']->locations->add('.report', 'Generic report',
'property', $allow_grant = true);
+ $translation = p_setup_translate('Generic report');
+ $GLOBALS['phpgw']->locations->add('.report', $translation, 'property',
$allow_grant = true);
- $GLOBALS['phpgw']->locations->add('.location.exception', 'location
exception', 'property');
+ $translation = p_setup_translate('location exception');
+ $GLOBALS['phpgw']->locations->add('.location.exception', $translation,
'property');
$GLOBALS['phpgw_setup']->oProc->query("DELETE from phpgw_config WHERE
config_app='property'");
// $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO phpgw_config
(config_app, config_name, config_value) VALUES ('property','meter_table',
'fm_entity_1_1')");
@@ -98,16 +206,18 @@
#
#fm_district
#
+ $translation = p_setup_translate('District');
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_district (id,
descr) VALUES ('1', 'District 1')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_district (id,
descr) VALUES ('2', 'District 2')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_district (id,
descr) VALUES ('3', 'District 3')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_district (id,
descr) VALUES ('1', '{$translation} 1')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_district (id,
descr) VALUES ('2', '{$translation} 2')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_district (id,
descr) VALUES ('3', '{$translation} 3')");
#
#fm_part_of_town
#
+ $translation = p_setup_translate('Part of town');
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_part_of_town
(name, district_id) VALUES ('Part of town 1','1')");
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_part_of_town
(name, district_id) VALUES ('{$translation} 1','1')");
#
@@ -114,16 +224,15 @@
#fm_owner_category
#
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_owner_category
(id, descr) VALUES ('1', 'Owner category 1')");
+ $translation = p_setup_translate('Owner category');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_owner_category
(id, descr) VALUES ('1', '{$translation} 1')");
#
#fm_owner
#
+ $translation = p_setup_translate('Owner');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_owner (id, abid,
org_name, category) VALUES (1, 1, '{$translation} 1',1)");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_owner (id, abid,
org_name, category) VALUES (1, 1, 'demo-owner 1',1)");
-
-
-
#
#fm_owner_attribute
#
@@ -137,26 +246,34 @@
# Dumping data for table fm_location1_category
#
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location1_category (id, descr) VALUES (1, 'SOMETHING')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location1_category (id, descr) VALUES (99, 'not active')");
+ $translation = p_setup_translate('SOMETHING');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location1_category (id, descr) VALUES (1, '{$translation}')");
+ $translation = p_setup_translate('not active');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location1_category (id, descr) VALUES (99, '{$translation}')");
#
# Dumping data for table fm_location2_category
#
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location2_category (id, descr) VALUES (1, 'SOMETHING')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location2_category (id, descr) VALUES (99, 'not active')");
+ $translation = p_setup_translate('SOMETHING');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location2_category (id, descr) VALUES (1, '{$translation}')");
+ $translation = p_setup_translate('not active');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location2_category (id, descr) VALUES (99, '{$translation}')");
#
# Dumping data for table fm_location3_category
#
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location3_category (id, descr) VALUES (1, 'SOMETHING')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location3_category (id, descr) VALUES (99, 'not active')");
+ $translation = p_setup_translate('SOMETHING');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location3_category (id, descr) VALUES (1, '{$translation}')");
+ $translation = p_setup_translate('not active');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location3_category (id, descr) VALUES (99, '{$translation}')");
#
# Dumping data for table fm_location4_category
#
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location4_category (id, descr) VALUES (1, 'SOMETHING')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location4_category (id, descr) VALUES (99, 'not active')");
+ $translation = p_setup_translate('SOMETHING');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location4_category (id, descr) VALUES (1, '{$translation}')");
+ $translation = p_setup_translate('not active');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO
fm_location4_category (id, descr) VALUES (99, '{$translation}')");
#
@@ -327,9 +444,11 @@
#
# Dumping data for table fm_tenant_category
#
-
+ $translation = p_setup_translate('male');
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_category
(id, descr) VALUES (1, 'male')");
+ $translation = p_setup_translate('female');
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_category
(id, descr) VALUES (2, 'female')");
+ $translation = p_setup_translate('organization');
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tenant_category
(id, descr) VALUES (3, 'organization')");
#
@@ -525,14 +644,14 @@
# Data for table fm_location_type
#
- $location_naming[1]['name'] = 'property';
- $location_naming[1]['descr'] = 'Property';
- $location_naming[2]['name'] = 'building';
- $location_naming[2]['descr'] = 'Building';
- $location_naming[3]['name'] = 'entrance';
- $location_naming[3]['descr'] = 'Entrance';
- $location_naming[4]['name'] = 'Apartment';
- $location_naming[4]['descr'] = 'Apartment';
+ $location_naming[1]['name'] = strtolower(p_setup_translate('Property'));
+ $location_naming[1]['descr'] = p_setup_translate('Property');
+ $location_naming[2]['name'] = strtolower(p_setup_translate('Building'));
+ $location_naming[2]['descr'] = p_setup_translate('Building');
+ $location_naming[3]['name'] = strtolower(p_setup_translate('Entrance'));
+ $location_naming[3]['descr'] = p_setup_translate('Entrance');
+ $location_naming[4]['name'] =
strtolower(p_setup_translate('Apartment'));
+ $location_naming[4]['descr'] = p_setup_translate('Apartment');
for ($location_type = 1; $location_type < 5; $location_type++)
{
@@ -954,6 +1073,8 @@
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecodimb_role (id,
name) VALUES (2, 'Attestant')", __LINE__, __FILE__);
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_ecodimb_role (id,
name) VALUES (3, 'Anviser')", __LINE__, __FILE__);
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tts_priority (id,
name) VALUES (1, '1 - Highest')");
+ $translation = p_setup_translate('Highest');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tts_priority (id,
name) VALUES (1, '1 - {$translation}')");
$GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tts_priority (id,
name) VALUES (2, '2')");
- $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tts_priority (id,
name) VALUES (3, '3 - Lowest')");
+ $translation = p_setup_translate('Lowest');
+ $GLOBALS['phpgw_setup']->oProc->query("INSERT INTO fm_tts_priority (id,
name) VALUES (3, '3 - {$translation}')");
Modified: branches/Version-2_0-branch/setup/index.php
===================================================================
--- branches/Version-2_0-branch/setup/index.php 2018-01-16 16:34:00 UTC (rev
17596)
+++ branches/Version-2_0-branch/setup/index.php 2018-01-16 16:35:44 UTC (rev
17597)
@@ -589,7 +589,7 @@
$setup_tpl->set_var('lang_status_img',$completed);
$setup_tpl->set_var('lang_status_alt','completed');
$btn_manage_lang =
$GLOBALS['phpgw_setup']->html->make_frm_btn_simple(
- lang('This stage is completed<br />') .
lang('Currently installed languages: %1 <br />',$langs_list),
+ lang('This stage is completed') . '<br/>' .
lang('Currently installed languages: %1',$langs_list) . ' <br/>',
'POST','lang.php',
'submit',lang('Manage Languages'),
'');
@@ -614,7 +614,7 @@
$setup_tpl->set_var('apps_status_img',$completed);
$setup_tpl->set_var('apps_status_alt',lang('completed'));
$btn_manage_apps =
$GLOBALS['phpgw_setup']->html->make_frm_btn_simple(
- lang('This stage is completed<br />'),
+ lang('This stage is completed') . '<br/>',
'','applications.php',
'submit',lang('Manage Applications'),
'');
Modified: branches/Version-2_0-branch/setup/lang/phpgw_no.lang
===================================================================
--- branches/Version-2_0-branch/setup/lang/phpgw_no.lang 2018-01-16
16:34:00 UTC (rev 17596)
+++ branches/Version-2_0-branch/setup/lang/phpgw_no.lang 2018-01-16
16:35:44 UTC (rev 17597)
@@ -4,7 +4,7 @@
13 (ntp) setup no 13 (ntp)
80 (http) setup no 80 (http)
<b>!!!this will delete all existing accounts!!!</b><br> setup no
<b>!!!THIS WILL DELETE ALL EXISTING ACCOUNTS!!!</b><br>
-<b>note:</b> you must have cookies enabled to use setup and header admin!
setup no <b>NOTE:</b> You must have cookies enabled to use setup and
header admin!
+<b>note:</b> you must have cookies enabled to use setup and header admin!
setup no <b>NB:</b> Du må ha aktivert bruk av cookies for å bruke setup
og header admin!
<br><b>this will delete all existing accounts.</b> setup no
<br><b>This will delete all existing accounts.</b>
<p class="msg">Your header.inc.php needs upgrading.<br />WARNING! MAKE
BACKUPS!</p> setup no <p class="msg">Your header.inc.php needs
upgrading.<br />WARNING! MAKE BACKUPS!</p>
actions setup no Actions
@@ -33,8 +33,8 @@
application name and status information setup no Application
Name and Status Information
application title setup no Application Title
applications setup no applications
-are you sure you want to delete your existing tables and data? setup no
Are you sure you want to delete your existing tables and data?
-are you sure? setup no ARE YOU SURE?
+are you sure you want to delete your existing tables and data? setup no
Er du sikker på at du vil slette alle dine tabeller og data?
+are you sure? setup no ER DU SIKKER?
at your request, this script is going to attempt to create the database and
assign the db user rights to it setup no At your request, this script
is going to attempt to create the database and assign the db user rights to it
at your request, this script is going to attempt to install the core tables
and the admin and preferences applications for you setup no At your
request, this script is going to attempt to install the core tables and the
admin and preferences applications for you.
at your request, this script is going to attempt to upgrade your old
applications to the current versions setup no At your request, this
script is going to attempt to upgrade your old applications to the current
versions
@@ -48,7 +48,7 @@
automatically detect domain from hostname setup no Automatically
detect domain from hostname
available version setup no Available Version
backupwarn setup no but we <u>highly recommend backing up</u> your
tables in case the script causes damage to your data.<br><strong>These
automated scripts can easily destroy your data.</strong><br><em>Please backup
before going any further!</em>
-because an application it depends upon was upgraded setup no because
an application it depends upon was upgraded
+because an application it depends upon was upgraded setup no avdi en
modul den er avhengig av er oppgradert
because it depends upon setup no because it depends upon
because it is not a user application, or access is controlled via acl setup
no because it is not a user application, or access is controlled via acl
because it requires manual table installation, <br>or the table definition was
incorrect setup no because it requires manual table installation,
<br>or the table definition was incorrect
@@ -66,7 +66,7 @@
click here setup no Click Here
completed setup no Completed
configuration setup no Configuration
-configuration completed setup no Configuration completed
+configuration completed setup no Configurasjonen er utført
configuration password setup no Configuration Password
configure now setup no Configure Now
continue setup no Continue
@@ -73,15 +73,15 @@
could not open header.inc.php for writing! setup no Could not open
header.inc.php for writing!
country selection setup no Country Selection
create setup no Create
-create accounts no Create Accounts
-create database setup no Create Database
-create demo accounts setup no Create demo accounts
+create accounts setup no Create Accounts
+create database setup no Lag database
+create demo accounts setup no Lag demobrukere
create one now setup no Create one now
-create your header.inc.php setup no Create your header.inc.php
+create your header.inc.php setup no Generer din header.inc.php
created setup no created
-creating tables setup no Creating Tables
+creating tables setup no Oppretter tabeller
current version setup no Current Version
-currently installed languages: %1 <br> setup no Currently installed
languages: %1 <br>
+currently installed languages: %1 setup no Installerte språk: %1
datetime port.<br>if using port 13, please set firewall rules appropriately
before submitting this page.<br>(port: 13 / host: 129.6.15.28) setup no
Datetime port.<br>If using port 13, please set firewall rules appropriately
before submitting this page.<br>(Port: 13 / Host: 129.6.15.28)
db host setup no DB Host
db name setup no DB Name
@@ -93,7 +93,7 @@
default file system space per user/group ? setup no Default file
system space per user/group ?
delete setup no Delete
delete all my tables and data setup no Delete all my tables and data
-delete all old languages and install new ones setup no Delete all old
languages and install new ones
+delete all old languages and install new ones setup no Slett alle
gamle språkinnstillinger - og installer nye
deleting tables setup no Deleting Tables
demo server setup setup no Demo Server Setup
deny access setup no Deny Access
@@ -110,11 +110,11 @@
domains setup no domains
dont touch my data setup no Dont touch my data
download setup no Download
-edit current configuration setup no Edit Current Configuration
+edit current configuration setup no Endre gjeldende konfigurasjon
edit your existing header.inc.php setup no Edit your existing
header.inc.php
edit your header.inc.php setup no Edit your header.inc.php
Enable custom error handle for heavy debugging setup no Enable custom
error handle for heavy debugging
-enable debug messages setup no enable debug messages
+enable debug messages setup no Aktiver debug-meldinger
enable mcrypt setup no Enable MCrypt
enter some random text for app session encryption setup no Enter
some random text for app session encryption
enter some random text for app_session <br>encryption (requires mcrypt)
setup no Enter some random text for app_session <br>encryption (requires
mcrypt)
@@ -147,7 +147,7 @@
host information setup no Host information
hostname/ip of database server setup no Hostname/IP of database server
however, the application is otherwise installed setup no
However, the application is otherwise installed
-however, the application may still work setup no However, the
application may still work
+however, the application may still work setup no Men, det kan
være at den fortsatt fungerer
if no acl records for user or any group the user is a member of setup
no If no ACL records for user or any group the user is a member of
if the application has no defined tables, selecting upgrade should remedy the
problem setup no If the application has no defined tables, selecting
upgrade should remedy the problem
if using ldap setup no If using LDAP
@@ -155,7 +155,7 @@
if you did not receive any errors, your applications have been setup no
If you did not receive any errors, your applications have been
if you did not receive any errors, your tables have been setup no
If you did not receive any errors, your tables have been
if you running this the first time, don't forget to manualy %1 !!! setup
no If you running this the first time, don't forget to manualy %1 !!!
-ignoring %1 for domain "%2" setup no ignoring %1 for domain "%2"
+ignoring %1 for domain "%2" setup no ignorerer %1 for domain "%2"
image type selection order setup no Image type selection order
import accounts from ldap to the phpgroupware accounts table (for a new
install using sql accounts) setup no Import accounts from LDAP to the
phpGroupWare accounts table (for a new install using SQL accounts)
import has been completed! setup no Import has been completed!
@@ -162,16 +162,16 @@
import ldap users/groups setup no Import LDAP users/groups
importing old settings into the new format.... setup no Importing old
settings into the new format....
include root (this should be the same as server root unless you know what you
are doing) setup no Include Root (this should be the same as
Server Root unless you know what you are doing)
-insanity setup no Insanity
-install setup no Install
-install all setup no Install All
-install applications setup no Install Applications
-install language setup no Install Language
-installed setup no installed
-invalid ip address setup no Invalid IP address
-invalid password setup no Invalid password
-is broken setup no is broken
-is disabled setup no is disabled
+insanity setup no Galskap
+install setup no Installer
+install all setup no Installer alt
+install applications setup no Installer aoduler
+install language setup no Installer oversettinger
+installed setup no installert
+invalid ip address setup no Ugyldig IP adresse
+invalid password setup no Ugyldig passord
+is broken setup no har feil
+is disabled setup no er deaktivert
ldap account import/export setup no LDAP account import/export
ldap accounts configuration setup no LDAP Accounts Configuration
ldap accounts context setup no LDAP accounts context
@@ -187,12 +187,12 @@
ldap root password setup no LDAP root password
ldap rootdn setup no LDAP rootdn
limit access to setup to the following addresses or networks (e.g.
10.1.1,127.0.0.1) setup no Limit access to setup to the following
addresses or networks (e.g. 10.1.1,127.0.0.1)
-logout setup no Logout
+logout setup no Logg ut
makesure setup no Make sure that your database is created and the
account permissions are set
-manage applications setup no Manage Applications
-manage languages setup no Manage Languages
+manage applications setup no Administrer moduler
+manage languages setup no Administrer Oversettinger
maximum account id (e.g. 65535 or 1000000) setup no Maximum account
id (e.g. 65535 or 1000000)
-may be broken setup no may be broken
+may be broken setup no Kan ha feil
mcrypt algorithm (default tripledes) setup no Mcrypt algorithm
(default TRIPLEDES)
mcrypt initialization vector setup no MCrypt initialization vector
mcrypt mode (default cbc) setup no Mcrypt mode (default CBC)
@@ -199,16 +199,16 @@
mcrypt settings (requires mcrypt php extension) setup no Mcrypt
Settings (requires mcrypt PHP extension)
mcrypt version setup no MCrypt version
minimum account id (e.g. 500 or 100, etc.) setup no Minimum account
id (e.g. 500 or 100, etc.)
-modifications have been completed! setup no Modifications have been
completed!
-modify setup no Modify
+modifications have been completed! setup no Endringer er utført!
+modify setup no Endre
modify an existing ldap account store for use with phpgroupware (for a new
install using ldap accounts) setup no Modify an existing LDAP
account store for use with phpGroupWare (for a new install using LDAP accounts)
multi-language support setup setup no Multi-Language support setup
mysqlinstr %1 setup no Instructions for creating the database in
MySQL:<br>Login to mysql -<br><i>address@hidden user]# mysql -u root
-p</i><br>Create the empty database and grant user permissions -<br><i>mysql>
create database %1;</i><br><i>mysql> grant all on %1.* to address@hidden
identified by 'password';</i>
-name of database setup no Name of database
+name of database setup no Navn på database
name of db user phpgroupware uses to connect setup no Name of db user
phpGroupWare uses to connect
-never setup no never
-new setup no New
-no setup no No
+never setup no Aldri
+new setup no Ny
+no setup no Nei
no algorithms available setup no no algorithms available
no imap support found. disabling imap email access setup no No IMAP
support found. Disabling IMAP email access
no microsoft sql server support found. disabling setup no No
Microsoft SQL Server support found. Disabling
@@ -218,9 +218,9 @@
no oracle-db support found. disabling setup no No Oracle-DB support
found. Disabling
no postgres-db support found. disabling setup no No Postgres-DB
support found. Disabling
no xsl support found. setup no No XSL support found.
-not complete setup no not complete
-not completed setup no Not Completed
-not ready for this stage yet setup no Not ready for this stage yet
+not complete setup no Ikke ferdig
+not completed setup no Ikke ferdig
+not ready for this stage yet setup no Ikke klar for dette steget ennå
note: this option will only work if show domain select box is off. setup
no Note: This option will only work if show domain select box is off.
note: you will be able to customize this later setup no Note: You will
be able to customize this later
now guessing better values for defaults... setup no Now guessing
better values for defaults...
@@ -228,14 +228,14 @@
once the database is setup correctly setup no Once the database is
setup correctly
one month setup no one month
one week setup no one week
-only add languages that are not in the database already setup no
Only add languages that are not in the database already
-only add new phrases setup no Only add new phrases
-or setup no or
+only add languages that are not in the database already setup no
Bare legg til språk som ikke allerede finnes i databbasen
+only add new phrases setup no Bare legg til nye tekster
+or setup no eller
or http://webdav.domain.com (webdav) setup no or
http://webdav.domain.com (WebDAV)
-or we can attempt to create the database for you: setup no Or we
can attempt to create the database for you:
-password needed for configuration setup no Password needed for
configuration
-password of db user setup no Password of db user
-passwords did not match, please re-enter setup no Passwords did
not match, please re-enter
+or we can attempt to create the database for you: setup no Eller
vi kan prøve å opprette databasen for deg:
+password needed for configuration setup no Passord for
configurasjon
+password of db user setup no Passord of db bruker
+passwords did not match, please re-enter setup no Passordene var
ikke like, venligst prøv på nytt
path information setup no Path information
path to user and group files has to be outside of the webservers
document-root!!! setup no Path to user and group files HAS TO BE
OUTSIDE of the webservers document-root!!!
persistent connections setup no Persistent connections
@@ -267,7 +267,7 @@
registered setup no registered
register_globals_ setup no register_globals_
remove setup no Remove
-remove all setup no Remove All
+remove all setup no Fjern alle
requires reinstall or manual repair setup no Requires reinstall or
manual repair
requires upgrade setup no Requires upgrade
resolve setup no Resolve
@@ -277,7 +277,7 @@
save this text as contents of your header.inc.php setup no Save
this text as contents of your header.inc.php
select an app, enter a target version, then submit to process to that
version.<br>if you do not enter a version, only the baseline tables will be
installed for the app.<br><blink>this will drop all of the apps' tables
first!</blink> setup no Select an app, enter a target version,
then submit to process to that version.<br>If you do not enter a version, only
the baseline tables will be installed for the app.<br><blink>THIS WILL DROP ALL
OF THE APPS' TABLES FIRST!</blink>
select the default applications to which your users will have access setup
no Select the default applications to which your users will have access
-select the desired action(s) from the available choices setup no
Select the desired action(s) from the available choices
+select the desired action(s) from the available choices setup no
Velg ønsket handling
select to download file setup no Select to download file
select where you want to store/retrieve file contents setup no Select
where you want to store/retrieve file contents
select where you want to store/retrieve filesystem information setup no
Select where you want to store/retrieve filesystem information
@@ -301,24 +301,26 @@
settings setup no Settings
setup setup no Setup
setup demo accounts in ldap setup no Setup demo accounts in LDAP
+Setup an Admininstrator account setup no Definer en administrator
+and optional demo accounts. setup no og demobrukere
setup the database setup no Setup the database
show 'powered by' logo on setup no Show 'powered by' logo on
-some or all of its tables are missing setup no Some or all of its
tables are missing
+some or all of its tables are missing setup no Noen eller alle
tabeller mangler
status setup no Status
-step 1 - simple application management setup no Step 1 - Simple
Application Management
-step 2 - configuration setup no Step 2 - Configuration
-step 3 - language management setup no Step 3 - Language Management
-step 4 - advanced application management setup no Step 4 -
Advanced Application Management
+step 1 - simple application management setup no Steg 1 - Enkel
modul-administrasjon
+step 2 - configuration setup no Steg 2 - konfigurasjon
+step 3 - language management setup no Steg 3 - Språk-administrasjon
+step 4 - advanced application management setup no Steg 4 -
Avansert modul-administrasjon
table change messages setup no Table Change Messages
-tables dropped setup no tables dropped
-tables installed, unless there are errors printed above setup no
tables installed, unless there are errors printed above
-tables upgraded setup no tables upgraded
+tables dropped setup no tabeller droppet
+tables installed, unless there are errors printed above setup no
tabelles er opprettet, dersom det ikke er skrevet ut feilmeldinger ovenfor
+tables upgraded setup no tabeller oppdatert
target version setup no Target Version
text entry setup no Text Entry
the db_type in defaults (%1) is not supported on this server. using first
supported type. setup no The db_type in defaults (%1) is not
supported on this server. using first supported type.
the file setup no the file
-the table definition was correct, and the tables were installed setup
no The table definition was correct, and the tables were installed
-the tables setup no the tables
+the table definition was correct, and the tables were installed setup
no tabelldefinisjoner var korrekt, og tabellene ble opprettet
+the tables setup no tabellene
there was a problem trying to connect to your ldap server. <br> setup
no There was a problem trying to connect to your LDAP server. <br>
there was a problem trying to connect to your ldap server. <br>please check
your ldap server configuration setup no There was a problem trying
to connect to your LDAP server. <br>please check your LDAP server configuration
this has to be outside the webservers document-root!!! setup no This
has to be outside the webservers document-root!!!
@@ -327,10 +329,10 @@
this section will help you import users and groups from your ldap tree into
phpgroupware's account tables setup no This section will help you
import users and groups from your LDAP tree into phpGroupWare's account tables
this section will help you setup your ldap accounts for use with phpgroupware
setup no This section will help you setup your LDAP accounts for use
with phpGroupWare
this should be around 32 bytes in length.<br>note: the default has been
randomly generated. setup no This should be around 32 bytes in
length.<br>Note: The default has been randomly generated.
-this stage is completed<br> setup no This stage is completed<br>
+this stage is completed setup no Dette steget er utført
this will create 1 admin account and 3 demo accounts<br>the username/passwords
are: demo/guest, demo2/guest and demo3/guest.<br><b>!!!this will delete all
existing accounts!!!</b><br> setup no This will create 1 admin
account and 3 demo accounts<br>The username/passwords are: demo/guest,
demo2/guest and demo3/guest.<br><b>!!!THIS WILL DELETE ALL EXISTING
ACCOUNTS!!!</b><br>
this will create an admin account and (optionally) 3 demo accounts.<br>the
username/passwords are: demo/guest, demo2/guest and demo3/guest.<br>
setup no This will create an admin account and (optionally) 3 demo
accounts.<br>The username/passwords are: demo/guest, demo2/guest and
demo3/guest.<br>
-to a version it does not know about setup no to a version it does
not know about
+to a version it does not know about setup no til en versjon den ikke
har kjenskap til
to setup 1 admin account and 3 demo accounts.<br><b>this will delete all
existing accounts</b> setup no to setup 1 admin account and 3 demo
accounts.<br><b>This will delete all existing accounts</b>
to setup an admin account and (optionally) 3 demo accounts. setup no
to setup an admin account and (optionally) 3 demo accounts.
top setup no top
@@ -340,20 +342,20 @@
try to configure your php to support one of the above mentioned dbms, or
install phpgroupware by hand. setup no Try to configure your php to
support one of the above mentioned DBMS, or install phpGroupWare by hand.
two weeks setup no two weeks
uninstall setup no uninstall
-uninstall all applications setup no Uninstall all applications
-uninstalled setup no uninstalled
-upgrade setup no Upgrade
-upgrade all setup no Upgrade All
-upgraded setup no upgraded
-upgrading tables setup no Upgrading Tables
+uninstall all applications setup no Avinstaller alle moduler
+uninstalled setup no Avinstallert
+upgrade setup no Oppdater
+upgrade all setup no Oppdater alle
+upgraded setup no Oppdatert
+upgrading tables setup no Oppdaterer tabeller
use cookies to pass sessionid setup no Use cookies to pass sessionid
use pure html compliant code (not fully working yet) setup no Use
pure HTML compliant code (not fully working yet)
users choice setup no Users Choice
version mismatch setup no Version Mismatch
-view setup no View
-warning! setup no Warning!
+view setup no Vis
+warning! setup no Advarsel!
warning: all your passwords (database, phpgroupware admin,...)<br> will be
shown in plain text after you log in for header administration. setup no
Warning: All your passwords (database, phpGroupWare admin,...)<br> will be
shown in plain text after you log in for header administration.
-we can proceed setup no We can proceed
+we can proceed setup no vi kan fortsette
we will automatically update your tables/records to %1 setup no We will
automatically update your tables/records to %1
what type of sessions management do you want to use (php session management
usually performs better)? setup no What type of sessions management do
you want to use (PHP session management usually performs better)?
which database type do you want to use with phpgroupware? setup no
Which database type do you want to use with phpGroupWare?
@@ -384,13 +386,19 @@
you should either uninstall and then reinstall it, or attempt manual repairs
setup no You should either uninstall and then reinstall it, or attempt
manual repairs
you're using an old configuration file format... setup no You're
using an old configuration file format...
you're using an old header.inc.php version... setup no You're using an
old header.inc.php version...
-your applications are current setup no Your applications are current
-your database does not exist setup no Your database does not exist
-your database is not working! setup no Your Database is not working!
+your applications are current setup no Modulene er av siste versjon
+your database does not exist setup no Databasen finnes ikke
+your database is not working! setup no Databasen fungerer ikke!
your database is working, but you dont have any applications installed setup
no Your database is working, but you dont have any applications installed
your header admin password is not set. please set it now! setup no
Your header admin password is NOT set. Please set it now!
your header.inc.php needs upgrading. setup no Your header.inc.php
needs upgrading.
<p class="msg">your header.inc.php needs upgrading.<br>warning! make
backups!</p> setup no <p class="msg">Your header.inc.php needs
upgrading.<br>WARNING! MAKE BACKUPS!</p>
-your tables are current setup no Your tables are current
-your tables may be altered and you may lose data setup no Your
tables may be altered and you may lose data.
-your tables will be dropped and you will lose data setup no Your
tables will be dropped and you will lose data !!
+your tables are current setup no Tabellene er av siste versjon
+your tables may be altered and you may lose data setup no
Tabellene kan bli endret, og du kan miste data.
+your tables will be dropped and you will lose data setup no
Tabellene blir slettet, og du vil miste data !!
+Application Name setup no Modulnavn
+Application Status setup no Modulstatus
+Current Version setup no Installert versjon
+Available Version setup no Tigljengelig versjon
+Available to install setup no Tigljengelig for installasjon
+Resolve setup no Løs problem
\ No newline at end of file
Modified: branches/Version-2_0-branch/setup/templates/base/head.tpl
===================================================================
--- branches/Version-2_0-branch/setup/templates/base/head.tpl 2018-01-16
16:34:00 UTC (rev 17596)
+++ branches/Version-2_0-branch/setup/templates/base/head.tpl 2018-01-16
16:35:44 UTC (rev 17597)
@@ -220,7 +220,7 @@
}
-->
</style>
- <title>phpGroupWare {lang_setup} {page_title}</title>
+ <title>Portico Estate {lang_setup} {page_title}</title>
</head>
<body>
@@ -228,7 +228,7 @@
<table width="100%" border="0" cellspacing="0" cellpadding="2">
<tr class="banner">
<td align="left">
- phpGroupWare version {pgw_ver} {lang_setup} {configdomain}
+ Portico Estate version {pgw_ver} {lang_setup}
{configdomain}
</td>
<td align="right">{logoutbutton}</td>
</tr>
Modified: branches/Version-2_0-branch/setup/templates/base/login_main.tpl
===================================================================
--- branches/Version-2_0-branch/setup/templates/base/login_main.tpl
2018-01-16 16:34:00 UTC (rev 17596)
+++ branches/Version-2_0-branch/setup/templates/base/login_main.tpl
2018-01-16 16:35:44 UTC (rev 17597)
@@ -37,7 +37,7 @@
<td colspan="2"> <b>Other Options</b></td>
</tr>
<tr class="row_on">
- <td colspan="2"><a href="../index.php">Return to phpGroupWare</a></td>
+ <td colspan="2"><a href="../index.php">Return to Portico Estate</a></td>
</tr>
<tr class="row_on">
<td colspan="2"> </td>
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Fmsystem-commits] [17597] Stable: Merge 17585:17596 from trunk,
sigurdne <=