You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
4. 对于上述3中的占位符,您可根据需要调整其语序。例如:`%s in %s must be a numerical` 可被翻译为 `%2$s 中的 %1$s 必须是数值型`。显然您可以看到这里每个`%s`的含义不一样,如果您需要调整第二个`%s`的语序,您可以添加它们的位置像`1$`这样的参数到其中。如果您不确定如何使用它,可以参考其他已被翻译的内容;
1. 对于上述3中的占位符,您可根据需要调整其语序。例如:`%s in %s must be a numerical` 可被翻译为 `%2$s 中的 %1$s 必须是数值型`。显然您可以看到这里每个`%s`的含义不一样,如果您需要调整第二个`%s`的语序,您可以添加它们的位置像`1$`这样的参数到其中。如果您不确定如何使用它,可以参考其他已被翻译的内容;
2. 无须翻译的内容:一些内置函数、参数、值不能被翻译。例如`WARNING: no value given for '--max-connections'` 其中 `'--max-connections'` 这样的我们可以判断为参数,则保持不变。因此我们翻译成`警告:'--max-connections' 没有给定值`;
1. 无须翻译的内容:一些内置函数、参数、值不能被翻译。例如`WARNING: no value given for '--max-connections'` 其中 `'--max-connections'` 这样的我们可以判断为参数,则保持不变。因此我们翻译成`警告:'--max-connections' 没有给定值`;
2. Select time period and generate report in rST format
138
-
3. Convert ~markdown to HTML and share in the R Contributors slack group's #core-translation channel
137
+
1. Select time period and generate report in rST format
138
+
1. Convert ~markdown to HTML and share in the R Contributors slack group's #core-translation channel
139
139
140
140
### To submit a patch file on the translations found in Weblate but not in the trunk of the main R subversion repo:
141
141
142
142
The basic idea is to compare the Weblate repo (which copies the R subversion repo, but also adds translations provided _via_ Weblate) to the "official" R sources; any difference in .po files should be submitted as a patch.
143
143
144
144
1. Make sure the Weblate repo is fully up-to-date. Check status at https://translate.rx.studio/projects/r-project/#repository -- be sure there are no `Update` or `Commit` actions needed.
4. Generate a patch file from the diff, going back to the most recent commit with translations merged, e.g.
206
+
1. Generate a patch file from the diff, going back to the most recent commit with translations merged, e.g.
207
207
208
208
```sh
209
209
# NB: _not_ 'git diff weblate/master svn/master' since we've just deleted the empty .po files locally
210
210
git diff svn/master --no-prefix -- "*.po"
211
211
```
212
212
213
-
8. Share the patch file on the R Contributors Slack group's #core-translation channel and kindly ping @MichaelLawrence for his assistance on getting the patch file applied on the trunk of R dev to get it merged. We should do this ~once per quarter.
213
+
1. Share the patch file on the R Contributors Slack group's #core-translation channel and kindly ping @MichaelLawrence for his assistance on getting the patch file applied on the trunk of R dev to get it merged. We should do this ~once per quarter.
214
214
215
215
## Maintenance
216
216
@@ -241,20 +241,20 @@ rebase refs/remotes/origin/trunk: command returned error: 1
241
241
Weblate will provide a suggestion on how to fix, but in short:
242
242
243
243
1. SSH to the Weblate server
244
-
2. Make a backup on the Git repo before messing with the rebase process:
244
+
1. Make a backup on the Git repo before messing with the rebase process:
245
245
246
246
```sh
247
247
tar -zcvf /root/base-r-gui-repo-$(date '+%Y-%m-%d').tar.gz \
5. Pull from SVN and start the rebase process to see the actual errors:
269
+
1. Pull from SVN and start the rebase process to see the actual errors:
270
270
271
271
```sh
272
272
git svn fetch
273
273
git svn rebase
274
274
```
275
275
276
-
6. Optionally, if not yet done, install [helpers](https://github.com/JulienPalard/po3way) to make it easier to deal with the git conflicts (inside Docker). Start Docker as root to install `po3way` system-wide:
276
+
1. Optionally, if not yet done, install [helpers](https://github.com/JulienPalard/po3way) to make it easier to deal with the git conflicts (inside Docker). Start Docker as root to install `po3way` system-wide:
0 commit comments