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:
parent
9e25d27db2
commit
ab49f96c74
5 changed files with 5 additions and 0 deletions
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect
|
||||
Name[ar]=كِيدِي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[az]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
|
|
|
@ -9,6 +9,7 @@ Icon=kdeconnect
|
|||
|
||||
Name=KDE Connect
|
||||
Name[ar]=كِيدِي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[az]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
IconName=kdeconnect
|
||||
Name=KDE Connect
|
||||
Name[ar]=كِيدِي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[az]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
|
|
|
@ -100,6 +100,7 @@
|
|||
"License": "GPL",
|
||||
"Name": "SMS",
|
||||
"Name[ar]": "اس ام اس",
|
||||
"Name[ast]": "SMS",
|
||||
"Name[az]": "SMS",
|
||||
"Name[bg]": "SMS",
|
||||
"Name[ca@valencia]": "SMS",
|
||||
|
|
|
@ -1,6 +1,7 @@
|
|||
[Desktop Entry]
|
||||
Name=KDE Connect
|
||||
Name[ar]=كِيدِي المتّصل
|
||||
Name[ast]=KDE Connect
|
||||
Name[az]=KDE Connect
|
||||
Name[bg]=KDE Connect
|
||||
Name[bs]=Konekcija KDE
|
||||
|
|
Loading…
Reference in a new issue