Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/AntonyCorbett/OnlyM
Browse files Browse the repository at this point in the history
  • Loading branch information
AntonyCorbett committed Nov 16, 2018
2 parents a36a91f + 6c7b712 commit 34227da
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 16 deletions.
12 changes: 6 additions & 6 deletions OnlyM.Core/Properties/Resources.nl-NL.resx
Original file line number Diff line number Diff line change
Expand Up @@ -126,23 +126,23 @@
<comment>Error notification message if OnlyM fails to create a folder. Please retain the placeholder.</comment>
</data>
<data name="FADE_CROSS" xml:space="preserve">
<value>Crossfade</value>
<value>Overvloeien</value>
<comment>See Settings =&gt; Images =&gt; Fading style</comment>
</data>
<data name="FADE_IN" xml:space="preserve">
<value>Infaden</value>
<value>Invloeien</value>
<comment>See Settings =&gt; Images =&gt; Fading style</comment>
</data>
<data name="FADE_IN_OUT" xml:space="preserve">
<value>In- en uitfaden</value>
<value>In- en uitvloeien</value>
<comment>See Settings =&gt; Images =&gt; Fading style</comment>
</data>
<data name="FADE_NONE" xml:space="preserve">
<value>Geen</value>
<comment>See Settings =&gt; Images =&gt; Fading style</comment>
</data>
<data name="FADE_OUT" xml:space="preserve">
<value>Uitfaden</value>
<value>Uitvloeien</value>
<comment>See Settings =&gt; Images =&gt; Fading style</comment>
</data>
<data name="FADE_SPEED_FAST" xml:space="preserve">
Expand All @@ -162,15 +162,15 @@
<comment>See Settings =&gt; Images =&gt; Fading speed</comment>
</data>
<data name="LOG_LEVEL_DEBUG" xml:space="preserve">
<value>Fouten opsporen</value>
<value>Foutopsporing</value>
<comment>See Settings =&gt; Miscellaneous =&gt; Logging level</comment>
</data>
<data name="LOG_LEVEL_ERROR" xml:space="preserve">
<value>Fout</value>
<comment>See Settings =&gt; Miscellaneous =&gt; Logging level</comment>
</data>
<data name="LOG_LEVEL_FATAL" xml:space="preserve">
<value>Fataal</value>
<value>Kritiek</value>
<comment>See Settings =&gt; Miscellaneous =&gt; Logging level</comment>
</data>
<data name="LOG_LEVEL_INFORMATION" xml:space="preserve">
Expand Down
4 changes: 2 additions & 2 deletions OnlyM.Core/Properties/Resources.ru-RU.resx
Original file line number Diff line number Diff line change
Expand Up @@ -150,11 +150,11 @@
<comment>See Settings =&gt; Images =&gt; Fading speed</comment>
</data>
<data name="FADE_SPEED_NORMAL" xml:space="preserve">
<value>Normal</value>
<value>Нормальная</value>
<comment>See Settings =&gt; Images =&gt; Fading speed</comment>
</data>
<data name="FADE_SPEED_SLOW" xml:space="preserve">
<value>Slow</value>
<value>Медленная</value>
<comment>See Settings =&gt; Images =&gt; Fading speed</comment>
</data>
<data name="FADE_SPEED_SUPER_FAST" xml:space="preserve">
Expand Down
14 changes: 7 additions & 7 deletions OnlyM/Properties/Resources.nl-NL.resx
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@
<comment>Title of the "Blank Screen" item</comment>
</data>
<data name="MEDIA_FOLDER_BROWSE" xml:space="preserve">
<value>Kies media-map</value>
<value>Kies mediamap</value>
<comment>Title of the "Open Folder" dialog that is displayed when you click the folder button in Settings =&gt; Media Files</comment>
</data>
<data name="SETTINGS" xml:space="preserve">
Expand Down Expand Up @@ -213,7 +213,7 @@
<comment>Displayed when an automatic slideshow is being played. Please retain the placeholders.</comment>
</data>
<data name="MEDIA_MONITOR" xml:space="preserve">
<value>Monitor</value>
<value>Scherm</value>
<comment>See Settings =&gt; Display</comment>
</data>
<data name="SECTION_DISPLAY" xml:space="preserve">
Expand All @@ -233,7 +233,7 @@
<comment>See Settings =&gt; Media Files</comment>
</data>
<data name="MEDIA_FOLDER_CMDLINE" xml:space="preserve">
<value>Media folder specified on command-line</value>
<value>Mediamap opgegeven op de opdrachtregel</value>
<comment>Displayed in Settings =&gt; Media Files when the media folder is set using a command-line option.</comment>
</data>
<data name="ALLOW_PAUSE" xml:space="preserve">
Expand Down Expand Up @@ -353,7 +353,7 @@
<comment>Tooltip for the Settings page "Back" button </comment>
</data>
<data name="UNHIDE" xml:space="preserve">
<value>UNHIDE</value>
<value>ZICHTBAAR MAKEN</value>
<comment>If you have hidden any of the media items (using the command panel), an "Unhide" button is displayed on the main page. This is the button caption.</comment>
</data>
<data name="DISPLAY_HELP" xml:space="preserve">
Expand Down Expand Up @@ -385,15 +385,15 @@
<comment>Tooltip on thumbnail right margin when "Freeze" is enabled.</comment>
</data>
<data name="LANGUAGE" xml:space="preserve">
<value>Language</value>
<value>Taal</value>
<comment>See Settings =&gt; Miscellaneous</comment>
</data>
<data name="RESTART_LANGUAGE" xml:space="preserve">
<value>Please restart OnlyM after changing the language.</value>
<value>Start OnlyT opnieuw na het wijzigen van de taal.</value>
<comment>See Settings =&gt; Miscellaneous</comment>
</data>
<data name="GENERATING_SUBTITLES" xml:space="preserve">
<value>Generating subtitles</value>
<value>Genereren van ondertitels</value>
<comment>Displayed in the notification bar when a subtitle file is generated for a video.</comment>
</data>
</root>
2 changes: 1 addition & 1 deletion OnlyM/Properties/Resources.ru-RU.resx
Original file line number Diff line number Diff line change
Expand Up @@ -357,7 +357,7 @@
<comment>If you have hidden any of the media items (using the command panel), an "Unhide" button is displayed on the main page. This is the button caption.</comment>
</data>
<data name="DISPLAY_HELP" xml:space="preserve">
<value>Display help</value>
<value>Справка</value>
<comment>Tooltip for the Help button in the main window</comment>
</data>
<data name="NEW_VERSION" xml:space="preserve">
Expand Down

0 comments on commit 34227da

Please sign in to comment.