mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-24 04:36:34 +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:
parent
02feca74ce
commit
8edcd52593
@ -36,7 +36,7 @@ Name[zh_TW]=Google
|
|||||||
Comment=Search with...
|
Comment=Search with...
|
||||||
Comment[az]=Bununla axtarmaq...
|
Comment[az]=Bununla axtarmaq...
|
||||||
Comment[ca]=Cerca amb...
|
Comment[ca]=Cerca amb...
|
||||||
Comment[ca@valencia]=Cerca amb...
|
Comment[ca@valencia]=Busca amb...
|
||||||
Comment[cs]=Hledat pomocí...
|
Comment[cs]=Hledat pomocí...
|
||||||
Comment[da]=Søg med...
|
Comment[da]=Søg med...
|
||||||
Comment[de]=Suchen mit ...
|
Comment[de]=Suchen mit ...
|
||||||
|
@ -36,7 +36,7 @@ Name[zh_TW]=TinEye
|
|||||||
Comment=Search with...
|
Comment=Search with...
|
||||||
Comment[az]=Bununla axtarmaq...
|
Comment[az]=Bununla axtarmaq...
|
||||||
Comment[ca]=Cerca amb...
|
Comment[ca]=Cerca amb...
|
||||||
Comment[ca@valencia]=Cerca amb...
|
Comment[ca@valencia]=Busca amb...
|
||||||
Comment[cs]=Hledat pomocí...
|
Comment[cs]=Hledat pomocí...
|
||||||
Comment[da]=Søg med...
|
Comment[da]=Søg med...
|
||||||
Comment[de]=Suchen mit ...
|
Comment[de]=Suchen mit ...
|
||||||
|
@ -36,7 +36,7 @@ Name[zh_TW]=Yandex
|
|||||||
Comment=Search with...
|
Comment=Search with...
|
||||||
Comment[az]=Bununla axtarmaq...
|
Comment[az]=Bununla axtarmaq...
|
||||||
Comment[ca]=Cerca amb...
|
Comment[ca]=Cerca amb...
|
||||||
Comment[ca@valencia]=Cerca amb...
|
Comment[ca@valencia]=Busca amb...
|
||||||
Comment[cs]=Hledat pomocí...
|
Comment[cs]=Hledat pomocí...
|
||||||
Comment[da]=Søg med...
|
Comment[da]=Søg med...
|
||||||
Comment[de]=Suchen mit ...
|
Comment[de]=Suchen mit ...
|
||||||
|
Loading…
Reference in New Issue
Block a user