Skip to content

Commit

Permalink
Merge branch 'master' of github.com:martinrotter/rssguard
Browse files Browse the repository at this point in the history
  • Loading branch information
martinrotter committed Feb 4, 2025
2 parents 4e1774e + 65c0e69 commit 6be83ed
Show file tree
Hide file tree
Showing 4 changed files with 46 additions and 46 deletions.
38 changes: 19 additions & 19 deletions localization/rssguard_en_GB.ts
Original file line number Diff line number Diff line change
Expand Up @@ -839,17 +839,17 @@ Click here to open parent directory.</translation>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="126"/>
<source>Duplicate shortcut</source>
<translation type="unfinished">Duplicate shortcut</translation>
<translation>Duplicate shortcut</translation>
</message>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="127"/>
<source>There is another action which has the same shortcut assigned.</source>
<translation type="unfinished">There is another action which has the same shortcut assigned.</translation>
<translation>There is another action which has the same shortcut assigned to it.</translation>
</message>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="128"/>
<source>Do you want to keep the new shortcut assignment and clear the previous shortcut?</source>
<translation type="unfinished">Do you want to keep the new shortcut assignment and clear the previous shortcut?</translation>
<translation>Do you want to keep the new shortcut assignment and clear the previous one?</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -1388,7 +1388,7 @@ Item ID: %5</translation>
<message>
<location filename="../src/librssguard/gui/feedsview.cpp" line="261"/>
<source>Do you really want to purge all non-starred articles from selected feeds?</source>
<translation type="unfinished">Do you really want to purge all non-starred articles from selected feeds?</translation>
<translation>Do you really want to purge all non-starred articles from selected feeds?</translation>
</message>
<message>
<location filename="../src/librssguard/gui/feedsview.cpp" line="315"/>
Expand Down Expand Up @@ -3155,7 +3155,7 @@ QtWebEngine cache folder -&gt; &quot;%7&quot;</translation>
<location filename="../src/librssguard/gui/dialogs/formmain.ui" line="966"/>
<location filename="../build/Desktop_Qt_6_8_0_MSVC2022_64bit-Debug/src/librssguard/ui_formmain.h" line="820"/>
<source>&amp;Purge selected feeds</source>
<translation type="unfinished">&amp;Purge selected feeds</translation>
<translation>&amp;Purge selected feeds</translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmain.ui" line="740"/>
Expand Down Expand Up @@ -4065,47 +4065,47 @@ You can install it now.</translation>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="268"/>
<source>Line is too short for valid protocol</source>
<translation type="unfinished">Line is too short for valid protocol</translation>
<translation>Line is too short for valid protocol</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="273"/>
<source>response too large!</source>
<translation type="unfinished">response too large!</translation>
<translation>response too large!</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="282"/>
<source>Line does not end with &lt;CR&gt; &lt;LF&gt;</source>
<translation type="unfinished">Line does not end with &lt;CR&gt; &lt;LF&gt;</translation>
<translation>Line does not end with &lt;CR&gt; &lt;LF&gt;</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="291"/>
<source>First character is not a digit.</source>
<translation type="unfinished">First character is not a digit.</translation>
<translation>First character is not a digit.</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="300"/>
<source>Second character is not a digit.</source>
<translation type="unfinished">Second character is not a digit.</translation>
<translation>Second character is not a digit.</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="312"/>
<source>Third character is not a space.</source>
<translation type="unfinished">Third character is not a space.</translation>
<translation>Third character is not a space.</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="361"/>
<source>Invalid URL for redirection!</source>
<translation type="unfinished">Invalid URL for redirection!</translation>
<translation>Invalid URL for redirection!</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="438"/>
<source>Unspecified status code used!</source>
<translation type="unfinished">Unspecified status code used!</translation>
<translation>Unspecified status code used!</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="447"/>
<source>META too large!</source>
<translation type="unfinished">META too large!</translation>
<translation>META too large!</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -5742,7 +5742,7 @@ Login tokens expiration: %2</translation>
<message>
<location filename="../src/librssguard/gui/toolbars/messagestoolbar.cpp" line="283"/>
<source>Show read articles</source>
<translation type="unfinished">Show read articles</translation>
<translation>Show read articles</translation>
</message>
<message>
<location filename="../src/librssguard/gui/toolbars/messagestoolbar.cpp" line="288"/>
Expand Down Expand Up @@ -8073,7 +8073,7 @@ Description: %3</translation>
<location filename="../src/librssguard/gui/settings/settingsgui.ui" line="196"/>
<location filename="../build/Desktop_Qt_6_8_0_MSVC2022_64bit-Debug/src/librssguard/ui_settingsgui.h" line="416"/>
<source>Use colored icon when there are unread articles</source>
<translation type="unfinished">Use colored icon when there are unread articles</translation>
<translation>Use coloured icon when there are unread articles</translation>
</message>
<message>
<location filename="../src/librssguard/gui/settings/settingsgui.ui" line="220"/>
Expand Down Expand Up @@ -9089,17 +9089,17 @@ This setting is useful when raw XML parsing of the feed is very slow, this happe
<message>
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.cpp" line="32"/>
<source>Use application settings</source>
<translation type="unfinished">Use application settings</translation>
<translation>Use application settings</translation>
</message>
<message>
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.cpp" line="34"/>
<source>Enabled</source>
<translation type="unfinished">Enabled</translation>
<translation>Enabled</translation>
</message>
<message>
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.cpp" line="35"/>
<source>Disabled</source>
<translation type="unfinished">Disabled</translation>
<translation>Disabled</translation>
</message>
</context>
<context>
Expand Down
38 changes: 19 additions & 19 deletions localization/rssguard_fr.ts
Original file line number Diff line number Diff line change
Expand Up @@ -839,17 +839,17 @@ Cliquez-ici pour ouvrir le répertoire parent.</translation>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="126"/>
<source>Duplicate shortcut</source>
<translation type="unfinished">Duplicate shortcut</translation>
<translation>Dupliquer le raccourci</translation>
</message>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="127"/>
<source>There is another action which has the same shortcut assigned.</source>
<translation type="unfinished">There is another action which has the same shortcut assigned.</translation>
<translation>Il y a une autre action qui a le même raccourci assigné.</translation>
</message>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="128"/>
<source>Do you want to keep the new shortcut assignment and clear the previous shortcut?</source>
<translation type="unfinished">Do you want to keep the new shortcut assignment and clear the previous shortcut?</translation>
<translation>Voulez-vous conserver le nouveau raccourci et effacer le précédent ?</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -1388,7 +1388,7 @@ Identifiant d&apos;élément: %5</translation>
<message>
<location filename="../src/librssguard/gui/feedsview.cpp" line="261"/>
<source>Do you really want to purge all non-starred articles from selected feeds?</source>
<translation type="unfinished">Do you really want to purge all non-starred articles from selected feeds?</translation>
<translation>Voulez-vous vraiment supprimer tous les articles non favoris des flux sélectionnés ?</translation>
</message>
<message>
<location filename="../src/librssguard/gui/feedsview.cpp" line="315"/>
Expand Down Expand Up @@ -3174,7 +3174,7 @@ recherche d&apos;articles</translation>
<location filename="../src/librssguard/gui/dialogs/formmain.ui" line="966"/>
<location filename="../build/Desktop_Qt_6_8_0_MSVC2022_64bit-Debug/src/librssguard/ui_formmain.h" line="820"/>
<source>&amp;Purge selected feeds</source>
<translation type="unfinished">&amp;Purge selected feeds</translation>
<translation>&amp;Purger les flux sélectionnés</translation>
</message>
<message>
<location filename="../src/librssguard/gui/dialogs/formmain.ui" line="740"/>
Expand Down Expand Up @@ -4085,47 +4085,47 @@ Vous pouvez désormais l&apos;installer.</translation>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="268"/>
<source>Line is too short for valid protocol</source>
<translation type="unfinished">Line is too short for valid protocol</translation>
<translation>La ligne est trop courte pour un protocole valide</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="273"/>
<source>response too large!</source>
<translation type="unfinished">response too large!</translation>
<translation>réponse trop grande!</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="282"/>
<source>Line does not end with &lt;CR&gt; &lt;LF&gt;</source>
<translation type="unfinished">Line does not end with &lt;CR&gt; &lt;LF&gt;</translation>
<translation>La ligne ne se termine pas par &lt;CR&gt; &lt;LF&gt;</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="291"/>
<source>First character is not a digit.</source>
<translation type="unfinished">First character is not a digit.</translation>
<translation>Le premier caractère n'est pas un chiffre.</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="300"/>
<source>Second character is not a digit.</source>
<translation type="unfinished">Second character is not a digit.</translation>
<translation>Le deuxième caractère n'est pas un chiffre.</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="312"/>
<source>Third character is not a space.</source>
<translation type="unfinished">Third character is not a space.</translation>
<translation>Le troisième caractère n'est pas un espace.</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="361"/>
<source>Invalid URL for redirection!</source>
<translation type="unfinished">Invalid URL for redirection!</translation>
<translation>URL invalide pour la redirection!</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="438"/>
<source>Unspecified status code used!</source>
<translation type="unfinished">Unspecified status code used!</translation>
<translation>Code de statut non spécifié utilisé!</translation>
</message>
<message>
<location filename="../src/librssguard/network-web/gemini/geminiclient.cpp" line="447"/>
<source>META too large!</source>
<translation type="unfinished">META too large!</translation>
<translation>META trop grande!</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -5764,7 +5764,7 @@ supplémentaire</translation>
<message>
<location filename="../src/librssguard/gui/toolbars/messagestoolbar.cpp" line="283"/>
<source>Show read articles</source>
<translation type="unfinished">Show read articles</translation>
<translation>Montrer les articles lus</translation>
</message>
<message>
<location filename="../src/librssguard/gui/toolbars/messagestoolbar.cpp" line="288"/>
Expand Down Expand Up @@ -8095,7 +8095,7 @@ Déscription: %3</translation>
<location filename="../src/librssguard/gui/settings/settingsgui.ui" line="196"/>
<location filename="../build/Desktop_Qt_6_8_0_MSVC2022_64bit-Debug/src/librssguard/ui_settingsgui.h" line="416"/>
<source>Use colored icon when there are unread articles</source>
<translation type="unfinished">Use colored icon when there are unread articles</translation>
<translation>Utiliser l'icône colorée lorsqu'il y a des articles non lus</translation>
</message>
<message>
<location filename="../src/librssguard/gui/settings/settingsgui.ui" line="220"/>
Expand Down Expand Up @@ -9110,17 +9110,17 @@ Ce paramètre est utile quand l'extraction des données XML brutes du flux est t
<message>
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.cpp" line="32"/>
<source>Use application settings</source>
<translation type="unfinished">Use application settings</translation>
<translation>Utiliser les paramètres de l'application</translation>
</message>
<message>
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.cpp" line="34"/>
<source>Enabled</source>
<translation type="unfinished">Enabled</translation>
<translation>Activé</translation>
</message>
<message>
<location filename="../src/librssguard-standard/src/gui/standardfeedexpdetails.cpp" line="35"/>
<source>Disabled</source>
<translation type="unfinished">Disabled</translation>
<translation>Désactivé</translation>
</message>
</context>
<context>
Expand Down
8 changes: 4 additions & 4 deletions localization/rssguard_ja.ts
Original file line number Diff line number Diff line change
Expand Up @@ -834,17 +834,17 @@ Click here to open parent directory.</source>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="126"/>
<source>Duplicate shortcut</source>
<translation type="unfinished">Duplicate shortcut</translation>
<translation>ショートカットを複製</translation>
</message>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="127"/>
<source>There is another action which has the same shortcut assigned.</source>
<translation type="unfinished">There is another action which has the same shortcut assigned.</translation>
<translation>同じショートカットが割り当てられている別のアクションがあります</translation>
</message>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="128"/>
<source>Do you want to keep the new shortcut assignment and clear the previous shortcut?</source>
<translation type="unfinished">Do you want to keep the new shortcut assignment and clear the previous shortcut?</translation>
<translation>新しいショートカットの割り当てを維持し、以前のショートカットを削除しますか?</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -8048,7 +8048,7 @@ Description: %3</source>
<location filename="../src/librssguard/gui/settings/settingsgui.ui" line="196"/>
<location filename="../build/Desktop_Qt_6_8_0_MSVC2022_64bit-Debug/src/librssguard/ui_settingsgui.h" line="416"/>
<source>Use colored icon when there are unread articles</source>
<translation type="unfinished">Use colored icon when there are unread articles</translation>
<translation>未読記事がある場合は色付きアイコンを使用する</translation>
</message>
<message>
<location filename="../src/librssguard/gui/settings/settingsgui.ui" line="220"/>
Expand Down
8 changes: 4 additions & 4 deletions localization/rssguard_nl.ts
Original file line number Diff line number Diff line change
Expand Up @@ -838,17 +838,17 @@ Klik hier op de huidige map to openen.</translation>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="126"/>
<source>Duplicate shortcut</source>
<translation type="unfinished">Duplicate shortcut</translation>
<translation>Dubbele snelkoppeling</translation>
</message>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="127"/>
<source>There is another action which has the same shortcut assigned.</source>
<translation type="unfinished">There is another action which has the same shortcut assigned.</translation>
<translation>Er is al een actie die dezelfde snelkoppeling heeft toegewezen.</translation>
</message>
<message>
<location filename="../src/librssguard/dynamic-shortcuts/dynamicshortcutswidget.cpp" line="128"/>
<source>Do you want to keep the new shortcut assignment and clear the previous shortcut?</source>
<translation type="unfinished">Do you want to keep the new shortcut assignment and clear the previous shortcut?</translation>
<translation>Wilt u de nieuwe snelkoppeling behouden en de vorige snelkoppeling wissen?</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -8072,7 +8072,7 @@ Omschrijving: %3</translation>
<location filename="../src/librssguard/gui/settings/settingsgui.ui" line="196"/>
<location filename="../build/Desktop_Qt_6_8_0_MSVC2022_64bit-Debug/src/librssguard/ui_settingsgui.h" line="416"/>
<source>Use colored icon when there are unread articles</source>
<translation type="unfinished">Use colored icon when there are unread articles</translation>
<translation>Gebruik gekleurde iconen als er ongelezen artikelen zijn</translation>
</message>
<message>
<location filename="../src/librssguard/gui/settings/settingsgui.ui" line="220"/>
Expand Down

0 comments on commit 6be83ed

Please sign in to comment.