3. Araxis Merge File Comparison Report

Produced by Araxis Merge on Fri Oct 19 14:25:19 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.

3.1 Files compared

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

3.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged36474
Changed1024
Inserted22254
Removed44

3.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

3.4 Active regular expressions

No regular expressions were active.

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