Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 4564f7c

Browse files
TheOneRingTheOneRing
committedJun 27, 2024·
Provide plural forms for the english soruce translation
1 parent c417037 commit 4564f7c

File tree

3 files changed

+36
-36
lines changed

3 files changed

+36
-36
lines changed
 

‎src/gui/activitywidget.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -285,13 +285,13 @@ void ActivityWidget::slotBuildNotificationDisplay(const ActivityList &list)
285285
// Assemble a tray notification
286286
QString msg;
287287
if (newGuiLogCount == 1) {
288-
msg = tr("%n notifications(s) for %1.", "", accNotified.begin().value()).arg(accNotified.begin().key());
288+
msg = tr("%n notification(s) for %1.", "", accNotified.begin().value()).arg(accNotified.begin().key());
289289
} else if (newGuiLogCount >= 2) {
290290
const auto acc1 = accNotified.begin();
291291
const auto acc2 = ++accNotified.begin();
292292
if (newGuiLogCount == 2) {
293293
const int notiCount = acc1.value() + acc2.value();
294-
msg = tr("%n notifications(s) for %1 and %2.", "", notiCount).arg(acc1.key(), acc2.key());
294+
msg = tr("%n notification(s) for %1 and %2.", "", notiCount).arg(acc1.key(), acc2.key());
295295
} else {
296296
msg = tr("New notifications for %1, %2 and other accounts.").arg(acc1.key(), acc2.key());
297297
}

‎src/gui/folder.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -528,7 +528,7 @@ void Folder::createGuiLog(const QString &filename, LogStatus status, int count,
528528
break;
529529
case LogStatusConflict:
530530
if (count > 1) {
531-
text = tr("%1 has and %n other file(s) have sync conflicts.", "", count - 1).arg(file);
531+
text = tr("%1 and %n other file(s) have sync conflicts.", "", count - 1).arg(file);
532532
} else {
533533
text = tr("%1 has a sync conflict. Please check the conflict file!").arg(file);
534534
}

‎translations/client_en.ts

+33-33
Original file line numberDiff line numberDiff line change
@@ -212,9 +212,9 @@ File synchronization desktop utility.</source>
212212
<message numerus="yes">
213213
<location filename="../src/gui/commonstrings.cpp" line="48"/>
214214
<source>%n Filter(s)</source>
215-
<translation type="unfinished">
216-
<numerusform></numerusform>
217-
<numerusform></numerusform>
215+
<translation>
216+
<numerusform>%n Filter</numerusform>
217+
<numerusform>%n Filters</numerusform>
218218
</translation>
219219
</message>
220220
</context>
@@ -896,18 +896,18 @@ This action will abort any currently running synchronization.</source>
896896
</message>
897897
<message numerus="yes">
898898
<location filename="../src/gui/activitywidget.cpp" line="288"/>
899-
<source>%n notifications(s) for %1.</source>
900-
<translation type="unfinished">
901-
<numerusform></numerusform>
902-
<numerusform></numerusform>
899+
<source>%n notification(s) for %1.</source>
900+
<translation>
901+
<numerusform>%n notification for %1.</numerusform>
902+
<numerusform>%n notifications for %1.</numerusform>
903903
</translation>
904904
</message>
905905
<message numerus="yes">
906906
<location filename="../src/gui/activitywidget.cpp" line="294"/>
907-
<source>%n notifications(s) for %1 and %2.</source>
908-
<translation type="unfinished">
909-
<numerusform></numerusform>
910-
<numerusform></numerusform>
907+
<source>%n notification(s) for %1 and %2.</source>
908+
<translation>
909+
<numerusform>%n notification for %1 and %2.</numerusform>
910+
<numerusform>%n notifications for %1 and %2.</numerusform>
911911
</translation>
912912
</message>
913913
<message>
@@ -1083,9 +1083,9 @@ The update will be performed in the background, and overwrite the current AppIma
10831083
<message numerus="yes">
10841084
<location filename="../src/gui/folder.cpp" line="496"/>
10851085
<source>%1 and %n other file(s) have been removed.</source>
1086-
<translation type="unfinished">
1087-
<numerusform></numerusform>
1088-
<numerusform></numerusform>
1086+
<translation>
1087+
<numerusform>%1 and %n other file have been removed.</numerusform>
1088+
<numerusform>%1 and %n other files have been removed.</numerusform>
10891089
</translation>
10901090
</message>
10911091
<message>
@@ -1106,9 +1106,9 @@ The update will be performed in the background, and overwrite the current AppIma
11061106
<message numerus="yes">
11071107
<location filename="../src/gui/folder.cpp" line="503"/>
11081108
<source>%1 and %n other file(s) have been added.</source>
1109-
<translation type="unfinished">
1110-
<numerusform></numerusform>
1111-
<numerusform></numerusform>
1109+
<translation>
1110+
<numerusform>%1 and %n other file have been added.</numerusform>
1111+
<numerusform>%1 and %n other files have been added.</numerusform>
11121112
</translation>
11131113
</message>
11141114
<message>
@@ -1120,33 +1120,33 @@ The update will be performed in the background, and overwrite the current AppIma
11201120
<message numerus="yes">
11211121
<location filename="../src/gui/folder.cpp" line="510"/>
11221122
<source>%1 and %n other file(s) have been updated.</source>
1123-
<translation type="unfinished">
1124-
<numerusform></numerusform>
1125-
<numerusform></numerusform>
1123+
<translation>
1124+
<numerusform>%1 and %n other file have been updated.</numerusform>
1125+
<numerusform>%1 and %n other files have been updated.</numerusform>
11261126
</translation>
11271127
</message>
11281128
<message numerus="yes">
11291129
<location filename="../src/gui/folder.cpp" line="517"/>
11301130
<source>%1 has been renamed to %2 and %n other file(s) have been renamed.</source>
1131-
<translation type="unfinished">
1132-
<numerusform></numerusform>
1133-
<numerusform></numerusform>
1131+
<translation>
1132+
<numerusform>%1 has been renamed to %2 and %n other file have been renamed.</numerusform>
1133+
<numerusform>%1 has been renamed to %2 and %n other files have been renamed.</numerusform>
11341134
</translation>
11351135
</message>
11361136
<message numerus="yes">
11371137
<location filename="../src/gui/folder.cpp" line="524"/>
11381138
<source>%1 has been moved to %2 and %n other file(s) have been moved.</source>
1139-
<translation type="unfinished">
1140-
<numerusform></numerusform>
1141-
<numerusform></numerusform>
1139+
<translation>
1140+
<numerusform>%1 has been moved to %2 and %n other file have been moved.</numerusform>
1141+
<numerusform>%1 has been moved to %2 and %n other files have been moved.</numerusform>
11421142
</translation>
11431143
</message>
11441144
<message numerus="yes">
11451145
<location filename="../src/gui/folder.cpp" line="531"/>
1146-
<source>%1 has and %n other file(s) have sync conflicts.</source>
1147-
<translation type="unfinished">
1148-
<numerusform></numerusform>
1149-
<numerusform></numerusform>
1146+
<source>%1 and %n other file(s) have sync conflicts.</source>
1147+
<translation>
1148+
<numerusform>%1 and %n other file have sync conflicts.</numerusform>
1149+
<numerusform>%1 and %n other files have sync conflicts.</numerusform>
11501150
</translation>
11511151
</message>
11521152
<message>
@@ -1157,9 +1157,9 @@ The update will be performed in the background, and overwrite the current AppIma
11571157
<message numerus="yes">
11581158
<location filename="../src/gui/folder.cpp" line="538"/>
11591159
<source>%1 and %n other file(s) could not be synced due to errors. See the log for details.</source>
1160-
<translation type="unfinished">
1161-
<numerusform></numerusform>
1162-
<numerusform></numerusform>
1160+
<translation>
1161+
<numerusform>%1 and %n other file could not be synced due to errors. See the log for details.</numerusform>
1162+
<numerusform>%1 and %n other files could not be synced due to errors. See the log for details.</numerusform>
11631163
</translation>
11641164
</message>
11651165
<message>

0 commit comments

Comments
 (0)
Please sign in to comment.