felixfoertsch/syncthing
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 10 Wiki Activity

chore(gui): fix merge conflict on Weblate (#9882)

Browse Source 
Commit dee920a840 was merged into
Weblate's repository, but later replaced on main by
2167ce9656. This led to a merge conflict,
which this commit fixes cleanly. After merging, we can unlock Weblate
again.
This commit is contained in:
André Colomb
2024-12-21 21:54:17 +00:00
committed by GitHub
parent 2167ce9656
commit 0ce92befc8
2 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
gui/default/assets/lang/lang-fil.json
+2 -2
View File
@@ -1,7 +1,7 @@
{
"A device with that ID is already added.": "Nadagdag na ang device na may ganitong ID.",
"A device with that ID is already added.": "May naidagdag na device na may ganitong ding ID.",
"A negative number of days doesn't make sense.": "Walang saysay ang negatibong numero ng araw.",
"A new major version may not be compatible with previous versions.": "Maaring hindi compatible ang isang bagong major na beryson sa mga kasalukuyang bersyon.",
"A new major version may not be compatible with previous versions.": "Maaring hindi compatible ang isang bagong major na beryson sa mga nakaraang bersyon.",
"API Key": "API Key",
"About": "Tungkol sa",
"Action": "Aksyon",