1
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 01:22:10 +01:00

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:17:46 +00:00
parent e79b55504f
commit 3e935e6779
4 changed files with 4 additions and 0 deletions

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Falkon
Name[ar]=فالكون
Name[ast]=Falkon
Name[az]=Falkon
Name[bg]=Falkon
Name[ca]=Falkon

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Dictionary
Name[ar]=قاموس
Name[ast]=Diccionariu
Name[az]=Lüğət
Name[bg]=Речник
Name[ca]=Diccionari

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Google
Name[ar]=غوغل
Name[ast]=Google
Name[az]=Google
Name[bg]=Google
Name[ca]=Google

View File

@ -1,6 +1,7 @@
[Desktop Entry]
Name=Linux
Name[ar]=لينكس
Name[ast]=Linux
Name[az]=Linux
Name[bg]=Linux
Name[ca]=Linux