Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Far3 - продолжим переводить NetBoxRus.lng #171

Closed
wants to merge 829 commits into from

Conversation

VictorVG
Copy link

@VictorVG VictorVG commented Nov 6, 2015

Продолжим переводить русский языковый файл, ну и понятно заодно поправим грамматику и прочие опечатки про которые говорилось в #169. Пока не всё сделано - с переводом надо ещё поработать, часть опечаток я уже убрал, а потому NetBoxRus.lng.zip чтобы нам было проще пока файл в работе пусть лежит в архиве, а файлик readme.txt не нулевого размера обеспечит нам постоянство рабочей ссылки иначе при любом обновлении архива Яндекс удаляет шару.

* master:
  version info: update
  TConfiguration::GetVersionStr: fix generation of file version string
  FormatVersion: fix parameters names
  Bugfix: remote command output is scrolled up if Far.exe is started with /w command line switch (Stretch to console window instead of console buffer)
  TFarDialog::SendDlgMessage: fix assert when "Host is not communicating ..." dialog is shown
* master:
  version info: update
  WebDAVFileSystem.cpp: NeonRequestAuth
  WebDAVFileSystem.cpp: refactoring: neon_request_auth
  WebDAVFileSystem.cpp: fix comments
  WebDAVFileSystem.cpp: cleanup
  WebDAVFileSystem.cpp: fix code style
  refactoring: use :: to indicate global system functions
  NetBox.vcxproj: add *.lng files
  fix warning: 'TFarDialog::SendDlgMessage' : not all control paths return a value
  fix typo
* master:
  version info: update
  TCustomFarPlugin::ShowTerminalScreen: do not clean previous console output
* master:
  amend 70dbdb9 (TWebDAVFileSystem::NeonRequestAuth)
  tinyxml2: update to latest version
* master:
  version info: update
* master:
  WebDAV: fix code style
  WebDAV: fix code style
  refactoring: CreateDirectory --> RemoteCreateDirectory
  version info: update
  OpenSessionInPutty: fix open session using Putty 0.63
  version info: update
  TCustomFarPlugin::GetTemporaryDir: always generate new temp dir name
  refactoring: TemporaryDir() --> GetTemporaryDir()

Conflicts:
	src/NetBox/FarPlugin.h
* master:
  refactoring: use :: to indicate global system functions
  refactoring: TFTPFileSystem::PostMessage --> TFTPFileSystem::FTPPostMessage
  refactoring: ++Index
  refactoring: init local vars
  refactoring: File --> AFile
  refactoring: DirName --> ADirName
  CoreDefs.hpp: fix code style
  WinSCPDialogs.cpp: minor improvements
  WebDAVFileSystem.cpp: use ApiPath()
  refactoring: TRegistryStorage::GetFailed() const
  add comments
  fix code style
  fix code style
  refactoring: rename parameter
  fix PVS warning: It is incorrect to compare the variable of BOOL type with TRUE
  remove unneeded check
  fix PVS warning: It is incorrect to compare the variable of BOOL type with TRUE. Correct expression is: 'PathIsRelativeW(Result.c_str()) != FALSE'
  refactoring: use :: to indicate global system functions
  tinyxml2: update to version 2.2.0
* master:
  tinyxml2: update to latest version
  tinyxml2: update to latest version
  code style
  Masks.cpp: apply astyle formatting rules
  refactoring: const UnicodeString & Path --> const UnicodeString & APath
  refactoring: TEXT --> MB_TEXT
  refactoring: use namespace Sysutils
  code style
  refactoring: _getpid()
  refactoring: DefaultEncodingName()
  refactoring: use :: to indicate global system functions
  CMakeLists.txt: minor change
  refactoring: const functions
  refactoring: TDateTime &
* master:
  TextsCore: cleanup
  rtlconsts: cleanup
  fix using ApiPath()
  use namespace Sysutils::
  refactoring: use :: to indicate global system functions
  Revert "CMakeLists.txt: remove /GL -GF -Gy /LTCG /OPT:REF /OPT:ICF=6; add -O2"
  update neon to version 0.30.1
  TextsCore2.rc: remove unused texts
  CMakeLists.txt: remove /GL -GF -Gy /LTCG /OPT:REF /OPT:ICF=6; add -O2
* master:
  mfc: cleanup
  mfc: cleanup
  mfc: cleanup
  mfc: cleanup
  bugfix: TFileOperationProgressType::LocalBlockSize: remove static_cast<uintptr_t>
* master:
  version info: update
  use ApiPath() to handle long paths (GetLocalFileAttributes)
  use ApiPath() to handle long paths (ForceDirectories)
  use ApiPath() to handle long paths (FindFirstFile)
  SysErrorMessageForError: use constant SOSError
  fix strings
  mfc: cleanup
  mfc: cleanup
  tinyxml2: update to latest version
* master:
  version info: update
  use namespace Sysutils::
  fix code style
  fix code style
  TWebDAVFileSystem::WebDAVDirectorySource: use FTerminal->FileExists
  TWebDAVFileSystem::WebDAVSource: cleanup
* master: (27 commits)
  fix warnings: unreferenced formal parameter
  intptr_t AIndex
  intptr_t I --> intptr_t Index
  bugfix: CAsyncSslSocketLayer::InitSSL() Returning without unlocking
  TSessionData::Default() init values
  uint32_t PeekCardinal(): init return value
  fix code style
  remove stray semicolon
  TRemoteFile ** File --> AFile
  UnicodeString * FileName --> UnicodeString * AFileName
  ProcessLocalDirectory: use THISDIRECTORY PARENTDIRECTORY
  ProcessLocalDirectory: use ApiPath()
  TFileSessionAction::FileName --> SetFileName
  NULL --> nullptr
  fix typos
  MaskFileName: init local var
  use wide strings
  FileMasks.cpp: fix break statements
  FileMasks.cpp: static UnicodeString MaskFilePart
  remove stray semicolon
  ...

Conflicts:
	src/NetBox/FarDialog.cpp
* master:
  version info: update
* master:
  enum FileAttributesEnum moved out of namespace Sysutils
  NetBox: namespace Sysutils::
  windows: namespace Sysutils::
  core: namespace Sysutils::
  fix typos
  remove using namespace Sysutils;
  NetBox: namespace Classes::
  filezilla: namespace Classes::
  core: namespace Classes::
  windows: namespace Classes::
  base: namespace Classes::
  remove using namespace Classes;
  fix code style
  remove //--

Conflicts:
	src/NetBox/FarConfiguration.cpp
	src/NetBox/FarConfiguration.h
	src/NetBox/FarDialog.cpp
	src/NetBox/FarDialog.h
	src/NetBox/FarPlugin.cpp
	src/NetBox/FarPlugin.h
	src/NetBox/NetBox.cpp
	src/NetBox/WinSCPDialogs.cpp
	src/NetBox/WinSCPFileSystem.cpp
	src/NetBox/WinSCPFileSystem.h
	src/NetBox/WinSCPPlugin.cpp
	src/NetBox/WinSCPPlugin.h
* master:
  refactoring: LENOF --> _countof
  refactoring: LENOF --> _countof
  fix code style (remove empty lines)
  fix code style (remove empty lines)

Conflicts:
	src/NetBox/FarDialog.cpp
	src/NetBox/FarPlugin.cpp
	src/NetBox/FarPlugin.h
	src/NetBox/NetBox.cpp
	src/NetBox/WinSCPFileSystem.cpp
* master:
  remove namespace Sysutils
  remove namespace Sysutils
  remove namespace Sysutils
  remove namespace Classes
  remove namespace Classes
  remove namespace Classes
  remove namespace Classes

Conflicts:
	src/NetBox/FarDialog.cpp
	src/NetBox/FarDialog.h
	src/NetBox/FarPlugin.cpp
	src/NetBox/FarPlugin.h
	src/NetBox/WinSCPDialogs.cpp
	src/NetBox/WinSCPFileSystem.cpp
	src/NetBox/WinSCPFileSystem.h
	src/NetBox/WinSCPPlugin.cpp
	src/NetBox/WinSCPPlugin.h
* master:
  neon: define NE_BUFSIZ 2 * 64 * 1024
  Sysutils.hpp: minor fix
  fix code style
  Common.h: remove unused defines
  EXCEPTION --> ThrowExtException()
  local.cpp: remove unused code
* master:
  version info: update
  bugfix: cannot edit remote file if filename has symbols not valid for Windows files
  refactoring: TStrings * FileList --> TStrings * AFileList
  refactoring: TStrings * Files --> TStrings * AFiles
  refactoring: ValidLocalFileName
  refactoring: use :: to indicate global system functions
  version info: update
  use explicit conversions
  UnicodeString.cpp: make constructor implicit AnsiString(const AnsiString & rht);
  UnicodeString.cpp: make constructors explicit
  UnicodeString.cpp: remove AnsiString::operator UnicodeString()
* master: (47 commits)
  fix code style
  refactoring: TSessionData::SessionGetUserName()
  refactoring: GetMsg(intptr_t MsgId) const
  refactoring: GetFarSystemSettings()
  refactoring: GetFarVersion()
  refactoring: GetFarThreadId()
  refactoring: TCustomFarPlugin::FarWriteConsole
  minor fix: use wide chars
  fix code style
  refactoring: UnicodeString ShellGetUserName() const
  refactoring: virtual UnicodeString FSGetUserName()
  refactoring: void RemoteCopyFile
  refactoring: UnicodeString GetCurrDirectory() const
  refactoring: TTerminal::TerminalMoveFile
  refactoring: TTerminal::TerminalCopyFile
  refactoring: TTerminal::TerminalGetUserName
  refactoring: UnicodeString GetUserName() const
  refactoring: uint32_t MinPacketSize() const
  refactoring: bool GetStoredCredentialsTried() const
  mfc: cleanup
  ...

Conflicts:
	src/NetBox/FarPlugin.cpp
	src/NetBox/FarPlugin.h
	src/NetBox/WinSCPFileSystem.cpp
	src/NetBox/WinSCPFileSystem.h
	src/NetBox/WinSCPPlugin.cpp
	src/NetBox/WinSCPPlugin.h
* master:
  version info: update
  amend 134b147
  amend 134b147
  refactoring: TWinSCPFileSystem::CreateFileList
* master: (47 commits)
  version info: update
  refactoring: UnicodeString.cpp
  zlib: exclude unused modules
  expat: exclude unused modules
  refactoring: remove unused AnsiString::operator + etc
  .lng: fix double quotas
  update openssl version info
  cleanup
  version info: update
  update openssl version info
  update openssl to 1.0.1j
  IDS_ERRORMSG_TIMEOUT IDS_STATUSMSG_DISCONNECTED
  mfc: cleanup
  update .lng files
  refactoring: FmtLoadStr, LoadStr
  NetBoxRus.lng: sync with NetBoxEng.lng
  remove rtlconsts.rc
  FarPluginStrings
  remove TextsCore2.rc
  remove rtlconsts.rc
  ...

Conflicts:
	src/NetBox/UnityBuildMain.cpp
* master:
  version info: update
  TWinSCPFileSystem::CreateFileList: allow duplicated filenames
* master:
  openssl: fix compilation after update
# Conflicts:
#	src/NetBox/CMakeLists.txt
#	src/NetBox/NetBox.rc
#	src/NetBox/NetBox.vcxproj
#	src/NetBox/NetBox.vs2015.vcxproj
* opt-string: (80 commits)
  wstring_t::StringLength
  CP_THREAD_ACP
  CP_THREAD_ACP
  UnicodeString.cpp: cleanup
  UnicodeString::Init
  CP_UTF8
  UnicodeString::Init
  TStringList::Insert
  UnicodeString::Init
  UnicodeString::Init
  wstring_t::StringLength
  UnicodeString::Init
  include/nbtypes.h
  ::MultiByteToWideChar
  UnicodeString: cleanup
  struct TReadFileData
  move code from headers.hpp to nbglobals.h
  UnicodeString
  NullToEmptyA
  NullToEmptyA
  ...

# Conflicts:
#	src/NetBox/CMakeLists.txt
#	src/NetBox/NetBox.rc
#	src/NetBox/NetBox.vcxproj
#	src/NetBox/NetBox.vs2015.vcxproj
* master: (143 commits)
  update version info
  fix warnings: C4244: 'argument': conversion from 'intptr_t' to 'int'
  fix warnings: C4244: '=': conversion from 'uintptr_t' to 'DWORD'
  fix warnings: C4244: 'argument': conversion from 'intptr_t' to 'int'
  fix merge
  zlib-ng rev. 45a5149c
  include "GlobalUtils.hpp"
  GetFixedPaths
  WinSCPSecurity
  static wchar_t --> UnicodeString
  NextWord(): remove static buffer
  bool Result = false;
  nullptr
  TWinSCPFileSystem::Synchronize: rename param
  nullptr
  use std::unique_ptr<>
  use SAFE_DESTROY_EX
  cleanup
  W2MB()
  AnsiString::AnsiString(const wchar_t * Str, intptr_t Length, int CodePage)
  ...

# Conflicts:
#	src/NetBox/NetBox.cpp
#	src/NetBox/NetBox.rc
* master:
  putty rev. 7705fc4470
  build_openssl.bat
  update_version.py
* master:
  update version info
  update putty version info
@michaellukashov
Copy link
Owner

уже не актуально

@VictorVG
Copy link
Author

Разумно ибо до него никак руки не дойдут завершить...:(

@michaellukashov
Copy link
Owner

я просмотрел файл, он уже не актуален. Извините что закрыл реквест без комментария.

@VictorVG
Copy link
Author

Тут порядок. Это я закрутился, в том числе и с новой студией - откатываем ибо проблем более чем плюсов. Компилятор ещё сырой. По стадии разработки это Эскизный проект на своих первых испытаниях - идея есть, первые наброски есть и ошибки начальной стадии разработки в полной мере присутствуют и проект ещё долго придётся до ума доводить.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants