SVN_SILENT made messages (.desktop file) - always resolve ours

In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
This commit is contained in:
l10n daemon script 2024-03-28 01:18:01 +00:00
parent 9e25d27db2
commit ab49f96c74
5 changed files with 5 additions and 0 deletions

View file

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect Name=KDE Connect
Name[ar]=كِيدِي المتّصل Name[ar]=كِيدِي المتّصل
Name[ast]=KDE Connect
Name[az]=KDE Connect Name[az]=KDE Connect
Name[bg]=KDE Connect Name[bg]=KDE Connect
Name[bs]=Konekcija KDE Name[bs]=Konekcija KDE

View file

@ -9,6 +9,7 @@ Icon=kdeconnect
Name=KDE Connect Name=KDE Connect
Name[ar]=كِيدِي المتّصل Name[ar]=كِيدِي المتّصل
Name[ast]=KDE Connect
Name[az]=KDE Connect Name[az]=KDE Connect
Name[bg]=KDE Connect Name[bg]=KDE Connect
Name[bs]=Konekcija KDE Name[bs]=Konekcija KDE

View file

@ -2,6 +2,7 @@
IconName=kdeconnect IconName=kdeconnect
Name=KDE Connect Name=KDE Connect
Name[ar]=كِيدِي المتّصل Name[ar]=كِيدِي المتّصل
Name[ast]=KDE Connect
Name[az]=KDE Connect Name[az]=KDE Connect
Name[bg]=KDE Connect Name[bg]=KDE Connect
Name[bs]=Konekcija KDE Name[bs]=Konekcija KDE

View file

@ -100,6 +100,7 @@
"License": "GPL", "License": "GPL",
"Name": "SMS", "Name": "SMS",
"Name[ar]": "اس ام اس", "Name[ar]": "اس ام اس",
"Name[ast]": "SMS",
"Name[az]": "SMS", "Name[az]": "SMS",
"Name[bg]": "SMS", "Name[bg]": "SMS",
"Name[ca@valencia]": "SMS", "Name[ca@valencia]": "SMS",

View file

@ -1,6 +1,7 @@
[Desktop Entry] [Desktop Entry]
Name=KDE Connect Name=KDE Connect
Name[ar]=كِيدِي المتّصل Name[ar]=كِيدِي المتّصل
Name[ast]=KDE Connect
Name[az]=KDE Connect Name[az]=KDE Connect
Name[bg]=KDE Connect Name[bg]=KDE Connect
Name[bs]=Konekcija KDE Name[bs]=Konekcija KDE