• R/O
  • SSH
  • HTTPS

tortoisesvn: Commit


Commit MetaInfo

Revision28527 (tree)
Time2019-03-13 05:11:05
Authorstefankueng

Log Message

* no crash reporter for older versions
* update pot file

Change Summary

Incremental Difference

--- branches/1.10.x/Languages/TortoiseUI.pot (revision 28526)
+++ branches/1.10.x/Languages/TortoiseUI.pot (revision 28527)
@@ -112,6 +112,11 @@
112112 msgid "%1!ls! : Working Base, Revision %2!ld!"
113113 msgstr ""
114114
115+#. Resource IDs: (IDS_PROGRS_UPDATE)
116+#, c-format
117+msgid "%1!ls! from %2!ls!"
118+msgstr ""
119+
115120 #. Resource IDs: (IDS_PROGRS_FINALINFO)
116121 #, c-format
117122 msgid "%1!ls! in %2!ls!"
@@ -3674,6 +3679,14 @@
36743679 msgid "Edit Properties"
36753680 msgstr ""
36763681
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+
36773690 #. Resource IDs: (IDS_PROC_EDIT_TREE_CONFLICTS)
36783691 msgid "Edit Tree Conflicts"
36793692 msgstr ""
@@ -3715,6 +3728,10 @@
37153728 msgid "Edit..."
37163729 msgstr ""
37173730
3731+#. Resource IDs: (IDS_EDITCONFLICT_TEXT_EDITCMD)
3732+msgid "Edit\nEdit text conflicts"
3733+msgstr ""
3734+
37183735 #. Resource IDs: (IDS_EDITCONFLICT_PROP_EDITCMD)
37193736 msgid "Edit\nchange merged property value in editor"
37203737 msgstr ""
@@ -9217,7 +9234,7 @@
92179234 msgid "Up one folder"
92189235 msgstr ""
92199236
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)
92219238 msgid "Update"
92229239 msgstr ""
92239240
@@ -9237,11 +9254,6 @@
92379254 msgid "Update externals"
92389255 msgstr ""
92399256
9240-#. Resource IDs: (IDS_PROGRS_CMD_UPDATE)
9241-#, c-format
9242-msgid "Update from %1!ls!"
9243-msgstr ""
9244-
92459257 #. Resource IDs: (IDS_SVNACTION_UPDATE)
92469258 msgid "Updated"
92479259 msgstr ""
Show on old repository browser