eeb082b763
Conflicts: extensions/freebase/module/langs/translation-default.json extensions/freebase/module/langs/translation-en.json extensions/freebase/module/langs/translation-it.json extensions/freebase/src/com/google/refine/freebase/commands/LoadLanguageCommand.java extensions/gdata/module/MOD-INF/controller.js extensions/gdata/module/langs/translation-default.json extensions/gdata/module/langs/translation-en.json extensions/gdata/module/langs/translation-it.json extensions/gdata/src/com/google/refine/extension/gdata/commands/LoadLanguageCommand.java main/src/com/google/refine/commands/lang/LoadLanguageCommand.java main/src/com/google/refine/commands/lang/SetLanguageCommand.java main/webapp/modules/core/langs/translation-default.json main/webapp/modules/core/langs/translation-en.json main/webapp/modules/core/langs/translation-it.json main/webapp/modules/core/scripts/index/lang-settings-ui.js |
||
---|---|---|
.. | ||
freebase | ||
gdata | ||
jython | ||
pc-axis | ||
sample | ||
build.xml |