mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-12-05 16:20:14 +01:00
Fixed conflicts when merging 'master' into 'rss'
This commit is contained in:
@@ -1310,6 +1310,14 @@ files, causing any whose files remain to be imported again.</source>
|
||||
<source>Log events in Syslog</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select Directory</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Select Log File</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>EditEncoder</name>
|
||||
@@ -3725,6 +3733,14 @@ Přepsat?</translation>
|
||||
<source>Multicast Address for Notifications</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Save text file</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
<message>
|
||||
<source>Progress</source>
|
||||
<translation type="unfinished"></translation>
|
||||
</message>
|
||||
</context>
|
||||
<context>
|
||||
<name>EditStation</name>
|
||||
|
||||
Reference in New Issue
Block a user