RenJuan/TASKPM
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1874 from vmazurashu/master

Browse source 
#1802 string This progress type cannot cannot be removed
This commit is contained in:
Jeroen Baten 2018-06-18 14:57:41 +02:00 • committed by GitHub
commit 6c6d2bf749
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
HACKING.rst
View file

@ -595,3 +595,5 @@ For MySQL users here are specific instructions.
$ cd libreplan-webapp/
$ mvn -Pdev,mysql jetty:run
* Go to http://localhost:8080/libreplan-webapp/

2
libreplan-webapp/src/main/resources/i18n/keys.pot
View file

@ -4784,7 +4784,7 @@ msgid "Connect"
msgstr ""
#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1240
msgid "This progress type cannot cannot be removed"
msgid "This progress type cannot be removed"
msgstr ""
#: libreplan-webapp/src/main/java/org/libreplan/web/limitingresources/QueueComponent.java:223

2
libreplan-webapp/src/main/resources/i18n/zh.po
View file

@ -4395,7 +4395,7 @@ msgid "Connect"
msgstr "连"
#: libreplan-webapp/src/main/java/org/libreplan/web/orders/ManageOrderElementAdvancesController.java:1240
msgid "This progress type cannot cannot be removed"
msgid "This progress type cannot be removed"
msgstr "这一进展类型不能不能被删除"
#: libreplan-webapp/src/main/webapp/expensesheet/expenseSheet.zul:145