Fixed issue #1397: Sync Dialog Conflict tab name not translated
treec71a942cd805f9ee86233ede0b5b26f3145eacfb
-rw-r--r-- 367 .gitignore
-rw-r--r-- 543 .gitmodules
drwxr-xr-x - Languages
-rw-r--r-- 3400 build.txt
drwxr-xr-x - common
drwxr-xr-x - contrib
drwxr-xr-x - doc
drwxr-xr-x - ext
-rw-r--r-- 184 release.txt
drwxr-xr-x - src
drwxr-xr-x - test