Mercurial > hg-stable
changeset 20323:f493c2f67430 stable
i18n: fix non-matching 1st line indentations
When generating documentation, indentation must match for getting the same
view for translated messages. Often an output is generated anyway, but it
can look different. When a syntactically wrong indentation change is done,
runrst will fail (this is detected by test-gendoc.t).
Fix the simple places. When translation knowledge is necessary, the entry is
marked as fuzzy (and therefore skipped when generating translations). A
translator can fix it later.
| author | Simon Heimberg <simohe@besonet.ch> |
|---|---|
| date | Wed, 22 Jan 2014 16:47:05 +0100 |
| parents | b7accec1aeec |
| children | ec7bca653e51 |
| files | i18n/da.po i18n/de.po i18n/it.po i18n/pt_BR.po i18n/ro.po i18n/ru.po i18n/sv.po i18n/zh_TW.po |
| diffstat | 8 files changed, 57 insertions(+), 51 deletions(-) [+] |
line wrap: on
line diff
--- a/i18n/da.po Wed Jan 22 16:35:10 2014 +0100 +++ b/i18n/da.po Wed Jan 22 16:47:05 2014 +0100 @@ -10998,10 +10998,10 @@ msgstr "forælder: %d:%s " msgid " (empty repository)" -msgstr "(tomt depot)" +msgstr " (tomt depot)" msgid " (no revision checked out)" -msgstr "(ingen revision hentet frem)" +msgstr " (ingen revision hentet frem)" #, python-format msgid "branch: %s\n" @@ -16103,7 +16103,7 @@ #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" -msgstr "%d filer ændret, %d indsættelser(+), %d sletninger(-)\n" +msgstr " %d filer ændret, %d indsættelser(+), %d sletninger(-)\n" #, python-format msgid "calling hook %s: %s\n"
--- a/i18n/de.po Wed Jan 22 16:35:10 2014 +0100 +++ b/i18n/de.po Wed Jan 22 16:47:05 2014 +0100 @@ -13730,7 +13730,7 @@ #: mercurial/commands.py:2084 msgid " (templates seem to have been installed incorrectly)\n" -msgstr "(Vorlagen scheinen falsch installiert worden zu sein)\n" +msgstr " (Vorlagen scheinen falsch installiert worden zu sein)\n" #: mercurial/commands.py:2088 #, fuzzy @@ -16887,11 +16887,11 @@ #: mercurial/commands.py:5488 msgid " (merge)" -msgstr "(Zusammenführung)" +msgstr " (Zusammenführung)" #: mercurial/commands.py:5490 msgid " (new branch)" -msgstr "(neuer Zeig)" +msgstr " (neuer Zeig)" #: mercurial/commands.py:5493 msgid " (head closed)" @@ -21186,10 +21186,10 @@ "- ``DATE to DATE`` - a date range, inclusive\n" "- ``-DAYS`` - within a given number of days of today\n" msgstr "" -" ``<DATUM`` - an oder vor einem/r angegebenen Datum/Uhrzeit\n" -" ``>DATUM`` - zu oder nach einem/r angegebenen Datum/Uhrzeit\n" -" ``DATUM to DATUM`` - ein Datumsbereich, inklusive\n" -" ``-TAGE`` - innerhalb der angegebenen Anzahl von Tagen vor heute\n" +"- ``<DATUM`` - an oder vor einem/r angegebenen Datum/Uhrzeit\n" +"- ``>DATUM`` - zu oder nach einem/r angegebenen Datum/Uhrzeit\n" +"- ``DATUM to DATUM`` - ein Datumsbereich, inklusive\n" +"- ``-TAGE`` - innerhalb der angegebenen Anzahl von Tagen vor heute\n" #: mercurial/help/diffs.txt:1 msgid "" @@ -21372,7 +21372,7 @@ #: mercurial/help/environment.txt:47 msgid " For each element in HGRCPATH:" -msgstr " Für jedes Element in HGRCPATH gilt:" +msgstr " Für jedes Element in HGRCPATH gilt:" #: mercurial/help/environment.txt:49 msgid ""
--- a/i18n/it.po Wed Jan 22 16:35:10 2014 +0100 +++ b/i18n/it.po Wed Jan 22 16:47:05 2014 +0100 @@ -934,7 +934,7 @@ msgstr " autore sorgente = autore destinatario" msgid " Empty lines and lines starting with a ``#`` are ignored." -msgstr " Linee vuote e linee che iniziano con un ``#`` vengono ignorate." +msgstr " Linee vuote e linee che iniziano con un ``#`` vengono ignorate." msgid "" " The filemap is a file that allows filtering and remapping of files\n" @@ -2090,7 +2090,7 @@ msgid " See :hg:`help dates` for a list of formats valid for -d/--date." msgstr "" -" Vedere :hg:`help dates` per l'elenco dei formati validi per -d/--date." +" Vedere :hg:`help dates` per l'elenco dei formati validi per -d/--date." msgid "" " Returns 0 on success.\n" @@ -3445,7 +3445,7 @@ msgstr " Restituisce 0 in caso di successo." msgid "only one patch applied\n" -msgstr " stata applicata solo una patch\n" +msgstr "stata applicata solo una patch\n" msgid "print the patches not yet applied" msgstr "stampa le patch non ancora applicate" @@ -7157,7 +7157,7 @@ msgstr "Sto controllando l'editor per il commit...\n" msgid " No commit editor set and can't find vi in PATH\n" -msgstr "Nessun editor per il commit trovato e non trovo vi in PATH\n" +msgstr " Nessun editor per il commit trovato e non trovo vi in PATH\n" msgid " (specify a commit editor in your configuration file)\n" msgstr "" @@ -7165,7 +7165,7 @@ #, python-format msgid " Can't find editor '%s' in PATH\n" -msgstr "Editor '%s' non trovato in PATH\n" +msgstr " Editor '%s' non trovato in PATH\n" msgid "Checking username...\n" msgstr "Sto controllando lo username...\n" @@ -9926,7 +9926,7 @@ msgstr "abortito: %s" msgid " empty string\n" -msgstr "stringa vuota\n" +msgstr " stringa vuota\n" msgid "killed!\n" msgstr "ucciso!\n" @@ -12791,7 +12791,7 @@ #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" -msgstr "%d file modificati, %d inserimenti(+), %d cancellazioni(-)\n" +msgstr " %d file modificati, %d inserimenti(+), %d cancellazioni(-)\n" #, python-format msgid "exited with status %d" @@ -13729,7 +13729,7 @@ #, python-format msgid " (expected %s)" -msgstr "(atteso %s)" +msgstr " (atteso %s)" #, python-format msgid "unknown parent 1 %s of %s"
--- a/i18n/pt_BR.po Wed Jan 22 16:35:10 2014 +0100 +++ b/i18n/pt_BR.po Wed Jan 22 16:47:05 2014 +0100 @@ -23654,7 +23654,7 @@ #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" -msgstr "%d arquivos modificados, %d inserções(+), %d remoções(-)\n" +msgstr " %d arquivos modificados, %d inserções(+), %d remoções(-)\n" #, python-format msgid "calling hook %s: %s\n"
--- a/i18n/ro.po Wed Jan 22 16:35:10 2014 +0100 +++ b/i18n/ro.po Wed Jan 22 16:47:05 2014 +0100 @@ -2326,8 +2326,8 @@ " This finds all changes from the repository at the specified path\n" " or URL and adds them to the local repository." msgstr "" -" Găsește toate modificările din depozit la calea sau URL-ul\n" -" specificat și le adaugă la depozitul local." +" Găsește toate modificările din depozit la calea sau URL-ul\n" +" specificat și le adaugă la depozitul local." msgid "" " If the pulled changes add a new branch head, the head is\n" @@ -6862,8 +6862,8 @@ " As a shortcut, you can also use the revision argument to mark a\n" " revision as good or bad without checking it out first." msgstr "" -" Ca scurtătură, puteți folosi argumentul reviziei pentru a marca o " -"revizie ca bună sau rea, fără a o actualiza în prealabil." +" Ca scurtătură, puteți folosi argumentul reviziei pentru a marca o\n" +" revizie ca bună sau rea, fără a o actualiza în prealabil." msgid "" " If you supply a command, it will be used for automatic bisection.\n" @@ -8066,7 +8066,7 @@ msgstr "afișează doar capetele de ramură active [ÎNVECHIT]" msgid "show normal and closed branch heads" -msgstr " afișează capetele de ramură normale și închise" +msgstr "afișează capetele de ramură normale și închise" msgid "[-ac] [-r STARTREV] [REV]..." msgstr "[-ac] [-r REV] [REVSTART]..." @@ -14566,7 +14566,7 @@ #, python-format msgid " (%+d heads)" -msgstr "(%+d capete)" +msgstr " (%+d capete)" #, python-format msgid "added %d changesets with %d changes to %d files%s\n"
--- a/i18n/ru.po Wed Jan 22 16:35:10 2014 +0100 +++ b/i18n/ru.po Wed Jan 22 16:47:05 2014 +0100 @@ -1003,7 +1003,7 @@ " файл должен содержать одно соответствие на строку::" msgid " committer = Bugzilla user" -msgstr " автор Mercurial = пользователь Bugzilla" +msgstr " автор Mercurial = пользователь Bugzilla" msgid " See also the ``[usermap]`` section." msgstr " См. также секцию ``[usermap]``." @@ -4967,7 +4967,7 @@ " настройки из файла." msgid " Use -d/--default to disable current configuration." -msgstr " Используйте -d/--default чтобы отключить текущие настройки." +msgstr " Используйте -d/--default чтобы отключить текущие настройки." msgid "" " See :hg:`help templates` for information on templates and filters.\n" @@ -10905,7 +10905,7 @@ msgstr " hg log --graph -r \"bisect(range)\"" msgid " See :hg:`help revsets` for more about the `bisect()` keyword." -msgstr " Подробнее о `bisect()` см. :hg:`help revsets`." +msgstr " Подробнее о `bisect()` см. :hg:`help revsets`." msgid "The first good revision is:\n" msgstr "Первая хорошая ревизия:\n" @@ -16939,7 +16939,7 @@ "of an empty temporary file, where the filtered data must be written by\n" "the command." msgstr "" -" Команда ``tempfile:`` является шаблоном. Строка ``INFILE`` заменяется\n" +"Команда ``tempfile:`` является шаблоном. Строка ``INFILE`` заменяется\n" "именем временного файла, содержащим данные для фильтрации. Строка\n" "``OUTFILE`` заменяется именем пустого временного файла, куда должен\n" "быть записан вывод команды." @@ -18397,6 +18397,7 @@ " Если истина, клиенты будут пытаться использовать протокол без\n" " сжатия. По умолчанию False (ложь)." +#, fuzzy msgid "" "``validate``\n" " Whether to validate the completeness of pushed changesets by\n" @@ -18516,7 +18517,7 @@ "задать правила замены вида::" msgid " <pattern> = <replacement>" -msgstr " <шаблон> = <замена>" +msgstr " <шаблон> = <замена>" msgid "" "where ``pattern`` is a regular expression matching a subrepository\n" @@ -20129,6 +20130,7 @@ msgid " Example: \"The experimental branch\"." msgstr " Пример: \"Экспериментальная ветка\"." +#, fuzzy msgid "" " (Verb) The action of creating a child changeset which results in\n" " its parent having more than one child." @@ -20332,7 +20334,7 @@ " ревизия являются более подходящими терминами в таком контексте." msgid " Example: \"I'm using checkout X.\"" -msgstr " Пример: \"Я использую извлечение Х.\"" +msgstr " Пример: \"Я использую извлечение Х.\"" msgid "" " (Verb) Updating the working directory to a specific changeset. See\n" @@ -20348,7 +20350,7 @@ "Child changeset\n" " See 'Changeset, child'." msgstr "" -" Дочерний набор изменений (ревизия)\n" +"Дочерний набор изменений (ревизия)\n" " См. 'Набор изменений, дочерний'." msgid "" @@ -20377,6 +20379,7 @@ msgid " Example: \"Is your clone up to date?\"." msgstr " Пример: \"Содержит ли твой клон все последние изменения?\"" +#, fuzzy msgid " (Verb) The process of creating a clone, using :hg:`clone`." msgstr "" "Клонирование\n" @@ -20706,7 +20709,7 @@ " :hg:`update`. Other commands to see the working directory parent\n" " are :hg:`summary` and :hg:`id`. Can be specified by the alias \".\"." msgstr "" -" Родитель, рабочего каталога\n" +"Родитель, рабочего каталога\n" " Родительская ревизия рабочего каталога отражает виртуальную\n" " ревизию, являющуюся дочерней ревизией показываемых :hg:`parents`\n" " наборов изменений. Меняется с помощью :hg:`update`. Также можно\n"
--- a/i18n/sv.po Wed Jan 22 16:35:10 2014 +0100 +++ b/i18n/sv.po Wed Jan 22 16:47:05 2014 +0100 @@ -15756,6 +15756,8 @@ " ancestor. See also: 'Descendant'." msgstr "" +#, fuzzy +# fuzzy because the title may not be apropriate msgid "" "Bookmark\n" " Bookmarks are pointers to certain commits that move when\n" @@ -15764,6 +15766,7 @@ " ID, e.g., with :hg:`update`. Unlike tags, bookmarks move along\n" " when you make a commit." msgstr "" +"Bokmärken\n" " Bokmärken är pekare till utvalda arkiveringar som flyttar vid\n" " arkivering. De liknar märken på det sättet att du kan använda\n" " bokmärkesnamn på alla platser där Mercurial förväntar sig ett\n" @@ -17685,7 +17688,7 @@ #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" -msgstr "%d filer ändrade, %d tillägg(+), %d raderingar(-)\n" +msgstr " %d filer ändrade, %d tillägg(+), %d raderingar(-)\n" #, python-format msgid "calling hook %s: %s\n"
--- a/i18n/zh_TW.po Wed Jan 22 16:35:10 2014 +0100 +++ b/i18n/zh_TW.po Wed Jan 22 16:47:05 2014 +0100 @@ -19,7 +19,7 @@ #, python-format msgid " (default: %s)" -msgstr "(內定: %s)" +msgstr " (內定: %s)" msgid "Options" msgstr "選項" @@ -40,7 +40,7 @@ #, python-format msgid " aliases: %s" -msgstr "\t別名:%s" +msgstr " 別名:%s" msgid "hooks for controlling repository access" msgstr "" @@ -6745,7 +6745,7 @@ msgstr "" msgid " patch test failed!\n" -msgstr "路徑測試失敗!\n" +msgstr " 路徑測試失敗!\n" msgid "" " (Current patch tool may be incompatible with patch, or misconfigured. " @@ -6761,20 +6761,20 @@ msgstr "檢查提交訊息編輯器...\n" msgid " No commit editor set and can't find vi in PATH\n" -msgstr "沒有設定提交訊息編輯器,然後在PATH中也沒有vi\n" +msgstr " 沒有設定提交訊息編輯器,然後在PATH中也沒有vi\n" msgid " (specify a commit editor in your configuration file)\n" -msgstr "(在你的設定檔指明一個用來編輯提交訊息的編輯器)\n" +msgstr " (在你的設定檔指明一個用來編輯提交訊息的編輯器)\n" #, python-format msgid " Can't find editor '%s' in PATH\n" -msgstr "在PATH中找不到編輯器 '%s'\n" +msgstr " 在PATH中找不到編輯器 '%s'\n" msgid "Checking username...\n" msgstr "檢查使用者名稱...\n" msgid " (specify a username in your configuration file)\n" -msgstr "(在你的設定檔指明一個使用者名稱)\n" +msgstr " (在你的設定檔指明一個使用者名稱)\n" msgid "No problems detected\n" msgstr "查不到問題\n" @@ -6988,7 +6988,7 @@ #, python-format msgid " (started at %s)" -msgstr "(開始在: %s)" +msgstr " (開始在: %s)" msgid "show help for a given topic or a help overview" msgstr "顯示特定主題的 help 說明或是 help overview" @@ -7446,7 +7446,7 @@ msgstr "" msgid " See :hg:`help urls` for more information." -msgstr "\tSee 'hg help urls' for more information." +msgstr " See 'hg help urls' for more information." msgid "not found!\n" msgstr "沒有找到！\n" @@ -7820,7 +7820,7 @@ msgstr "顯示目前工作目錄的 root(top)" msgid " Print the root directory of the current repository." -msgstr "顯示目前儲存庫的 root 目錄" +msgstr " 顯示目前儲存庫的 root 目錄" msgid "start stand-alone webserver" msgstr "啟動常駐web伺服器" @@ -7923,7 +7923,7 @@ msgstr "母系:\t\t%d:%s" msgid " (empty repository)" -msgstr "(空白的儲存庫)" +msgstr " (空白的儲存庫)" msgid " (no revision checked out)" msgstr "" @@ -7973,10 +7973,10 @@ msgstr "" msgid " (merge)" -msgstr "(合併)" +msgstr " (合併)" msgid " (new branch)" -msgstr "(新分支)" +msgstr " (新分支)" msgid " (head closed)" msgstr "" @@ -7985,7 +7985,7 @@ msgstr "" msgid " (new branch head)" -msgstr "(新分支標頭)" +msgstr " (新分支標頭)" #, python-format msgid "commit: %s\n" @@ -9182,7 +9182,7 @@ msgstr "中止: %s" msgid " empty string\n" -msgstr "空字串\n" +msgstr " 空字串\n" msgid "killed!\n" msgstr "" @@ -11958,7 +11958,7 @@ #, python-format msgid " %d files changed, %d insertions(+), %d deletions(-)\n" -msgstr "%d 修改,%d 插入(+),%d 刪除(-)\n" +msgstr " %d 修改,%d 插入(+),%d 刪除(-)\n" #, python-format msgid "exited with status %d"