From 8ac31e9134e67857581668c79f43b0ec451dfb9d Mon Sep 17 00:00:00 2001 From: Andrey Yankin Date: Tue, 4 Nov 2014 00:13:48 +0300 Subject: [PATCH 1/3] RecentSystemTiddlers russian translation --- languages/ru-RU/Filters.multids | 1 + 1 file changed, 1 insertion(+) diff --git a/languages/ru-RU/Filters.multids b/languages/ru-RU/Filters.multids index 0abcee2ea..bf7658c5a 100644 --- a/languages/ru-RU/Filters.multids +++ b/languages/ru-RU/Filters.multids @@ -1,6 +1,7 @@ title: $:/language/Filters/ AllTiddlers: Все заметки, кроме системных +RecentSystemTiddlers: Недавно измененные заметки, включая системные RecentTiddlers: Недавно измененные заметки AllTags: Все метки, кроме системных Missing: Отсутствующие заметки From d34bcc2ebbce690443d8937577cb4e0712b6cf6e Mon Sep 17 00:00:00 2001 From: Andrey Yankin Date: Tue, 4 Nov 2014 00:16:45 +0300 Subject: [PATCH 2/3] delete untranslated help for commands --- languages/ru-RU/Help/build.tid | 11 -------- languages/ru-RU/Help/clearpassword.tid | 8 ------ languages/ru-RU/Help/default.tid | 22 --------------- languages/ru-RU/Help/help.tid | 10 ------- languages/ru-RU/Help/init.tid | 23 --------------- languages/ru-RU/Help/load.tid | 16 ----------- languages/ru-RU/Help/makelibrary.tid | 14 ---------- languages/ru-RU/Help/notfound.tid | 3 -- languages/ru-RU/Help/output.tid | 10 ------- languages/ru-RU/Help/password.tid | 9 ------ languages/ru-RU/Help/rendertiddler.tid | 12 -------- languages/ru-RU/Help/rendertiddlers.tid | 18 ------------ languages/ru-RU/Help/savetiddler.tid | 12 -------- languages/ru-RU/Help/savetiddlers.tid | 12 -------- languages/ru-RU/Help/server.tid | 37 ------------------------- languages/ru-RU/Help/setfield.tid | 18 ------------ languages/ru-RU/Help/verbose.tid | 8 ------ languages/ru-RU/Help/version.tid | 8 ------ 18 files changed, 251 deletions(-) delete mode 100644 languages/ru-RU/Help/build.tid delete mode 100644 languages/ru-RU/Help/clearpassword.tid delete mode 100644 languages/ru-RU/Help/default.tid delete mode 100644 languages/ru-RU/Help/help.tid delete mode 100644 languages/ru-RU/Help/init.tid delete mode 100644 languages/ru-RU/Help/load.tid delete mode 100644 languages/ru-RU/Help/makelibrary.tid delete mode 100644 languages/ru-RU/Help/notfound.tid delete mode 100644 languages/ru-RU/Help/output.tid delete mode 100644 languages/ru-RU/Help/password.tid delete mode 100644 languages/ru-RU/Help/rendertiddler.tid delete mode 100644 languages/ru-RU/Help/rendertiddlers.tid delete mode 100644 languages/ru-RU/Help/savetiddler.tid delete mode 100644 languages/ru-RU/Help/savetiddlers.tid delete mode 100644 languages/ru-RU/Help/server.tid delete mode 100644 languages/ru-RU/Help/setfield.tid delete mode 100644 languages/ru-RU/Help/verbose.tid delete mode 100644 languages/ru-RU/Help/version.tid diff --git a/languages/ru-RU/Help/build.tid b/languages/ru-RU/Help/build.tid deleted file mode 100644 index 4ffb848b0..000000000 --- a/languages/ru-RU/Help/build.tid +++ /dev/null @@ -1,11 +0,0 @@ -title: $:/language/Help/build -description: Automatically run configured commands - -Build the specified build targets for the current wiki. If no build targets are specified then all available targets will be built. - -``` ---build [ ...] -``` - -Build targets are defined in the `tiddlywiki.info` file of a wiki folder. - diff --git a/languages/ru-RU/Help/clearpassword.tid b/languages/ru-RU/Help/clearpassword.tid deleted file mode 100644 index 936d9b75c..000000000 --- a/languages/ru-RU/Help/clearpassword.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: $:/language/Help/clearpassword -description: Clear a password for subsequent crypto operations - -Clear the password for subsequent crypto operations - -``` ---clearpassword -``` diff --git a/languages/ru-RU/Help/default.tid b/languages/ru-RU/Help/default.tid deleted file mode 100644 index 0a8fce44c..000000000 --- a/languages/ru-RU/Help/default.tid +++ /dev/null @@ -1,22 +0,0 @@ -title: $:/language/Help/default - -\define commandTitle() -$:/language/Help/$(command)$ -\end -``` -usage: tiddlywiki [] [-- [...]...] -``` - -Available commands: - -
    -<$list filter="[commands[]sort[title]]" variable="command"> -
  • <$link to=<>><$macrocall $name="command" $type="text/plain" $output="text/plain"/>: <$transclude tiddler=<> field="description"/>
    • - -
- -To get detailed help on a command: - -``` -tiddlywiki --help -``` diff --git a/languages/ru-RU/Help/help.tid b/languages/ru-RU/Help/help.tid deleted file mode 100644 index 88bb38a8f..000000000 --- a/languages/ru-RU/Help/help.tid +++ /dev/null @@ -1,10 +0,0 @@ -title: $:/language/Help/help -description: Display help for TiddlyWiki commands - -Displays help text for a command: - -``` ---help [] -``` - -If the command name is omitted then a list of available commands is displayed. diff --git a/languages/ru-RU/Help/init.tid b/languages/ru-RU/Help/init.tid deleted file mode 100644 index c144b0d68..000000000 --- a/languages/ru-RU/Help/init.tid +++ /dev/null @@ -1,23 +0,0 @@ -title: $:/language/Help/init -description: Initialise a new wiki folder - -Initialise an empty [[WikiFolder|WikiFolders]] with a copy of the specified edition. - -``` ---init [ ...] -``` - -For example: - -``` -tiddlywiki ./MyWikiFolder --init empty -``` - -Note: - -* The wiki folder directory will be created if necessary -* The "edition" defaults to ''empty'' -* The init command will fail if the wiki folder is not empty -* The init command removes any `includeWikis` definitions in the edition's `tiddlywiki.info` file -* When multiple editions are specified, editions initialised later will overwrite any files shared with earlier editions (so, the final `tiddlywiki.info` file will be copied from the last edition) -* `--editions` returns a list of available editions diff --git a/languages/ru-RU/Help/load.tid b/languages/ru-RU/Help/load.tid deleted file mode 100644 index e1100250f..000000000 --- a/languages/ru-RU/Help/load.tid +++ /dev/null @@ -1,16 +0,0 @@ -title: $:/language/Help/load -description: Load tiddlers from a file - -Load tiddlers from 2.x.x TiddlyWiki files (`.html`), `.tiddler`, `.tid`, `.json` or other files - -``` ---load -``` - -To load tiddlers from an encrypted TiddlyWiki file you should first specify the password with the PasswordCommand. For example: - -``` -tiddlywiki ./MyWiki --password pa55w0rd --load my_encrypted_wiki.html -``` - -Note that TiddlyWiki will not load an older version of an already loaded plugin. diff --git a/languages/ru-RU/Help/makelibrary.tid b/languages/ru-RU/Help/makelibrary.tid deleted file mode 100644 index cff8d392e..000000000 --- a/languages/ru-RU/Help/makelibrary.tid +++ /dev/null @@ -1,14 +0,0 @@ -title: $:/language/Help/makelibrary -description: Construct library plugin required by upgrade process - -Constructs the `$:/UpgradeLibrary` tiddler for the upgrade process. - -The upgrade library is formatted as an ordinary plugin tiddler with the plugin type `library`. It contains a copy of each of the plugins, themes and language packs available within the TiddlyWiki5 repository. - -This command is intended for internal use; it is only relevant to users constructing a custom upgrade procedure. - -``` ---makelibrary -``` - -The title argument defaults to `$:/UpgradeLibrary`. diff --git a/languages/ru-RU/Help/notfound.tid b/languages/ru-RU/Help/notfound.tid deleted file mode 100644 index 83eca6baa..000000000 --- a/languages/ru-RU/Help/notfound.tid +++ /dev/null @@ -1,3 +0,0 @@ -title: $:/language/Help/notfound - -No such help item \ No newline at end of file diff --git a/languages/ru-RU/Help/output.tid b/languages/ru-RU/Help/output.tid deleted file mode 100644 index 527b52f2e..000000000 --- a/languages/ru-RU/Help/output.tid +++ /dev/null @@ -1,10 +0,0 @@ -title: $:/language/Help/output -description: Set the base output directory for subsequent commands - -Sets the base output directory for subsequent commands. The default output directory is the `output` subdirectory of the edition directory. - -``` ---output <pathname> -``` - -If the specified pathname is relative then it is resolved relative to the current working directory. diff --git a/languages/ru-RU/Help/password.tid b/languages/ru-RU/Help/password.tid deleted file mode 100644 index d9e87a503..000000000 --- a/languages/ru-RU/Help/password.tid +++ /dev/null @@ -1,9 +0,0 @@ -title: $:/language/Help/password -description: Set a password for subsequent crypto operations - -Set a password for subsequent crypto operations - -``` ---password <password> -``` - diff --git a/languages/ru-RU/Help/rendertiddler.tid b/languages/ru-RU/Help/rendertiddler.tid deleted file mode 100644 index 70db526f2..000000000 --- a/languages/ru-RU/Help/rendertiddler.tid +++ /dev/null @@ -1,12 +0,0 @@ -title: $:/language/Help/rendertiddler -description: Render an individual tiddler as a specified ContentType - -Render an individual tiddler as a specified ContentType, defaults to `text/html` and save it to the specified filename: - -``` ---rendertiddler <title> <filename> [<type>] -``` - -By default, the filename is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. - -Any missing directories in the path to the filename are automatically created. diff --git a/languages/ru-RU/Help/rendertiddlers.tid b/languages/ru-RU/Help/rendertiddlers.tid deleted file mode 100644 index 158872f23..000000000 --- a/languages/ru-RU/Help/rendertiddlers.tid +++ /dev/null @@ -1,18 +0,0 @@ -title: $:/language/Help/rendertiddlers -description: Render tiddlers matching a filter to a specified ContentType - -Render a set of tiddlers matching a filter to separate files of a specified ContentType (defaults to `text/html`) and extension (defaults to `.html`). - -``` ---rendertiddlers <filter> <template> <pathname> [<type>] [<extension>] -``` - -For example: - -``` ---rendertiddlers [!is[system]] $:/core/templates/static.tiddler.html ./static text/plain -``` - -By default, the pathname is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. - -Any files in the target directory are deleted. The target directory is recursively created if it is missing. diff --git a/languages/ru-RU/Help/savetiddler.tid b/languages/ru-RU/Help/savetiddler.tid deleted file mode 100644 index da86126e6..000000000 --- a/languages/ru-RU/Help/savetiddler.tid +++ /dev/null @@ -1,12 +0,0 @@ -title: $:/language/Help/savetiddler -description: Saves a raw tiddler to a file - -Saves an individual tiddler in its raw text or binary format to the specified filename. - -``` ---savetiddler <title> <filename> -``` - -By default, the filename is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. - -Any missing directories in the path to the filename are automatically created. diff --git a/languages/ru-RU/Help/savetiddlers.tid b/languages/ru-RU/Help/savetiddlers.tid deleted file mode 100644 index 61b9ba30e..000000000 --- a/languages/ru-RU/Help/savetiddlers.tid +++ /dev/null @@ -1,12 +0,0 @@ -title: $:/language/Help/savetiddlers -description: Saves a group of raw tiddlers to a directory - -Saves a group of tiddlers in their raw text or binary format to the specified directory. - -``` ---savetiddlers <filter> <pathname> -``` - -By default, the pathname is resolved relative to the `output` subdirectory of the edition directory. The `--output` command can be used to direct output to a different directory. - -Any missing directories in the pathname are automatically created. diff --git a/languages/ru-RU/Help/server.tid b/languages/ru-RU/Help/server.tid deleted file mode 100644 index c8a989c2e..000000000 --- a/languages/ru-RU/Help/server.tid +++ /dev/null @@ -1,37 +0,0 @@ -title: $:/language/Help/server -description: Provides an HTTP server interface to TiddlyWiki - -The server built in to TiddlyWiki5 is very simple. Although compatible with TiddlyWeb it doesn't support many of the features needed for robust Internet-facing usage. - -At the root, it serves a rendering of a specified tiddler. Away from the root, it serves individual tiddlers encoded in JSON, and supports the basic HTTP operations for `GET`, `PUT` and `DELETE`. - -``` ---server <port> <roottiddler> <rendertype> <servetype> <username> <password> <host> <pathprefix> -``` - -The parameters are: - -* ''port'' - port number to serve from (defaults to "8080") -* ''roottiddler'' - the tiddler to serve at the root (defaults to "$:/core/save/all") -* ''rendertype'' - the content type to which the root tiddler should be rendered (defaults to "text/plain") -* ''servetype'' - the content type with which the root tiddler should be served (defaults to "text/html") -* ''username'' - the default username for signing edits -* ''password'' - optional password for basic authentication -* ''host'' - optional hostname to serve from (defaults to "127.0.0.1" aka "localhost") -* ''pathprefix'' - optional prefix for paths - -If the password parameter is specified then the browser will prompt the user for the username and password. Note that the password is transmitted in plain text so this implementation isn't suitable for general use. - -For example: - -``` ---server 8080 $:/core/save/all text/plain text/html MyUserName passw0rd -``` - -The username and password can be specified as empty strings if you need to set the hostname or pathprefix and don't want to require a password: - -``` ---server 8080 $:/core/save/all text/plain text/html "" "" 192.168.0.245 -``` - -To run multiple TiddlyWiki servers at the same time you'll need to put each one on a different port. diff --git a/languages/ru-RU/Help/setfield.tid b/languages/ru-RU/Help/setfield.tid deleted file mode 100644 index 8e09380da..000000000 --- a/languages/ru-RU/Help/setfield.tid +++ /dev/null @@ -1,18 +0,0 @@ -title: $:/language/Help/setfield -description: Prepares external tiddlers for use - -//Note that this command is experimental and may change or be replaced before being finalised// - -Sets the specified field of a group of tiddlers to the result of wikifying a template tiddler with the `currentTiddler` variable set to the tiddler. - -``` ---setfield <filter> <fieldname> <templatetitle> <rendertype> -``` - -The parameters are: - -* ''filter'' - filter identifying the tiddlers to be affected -* ''fieldname'' - the field to modify (defaults to "text") -* ''templatetitle'' - the tiddler to wikify into the specified field. If blank or missing then the specified field is deleted -* ''type'' - the text type to render (defaults to "text/plain"; "text/html" can be used to include HTML tags) - diff --git a/languages/ru-RU/Help/verbose.tid b/languages/ru-RU/Help/verbose.tid deleted file mode 100644 index 395321a30..000000000 --- a/languages/ru-RU/Help/verbose.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: $:/language/Help/verbose -description: Triggers verbose output mode - -Triggers verbose output, useful for debugging - -``` ---verbose -``` diff --git a/languages/ru-RU/Help/version.tid b/languages/ru-RU/Help/version.tid deleted file mode 100644 index 4d9ba0bae..000000000 --- a/languages/ru-RU/Help/version.tid +++ /dev/null @@ -1,8 +0,0 @@ -title: $:/language/Help/version -description: Displays the version number of TiddlyWiki - -Displays the version number of TiddlyWiki. - -``` ---version -``` From 2e41b139d3133cea60e5101b461e890fed7c39b2 Mon Sep 17 00:00:00 2001 From: Andrey Yankin <yankin013@gmail.com> Date: Tue, 4 Nov 2014 00:56:48 +0300 Subject: [PATCH 3/3] Russian translation for Modals --- languages/ru-RU/Modals/Download.tid | 12 +++++----- languages/ru-RU/Modals/SaveInstructions.tid | 26 ++++++++++----------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/languages/ru-RU/Modals/Download.tid b/languages/ru-RU/Modals/Download.tid index 49ea95d59..f8c65fdc9 100644 --- a/languages/ru-RU/Modals/Download.tid +++ b/languages/ru-RU/Modals/Download.tid @@ -1,13 +1,13 @@ title: $:/language/Modals/Download type: text/vnd.tiddlywiki -subtitle: Download changes -footer: <$button message="tm-close-tiddler">Close</$button> +subtitle: Скачать изменения +footer: <$button message="tm-close-tiddler">Закрыть</$button> help: http://tiddlywiki.com/static/DownloadingChanges.html -Your browser only supports manual saving. +Ваш браузер поддерживает только ручное сохранение. -To save your modified wiki, right click on the download link below and select "Download file" or "Save file", and then choose the folder and filename. +Чтобы сохранить измененную ~TiddlyWiki, щёлкните правой кнопкой мыши по ссылке ниже и выберите "Скачать файл" или "Сохранить файл", затем выберите расположение и имя файла. -//You can marginally speed things up by clicking the link with the control key (Windows) or the options/alt key (Mac OS X). You will not be prompted for the folder or filename, but your browser is likely to give it an unrecognisable name -- you may need to rename the file to include an `.html` extension before you can do anything useful with it.// +//Вы можете заметно ускорить этот процесс, щёлкнув по ссылке с нажатой клавишей Control (Windows) или Options/Alt (Mac OS X). У вас не спросят расположение и имя файла, возможно, имя будет неузнаваемым -- также может понадобиться добавить расширение `.html` к имени файла.// -On smartphones that do not allow files to be downloaded you can instead bookmark the link, and then sync your bookmarks to a desktop computer from where the wiki can be saved normally. +На смартфонах, которые на позволяют скачивать файлы, можно поместить ссылку в закладки, затем синхронизировать закладки с компьютером, где ~TiddlyWiki можно сохранить обычным методом. diff --git a/languages/ru-RU/Modals/SaveInstructions.tid b/languages/ru-RU/Modals/SaveInstructions.tid index 61f46dea0..ce1c69d4a 100644 --- a/languages/ru-RU/Modals/SaveInstructions.tid +++ b/languages/ru-RU/Modals/SaveInstructions.tid @@ -1,22 +1,22 @@ title: $:/language/Modals/SaveInstructions type: text/vnd.tiddlywiki -subtitle: Save your work -footer: <$button message="tm-close-tiddler">Close</$button> +subtitle: Сохраните свою работу +footer: <$button message="tm-close-tiddler">Закрыть</$button> help: http://tiddlywiki.com/static/SavingChanges.html -Your changes to this wiki need to be saved as a ~TiddlyWiki HTML file. +Изменения должны быть сохранены в виде HTML файла ~TiddlyWiki. -!!! Desktop browsers +!!! На компьютере -# Select ''Save As'' from the ''File'' menu -# Choose a filename and location -#* Some browsers also require you to explicitly specify the file saving format as ''Webpage, HTML only'' or similar -# Close this tab +# Нажмите ''Сохранить как'' в меню ''Файл'' +# Выберите название и расположение файла +#* Иногда требуется также явно указать формат сохраняемого файла: ''Веб-страница, только HTML'' или подобный +# Закройте эту вкладку -!!! Smartphone browsers +!!! На смартфоне -# Create a bookmark to this page -#* If you've got iCloud or Google Sync set up then the bookmark will automatically sync to your desktop where you can open it and save it as above -# Close this tab +# Поместите эту страницу в закладки +#* Если у вас настроен iCloud или Google Sync, тогда закладка автоматически синхронизируется с компьютером, и вы сможете открыть её и сохранить по инструкции для компьютеров +# Закройте эту вкладку -//If you open the bookmark again in Mobile Safari you will see this message again. If you want to go ahead and use the file, just click the ''close'' button below// +//При открытии закладки в Mobile Safari вы снова увидите это сообщение. Если вы хотите продолжить работу с файлом, нажмите на кнопку ''Закрыть'' ниже//