Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-13 10:32:11 +01:00
Code Releases Activity

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

Browse Source 
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 2018-10-17 08:36:36 +02:00
parent b16432253c
commit e2deca53a3
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/plugins/TestPlugin/metadata.desktop
View File

@ -8,7 +8,7 @@ Name[de]=Beispielmodul
Name[en_GB]=Example Plugin Name[en_GB]=Example Plugin
Name[es]=Complemento de ejemplo Name[es]=Complemento de ejemplo
Name[fi]=Esimerkkiliitännäinen Name[fi]=Esimerkkiliitännäinen
Name[fr]=Module externe d'exemple Name[fr]=Exemple de module externe
Name[gl]=Complemento de exemplo Name[gl]=Complemento de exemplo
Name[id]=Example Plugin Name[id]=Example Plugin
Name[it]=Estensione di esempio Name[it]=Estensione di esempio