Skip to content

[pull] master from flameshot-org:master #120

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pull merged 1 commit into from
Jun 8, 2025
Merged

[pull] master from flameshot-org:master #120

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 17 additions & 17 deletions data/translations/Internationalization_de_DE.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -244,17 +244,17 @@
<message>
<location filename="../../src/widgets/capture/capturewidget.cpp" line="482"/>
<source>Quit Capture</source>
<translation type="unfinished"></translation>
<translation>Aufnahme beenden</translation>
</message>
<message>
<location filename="../../src/widgets/capture/capturewidget.cpp" line="483"/>
<source>Are you sure you want to quit capture?</source>
<translation type="unfinished"></translation>
<translation>Soll die Aufnahme wirklich beendet werden?</translation>
</message>
<message>
<location filename="../../src/widgets/capture/capturewidget.cpp" line="488"/>
<source>Do not show this again</source>
<translation type="unfinished"></translation>
<translation>Nicht erneut zeigen</translation>
</message>
<message>
<location filename="../../src/widgets/capture/capturewidget.cpp" line="683"/>
Expand Down Expand Up @@ -1029,7 +1029,7 @@ Bitte beseitige sie manuell in der Konfigurationsdatei.</translation>
<message>
<location filename="../../src/config/generalconf.cpp" line="456"/>
<source>Show welcome message on launch</source>
<translation>Zeige Willkommensnachricht beim Start</translation>
<translation>Willkommensnachricht beim Start zeigen</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="484"/>
Expand Down Expand Up @@ -1062,12 +1062,12 @@ Bitte beseitige sie manuell in der Konfigurationsdatei.</translation>
<message>
<location filename="../../src/config/generalconf.cpp" line="277"/>
<source>Use last region for GUI mode</source>
<translation type="unfinished">Letzte Region verwenden</translation>
<translation>Letzte Region für den GUI-Modus verwenden</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="279"/>
<source>Use the last region as the default selection for the next screenshot in GUI mode</source>
<translation type="unfinished">Letzte Region als Standardauswahl für den nächsten Screenshot verwenden</translation>
<translation>Letzte Region als Standardauswahl für den nächsten Screenshot verwenden</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="293"/>
Expand All @@ -1082,12 +1082,12 @@ Bitte beseitige sie manuell in der Konfigurationsdatei.</translation>
<message>
<location filename="../../src/config/generalconf.cpp" line="316"/>
<source>Show abort notifications</source>
<translation type="unfinished"></translation>
<translation>Abbruchbenachrichtigungen anzeigen</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="317"/>
<source>Enable abort notifications</source>
<translation type="unfinished"></translation>
<translation>Abbruchbenachrichtigungen aktivieren</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="330"/>
Expand All @@ -1097,12 +1097,12 @@ Bitte beseitige sie manuell in der Konfigurationsdatei.</translation>
<message>
<location filename="../../src/config/generalconf.cpp" line="343"/>
<source>Use grim to capture screenshots</source>
<translation type="unfinished"></translation>
<translation>Grim zum Aufnehmen von Screenshots verwenden</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="345"/>
<source>Grim is a wayland only utility to capture screens based on the screencopy protocol. Generally only enable on minimal wayland window managers like sway, hyprland, etc.</source>
<translation type="unfinished"></translation>
<translation>Grim ist ein ausschließlich in Wayland verfügbares Dienstprogramm zur Aufnahme von Screenshots basierend auf dem Screencopy-Protokoll. Es ist im Allgemeinen nur auf minimalen Wayland-Fenstermanagern wie Sway, Hyprland usw. vorhanden.</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="363"/>
Expand Down Expand Up @@ -1154,22 +1154,22 @@ Bitte beseitige sie manuell in der Konfigurationsdatei.</translation>
<message>
<location filename="../../src/config/generalconf.cpp" line="433"/>
<source>Automatically close daemon (background process) when it is not needed</source>
<translation type="unfinished"></translation>
<translation>Daemon (Hintergrundprozess) automatisch beenden, wenn er nicht benötigt wird</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="444"/>
<source>Launch in background at startup</source>
<translation type="unfinished"></translation>
<translation>Beim Systemstart im Hintergrund starten</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="445"/>
<source>Launch Flameshot daemon (background process) when computer is booted</source>
<translation type="unfinished"></translation>
<translation>Den Flameshot-Daemon (Hintergrundprozess) starten, wenn der Computer hochgefahren wird</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="470"/>
<source>Ask before quit capture</source>
<translation type="unfinished"></translation>
<translation>Vor dem Beenden der Aufnahme fragen</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="473"/>
Expand All @@ -1179,12 +1179,12 @@ Bitte beseitige sie manuell in der Konfigurationsdatei.</translation>
<message>
<location filename="../../src/config/generalconf.cpp" line="498"/>
<source>Enable Copy to clipboard on Double Click</source>
<translation type="unfinished"></translation>
<translation>Kopieren bei Doppelklick aktivieren</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="510"/>
<source>Copy URL after uploading was successful</source>
<translation type="unfinished"></translation>
<translation>URL nach erfolgreichem Upload kopieren</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="522"/>
Expand Down Expand Up @@ -1831,7 +1831,7 @@ Bitte beseitige sie manuell in der Konfigurationsdatei.</translation>
<message>
<location filename="../../src/tools/pin/pinwidget.cpp" line="331"/>
<source>Close</source>
<translation type="unfinished">Schließen</translation>
<translation>Schließen</translation>
</message>
</context>
<context>
Expand Down
40 changes: 20 additions & 20 deletions data/translations/Internationalization_ru.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1211,7 +1211,7 @@ Please solve them manually in the configuration file.</source>
<message>
<location filename="../../src/config/generalconf.cpp" line="496"/>
<source>Copy on double click</source>
<translation>Скопировать двойным нажатием кнопки мыши</translation>
<translation>Копировать двойным щелчком кнопки мыши</translation>
</message>
<message>
<source>Enable Copy on Double Click</source>
Expand Down Expand Up @@ -1314,7 +1314,7 @@ Please solve them manually in the configuration file.</source>
<message>
<location filename="../../src/config/generalconf.cpp" line="704"/>
<source>Copy file path after save</source>
<translation>Скопировать путь к файлу после сохранения</translation>
<translation>Копировать путь к файлу после сохранения</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="705"/>
Expand Down Expand Up @@ -1370,22 +1370,22 @@ Please solve them manually in the configuration file.</source>
<message>
<location filename="../../src/config/generalconf.cpp" line="794"/>
<source>Milliseconds before geometry display hides; 0 means do not hide</source>
<translation>Время в миллисекундах до скрытия отображения геометрии; 0 — не скрывать</translation>
<translation>Время в миллисекундах до скрытия панели геометрии; 0 — не скрывать</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="797"/>
<source>Set geometry display timeout (ms)</source>
<translation>Задать время отображения геометрии (мс)</translation>
<translation>Задать время показа панели геометрии (мс)</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="805"/>
<source>Selection Geometry Display</source>
<translation>Отображение геометрии выделения</translation>
<translation>Панель геометрии выделения</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="812"/>
<source>Display Location</source>
<translation>Расположение отображения</translation>
<translation>Расположение панели</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="815"/>
Expand Down Expand Up @@ -1430,7 +1430,7 @@ Please solve them manually in the configuration file.</source>
<message>
<location filename="../../src/config/generalconf.cpp" line="864"/>
<source>Reverse arrow</source>
<translation>Обратить стрелу</translation>
<translation>Обратить стрелку</translation>
</message>
<message>
<location filename="../../src/config/generalconf.cpp" line="865"/>
Expand Down Expand Up @@ -1876,7 +1876,7 @@ Please solve them manually in the configuration file.</source>
<message>
<location filename="../../src/tools/invert/inverttool.cpp" line="25"/>
<source>Invert</source>
<translation>Инвертировать</translation>
<translation>Инвертор</translation>
</message>
<message>
<location filename="../../src/tools/invert/inverttool.cpp" line="35"/>
Expand Down Expand Up @@ -2002,7 +2002,7 @@ Please solve them manually in the configuration file.</source>
<message>
<location filename="../../src/tools/pixelate/pixelatetool.cpp" line="36"/>
<source>Set Pixelate as the paint tool.</source>
<translation>Сделать Pixelate инструментом рисования.</translation>
<translation>Сделать размытие инструментом рисования</translation>
</message>
<message>
<source>Set Pixelate as the paint tool</source>
Expand Down Expand Up @@ -2098,7 +2098,7 @@ Please solve them manually in the configuration file.</source>
<message>
<location filename="../../src/main.cpp" line="203"/>
<source>Open the capture launcher.</source>
<translation>Открыть программу запуска захвата.</translation>
<translation>Открыть средство запуска захвата.</translation>
</message>
<message>
<location filename="../../src/main.cpp" line="206"/>
Expand Down Expand Up @@ -2536,22 +2536,22 @@ You can find me in the system tray.</source>
<message>
<location filename="../../src/config/setshortcutwidget.cpp" line="18"/>
<source>Set Shortcut</source>
<translation>Установить горячую клавишу</translation>
<translation>Назначение сочетания клавиш</translation>
</message>
<message>
<location filename="../../src/config/setshortcutwidget.cpp" line="24"/>
<source>Enter new shortcut to change </source>
<translation>Введите новую горячую клавишу </translation>
<translation>Введите новое сочетание для замены </translation>
</message>
<message>
<location filename="../../src/config/setshortcutwidget.cpp" line="38"/>
<source>Press Esc to cancel or ⌘+Backspace to disable the keyboard shortcut.</source>
<translation>Нажмите Esc, чтобы отменить, или ⌘+Backspace, чтобы отключить сочетание клавиш.</translation>
<translation>Нажмите Esc для отмены или ⌘+Backspace для отключения сочетание клавиш.</translation>
</message>
<message>
<location filename="../../src/config/setshortcutwidget.cpp" line="42"/>
<source>Press Esc to cancel or Backspace to disable the keyboard shortcut.</source>
<translation>Нажмите Esc, чтобы отменить, или Backspace, чтобы отключить сочетание клавиш.</translation>
<translation>Нажмите Esc для отмены или Backspace для отключения сочетание клавиш.</translation>
</message>
<message>
<location filename="../../src/config/setshortcutwidget.cpp" line="47"/>
Expand Down Expand Up @@ -2614,22 +2614,22 @@ You can find me in the system tray.</source>
<message>
<location filename="../../src/config/shortcutswidget.cpp" line="180"/>
<source>Symmetrically decrease width by 2px</source>
<translation>Симметрично уменьшить ширину на 2 пикселя</translation>
<translation>Симметрично уменьшить ширину на 2 пикс</translation>
</message>
<message>
<location filename="../../src/config/shortcutswidget.cpp" line="182"/>
<source>Symmetrically increase width by 2px</source>
<translation>Симметрично увеличить ширину на 2 пикселя</translation>
<translation>Симметрично увеличить ширину на 2 пикс</translation>
</message>
<message>
<location filename="../../src/config/shortcutswidget.cpp" line="184"/>
<source>Symmetrically increase height by 2px</source>
<translation>Симметрично увеличить высоту на 2 пикселя</translation>
<translation>Симметрично увеличить высоту на 2 пикс</translation>
</message>
<message>
<location filename="../../src/config/shortcutswidget.cpp" line="186"/>
<source>Symmetrically decrease height by 2px</source>
<translation>Симметрично уменьшить высоту на 2 пикселя</translation>
<translation>Симметрично уменьшить высоту на 2 пикс</translation>
</message>
<message>
<location filename="../../src/config/shortcutswidget.cpp" line="187"/>
Expand Down Expand Up @@ -2718,7 +2718,7 @@ You can find me in the system tray.</source>
<message>
<location filename="../../src/widgets/panel/sidepanelwidget.cpp" line="85"/>
<source>Display grid</source>
<translation>Сетка экрана</translation>
<translation>Сетка дисплея</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -2954,7 +2954,7 @@ You can find me in the system tray.</source>
<message>
<location filename="../../src/widgets/trayicon.cpp" line="133"/>
<source>Check for updates</source>
<translation>Проверка обновлений</translation>
<translation>Проверить обновления</translation>
</message>
<message>
<location filename="../../src/widgets/trayicon.cpp" line="144"/>
Expand Down
Loading