Brian Carrier 514a7f00a6 resolved conflicts

2014-04-23 20:55:44 -04:00

..

actions

Added NON-NLS tag to lines containing hardcoded strings that do not need National Language Support (NLS).

2014-04-21 14:05:59 -04:00

casemodule

Pulled two strings and translated.

2014-04-22 10:12:28 -04:00

contentviewers

Added NON-NLS tag to hardcoded strings not needing National Language Support

2014-04-21 15:01:02 -04:00

core

Added NON-NLS tag to hardcoded strings not needing National Language Support

2014-04-21 15:05:00 -04:00

corecomponentinterfaces

Added NON-NLS tag to hardcoded strings not needing National Language Support

2014-04-21 15:07:57 -04:00

corecomponents

Resolved merge conflict.

2014-04-22 09:50:19 -04:00

coreutils

Coreutilss - Added NON-NLS tag to hardcoded strings not needing National Language Support

2014-04-21 16:00:02 -04:00

datamodel

Merge branch 'develop' of github.com:sleuthkit/autopsy into develop

2014-04-22 14:18:54 -04:00

directorytree

Directorytree - Added NON-NLS tag to hardcoded strings not needing National Language Support

2014-04-21 16:36:08 -04:00

examples

Reinserted refCounter increment since it used to be a side effect of a method that was removed.

2014-04-23 11:27:02 -04:00

filesearch

Filesearch - Added NON-NLS tag to hardcoded strings not needing National Language Support

2014-04-21 16:40:41 -04:00

images

remove unecessary file

2014-04-02 13:19:06 -04:00

ingest

Merge remote-tracking branch 'upstream/develop' into mt-update

2014-04-23 11:55:34 -04:00

menuactions

Completed translation

2014-03-06 10:27:47 -08:00

modules

prevent netbeans assigned value is never used warning (although it's innocuous in this case)

2014-04-23 11:59:59 -04:00

report

added method comment

2014-04-23 15:17:49 -04:00

timeline

Timeline - Added NON-NLS tags to hardcoded strings not needing National Language Support.

2014-04-22 10:54:22 -04:00