Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-10-17 08:01:13 +02:00
Code Issues Projects Releases Wiki Activity

Fixed conflicts when merging 'master' into 'rss'

Browse Source
This commit is contained in:
Fred Gleason
2020-03-10 13:28:31 -04:00
parent 4f6c0eb2c9 7cbacda0e2
commit 379fef019d
150 changed files with 1491 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
rdadmin/rdadmin_fr.ts
View File

@@ -929,6 +929,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>EditEndpoint</name>
@@ -2999,6 +3007,14 @@ Overwrite?</source>
<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>