OSDN Git Service

winmerge-jp/winmerge-jp.git
9 years agoUpdate translations
sdottaka [Fri, 13 Feb 2015 12:20:03 +0000 (21:20 +0900)]
Update translations

--HG--
branch : stable

9 years ago- Make Hex Editor configurable
sdottaka [Fri, 13 Feb 2015 12:19:41 +0000 (21:19 +0900)]
- Make Hex Editor configurable
- Compare binary files with Hex Editor when the file extensions are registered as binary

--HG--
branch : stable

9 years agoHexEditor: Fix graphical glitch at statusbar
sdottaka [Fri, 13 Feb 2015 12:09:11 +0000 (21:09 +0900)]
HexEditor: Fix graphical glitch at statusbar

--HG--
branch : stable

9 years agoFix crash when opening hex view, if frhed is not installed
sdottaka [Wed, 11 Feb 2015 08:13:48 +0000 (17:13 +0900)]
Fix crash when opening hex view, if frhed is not installed

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Wed, 11 Feb 2015 08:00:45 +0000 (17:00 +0900)]
Update translations

--HG--
branch : stable

9 years agoRemove unused resource strings
sdottaka [Wed, 11 Feb 2015 07:56:22 +0000 (16:56 +0900)]
Remove unused resource strings

--HG--
branch : stable

9 years agoWinMerge*.iss: Add Frhed/Languages/ja.po
sdottaka [Tue, 10 Feb 2015 14:24:48 +0000 (23:24 +0900)]
WinMerge*.iss: Add Frhed/Languages/ja.po

--HG--
branch : stable

9 years agoPoco: Attempt to avoid crash when accessing unstable filesystem or network share
sdottaka [Tue, 10 Feb 2015 14:23:14 +0000 (23:23 +0900)]
Poco: Attempt to avoid crash when accessing unstable filesystem or network share

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-69
sdottaka [Mon, 9 Feb 2015 01:10:23 +0000 (10:10 +0900)]
Bump revision to 2.14.0+-jp-69

--HG--
branch : stable

9 years agoBuildArc.cmd: Fix the path of frhed
sdottaka [Mon, 9 Feb 2015 01:09:43 +0000 (10:09 +0900)]
BuildArc.cmd: Fix the path of frhed

--HG--
branch : stable

9 years agoMerge.vcxproj: Add HexMergeView.h
sdottaka [Sun, 8 Feb 2015 16:16:06 +0000 (01:16 +0900)]
Merge.vcxproj: Add HexMergeView.h

--HG--
branch : stable

9 years agoMergeDoc.h: Remove unused function declaration
sdottaka [Sun, 8 Feb 2015 16:15:34 +0000 (01:15 +0900)]
MergeDoc.h: Remove unused function declaration

--HG--
branch : stable

9 years agoHexEditor: Add Undo & Redo feature
sdottaka [Sun, 8 Feb 2015 16:13:41 +0000 (01:13 +0900)]
HexEditor: Add Undo & Redo feature

--HG--
branch : stable

9 years agoAdded tag 2.14.0+-jp-68 for changeset 0cb70ac3d833
sdottaka [Wed, 28 Jan 2015 11:49:16 +0000 (20:49 +0900)]
Added tag 2.14.0+-jp-68 for changeset 0cb70ac3d833

--HG--
branch : stable

9 years agoUpdate revision to 2.14.0+-jp-68 2.14.0+-jp-68
sdottaka [Sat, 24 Jan 2015 08:10:16 +0000 (17:10 +0900)]
Update revision to 2.14.0+-jp-68

--HG--
branch : stable

9 years agorev. 8127 was incomplete.
sdottaka [Sat, 24 Jan 2015 06:14:01 +0000 (15:14 +0900)]
rev. 8127 was incomplete.

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-67
sdottaka [Thu, 22 Jan 2015 01:45:58 +0000 (10:45 +0900)]
Bump revision to 2.14.0+-jp-67

--HG--
branch : stable

9 years agoCompareMS*Files.sct: Make chkCompareWorksheetsAsImage checkbox checkable whether...
sdottaka [Thu, 22 Jan 2015 01:45:18 +0000 (10:45 +0900)]
CompareMS*Files.sct: Make chkCompareWorksheetsAsImage checkbox checkable whether chkUnpackToFolder checkbox is checked

--HG--
branch : stable

9 years agoDirView.*: Inherit ReadOnly status from parent window when opening new folder window
sdottaka [Thu, 22 Jan 2015 01:00:09 +0000 (10:00 +0900)]
DirView.*: Inherit ReadOnly status from parent window when opening new folder window

--HG--
branch : stable

9 years agoCompareMS*Files.sct: Avoid detecting the script calling WScript.Shell#Run as a virus.
sdottaka [Thu, 22 Jan 2015 00:02:08 +0000 (09:02 +0900)]
CompareMS*Files.sct: Avoid detecting the script calling WScript.Shell#Run as a virus.

--HG--
branch : stable

11 years agoOptionsMgr: avoid unneccessary copying values
sdottaka [Sun, 7 Jul 2013 05:19:52 +0000 (14:19 +0900)]
OptionsMgr: avoid unneccessary copying values

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-66
sdottaka [Fri, 16 Jan 2015 08:27:43 +0000 (17:27 +0900)]
Bump revision to 2.14.0+-jp-66

--HG--
branch : stable

9 years agoOptionsDef.h: Rename Settings/CompMethod to Settings/CompMethod2
sdottaka [Fri, 16 Jan 2015 08:27:22 +0000 (17:27 +0900)]
OptionsDef.h: Rename Settings/CompMethod to Settings/CompMethod2

--HG--
branch : stable

9 years agoTimeSizeCompare: Support 3-way compare
sdottaka [Fri, 16 Jan 2015 06:50:09 +0000 (15:50 +0900)]
TimeSizeCompare: Support 3-way compare

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Fri, 16 Jan 2015 02:55:45 +0000 (11:55 +0900)]
Update translations

--HG--
branch : stable

9 years agoFolderCompare: Add Binary Contents compare method
sdottaka [Fri, 16 Jan 2015 02:47:15 +0000 (11:47 +0900)]
FolderCompare: Add Binary Contents compare method

--HG--
branch : stable

9 years agoFolderCompare: Did not show items that have an error
sdottaka [Fri, 16 Jan 2015 02:45:51 +0000 (11:45 +0900)]
FolderCompare: Did not show items that have an error

--HG--
branch : stable

9 years agoImgMergeFrm.cpp: Fix mixed eol-style
sdottaka [Fri, 16 Jan 2015 02:38:28 +0000 (11:38 +0900)]
ImgMergeFrm.cpp: Fix mixed eol-style

--HG--
branch : stable

9 years agoUpdate freeimage to changeset 4:6e3572e0c245
sdottaka [Fri, 16 Jan 2015 02:37:46 +0000 (11:37 +0900)]
Update freeimage to changeset 4:6e3572e0c245

--HG--
branch : stable

9 years agoUpdate winimerge to changeset 66:10c50c358bd4
sdottaka [Fri, 16 Jan 2015 02:37:09 +0000 (11:37 +0900)]
Update winimerge to changeset 66:10c50c358bd4

--HG--
branch : stable

9 years agoAdded tag 2.14.0+-jp-65 for changeset 95c3fc162f25
sdottaka [Mon, 29 Dec 2014 12:54:40 +0000 (21:54 +0900)]
Added tag 2.14.0+-jp-65 for changeset 95c3fc162f25

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-65 2.14.0+-jp-65
sdottaka [Mon, 29 Dec 2014 12:52:39 +0000 (21:52 +0900)]
Bump revision to 2.14.0+-jp-65

--HG--
branch : stable

9 years agoImageDiff: Make comparing position adjustable by Shift+Arrow keys
sdottaka [Mon, 29 Dec 2014 12:50:56 +0000 (21:50 +0900)]
ImageDiff: Make comparing position adjustable by Shift+Arrow keys

--HG--
branch : stable

9 years ago3-way Folder Compare: Fix treating different binary files as the same files
sdottaka [Sat, 27 Dec 2014 13:17:55 +0000 (22:17 +0900)]
3-way Folder Compare: Fix treating different binary files as the same files

--HG--
branch : stable

9 years agoFix crash when replacing the end of text
sdottaka [Sat, 27 Dec 2014 11:51:52 +0000 (20:51 +0900)]
Fix crash when replacing the end of text

--HG--
branch : stable

9 years agoFix that 'Match whole word only' in Replace dialog didn't work properly
sdottaka [Sat, 27 Dec 2014 11:48:53 +0000 (20:48 +0900)]
Fix that 'Match whole word only' in Replace dialog didn't work properly

e.g.
  Find what: L
  Replace with: R
  Match whole word only: checked

  NULL -> NULR

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Sat, 27 Dec 2014 11:25:14 +0000 (20:25 +0900)]
Update translations

--HG--
branch : stable

9 years agoMove splash screen image to About dialog and remove splash screen
sdottaka [Sat, 27 Dec 2014 11:21:43 +0000 (20:21 +0900)]
Move splash screen image to About dialog and remove splash screen

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-64
sdottaka [Thu, 18 Dec 2014 13:56:35 +0000 (22:56 +0900)]
Bump revision to 2.14.0+-jp-64

--HG--
branch : stable

9 years agoHexMergeView.cpp: Fix crash when scrolling horizontally in the HexView
sdottaka [Thu, 18 Dec 2014 13:28:01 +0000 (22:28 +0900)]
HexMergeView.cpp: Fix crash when scrolling horizontally in the HexView

--HG--
branch : stable

9 years agoAdded tag 2.14.0+-jp-63 for changeset 4baac03bf014
sdottaka [Sat, 29 Nov 2014 12:29:55 +0000 (21:29 +0900)]
Added tag 2.14.0+-jp-63 for changeset 4baac03bf014

--HG--
branch : stable

9 years agoRemoved tag 2.14.0+-jp-63
sdottaka [Sat, 29 Nov 2014 12:29:53 +0000 (21:29 +0900)]
Removed tag 2.14.0+-jp-63

--HG--
branch : stable

9 years agoUpdate winimerge to changeset 54:f4220d068465 2.14.0+-jp-63
sdottaka [Sat, 29 Nov 2014 12:29:10 +0000 (21:29 +0900)]
Update winimerge to changeset 54:f4220d068465

--HG--
branch : stable

9 years agoBuildBin.cmd: Replace WinMerge_vc10.sln with WinMerge.sln
sdottaka [Sat, 29 Nov 2014 10:47:50 +0000 (19:47 +0900)]
BuildBin.cmd: Replace WinMerge_vc10.sln with WinMerge.sln

--HG--
branch : stable

9 years agoAdded tag 2.14.0+-jp-63 for changeset 773fc856e383
sdottaka [Sat, 29 Nov 2014 08:43:20 +0000 (17:43 +0900)]
Added tag 2.14.0+-jp-63 for changeset 773fc856e383

--HG--
branch : stable

9 years agoTimeSizeCompare.cpp: Remove an invalid line
sdottaka [Sat, 29 Nov 2014 08:37:34 +0000 (17:37 +0900)]
TimeSizeCompare.cpp: Remove an invalid line

--HG--
branch : stable

9 years agoReduce compiler warnings
sdottaka [Sat, 29 Nov 2014 08:02:55 +0000 (17:02 +0900)]
Reduce compiler warnings

--HG--
branch : stable

9 years agoMerge*.ico: Compress file size by IcoFX and remove 128x128 image
sdottaka [Sat, 29 Nov 2014 04:56:42 +0000 (13:56 +0900)]
Merge*.ico: Compress file size by IcoFX and remove 128x128 image

--HG--
branch : stable

9 years agoRename WinMerge_vc10.sln to WinMerge.sln
sdottaka [Sat, 29 Nov 2014 04:29:26 +0000 (13:29 +0900)]
Rename WinMerge_vc10.sln to WinMerge.sln

--HG--
branch : stable

9 years agoUse std::int64_t instead of Poco::Int64
sdottaka [Sat, 29 Nov 2014 04:09:47 +0000 (13:09 +0900)]
Use std::int64_t instead of Poco::Int64

--HG--
branch : stable

9 years agoPlugins.cpp: Fix crash when running UnitTests
sdottaka [Sat, 29 Nov 2014 02:23:07 +0000 (11:23 +0900)]
Plugins.cpp: Fix crash when running UnitTests

--HG--
branch : stable

9 years agoAdd google test to Externals folder
sdottaka [Sat, 29 Nov 2014 02:22:19 +0000 (11:22 +0900)]
Add google test to Externals folder

--HG--
branch : stable

9 years agoPoco: Enable optimization
sdottaka [Sat, 29 Nov 2014 01:06:48 +0000 (10:06 +0900)]
Poco: Enable optimization

--HG--
branch : stable

9 years agoRename ToolbarDummy.bmp to ToolbarEnabled8bit.bmp
sdottaka [Fri, 28 Nov 2014 14:32:26 +0000 (23:32 +0900)]
Rename ToolbarDummy.bmp to ToolbarEnabled8bit.bmp

--HG--
branch : stable

9 years agoToolbarDummy.bmp: monochrome toolbar to 8bit color toolbar
sdottaka [Fri, 28 Nov 2014 14:10:57 +0000 (23:10 +0900)]
ToolbarDummy.bmp: monochrome toolbar to 8bit color toolbar

--HG--
branch : stable

9 years agoUpdate google test version to 1.7
sdottaka [Fri, 28 Nov 2014 12:36:29 +0000 (21:36 +0900)]
Update google test version to 1.7

--HG--
branch : stable

9 years agoMergeDoc.cpp: Use std::swap instead of boost::swap
sdottaka [Fri, 28 Nov 2014 12:32:46 +0000 (21:32 +0900)]
MergeDoc.cpp: Use std::swap instead of boost::swap

--HG--
branch : stable

9 years agoUse std::unique_ptr/shared_ptr instead of boost::scoped_ptr/scoped_array/shared_ptr
sdottaka [Fri, 28 Nov 2014 12:29:52 +0000 (21:29 +0900)]
Use std::unique_ptr/shared_ptr instead of boost::scoped_ptr/scoped_array/shared_ptr

--HG--
branch : stable

9 years agoRemove VC7.1 project files
sdottaka [Fri, 28 Nov 2014 11:19:13 +0000 (20:19 +0900)]
Remove VC7.1 project files

--HG--
branch : stable

9 years agoStdAfx.h: Reduce compiler warnings
sdottaka [Fri, 28 Nov 2014 10:24:53 +0000 (19:24 +0900)]
StdAfx.h: Reduce compiler warnings

--HG--
branch : stable

9 years agoUse <=8bit toolbar bitmap to avoid an assertion on VS2013 debug build
sdottaka [Thu, 27 Nov 2014 07:26:03 +0000 (16:26 +0900)]
Use <=8bit toolbar bitmap to avoid an assertion on VS2013 debug build

--HG--
branch : stable

9 years agoboost/core/addressof.hpp: Forgot to add the file
sdottaka [Wed, 26 Nov 2014 13:59:38 +0000 (22:59 +0900)]
boost/core/addressof.hpp: Forgot to add the file

--HG--
branch : stable

9 years agoUpdate revision to 2.14.0+-jp-63
sdottaka [Wed, 26 Nov 2014 13:53:04 +0000 (22:53 +0900)]
Update revision to 2.14.0+-jp-63

--HG--
branch : stable

9 years agoMerge.vcxproj: Reduce executable size
sdottaka [Wed, 26 Nov 2014 13:50:50 +0000 (22:50 +0900)]
Merge.vcxproj: Reduce executable size

--HG--
branch : stable

9 years agoUpdate project files to Visual Studio 2013
sdottaka [Wed, 26 Nov 2014 12:40:06 +0000 (21:40 +0900)]
Update project files to Visual Studio 2013

--HG--
branch : stable

9 years agoUpdate boost version to 1.57
sdottaka [Wed, 26 Nov 2014 05:54:43 +0000 (14:54 +0900)]
Update boost version to 1.57

--HG--
branch : stable

9 years agoClean up project files
sdottaka [Wed, 26 Nov 2014 04:16:57 +0000 (13:16 +0900)]
Clean up project files

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Wed, 26 Nov 2014 04:08:09 +0000 (13:08 +0900)]
Update translations

--HG--
branch : stable

9 years agoFix conflicting menu accelerator
sdottaka [Wed, 26 Nov 2014 04:05:09 +0000 (13:05 +0900)]
Fix conflicting menu accelerator

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-62
sdottaka [Sat, 15 Nov 2014 01:46:03 +0000 (10:46 +0900)]
Bump revision to 2.14.0+-jp-62

--HG--
branch : stable

9 years agoFix crash when comparing files with following conditions:
sdottaka [Sat, 15 Nov 2014 01:43:31 +0000 (10:43 +0900)]
Fix crash when comparing files with following conditions:
- file encoding is utf-8
- add a syncpoint to the first line in one side and to not the first line in other side

Don't include BOM in files for diff. close #35

--HG--
branch : stable

9 years agoAdd #include <algorighm> for VS2013
sdottaka [Fri, 14 Nov 2014 10:47:33 +0000 (19:47 +0900)]
Add #include <algorighm> for VS2013

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-61
sdottaka [Tue, 11 Nov 2014 16:27:28 +0000 (01:27 +0900)]
Bump revision to 2.14.0+-jp-61

--HG--
branch : stable

9 years agoCompareMSWordFiles.sct: Show which setting items are slow
sdottaka [Mon, 10 Nov 2014 13:07:28 +0000 (22:07 +0900)]
CompareMSWordFiles.sct: Show which setting items are slow

--HG--
branch : stable

9 years agoCompareMSExcelFiles.sct: * Handle an error when converting a sheet to image
sdottaka [Mon, 10 Nov 2014 13:07:10 +0000 (22:07 +0900)]
CompareMSExcelFiles.sct: * Handle an error when converting a sheet to image
                         * Show which setting items are slow

--HG--
branch : stable

9 years agoCompareMS*.sct: Select proper language item in 'Language' combobox
sdottaka [Mon, 10 Nov 2014 05:29:48 +0000 (14:29 +0900)]
CompareMS*.sct: Select proper language item in 'Language' combobox

--HG--
branch : stable

9 years agoOpenView.cpp: Fix crash when getting WM_USER message from an unknown sender
sdottaka [Mon, 10 Nov 2014 03:46:18 +0000 (12:46 +0900)]
OpenView.cpp: Fix crash when getting WM_USER message from an unknown sender

--HG--
branch : stable

9 years agoBump revision to 2.14.0+-jp-60
sdottaka [Sun, 9 Nov 2014 23:31:03 +0000 (08:31 +0900)]
Bump revision to 2.14.0+-jp-60

--HG--
branch : stable

9 years agoCompareMS*Files.sct: * Make these configurable
sdottaka [Sun, 9 Nov 2014 23:22:35 +0000 (08:22 +0900)]
CompareMS*Files.sct: * Make these configurable
                     * Implement IsFolder(), UnpackFolder() method

--HG--
branch : stable

9 years agoUpdate plugin dlls
sdottaka [Sun, 9 Nov 2014 11:52:42 +0000 (20:52 +0900)]
Update plugin dlls

--HG--
branch : stable

9 years agoRemove following plugins that are not exist in x86 version:
sdottaka [Sun, 9 Nov 2014 11:52:02 +0000 (20:52 +0900)]
Remove following plugins that are not exist in x86 version:
 DisplayBinaryFiles.dll EditBinaryFiles.dll HideFirstLetter.dll

--HG--
branch : stable

9 years agoReplace CompareMS*.dll plugins with CompareMS*.sct plugins
sdottaka [Sun, 9 Nov 2014 11:47:54 +0000 (20:47 +0900)]
Replace CompareMS*.dll plugins with CompareMS*.sct plugins

--HG--
branch : stable

9 years ago* Introduce new plugin type FILE_FOLDER_PACK_UNPACKER
sdottaka [Sat, 8 Nov 2014 02:25:26 +0000 (11:25 +0900)]
* Introduce new plugin type FILE_FOLDER_PACK_UNPACKER
* Use FILE_FOLDER_PACK_UNPACKER plugin for decompressing archives

--HG--
branch : stable

9 years agoUpdate .hgignore
sdottaka [Sat, 8 Nov 2014 01:48:52 +0000 (10:48 +0900)]
Update .hgignore

--HG--
branch : stable

9 years agoUse <algorithm> function templates
sdottaka [Fri, 7 Nov 2014 22:56:53 +0000 (07:56 +0900)]
Use <algorithm> function templates

--HG--
branch : stable

9 years agoAdd overloaded functions: FileTransform_Unpacking(), FileTransform_Prediffing()
sdottaka [Thu, 6 Nov 2014 14:24:53 +0000 (23:24 +0900)]
Add overloaded functions: FileTransform_Unpacking(), FileTransform_Prediffing()

--HG--
branch : stable

9 years agoImgMergeFrm.cpp: Use string_join()
sdottaka [Thu, 6 Nov 2014 14:19:24 +0000 (23:19 +0900)]
ImgMergeFrm.cpp: Use string_join()

--HG--
branch : stable

10 years agoRename String_join() to string_join()
sdottaka [Mon, 26 Aug 2013 15:15:32 +0000 (00:15 +0900)]
Rename String_join() to string_join()

--HG--
branch : stable

10 years agoUse String_join()
sdottaka [Mon, 26 Aug 2013 12:42:52 +0000 (21:42 +0900)]
Use String_join()

--HG--
branch : stable

10 years agoThe iterator of PathContext class seems to work
sdottaka [Sun, 18 Aug 2013 16:08:20 +0000 (01:08 +0900)]
The iterator of PathContext class seems to work

--HG--
branch : stable

10 years agoAdd iterator for PathContext class
sdottaka [Sun, 18 Aug 2013 15:48:57 +0000 (00:48 +0900)]
Add iterator for PathContext class

--HG--
branch : stable

10 years agoAdd String_join() function template
sdottaka [Sun, 18 Aug 2013 15:44:05 +0000 (00:44 +0900)]
Add String_join() function template

--HG--
branch : stable

9 years agoDirView.cpp: Remove unused function
sdottaka [Thu, 6 Nov 2014 02:00:24 +0000 (11:00 +0900)]
DirView.cpp: Remove unused function

--HG--
branch : stable

9 years agoAdd CScriptsOfThread::GetAutomaticPluginByFilter() function
sdottaka [Wed, 5 Nov 2014 07:15:54 +0000 (16:15 +0900)]
Add CScriptsOfThread::GetAutomaticPluginByFilter() function

--HG--
branch : stable

9 years agoRemove FileTransform.h dependency from Plugins.cpp
sdottaka [Wed, 5 Nov 2014 05:45:52 +0000 (14:45 +0900)]
Remove FileTransform.h dependency from Plugins.cpp
(Move the global variable 'TransformationCategories' in FileTransform.* to Plugins.*)

--HG--
branch : stable

9 years ago* Remove MergeDoc.h and HexMergeDoc.h dependency from DirDoc.* and DirView.cpp
sdottaka [Wed, 5 Nov 2014 01:22:46 +0000 (10:22 +0900)]
* Remove MergeDoc.h and HexMergeDoc.h dependency from DirDoc.* and DirView.cpp
  (Introduce IMergeDoc interface)
* Fix crash when closing a DirFrame window without closing the related ImgMergeFrame windows

--HG--
branch : stable

9 years agolwdisp.c: Show a better error message when occurring an error of plugins
sdottaka [Mon, 3 Nov 2014 23:35:35 +0000 (08:35 +0900)]
lwdisp.c: Show a better error message when occurring an error of plugins

--HG--
branch : stable

9 years agoAdd Plugins/src_VB/VBPlugins.vbg
sdottaka [Mon, 3 Nov 2014 23:29:08 +0000 (08:29 +0900)]
Add Plugins/src_VB/VBPlugins.vbg

--HG--
branch : stable

9 years agoPlugins: Add ShowSettingsDialog() method to plugins
sdottaka [Mon, 3 Nov 2014 23:28:20 +0000 (08:28 +0900)]
Plugins: Add ShowSettingsDialog() method to plugins

--HG--
branch : stable

9 years agoUpdate translations
sdottaka [Mon, 3 Nov 2014 12:11:05 +0000 (21:11 +0900)]
Update translations

--HG--
branch : stable