Skip to content

Commit

Permalink
Merge branch 'master' into Valdnet-patch-1
Browse files Browse the repository at this point in the history
  • Loading branch information
@Valdnet
Valdnet authored Sep 25, 2021
2 parents 9dd3e01 + 295a5a3 commit 8d04794
Show file tree
Hide file tree
Showing 8 changed files with 126 additions and 121 deletions.
24 changes: 12 additions & 12 deletions translations/client_cs.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2281,62 +2281,62 @@ Položky u kterých je umožněno mazání budou smazány, pokud brání tomu, a
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="14"/>
<source>Invalid filename</source>
<translation type="unfinished"/>
<translation>Neplatný název souboru</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
<translation>Soubor nebyl synchronizován, protože obsahuje znaky, které nejsou na tomto systému povoleny.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Chyba</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="49"/>
<source>Please enter a new name for the file:</source>
<translation type="unfinished"/>
<translation>Zadejte nový název pro soubor:</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="62"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation>Nový název souboru</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="71"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation>Přejmenovat soubor</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="73"/>
<source>The file %1 could not be synced because it contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
<translation>Soubor %1 nebyl synchronizován, protože obsahuje znaky, které nejsou na tomto systému povoleny.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="74"/>
<source>The following characters are not allowed on the system: * &quot; | &amp; ? , ; : \ / ~ &lt; &gt;</source>
<translation type="unfinished"/>
<translation>Následující znaky nejsou v systému povoleny: * &quot; | &amp; ? , ; : \ / ~ &lt; &gt;</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation>Nemáte potřebná práva k přejmenování souboru. Požádejte vlastníka souboru, aby ho přejmenoval.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="130"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
<translation>Název souboru obsahuje neplatné znaky: %1</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation>Přejmenovat soubor se nepodařilo. Ujistěte se, že jste připojeni k serveru.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="155"/>
<source>Can not rename file because file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Soubor není možné přejmenovat, protože soubor se stejným názvem na serveru už existuje. Vyberte jiný název.</translation>
</message>
</context>
<context>
Expand Down
24 changes: 12 additions & 12 deletions translations/client_de.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2282,62 +2282,62 @@ Objekte, bei denen Löschen erlaubt ist, werden gelöscht, wenn diese das Lösch
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="14"/>
<source>Invalid filename</source>
<translation type="unfinished"/>
<translation>Ungültiger Dateiname</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
<translation>Die Datei konnte nicht synchronisiert werden, da der Name Zeichen enthält, die auf diesem System nicht zulässig sind.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="36"/>
<source>Error</source>
<translation type="unfinished"/>
<translation>Fehler</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="49"/>
<source>Please enter a new name for the file:</source>
<translation type="unfinished"/>
<translation>Bitte geben Sie einen neuen Namen für die Datei ein:</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="62"/>
<source>New filename</source>
<translation type="unfinished"/>
<translation>Neuer Dateiname</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="71"/>
<source>Rename file</source>
<translation type="unfinished"/>
<translation>Datei umbenennen</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="73"/>
<source>The file %1 could not be synced because it contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
<translation>Die Datei %1 konnte nicht synchronisiert werden, da der Name Zeichen enthält, die auf diesem System nicht zulässig sind.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="74"/>
<source>The following characters are not allowed on the system: * &quot; | &amp; ? , ; : \ / ~ &lt; &gt;</source>
<translation type="unfinished"/>
<translation>Die folgenden Zeichen sind auf dem System nicht erlaubt: * &quot; | &amp; ? , ; : \ / ~ &lt; &gt;</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="105"/>
<source>You don&apos;t have the permission to rename this file. Please ask the author of the file to rename it.</source>
<translation type="unfinished"/>
<translation>Sie haben nicht die Berechtigung, diese Datei umzubenennen. Bitte wenden Sie sich an den Autor der Datei, um sie umzubenennen.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="130"/>
<source>Filename contains illegal characters: %1</source>
<translation type="unfinished"/>
<translation>Dateiname enthält unzulässige Zeichen: %1</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="144"/>
<source>Could not rename file. Please make sure you are connected to the server.</source>
<translation type="unfinished"/>
<translation>Datei konnte nicht umbenannt werden. Bitte stellen Sie sicher, dass Sie mit dem Server verbunden sind.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="155"/>
<source>Can not rename file because file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Die Datei kann nicht umbenannt werden, da eine Datei mit demselben Namen bereits auf dem Server existiert. Bitte wählen Sie einen anderen Namen.</translation>
</message>
</context>
<context>
Expand Down
6 changes: 3 additions & 3 deletions translations/client_en_GB.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2260,7 +2260,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="23"/>
<source>The file could not be synced because it contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
<translation>The file could not be synced because its name contains characters which are not allowed on this system.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.ui" line="36"/>
Expand All @@ -2285,7 +2285,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="73"/>
<source>The file %1 could not be synced because it contains characters which are not allowed on this system.</source>
<translation type="unfinished"/>
<translation>The file %1 could not be synced because the fliename contains characters which are not allowed on this system.</translation>
</message>
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="74"/>
Expand All @@ -2310,7 +2310,7 @@ Items where deletion is allowed will be deleted if they prevent a directory from
<message>
<location filename="../src/gui/invalidfilenamedialog.cpp" line="155"/>
<source>Can not rename file because file with the same name does already exist on the server. Please pick another name.</source>
<translation type="unfinished"/>
<translation>Cannot rename file because a file with the same name already exist on the server. Please pick another name.</translation>
</message>
</context>
<context>
Expand Down
Loading

0 comments on commit 8d04794

Please sign in to comment.