Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

i18n: fix german base.po

Browse source 
Signed-off-by: Martin Schiller <ms@dev.tdt.de>
This commit is contained in:
Martin Schiller 2018-09-13 08:21:22 +02:00 committed by Hannu Nyman
parent b3d4b84aaf
commit 01fe783494
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
modules/luci-base/po/de/base.po
View file

@ -4179,8 +4179,6 @@ msgstr "ja"
msgid "« Back"
msgstr "« Zurück"
<<<<<<< HEAD
=======
#~ msgid "<abbr title='Pairwise: %s / Group: %s'>%s - %s</abbr>"
#~ msgstr "<abbr title='Paarweise: %s / Gruppe: %s'>%s - %s</abbr>"
@ -4271,4 +4269,3 @@ msgstr "« Zurück"
#~ msgid "IPv6 WAN Status"
#~ msgstr "IPv6 WAN Status"
>>>>>>> 86660f92d... i18n: sync translations