Skip to content
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

[pull] master from nextcloud:master #436

Merged
merged 6 commits into from
Feb 24, 2025
Merged

[pull] master from nextcloud:master #436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9078317
Fix(l10n): Update translations from Transifex
nextcloud-bot Feb 24, 2025
9552eda
Added plural forms handling correction to notification message
Pabarino Feb 20, 2025
caacdc2
Removed parenthesis and passed a nullptr for the disambiguation
Pabarino Feb 23, 2025
e11bc82
Merge pull request #7904 from Pabarino/feature/issue7887
claucambra Feb 24, 2025
c40c6b3
Added space between sentences
Pabarino Feb 20, 2025
6af6c7b
Merge pull request #7898 from Pabarino/feature/7890
claucambra Feb 24, 2025
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
2 changes: 1 addition & 1 deletion src/gui/macOS/fileprovidereditlocallyjob.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ void FileProviderEditLocallyJob::start()

const auto relPathSplit = _relPath.split(QLatin1Char('/'));
if (relPathSplit.isEmpty()) {
showError(tr("Could not find a file for local editing."
showError(tr("Could not find a file for local editing. "
"Make sure its path is valid and it is synced locally."), _relPath);
return;
}
Expand Down
2 changes: 1 addition & 1 deletion src/gui/tray/usermodel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ void User::showDesktopNotification(const Activity &activity)

void User::showDesktopNotification(const ActivityList &activityList)
{
const auto subject = tr("%1 notifications").arg(activityList.count());
const auto subject = tr("%n notifications", nullptr, activityList.count());
const auto notificationId = -static_cast<int>(qHash(subject));

if (!canShowNotification(notificationId)) {
Expand Down
42 changes: 21 additions & 21 deletions translations/client_it.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@
<message>
<location filename="../src/gui/macOS/ui/FileProviderStorageInfo.qml" line="59"/>
<source>Evict local copies …</source>
<translation type="unfinished"/>
<translation>Evita copie locali …</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -948,7 +948,7 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<message>
<location filename="../src/gui/accountsettings.cpp" line="1350"/>
<source>You need to accept the terms of service at %1.</source>
<translation type="unfinished"/>
<translation>È necessario accettare i termini di servizio su %1.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1355"/>
Expand Down Expand Up @@ -1496,7 +1496,7 @@ Questa azione interromperà qualsiasi sincronizzazione attualmente in esecuzione
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="1166"/>
<source>Login to the token failed after providing the user PIN. It may be invalid or wrong. Please try again!</source>
<translation type="unfinished"/>
<translation>L&apos;accesso al token non è riuscito dopo aver fornito il PIN utente. Potrebbe essere non valido o sbagliato. Riprova!</translation>
</message>
<message>
<location filename="../src/libsync/clientsideencryption.cpp" line="2223"/>
Expand Down Expand Up @@ -3648,7 +3648,7 @@ Nota che l&apos;utilizzo di qualsiasi opzione della riga di comando di registraz
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="656"/>
<source>In Finder&apos;s &quot;Locations&quot; sidebar section</source>
<translation type="unfinished"/>
<translation>Nella sezione &quot;Posizioni&quot; della barra laterale del Finder</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -3877,17 +3877,17 @@ Nota che l&apos;utilizzo di qualsiasi opzione della riga di comando di registraz
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="696"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;File Provider-based account %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation type="unfinished"/>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Account basato sul provider di file %1creato con successo!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="701"/>
<source>Virtual files enabled</source>
<translation type="unfinished"/>
<translation>File virtuali abilitati</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="702"/>
<source>Your account is now syncing with virtual files support. This means that all your files are online-only by default, and will be downloaded on-demand when you open them. You may find your files under the &lt;b&gt;Locations&lt;/b&gt; section of the Finder sidebar.</source>
<translation type="unfinished"/>
<translation>Yil nostro account ora si sincronizza con il supporto dei file virtuali. Ciò significa che tutti i tuoi file sono solo online per impostazione predefinita e verranno scaricati su richiesta quando li apri. Potresti trovare i tuoi file sotto &lt;b&gt;Posizioni&lt;/b&gt; sezione della barra laterale del Finder.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="720"/>
Expand Down Expand Up @@ -4016,7 +4016,7 @@ This is a new, experimental mode. If you decide to use it, please report any iss
<location filename="../src/libsync/discovery.cpp" line="443"/>
<location filename="../src/libsync/discovery.cpp" line="485"/>
<source>Cannot be renamed or uploaded.</source>
<translation type="unfinished"/>
<translation>Non può essere rinominato o caricato.</translation>
</message>
<message>
<location filename="../src/libsync/discovery.cpp" line="433"/>
Expand Down Expand Up @@ -5250,7 +5250,7 @@ Il server ha risposto con errore: %2</translation>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
<translation>Devi accettare i termini del servizio</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="141"/>
Expand Down Expand Up @@ -5375,27 +5375,27 @@ Il server ha risposto con errore: %2</translation>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="134"/>
<source>Waiting for terms to be accepted</source>
<translation type="unfinished"/>
<translation>In attesa che i termini vengano accettati</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="140"/>
<source>Polling</source>
<translation type="unfinished"/>
<translation>Sondaggio</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="146"/>
<source>Link copied to clipboard.</source>
<translation type="unfinished"/>
<translation>Link copiato negli appunti.</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="187"/>
<source>Open Browser</source>
<translation type="unfinished"/>
<translation>Apri browser</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="189"/>
<source>Copy Link</source>
<translation type="unfinished"/>
<translation>Copia link</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -5641,12 +5641,12 @@ Il server ha risposto con errore: %2</translation>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="416"/>
<source>%1 minutes</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 minuto</numerusform><numerusform>%1 minuti</numerusform><numerusform>%1 minuti</numerusform></translation>
</message>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="423"/>
<source>%1 hours</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 ora</numerusform><numerusform>%1 ore</numerusform><numerusform>%1 ore</numerusform></translation>
</message>
<message>
<location filename="../src/gui/userstatusselectormodel.cpp" line="428"/>
Expand All @@ -5656,7 +5656,7 @@ Il server ha risposto con errore: %2</translation>
<message numerus="yes">
<location filename="../src/gui/userstatusselectormodel.cpp" line="430"/>
<source>%1 days</source>
<translation type="unfinished"><numerusform></numerusform><numerusform></numerusform><numerusform></numerusform></translation>
<translation><numerusform>%1 giorno</numerusform><numerusform>%1 giorni</numerusform><numerusform>%1 giorni</numerusform></translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -6295,7 +6295,7 @@ Il server ha risposto con errore: %2</translation>
<message>
<location filename="../src/gui/tray/SyncStatus.qml" line="126"/>
<source>Open browser</source>
<translation type="unfinished"/>
<translation>Apri browser</translation>
</message>
</context>
<context>
Expand All @@ -6316,17 +6316,17 @@ Il server ha risposto con errore: %2</translation>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="26"/>
<source>Terms of Service</source>
<translation type="unfinished"/>
<translation>Termini di servizio</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="47"/>
<source>Logo</source>
<translation type="unfinished"/>
<translation>Logo</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="76"/>
<source>Switch to your browser to accept the terms of service</source>
<translation type="unfinished"/>
<translation>Passa al tuo browser per accettare i termini di servizio</translation>
</message>
</context>
<context>
Expand Down
2 changes: 1 addition & 1 deletion translations/client_ja.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6289,7 +6289,7 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/tray/SyncStatus.qml" line="94"/>
<source>Sync now</source>
<translation>直ちに同期</translation>
<translation>今すぐ同期</translation>
</message>
<message>
<location filename="../src/gui/tray/SyncStatus.qml" line="113"/>
Expand Down
10 changes: 5 additions & 5 deletions translations/client_lv.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -394,7 +394,7 @@
<message>
<location filename="../src/gui/macOS/ui/FileProviderSyncStatus.qml" line="57"/>
<source>All synced!</source>
<translation type="unfinished"/>
<translation>Viss ir sinhronizēts.</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -5231,7 +5231,7 @@ Server replied with error: %2</source>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="346"/>
<location filename="../src/gui/tray/syncstatussummary.h" line="94"/>
<source>All synced!</source>
<translation type="unfinished"/>
<translation>Viss ir sinhronizēts.</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="151"/>
Expand Down Expand Up @@ -5995,7 +5995,7 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="808"/>
<source>You deleted %1</source>
<translation>Jūs izdzēsāt %1</translation>
<translation>Tika izdzēsta %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="810"/>
Expand All @@ -6005,12 +6005,12 @@ Server replied with error: %2</source>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="812"/>
<source>You changed %1</source>
<translation>Jūs izmainījāt %1</translation>
<translation>Tu mainīji %1</translation>
</message>
<message>
<location filename="../src/gui/tray/usermodel.cpp" line="836"/>
<source>Synced %1</source>
<translation>Sinhronizēti %1</translation>
<translation>Sinhronizēta %1</translation>
</message>
<message numerus="yes">
<location filename="../src/common/utility.cpp" line="440"/>
Expand Down
30 changes: 15 additions & 15 deletions translations/client_pl.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -948,7 +948,7 @@ Ta czynność spowoduje przerwanie aktualnie uruchomionej synchronizacji.</trans
<message>
<location filename="../src/gui/accountsettings.cpp" line="1350"/>
<source>You need to accept the terms of service at %1.</source>
<translation type="unfinished"/>
<translation>Musisz zaakceptować warunki korzystania z usługi na %1.</translation>
</message>
<message>
<location filename="../src/gui/accountsettings.cpp" line="1355"/>
Expand Down Expand Up @@ -3648,7 +3648,7 @@ Zauważ, że użycie jakichkolwiek opcji wiersza poleceń logowania spowoduje za
<message>
<location filename="../src/gui/wizard/owncloudadvancedsetuppage.cpp" line="656"/>
<source>In Finder&apos;s &quot;Locations&quot; sidebar section</source>
<translation type="unfinished"/>
<translation>W sekcji paska bocznego Findera &quot;Lokalizacje&quot;</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -3877,17 +3877,17 @@ Zauważ, że użycie jakichkolwiek opcji wiersza poleceń logowania spowoduje za
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="696"/>
<source>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;File Provider-based account %1 successfully created!&lt;/b&gt;&lt;/font&gt;</source>
<translation type="unfinished"/>
<translation>&lt;font color=&quot;green&quot;&gt;&lt;b&gt;Konto u tego dostawcy %1 zostało pomyślnie utworzone!&lt;/b&gt;&lt;/font&gt;</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="701"/>
<source>Virtual files enabled</source>
<translation type="unfinished"/>
<translation>Włączono pliki wirtualne</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="702"/>
<source>Your account is now syncing with virtual files support. This means that all your files are online-only by default, and will be downloaded on-demand when you open them. You may find your files under the &lt;b&gt;Locations&lt;/b&gt; section of the Finder sidebar.</source>
<translation type="unfinished"/>
<translation>Twoje konto jest teraz synchronizowane z obsługą plików wirtualnych. Oznacza to, że wszystkie Twoje pliki są domyślnie dostępne tylko online i zostaną pobrane na żądanie po ich otwarciu. Możesz znaleźć swoje pliki w sekcji &lt;b&gt;Lokalizacje&lt;/b&gt; na pasku bocznym Findera.</translation>
</message>
<message>
<location filename="../src/gui/owncloudsetupwizard.cpp" line="720"/>
Expand Down Expand Up @@ -5256,7 +5256,7 @@ Serwer odpowiedział błędem: %2</translation>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="137"/>
<source>You need to accept the terms of service</source>
<translation type="unfinished"/>
<translation>Musisz zaakceptować warunki korzystania z usługi</translation>
</message>
<message>
<location filename="../src/gui/tray/syncstatussummary.cpp" line="141"/>
Expand Down Expand Up @@ -5381,27 +5381,27 @@ Serwer odpowiedział błędem: %2</translation>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="134"/>
<source>Waiting for terms to be accepted</source>
<translation type="unfinished"/>
<translation>Oczekiwanie na akceptację warunków</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="140"/>
<source>Polling</source>
<translation type="unfinished"/>
<translation>Głosowanie</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="146"/>
<source>Link copied to clipboard.</source>
<translation type="unfinished"/>
<translation>Link skopiowany do schowka.</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="187"/>
<source>Open Browser</source>
<translation type="unfinished"/>
<translation>Otwórz przeglądarkę</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.cpp" line="189"/>
<source>Copy Link</source>
<translation type="unfinished"/>
<translation>Kopiuj link</translation>
</message>
</context>
<context>
Expand Down Expand Up @@ -6300,7 +6300,7 @@ Serwer odpowiedział błędem: %2</translation>
<message>
<location filename="../src/gui/tray/SyncStatus.qml" line="126"/>
<source>Open browser</source>
<translation type="unfinished"/>
<translation>Otwórz przeglądarkę</translation>
</message>
</context>
<context>
Expand All @@ -6321,17 +6321,17 @@ Serwer odpowiedział błędem: %2</translation>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="26"/>
<source>Terms of Service</source>
<translation type="unfinished"/>
<translation>Warunki usługi</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="47"/>
<source>Logo</source>
<translation type="unfinished"/>
<translation>Logo</translation>
</message>
<message>
<location filename="../src/gui/wizard/termsofservicecheckwidget.ui" line="76"/>
<source>Switch to your browser to accept the terms of service</source>
<translation type="unfinished"/>
<translation>Przejdź do swojej przeglądarki, aby zaakceptować warunki korzystania z usługi</translation>
</message>
</context>
<context>
Expand Down
Loading
Loading