| Révision | 28527 (tree) |
|---|---|
| l'heure | 2019-03-13 05:11:05 |
| Auteur | stefankueng |
* no crash reporter for older versions
* update pot file
branches/1.10.x/Languages/TortoiseUI.pot (diff)
branches/1.10.x/default.build (diff) branches/1.10.x/ext/build/default.build (diff)| @@ -112,6 +112,11 @@ | ||
| 112 | 112 | msgid "%1!ls! : Working Base, Revision %2!ld!" |
| 113 | 113 | msgstr "" |
| 114 | 114 | |
| 115 | +#. Resource IDs: (IDS_PROGRS_UPDATE) | |
| 116 | +#, c-format | |
| 117 | +msgid "%1!ls! from %2!ls!" | |
| 118 | +msgstr "" | |
| 119 | + | |
| 115 | 120 | #. Resource IDs: (IDS_PROGRS_FINALINFO) |
| 116 | 121 | #, c-format |
| 117 | 122 | msgid "%1!ls! in %2!ls!" |
| @@ -3674,6 +3679,14 @@ | ||
| 3674 | 3679 | msgid "Edit Properties" |
| 3675 | 3680 | msgstr "" |
| 3676 | 3681 | |
| 3682 | +#. Resource IDs: (IDS_PROC_EDIT_PROP_CONFLICTS) | |
| 3683 | +msgid "Edit Property Conflicts" | |
| 3684 | +msgstr "" | |
| 3685 | + | |
| 3686 | +#. Resource IDs: (IDS_PROC_EDIT_TEXT_CONFLICTS) | |
| 3687 | +msgid "Edit Text Conflicts" | |
| 3688 | +msgstr "" | |
| 3689 | + | |
| 3677 | 3690 | #. Resource IDs: (IDS_PROC_EDIT_TREE_CONFLICTS) |
| 3678 | 3691 | msgid "Edit Tree Conflicts" |
| 3679 | 3692 | msgstr "" |
| @@ -3715,6 +3728,10 @@ | ||
| 3715 | 3728 | msgid "Edit..." |
| 3716 | 3729 | msgstr "" |
| 3717 | 3730 | |
| 3731 | +#. Resource IDs: (IDS_EDITCONFLICT_TEXT_EDITCMD) | |
| 3732 | +msgid "Edit\nEdit text conflicts" | |
| 3733 | +msgstr "" | |
| 3734 | + | |
| 3718 | 3735 | #. Resource IDs: (IDS_EDITCONFLICT_PROP_EDITCMD) |
| 3719 | 3736 | msgid "Edit\nchange merged property value in editor" |
| 3720 | 3737 | msgstr "" |
| @@ -9217,7 +9234,7 @@ | ||
| 9217 | 9234 | msgid "Up one folder" |
| 9218 | 9235 | msgstr "" |
| 9219 | 9236 | |
| 9220 | -#. Resource IDs: (Dialog IDD_UPDATE: Control id 152, IDS_PROGRS_TITLE_UPDATE) | |
| 9237 | +#. Resource IDs: (Dialog IDD_UPDATE: Control id 152, IDS_PROGRS_CMD_UPDATE, IDS_PROGRS_TITLE_UPDATE) | |
| 9221 | 9238 | msgid "Update" |
| 9222 | 9239 | msgstr "" |
| 9223 | 9240 |
| @@ -9237,11 +9254,6 @@ | ||
| 9237 | 9254 | msgid "Update externals" |
| 9238 | 9255 | msgstr "" |
| 9239 | 9256 | |
| 9240 | -#. Resource IDs: (IDS_PROGRS_CMD_UPDATE) | |
| 9241 | -#, c-format | |
| 9242 | -msgid "Update from %1!ls!" | |
| 9243 | -msgstr "" | |
| 9244 | - | |
| 9245 | 9257 | #. Resource IDs: (IDS_SVNACTION_UPDATE) |
| 9246 | 9258 | msgid "Updated" |
| 9247 | 9259 | msgstr "" |
TortoiseSVN