2. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Oct 19 14:25:18 2007 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

2.1 Files compared

#FileLocationLast Modified
1Corporate_portal_templates_v2.propertiesC:\jahia\template_diff\V2_JAHIA_5_0_0\src\java\jahiatemplatesFri Oct 19 14:18:32 2007 UTC
2Corporate_portal_templates_v2.propertiesC:\jahia\template_diff\V2_JAHIA_5_0_3\src\java\jahiatemplatesFri Oct 19 14:16:49 2007 UTC

2.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged42479
Changed1131
Inserted28259
Removed33

2.3 Comparison options

WhitespaceAll differences in whitespace within lines are ignored
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersHidden in comparison detail

2.4 Active regular expressions

No regular expressions were active.

2.5 Comparison detail

1 # openration modes 1 # openration modes
2 operationMode.edit = Edit 2 operationMode.edit = Edit
3 operationMode.compare = Compare 3 operationMode.compare = Compare
4 operationMode.preview = Preview 4 operationMode.preview = Preview
5 operationMode.live = Live 5 operationMode.live = Live
6  6 
7 # admin buttons 7 # admin buttons
8 button.mySettings = My settings 8 button.mySettings = My settings
9 button.pageSettings = Page settings 9 button.pageSettings = Page settings
10 button.workflow = Workflow 10 button.workflow = Workflow
11 button.administration = Administration 11 button.administration = Administration
12 button.login = Login 12 button.login = Login
13 button.logout = Logout 13 button.logout = Logout
14 button.username = username 14 button.username = username
15 button.search = Search 15 button.search = Search
16 button.sitemap = Sitemap 16 button.sitemap = Sitemap
17  17 
18 # general messages 18 # general messages
19 update = Update 19 update = Update
  20 editinword = Edit in Word
20 delete = Delete 21 delete = Delete
21 copy = Copy 22 copy = Copy
22 paste = Paste 23 paste = Paste
23 search = Search 24 search = Search
24 add = Add 25 add = Add
  26 differentACLTitle = This object and its parent have different ACLs
25 message.noLink = No link 27 message.noLink = No link
26 message.noPage = No page 28 message.noPage = No page
27 message.noNews = No news 29 message.noNews = No news
28 message.maxNews = Number of news to display 30 message.maxNews = Number of news to display
29 message.more = More... 31 message.more = More...
30 message.filter = Filter by 32 message.filter = Filter by
31 message.and = and 33 message.and = and
32 message.display = Display 34 message.display = Display
33 message.paginationInfo = results per page 35 message.paginationInfo = results per page
34 message.infoCatLabel = Documents published in category 36 message.infoCatLabel = Documents published in category
35 message.infoCatLegendEnd = and are published in others categories. 37 message.infoCatLegendEnd = and are published in others categories.
36 message.infoCatLegendStart = Documents ending with a \"*\" are related to 38 message.infoCatLegendStart = Documents ending with a \"*\" are related to
37 message.addCategory = Select the news categories you want to display by selecting them in the MetaData part of the news box 39 message.addCategory = Select the news categories you want to display by selecting them in the MetaData part of the news box
38 message.addInformation = Add information 40 message.addInformation = Add information
39  41 
40 doc.docCreationDate                          = Creation date 42 doc.docCreationDate                          = Creation date
41 doc.docCreatorLbl                            = Created by 43 doc.docCreatorLbl                            = Created by
42 doc.docLastModDate                           = Modified on 44 doc.docLastModDate                           = Modified on
43 doc.docListCatLabel                          = This document belongs to the followings categories 45 doc.docListCatLabel                          = This document belongs to the followings categories
44 doc.docModifLabel                            = Modified by 46 doc.docModifLabel                            = Modified by
45  47 
46 reload=Reload the page 48 reload=Reload the page
47 displayingDocuments    = Displaying documents 49 displayingDocuments     = Displaying documents
48 yes                    = yes 50 yes                     = yes
49 no                     = no 51 no                      = no
50 skill                  = Skill 52 skill                   = Skill
51 level                  = Level 53 level                   = Level
52 hourlyRate             = Hourly Rate 54 hourlyRate              = Hourly Rate
  55 homepage                = Homepage
53 tel=Tel 56 tel                     = Tel
54 mobile=Mobile 57 mobile                  = Mobile
55 email=Email 58 email                   = Email
56 street=Street 59 street                  = Street
57 cityCode=NPA / City 60 cityCode                = NPA / City
58 back=Back 61 back                    = Back
59 of = of 62 of                      = of
60 whichBestMachesFirst   = with best matches first 63 whichBestMachesFirst    = with best matches first
61 process=Process 64 process                 = Process
62 refresh=Refresh 65 refresh                 = Refresh
63  66 
64 # general labels 67 # general labels
65 label.navigation = Navigation 68 label.navigation = Navigation
66  69 
67 # quick link container list 70 # quick link container list
68 add.quicklinks = Add a quicklink 71 add.quicklinks = Add a quicklink
69 update.quicklinks = Update quicklink settings 72 update.quicklinks = Update quicklink settings
70 update.quicklink = Update 73 update.quicklink = Update
71 delete.quicklink = Delete 74 delete.quicklink = Delete
72  75 
73 # mainContent container list 76 # mainContent container list
74 mainContent.mainContentList = Content Container 77 mainContent.mainContentList = Content Container
75 mainContent.title = Title 78 mainContent.title = Title
76 mainContent.content = Content 79 mainContent.content = Content
77 mainContent.image = Image 80 mainContent.image = Image
78 mainContent.align = Align 81 mainContent.align = Align
79 add.mainContents = Add content 82 add.mainContents = Add content
80 update.mainContents = Update content settings 83 update.mainContents = Update content settings
81 update.mainContent = Edit this content 84 update.mainContent = Edit this content
82 delete.mainContent = Delete this content 85 delete.mainContent = Delete this content
83  86 
84 # footer link container list 87 # footer link container list
85 add.footerLinks = Add a link 88 add.footerLinks = Add a link
86 update.footerLinks = Update list settings 89 update.footerLinks = Update list settings
87 update.footerLink = Update 90 update.footerLink = Update
88 delete.footerLink = Delete 91 delete.footerLink = Delete
89 footer.footerText = Footer 92 footer.footerText = Footer
90  93 
91 # navigationLink 94 # navigationLink
92 add.navigationLinks = Add a link 95 add.navigationLinks = Add a page
93 update.navigationLinks = Settings 96 update.navigationLinks = Settings
94 update.navigationLink = Update 97 update.navigationLink = Update
95 delete.navigationLink = Delete 98 delete.navigationLink = Delete
96  99 
97 # SiteSettings 100 # SiteSettings
98 logoSettings = Update logo 101 logoSettings = Update logo
99  102 
100  103 
101 # boxContainer 104 # boxContainer
102 boxContainer = Box containers 105 boxContainer = Box containers
103 boxContainer.title = Title 106 boxContainer.title = Title
104 boxContainer.boxType = Type 107 boxContainer.boxType = Type
105 boxContainer.layout = Layout 108 boxContainer.layout = Layout
106 add.boxContainers = Add a box 109 add.boxContainers = Add a box
107 update.boxContainers = Settings 110 update.boxContainers = Settings
108 update.boxContainer = Update 111 update.boxContainer = Update
109 delete.boxContainer = Delete 112 delete.boxContainer = Delete
110  113 
111 add.savedSearch = Add a saved search 114 add.savedSearch = Add a saved search
112 boxContainer.savedSearch.maxFiles = Files number 115 boxContainer.savedSearch.maxFiles = Files number
113 boxContainer.savedSearch.list = Saved searches 116 boxContainer.savedSearch.list = Saved searches
114  117 
  118 add.searchBox = Add a search
  119 boxContainer.searchBox.maxFiles = Max items
  120 boxContainer.searchBox.list = Files searches
  121 
115 boxContainer.filesContainer = Files 122 boxContainer.filesContainer = Files
116 boxContainer.filesContainer.file = File 123 boxContainer.filesContainer.file = File
117 boxContainer.filesContainer.description = Description 124 boxContainer.filesContainer.description = Description
118 add.filesContainers = Add a file 125 add.filesContainers = Add a file
119 update.filesContainers = Settings 126 update.filesContainers = Settings
120 update.filesContainer = Update 127 update.filesContainer = Update
121 delete.filesContainer = Delete 128 delete.filesContainer = Delete
122  129 
123 boxContainer.links = Links 130 boxContainer.links = Links
124 boxContainer.links.link = Link 131 boxContainer.links.link = Link
125 boxContainer.links.description = Description 132 boxContainer.links.description = Description
126 add.links = Add a link 133 add.links = Add a link
127 update.links = Settings 134 update.links = Settings
128 update.link = Update 135 update.link = Update
129 delete.link = Delete 136 delete.link = Delete
130  137 
131 boxContainer.pages = Pages 138 boxContainer.pages = Pages
132 boxContainer.pages.link = Page 139 boxContainer.pages.link = Page
133 add.pages = Add a page 140 add.pages = Add a page
134 update.pages = Settings 141 update.pages = Settings
135 update.page = Update 142 update.page = Update
136 delete.page = Delete 143 delete.page = Delete
137  144 
138 boxContainer.texts = Textes 145 boxContainer.texts = Text s
139 boxContainer.texts.text = Text 146 boxContainer.texts.text = Text
140 add.texts = Insert text here 147 add.texts = Insert text here
141 update.texts = Settings 148 update.texts = Settings
142 update.text = Update 149 update.text = Update
143 delete.text = Delete 150 delete.text = Delete
144  151 
145 boxContainer.webapps = Portlets 152 boxContainer.webapps = Portlets
146 boxContainer.webapps.webapp = Portlet 153 boxContainer.webapps.webapp = Portlet
147 add.webapps = Add a portlet 154 add.webapps = Add a portlet
148 update.webapps = Settings 155 update.webapps = Settings
149 update.webapp = Update 156 update.webapp = Update
150 delete.webapp = Delete 157 delete.webapp = Delete
151  158 
152 boxContainer.webdav = DAV 159 boxContainer.webdav = DAV
153 add.webdav = Add a DAV view 160 add.webdav = Add a DAV view
154 update.webdav = Settings  
155 update.webdav = Update 161 update.webdav = Update
156 delete.webdav = Delete 162 delete.webdav = Delete
157 boxContainer.mountPoint = Path to mount 163 boxContainer.mountPoint = Path to mount
158 boxContainer.displaySubDir = Display sub directories 164 boxContainer.displaySubDir = Display sub directories
  165 davbox.mountpoint = Mount point
159  166 
160 boxContainer.lastNews = Last news 167 boxContainer.lastNews = Last news
161 boxContainer.lastNews.max = Display X news 168 boxContainer.lastNews.max = Display X news
162 add.news = Add a new 169 add.news = Add a new
163 update.new = Update 170 update.new = Update
164 delete.new = Delete 171 delete.new = Delete
165 news.title = Title 172 news.title = Title
166 news.description = Description 173 news.description = Description
167 news.link = Link 174 news.link = Link
168 news.date = Date 175 news.date = Date
169 news.startDate = Start date 176 news.startDate = Start date
170 news.endDate = End date 177 news.endDate = End date
171  178 
  179 boxContainer.pollbox    =   Poll box
  180 
  181 
  182 
172 splashs = banner 183 splashs = banner
173 splashs.splash = Banner 184 splashs.splash = Banner
174 add.splash = Add a banner 185 add.splash = Add a banner
175 update.splashs = Settings 186 update.splashs = Settings
176 update.splash = Update 187 update.splash = Update
177 delete.splash = Delete 188 delete.splash = Delete
178  189 
179 files = Files 190 files = Files
180 links = Links 191 links = Links
181 pages = Pages 192 pages = Pages
182 lastNews = Last news 193 lastNews = Last news
183 texts = Texte 194 texts = Text 
184 webapps = Portlet 195 webapps = Portlet
185 savedSearch = Search result 196 savedSearch = Search result
  197 searchBox = File search box
186 webdav = Mount webdav repository 198 webdav = Mount webdav repository
  199 pollbox =   Poll
187 layout0 = Blank box 200 layout0 = Blank box
188 layout1 = Outline box 201 layout1 = Outline box
189 layout3 = Filled box 202 layout3 = Filled box
190  203 
191  204 
192 mySettings             = My Settings 205 mySettings             = My Settings
193 mySettingsIntro        = Please update your personal information. 206 mySettingsIntro        = Please update your personal information.
194 mySettingsErrors       = Errors 207 mySettingsErrors       = Errors
195 mySettingsPassword1    = Password 208 mySettingsPassword1    = Password
196 mySettingsPassword2    = Confirm password 209 mySettingsPassword2    = Confirm password
197 mySettingsProperties   = Properties 210 mySettingsProperties   = Properties
198 mySettingsFirstName    = First name 211 mySettingsFirstName    = First name
199 mySettingsLastName     = Last name 212 mySettingsLastName     = Last name
200 mySettingsOrganization = Organization 213 mySettingsOrganization = Organization
201 mySettingsEmail        = Email 214 mySettingsEmail        = Email
  215 mySettingsEditInWord   = Possibility to edit in MS-Word
  216 mySettingsEditInWordPlugin = (The MS-Word plugin must be installed)
202 mySettingsSubmit       = Submit 217 mySettingsSubmit       = Submit
203 mySettingsBackToPage   = Back to page 218 mySettingsBackToPage   = Back to page
204 mySettingsSuccess      = Settings updated 219 mySettingsSuccess      = Settings updated
205 mySettingsSuccessIntro = Your user settings have been updated successfully. 220 mySettingsSuccessIntro = Your user settings have been updated successfully.
206  221 mySettingsPersonalProperties = User personal properties
  222 mySettingsaddPersonalProperties   = To add a personal property
  223 mySettingsremoveProperty    = To remove this personal property
  224 mySettingsnewpropvalue  = initial value
  225 mySettingsnewproplabel  = label of this new property
207  226 
208 ContentContainerListOperations = List operations 227 ContentContainerListOperations = List operations
209 ContentContainerOperations = Container operations 228 ContentContainerOperations = Container operations
210 ContentFieldOperations = Field operations 229 ContentFieldOperations = Field operations
211 ContentPageOperations = Page operation 230 ContentPageOperations = Page operation
212  231 
213 faq.title = Title 232 faq.title = Title
214 faq.question = Question 233 faq.question = Question
215 faq.answer = Answer 234 faq.answer = Answer
216 add.faqs = Add a category 235 add.faqs = Add a category
217 update.faqs = Settings 236 update.faqs = Settings
218 update.faq = Update 237 update.faq = Update
219 Supprimer.faq = Delete 238 Supprimer.faq = Delete
220 add.qas = Add a question/answer 239 add.qas = Add a question/answer
221 update.qas = Settings 240 update.qas = Settings
222 update.qa = Update 241 update.qa = Update
223 Supprimer.qa = Delete 242 Supprimer.qa = Delete
224  243 
225  244 
226 singleLine = Single line 245 singleLine = Single line
227 smallTextarea = Small textarea 246 smallTextarea = Small textarea
228 largeTextarea = Large textarea 247 largeTextarea = Large textarea
229 radioButtons = Radio Buttons 248 radioButtons = Radio Buttons
230 selectBox = Select Box 249 selectBox = Select Box
231 checkboxes = Check boxes 250 checkboxes = Check boxes
232 submitButton = Sumb it button 251 submitButton = Su bmit button
  252 fileUpload = File Upload
233  253 
234 form.sender = Sender 254 form.sender = Sender
235 form.recipients = Recipients, separated by comas 255 form.recipients = Recipients, separated by comas
236 form.recipientsCC = Recipients CC, separated by comas 256 form.recipientsCC = Recipients CC, separated by comas
237 form.Subject = Subject 257 form.Subject = Subject
238 form.displayTextAfterPost = Text to display after a post 258 form.displayTextAfterPost = Text to display after a post
239 form.displayTextAfterPostValue = Thank you. Your form has been sent. 259 form.displayTextAfterPostValue = Thank you. Your form has been sent.
240 form.title = Title 260 form.title = Title
241 form.isMandatory = Mandatory 261 form.isMandatory = Mandatory
242 form.type = Type 262 form.type = Type
243 form.defaultValue = Default value(s) separated by semi-column ':' 263 form.defaultValue = Default value(s) separated by semi-column ':'
244 form.addSender = Add sender, recipient, ... 264 form.addSender = Add sender, recipient, ...
245 form.fieldIsMandatory = Error: Fields with (*) are mandatory 265 form.fieldIsMandatory = Error: Fields with (*) are mandatory
246 form.defaultValueRequired = Default value is required for this type 266 form.defaultValueRequired = Default value is required for this type
  267 form.defaultPathWillBeUsed = Storage path (default value) is missing, /shared/forms/missing_path will be used
247 form.storePostedValues = Store posted values 268 form.storePostedValues = Store posted values
248 form.create = Create your form 269 form.create = Create your form
  270 form.sendMail = Send an E-Mail of the posted values
  271 form.mailWillBeSentIf = An E-Mail will be sent if the mail server has been configured by the administrator
  272 form.mailDisabled = Sending E-Mail messages is currently disabled
  273 form.showPostedValues = Show posted values in live mode
249  274 
250 blog.postedBy          = Posted by 275 blog.postedBy          = Posted by
251 blog.at                = at 276 blog.at                = at
252 blog.in                = in 277 blog.in                = in
253 blog.comments          = comments 278 blog.comments          = comments
254 blog.addBlog           = Add blog 279 blog.addBlog           = Add blog
255 blog.addComment        = Add comment 280 blog.addComment        = Add comment
256 blog.forFar            = so far 281 blog.forFar            = so far
257 blog.postYourOwn       = Post your own 282 blog.postYourOwn       = Post your own
258 blog.commentTitle      = Title 283 blog.commentTitle      = Title
259 blog.commentAuthor     = Author 284 blog.commentAuthor     = Author
260 blog.commentBody       = Body text 285 blog.commentBody       = Body text
261 blog.commentDate       = Date 286 blog.commentDate       = Date
262 blog.title             = Title 287 blog.title             = Title
263 blog.body              = Body 288 blog.body              = Body
264 blog.attachement       = Attachment associated 289 blog.attachement       = Attachment associated
265 blog.date              = Date 290 blog.date              = Date
266 blog.author            = Author 291 blog.author            = Author
267 blog.permanentLink     = Permanent link 292 blog.permanentLink     = Permanent link
268 blog.categories        = Categories 293 blog.categories        = Categories
269 blog.allCategories     = All categories 294 blog.allCategories     = All categories
270 blog.addEntry          = Add entry 295 blog.addEntry          = Add entry
271 blog.noEntry           = Could not find any entry 296 blog.noEntry           = Could not find any entry
272 blog.category          = category 297 blog.category          = category
273 blog.for               = for 298 blog.for               = for
274 blog.backTo            = back to 299 blog.backTo            = back to
275 blog.the               = the 300 blog.the               = the
276 blog.from              = from 301 blog.from              = from
277 blog.to                = to 302 blog.to                = to
278 blog.blogs             = Blogs 303 blog.blogs             = Blogs
279 blog.mo                = mo 304 blog.mo                = mo
280 blog.tu                = tu 305 blog.tu                = tu
281 blog.we                = we 306 blog.we                = we
282 blog.th                = th 307 blog.th                = th
283 blog.fr                = fr 308 blog.fr                = fr
284 blog.sa                = sa 309 blog.sa                = sa
285 blog.su                = su 310 blog.su                = su
286 blog.today             = Today 311 blog.today             = Today
287 blog.thisWeek          = This week 312 blog.thisWeek          = This week
288 blog.trackbacks        = trackbacks 313 blog.trackbacks        = trackbacks
289 blog.trackback         = trackback 314 blog.trackback         = trackback
290 blog.sentPingUrl       = Sent ping urls 315 blog.sentPingUrl       = Send a ping url 
291 blog.pingURL           = URL to send the ping to 316 blog.pingURL           = URL to send the ping to
292 blog.trackBackTitle    = Title of the blog entry for this trackback 317 blog.trackBackTitle    = Title of the blog entry for this trackback
293 blog.trackBackExcerpt  = Excerpt of the blog entry for this trackback 318 blog.trackBackExcerpt  = Excerpt of the blog entry for this trackback
294 blog.trackBackUrl      = Url (permalink) of the blog entry for this trackback 319 blog.trackBackUrl      = Url (permalink) of the blog entry for this trackback
295 blog.trackBackBlog_name= Name of the blog for this trackback 320 blog.trackBackBlog_name= Name of the blog for this trackback
296 blog.trackBackPing_IP  = The IP address of the host that sent the ping 321 blog.trackBackPing_IP  = The IP address of the host that sent the ping
297 blog.excerpt           = The Excerpt of this post 322 blog.excerpt           = The Excerpt of this post
298 blog.keyWords          = Comma seperated Keywords for this post 323 blog.keyWords          = Comma seperated Keywords for this post
299 blog.continued         = Continued 324 blog.continued         = Continued
300 blog.on                = on 325 blog.on                = on
301 blog.wrote             = wrote 326 blog.wrote             = wrote
  327 blog.results.next      = Next Results
  328 blog.results.previous  = Previous Results
302 rss.title              = Subscribe via RSS to this blog 329 rss.title              = Subscribe via RSS to this blog
303 rss.titleALL           = Combined RSS feed for all blogs 330 rss.titleALL           = Combined RSS feed for all blogs
304  331 
305 types.allTypes = All types 332 types.allTypes = All types
306 sources.allSources = Toutes les sources 333 sources.allSources = All  sources
  334 source = Go to original page to validate
307  335 
308 doc.docPage = Doc page 336 doc.docPage = Doc page
309 doc.title = Title 337 doc.title = Title
310 doc.description = Description 338 doc.description = Description
311 doc.type = Type 339 doc.type = Type
312 doc.source = Source 340 doc.source = Source
313 doc.creationDate = Creation date 341 doc.creationDate = Creation date
314 doc.publishingDate = Publishing date 342 doc.publishingDate = Publishing date
315 doc.lastModificationDate = Last modification 343 doc.lastModificationDate = Last modification
316 doc.creator = Creator 344 doc.creator = Creator
317 doc.publisher = Publisher 345 doc.publisher = Publisher
318 doc.lastContributor = Last contributor 346 doc.lastContributor = Last contributor
319  347 
320 #ldap messages and labels 348 #ldap messages and labels
321 ldap.criteria.hide=To hide the advanced criteria 349 ldap.criteria.hide=To hide the advanced criteria
322 ldap.criteria.show=to show the advanced criteria 350 ldap.criteria.show=to show the advanced criteria
323 ldap.gosearch=Search 351 ldap.gosearch=Search
324 ldap.group.membercount=Member's count 352 ldap.group.membercount=Member's count
325 ldap.group.name=Group name 353 ldap.group.name=Group name
326 ldap.group.key=Key 354 ldap.group.key=Key
  355 ldap.group.sitelocalisation=Group Localisation
327 ldap.group.provider=Group provider 356 ldap.group.provider=Group provider
328 ldap.group.origin=from 357 ldap.group.origin=from
329 ldap.grouplist = Group List 358 ldap.grouplist = Group List
330 ldap.userlist = User List 359 ldap.userlist = User List
331 ldap.bygroups=By groups 360 ldap.bygroups=by groups
332 ldap.input.index=Index 361 ldap.input.index=Index
333 ldap.input.query=Enter your query 362 ldap.input.query=Enter your query
334 ldap.input.searchindex=To search by alphabetic index 363 ldap.input.searchindex=To search by alphabetic index
335 ldap.input.searchquery=To search by query 364 ldap.input.searchquery=To search by query
336 ldap.input.search=Search 365 ldap.input.search=Search
337 ldap.provider.all=everywhere 366 ldap.provider.all=everywhere
338 ldap.provider.choice = Choose in 367 ldap.provider.choice = Choose in
339 ldap.results.display.choice = Choose how many results to display 368 ldap.results.display.choice = Choose how many results to display
340 ldap.results.title = Results List 369 ldap.results.title = Results List
341 ldap.results.next = Next Results 370 ldap.results.next = Next Results
342 ldap.results.previous = Previous Results 371 ldap.results.previous = Previous Results
343 ldap.byusers = By users 372 ldap.byusers = by users
344 ldap.user.name = User name 373 ldap.user.name = User name
345 ldap.user.firstname = User firstname 374 ldap.user.firstname = User firstname
346 ldap.user.organization = Organization 375 ldap.user.organization = Organization
347 ldap.user.email =email 376 ldap.user.email =email
348 ldap.user.lastname = User lastname 377 ldap.user.lastname = User lastname
349 ldap.user.origin = from 378 ldap.user.origin = from
350 ldap.limit.10 = the first ten 379 ldap.limit.10 = the first ten
351 ldap.limit.20 = the first twenty 380 ldap.limit.20 = the first twenty
352 ldap.limit.50 = the first fifty 381 ldap.limit.50 = the first fifty
353 ldap.limit.all= all 382 ldap.limit.all= all
354 ldap.user = user 383 ldap.user = user
355 ldap.users = users 384 ldap.users = users
356 ldap.group = group 385 ldap.group = group
357 ldap.groups = groups 386 ldap.groups = groups
358 ldap.nouserfound = No {0} found 387 ldap.nouserfound = No {0} found
359 ldap.oneuserfound = one {0} found 388 ldap.oneuserfound = one {0} found
360 ldap.allfound = {0} {2} found 389 ldap.allfound = {0} {2} found
361 ldap.somefound = {0} {1} found - Displaying {2} to {3}. 390 ldap.somefound = {0} {1} found - Displaying {2} to {3}.
362 ldap.listing=Displaying {0} to {2} 391 ldap.listing=Displaying {0} to {2}
  392 ldap.searchall=search all
363  393 
364  394 savesearch.customizeView                    = Customize view
365   
366 savesearch.savedSuccessfully                = Saved success fully 395 savesearch.savedSuccessfully                = Saved success fully
367 savesearch.nameRequired                     = Name required 396 savesearch.nameRequired                     = Name required
368 savesearch.deletedSuccessfully              = Deleted successfully 397 savesearch.deletedSuccessfully              = Deleted successfully
369  398 
  399 search.archivedStatus                       = Archived status
370 search.author                               = Author 400 search.author                               = Author
  401 search.categories                           = Categories
371 search.category                             = Category 402 search.category                             = Category
372 search.creationDate                         = Creation Date 403 search.creationDate                         = Creation Date
373 search.comments                             = Comments 404 search.comments                             = Comments
  405 search.extendSelectionToSubCategories       = extend selection to sub categories
374 search.keywords                             = Keywords 406 search.keywords                             = Keywords
375 search.lastModificationDate                 = Last modification Date 407 search.lastModificationDate                 = Last modification Date
376 search.lastAuthor                           = Last author 408 search.lastAuthor                           = Last author
  409 search.selectCategory.apply                 = apply
  410 search.selectCategory.applyAndClose         = apply and close
  411 search.selectCategory.cancel                = cancel
  412 search.since                                = since
377 search.subject                              = Subject 413 search.subject                              = Subject
378 search.title                                = Title 414 search.title                                = Title
379 search.rank                                 = Rank 415 search.rank                                 = Rank
380 search.file                                 = File 416 search.file                                 = File
381 search.mimeType                             = Mime Type 417 search.mimeType                             = Mime Type
382 search.size                                 = Size 418 search.size                                 = Size
383  419 
  420 search.documentNumber                       = Document number
  421 search.processType                          = Process type
  422 search.diffusionGroup                       = Diffusion group
  423 search.confidentialGroup                    = Confidential group
  424 
384 search.comparator.contains                  = contains 425 search.comparator.contains                  = contains
385 search.comparator.notContains               = does not contain 426 search.comparator.notContains               = does not contain
386 search.comparator.equals                    = equals 427 search.comparator.equals                    = equals
387 search.comparator.notEquals                 = not equals 428 search.comparator.notEquals                 = not equals
388 search.comparator.lessOrEquals              = less or equals 429 search.comparator.lessOrEquals              = less or equals
389 search.comparator.greaterThanOrEquals       = greater than or equals 430 search.comparator.greaterThanOrEquals       = greater than or equals
390  431 
391 search.advancedSearch                       = Advanced search 432 search.advancedSearch                       = Advanced search
392 search.after                                = after 433 search.after                                = after
393 search.anywhere                             = anywhere 434 search.anywhere                             = anywhere
394 search.before                               = before 435 search.before                               = before
395 search.browse                               = browse 436 search.browse                               = browse
396 search.close                                = Close 437 search.close                                = Close
397 search.defineACriteria                      = Define a criteria 438 search.defineACriteria                      = Define a criteria
398 search.date                                 = Date 439 search.date                                 = Date
399 search.date.anytime                         = anytime 440 search.date.anytime                         = anytime
400 search.date.today                           = today 441 search.date.today                           = today
  442 search.date.oneDay                          = one day
  443 search.date.twoDays                         = two days
  444 search.date.threeDays                       = three days
  445 search.date.thisWeek                        = this week
  446 search.date.oneWeek                         = one week
  447 search.date.twoWeeks                        = two weeks
  448 search.date.threeWeeks                      = three weeks
  449 search.date.thisMonth                       = this month
  450 search.date.oneMonth                        = one month
  451 search.date.twoMonths                       = two months
  452 search.date.threeMonths                     = three months
  453 search.date.sixMonths                       = six months
  454 search.date.thisYear                        = this year
  455 search.date.oneYear                         = one year
  456 search.date.twoYears                        = two years
401 search.date.lastweek                        = last week 457 search.date.lastweek                        = last week
402 search.date.past3Months                     = past 3 months 458 search.date.past3Months                     = past 3 months
403 search.date.past6Months                     = past 6 months 459 search.date.past6Months                     = past 6 months
404 search.date.pastYear                        = past year 460 search.date.pastYear                        = past year
405 search.delete                               = Delete 461 search.delete                               = Delete
406 search.description                          = Description 462 search.description                          = Description
407 search.documentsUpdatedIn                   = return documents updated in the 463 search.documentsUpdatedIn                   = return documents updated in the
408 search.domain                               = Domain 464 search.domain                               = Domain
409 search.domain.site                          = Site 465 search.domain.site                          = Site
410 search.edit                                 = edit 466 search.edit                                 = edit
411 search.fileFormat                           = File Format 467 search.fileFormat                           = File Format
412 search.fileFormat.anyFormat                 = any format 468 search.fileFormat.anyFormat                 = any format
413 search.fileFormat.pdf                       = Adobe Acrobat PDF (.pdf) 469 search.fileFormat.pdf                       = Adobe Acrobat PDF (.pdf)
414 search.fileFormat.doc                       = Office Word (.doc) 470 search.fileFormat.doc                       = Office Word (.doc)
415 search.fileFormat.xls                       = Office Excel (.xls) 471 search.fileFormat.xls                       = Office Excel (.xls)
416 search.fileFormat.ppt                       = Office Powerpoint (.ppt) 472 search.fileFormat.ppt                       = Office Powerpoint (.ppt)
417 search.fileRepositorySearch                 = File repository search 473 search.fileRepositorySearch                 = File repository search
418 search.findResults                          = Find results 474 search.findResults                          = Find results
419 search.freeSearch                           = free search 475 search.freeSearch                           = free search
420 search.location                             = Location 476 search.location                             = Location
421 search.inContentAndFilename                 = content and file name 477 search.inContentAndFilename                 = content and file name
  478 search.inContentAndName                     = content and name
422 search.inContentOnly                        = content only 479 search.inContentOnly                        = content only
423 search.inFilenameOnly                       = file name only 480 search.inFilenameOnly                       = file name only
  481 search.inNameOnly                           = name only
424 search.name                                 = Name 482 search.name                                 = Name
425 search.more                                 = More 483 search.more                                 = More
426 search.moreSearchOptions                    = More search options 484 search.moreSearchOptions                    = More search options
427 search.customSearchOptions                  = Custom search options 485 search.customSearchOptions                  = Custom search options
  486 search.objectOfTheResourceType              = return object of type
428 search.occurences.inJahiaContentOnly        = in Jahia's content only 487 search.occurences.inJahiaContentOnly        = in Jahia's content only
429 search.occurences.inJahiaMetadataOnly       = in Jahia's metadatas only 488 search.occurences.inJahiaMetadataOnly       = in Jahia's metadatas only
430 search.occurences.inAuthor                  = in the author's name 489 search.occurences.inAuthor                  = in the author's name
431 search.occurences.inLastContributor         = in the last contributor's name 490 search.occurences.inLastContributor         = in the last contributor's name
432 search.occurences.inFileContentOnly         = in file's content only 491 search.occurences.inFileContentOnly         = in file's content only
433 search.occurences.inFileMetadataOnly        = in file's metadatas only 492 search.occurences.inFileMetadataOnly        = in file's metadatas only
434 search.occurences.inFileAuthor              = in the file's author name 493 search.occurences.inFileAuthor              = in the file's author name
435 search.occurences.inFileLastContributor     = in the file's last contributor name 494 search.occurences.inFileLastContributor     = in the file's last contributor name
436 search.occurences.inFileTitle               = in the file's title 495 search.occurences.inFileTitle               = in the file's title
437 search.occurences.inFileSubject             = in the file's subject 496 search.occurences.inFileSubject             = in the file's subject
438 search.occurences.inFileDescription         = in the file's description 497 search.occurences.inFileDescription         = in the file's description
439 search.occurences.inFileKeywords            = in the file's keywords 498 search.occurences.inFileKeywords            = in the file's keywords
  499 search.quickAccess                          = Quick access
  500 search.quickAccessBy                        = by
440 search.remove                               = remove 501 search.remove                               = remove
441 search.reset                                = reset 502 search.reset                                = reset
  503 search.resourceType                         = Resource type
  504 search.resourceType.file                    = File
  505 search.resourceType.folder                  = Folder
  506 search.resourceType.all                     = All
442 search.resultsFrom                          = return results from 507 search.resultsFrom                          = return results from
443 search.resultsFromTheSiteOrDomain           = return results from the site or domain 508 search.resultsFromTheSiteOrDomain           = return results from the site or domain
444 search.resultsOfTheFileFormat               = return results of the file format 509 search.resultsOfTheFileFormat               = return results of the file format
  510 search.resultsOfTheArchivedStatus           = return results with the status
445 search.resultsWhereMyTermsOccur             = return results where my terms occur 511 search.resultsWhereMyTermsOccur             = return results where my terms occur
446 search.save                                 = Save 512 search.save                                 = Save
447 search.saveUpdatedSearch                    = Save updated search 513 search.saveUpdatedSearch                    = Save updated search
448 search.saveSearch                           = Save search 514 search.saveSearch                           = Save search
449 search.saveSearch.isPublic                  = Is public 515 search.saveSearch.isPublic                  = Is public
450 search.savedSearches                        = Saved searches 516 search.savedSearches                        = Saved searches
451 search.savedSearches.select                 = Select a saved search 517 search.savedSearches.select                 = Select a saved search
452 search.savedSearches.mySavedSearchesOnly    = My saved searches only 518 search.savedSearches.mySavedSearchesOnly    = My saved searches only
453 search.search                               = Search 519 search.search                               = Search
454 search.searchOptions                        = Search Options 520 search.searchOptions                        = Search Options
455 search.textSearchIn                         = text search in 521 search.textSearchIn                         = text search in
456 search.webSiteSearch                        = Web site search 522 search.webSiteSearch                        = Web site search
457 search.update                               = Update 523 search.update                               = Update
458 search.withAllOfTheWords                    = with <b>all</b> of the words 524 search.withAllOfTheWords                    = with <b>all</b> of the words
459 search.withTheExactPhrase                   = with the <b>exact phrase</b> 525 search.withTheExactPhrase                   = with the <b>exact phrase</b>
460 search.withAtLeastOneOfTheWords             = with <b>at least one</b> of the words 526 search.withAtLeastOneOfTheWords             = with <b>at least one</b> of the words
461 search.withoutTheWords                      = <b>without</b> the words 527 search.withoutTheWords                      = <b>without</b> the words
462 searchResultFor                             = Search results for 528 searchResultFor                             = Search results for
463 linkedPages                                 = Linked pages 529 linkedPages                                 = Linked pages
464  530 
465 addCategory                              = Add category 531 addCategory                              = Add category
  532 addContent                              = Add Content
466 #def containers 533 #def containers
467 groupsContainer        = Groups Container 534 groupsContainer        = Groups List
468 usersContainer         = Users Container 535 usersContainer         = Users List
469  536 
470 #filemanager link 537 #filemanager link
471 filemanager.name    =   filemanager 538 filemanager.name    =   filemanager
472  539 
473 # messages ldap pop-ups 540 # messages ldap pop-ups
474 ldap.user.nohomepage    =   this user have no homepage 541 ldap.user.nohomepage    =   this user have no homepage
475   
476 ldap.user.membership    =   this user belongs to the following groups 542 ldap.user.membership    =   this user belongs to the following groups
477 ldap.user.nohomepage=this user have no homepage  
478 ldap.group.membership   =   this group have the following members 543 ldap.group.membership   =   this group have the following members
479 ldap.group.nohomepage=this group have no homepage 544 ldap.group.nohomepage=this group have no homepage
480 ldap.user.nomembership  =   this user belongs to no groups 545 ldap.user.nomembership  =   this user belongs to no groups
481  546 
482 #pickers and picked 547 #pickers and picked
483 picker                                   = Source 548 picker                                   = Source
484 picked                                   = Copies 549 picked                                   = Copies
485 pickedlist                               = copies 550 pickedlist                               = copies
486 copylinkid                               = linked copy ID 551 copylinkid                               = linked copy ID
487 numbercopies                             = number of copies 552 numbercopies                             = number of copies
488 linkedcopies                             = linked copies 553 linkedcopies                             = linked copies
489 pickers.title                            = linked copies 554 pickers.title                            = linked copies
490 pickers.table.title                      = list of linked copies 555 pickers.table.title                      = list of linked copies
491 pickers.picked.message1                  = for the object id 556 pickers.picked.message1                  = for the object id
492 pickers.picked.message2                  = of type 557 pickers.picked.message2                  = of type
493 pickers.error.message                    = no linked copies 558 pickers.error.message                    = no linked copies
494 pickers.type                             = content 559 pickers.type                             = content
495 contentLayout=content layout 560 contentLayout=content layout
  561 
  562 poll.question = Question
  563 poll.answer = Answer
  564 poll.typeYourQuestionHere = Type your question here
  565 poll.submit = Submit
  566 poll.chooseAValue = Please choose a value
  567 poll.totalAanswers = Total answers
  568 poll.preferences = Preferences
  569 
  570 ##messages
  571 poll.addresponses = Add your anwsers here
  572 poll.updatePrefsMsg = Please update the message Preferences
  573 poll.errorMsgIfNoValueLabel = Error message if no value
  574 poll.errorMsgIfNoValue = There is no value chosen
  575 poll.errorMsgIfalreadyPostedLabel = Error message if the poll already posted
  576 poll.alreadyPostedAt = Sorry, but you have already posted this poll
  577 poll.successMsgLabel = Message thanks in case of successful answering
  578 poll.successMsg = Thanks for your participation
  579 
  580 quizz.question = Question
  581 quizz.isSeparator = This is a separator
  582 quizz.answer = Answer
  583 quizz.isTrue = This is the answer
  584 quizz.previous = Previous
  585 quizz.next = Next
  586 quizz.addAnswer = Please add a possible answer.
  587 quizz.onlyOneAnswer = Error: Only one answer is available.
  588 quizz.setGoodAnswer = Warning: you need to set at least one anwser as correct.
  589 quizz.addSeparator = You must add a <em>separator</em> at the end of your quizz to add the the submit button.
  590 quizz.helpSeparator = To do this, you need to add a question, check the "separator" box and specify a title. The column character is used to separate the <em>previous</em> and the <em>next</em> button in the question.<br/>Example: <span style="color:blue">Previous<strong>:</strong>Next</span><br/>Example: <span style="color:blue">Previous<strong>:</strong>View results</span>
  591 quizz.addQuestion = Please add a question...
  592 quizz.yourAnswer = Your answer
  593 quizz.OK = OK
  594 quizz.wrong = WRONG
  595 quizz.rightAnswerWas = The right answer was
  596 quizz.rightAnswer = Right answers
  597 quizz.preferences = Preferences
  598 quizz.playItAgain = Play it again
  599 quizz.result10 = Are you kidding me?
  600 quizz.result20 = Unworthy
  601 quizz.result30 = Poor
  602 quizz.result40 = Unsatisfactory
  603 quizz.result50 = Rather average
  604 quizz.result60 = Satisfactory
  605 quizz.result70 = Good
  606 quizz.result80 = Very Good
  607 quizz.result90 = Outstanding
  608 quizz.result100 = You rule!
  609 
  610 #messages
  611 quizz.alreadyPostedAt = Sorry, but you have already posted this quizz
  612 quizz.errorMsgIfalreadyPostedLabel = Error message if the quizz is already posted
  613 quizz.successMsg = Thanks for your participation
  614 quizz.successMsgLabel = Message thanks in case of successful answering
  615 quizz.storeValuesLabel = Store values
  616 
  617 survey.question = Question or separator label
  618 survey.type = Type
  619 survey.previous = Previous
  620 survey.next = Next
  621 survey.addAnswer = Please add a possible answer.
  622 survey.addSeparator = You must add a <em>separator</em> at the end of your survey to add the the submit button.
  623 survey.helpSeparator = To do this, you need to add a question, select the "separator" type in the list box and specify a title. The column character is used to separate the <em>previous</em> and the <em>next</em> button in the question.<br/>Example: <span style="color:blue">Previous<strong>:</strong>Next</span><br/>Example: <span style="color:blue">Previous<strong>:</strong>View results</span>
  624 survey.addQuestion = Please add a question...
  625 survey.separator = Separator
  626 survey.multiple = Multiple choice
  627 survey.single = Single choice
  628 survey.text = Text field
  629 survey.confirmationMessage = Confirmation message
  630 
  631 survey.thankYou = Thank you for your participation!
  632 survey.preferences = Preferences
  633 
  634 #messages
  635 survey.alreadyPostedAt = Sorry, but you have already posted this survey
  636 survey.errorMsgIfalreadyPostedLabel = Error message if the survey is already posted
  637 survey.successMsg = Thanks for your participation
  638 survey.successMsgLabel = Message thanks in case of successful answering
  639 survey.storeUsernameLabel = Store usernames
  640 
  641 # error messages used for the yav javascript form validator
  642 HEADER_MSG = Data not valid:
  643 FOOTER_MSG = Please retry.
  644 DEFAULT_MSG = The data is invalid.
  645 REQUIRED_MSG = A value for question \{1\} is mandatory.
  646 ALPHABETIC_MSG = \{1\} is not valid. Characters allowed: A-Za-z
  647 ALPHANUMERIC_MSG = \{1\} is not valid. Characters allowed: A-Za-z0-9
  648 ALNUMHYPHEN_MSG = \{1\} is not valid. Characters allowed: A-Za-z0-9\\-_
  649 ALNUMHYPHENAT_MSG = \{1\} is not valid. Characters allowed: A-Za-z0-9\\-_@
  650 ALPHASPACE_MSG = \{1\} is not valid. Characters allowed: A-Za-z0-9\\-_space
  651 MINLENGTH_MSG = \{1\} must be at least \{2\} characters long.
  652 MAXLENGTH_MSG = \{1\} must be no more than \{2\} characters long.
  653 NUMRANGE_MSG = \{1\} must be a number in \{2\} range.
  654 DATE_MSG = \{1\} is not a valid date, using the format
  655 NUMERIC_MSG = \{1\} must be a number.
  656 INTEGER_MSG = \{1\} must be an integer
  657 DOUBLE_MSG = \{1\} must be a decimal number.
  658 REGEXP_MSG = \{1\} is not valid. Format allowed: \{2\}.
  659 EQUAL_MSG = \{1\} must be equal to \{2\}.
  660 NOTEQUAL_MSG = \{1\} must be not equal to \{2\}.
  661 DATE_LT_MSG = \{1\} must be previous to \{2\}.
  662 DATE_LE_MSG = \{1\} must be previous or equal to \{2\}.
  663 EMAIL_MSG = \{1\} must be a valid e-mail.
  664 EMPTY_MSG = \{1\} must be empty.
  665 owner   = owner
  666 addFolder = add Folder
  667 sortAndProperties = sort And Properties
  668 emptyFolder = empty Folder
  669 search.savedSuccessfully=Saved successfully
  670 uploadFile = upload File
  671 start   = start
  672 message.Display = message Display
  673 
  674 size    = size
  675 name    = name
  676 description = description
  677 dateModified    = date Modified
  678 filter  = filter
  679 allTypes    = all Types
  680 containers  = containers
  681 containerLists  = container Lists
  682 allCategories = allCategories
  683 result = result
  684 category = Category
  685 end = end
  686 addProject=add a Project
  687 
  688 #metdatada
  689 metadataapi.contentLocated  = Content Localisation
  690 metadataapi.anywhere    = anywhere
  691 metadataapi.FromCurrentPageAndSubPagesOnly  =  From currentPage and subpages Only
  692 metadataapi.contentName = content Name
  693 metadataapi.creator = creator
  694 metadataapi.creationDate    = Creation Date
  695 metadataapi.lastContributor = Last contributor
  696 metadataapi.lastModificationDate    = Last modification date
  697 metadataapi.lastPublisher   = Last publisher
  698 metadataapi.lastPublishingDate  = Last publishing date
  699 
  700 
  701 update.news=List settings
  702 search.quickAcces=Quick access
  703 search.listenFilesClassifiedBy=List Files classified by
  704 search.folder=Folder
  705 messafe.filter=Filter by
  706 layout2=Colored box
  707 delete.qa=Delete
  708 delete.faq=delete
  709 # dup addLink=addLink
  710 
  711 allSkills=allSkills
  712 addLink=add a Link
  713 employee = employee
  714 consultant=consultant
  715 allLevels=allLevels
  716 beginner=beginner
  717 junior=junior
  718 senior=senior
  719 expert=expert
  720 emptyList=emptyList
  721 addPeople=addPeople
  722 addNew=Add a news
  723 resetLayout                              = Reset layout in
  724 addWebapps=Add a portlet
  725 columns                                  = columns
  726 noNews                                   = No news
  727 addText                                  = Add Text
  728 noLink  = noLink
  729 noPortlet   = no Portlet
  730 linksContainer                           = Links content object
  731 freeTextContainer                        = Free text and image content object
  732 newsContainer                            = News content object
  733 coloredBackground                        = Colored background
  734 coloredBorder                            = Colored border
  735 greyBackground                           = Grey background
  736 greyBorder                               = Grey border
  737 freeText                                 = Free text and image
  738 transparent                             = transparent
  739 news                                     = News
  740 
  741 box.users.query                         = query
  742 box.groups.query                        = query
  743 box.users.displaylimit                  = max users limit
  744 box.users.query.info                    = (optionnaly you can use * to approximate your query)
  745 box.groups.query.info                   = (optionnaly you can use * to approximate your query)
  746 box.groups.displaylimit                 = max groups limit
  747 box.groups.query.validate               = validate your choices
  748 box.users.query.validate                = validate your choices
  749 
  750 noTitle =   No title
  751 quizz.errorMsgIfalreadyPosted=you have already posted
  752 quizz.onlyOnAnswer=Error: Only one answer is available.
  753 quizz.storeValues=Store values
  754 
  755 emailnotifier.addmail=please update your email in your settings
  756 emailnotifier.subscribe=click to be subscribed

Araxis Merge (but not this generated report) is Copyright © 1993-2003 Araxis Ltd (www.araxis.com). All rights reserved.