mirror of
https://invent.kde.org/network/falkon.git
synced 2024-12-20 10:46:35 +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
e0f390e986
commit
a703947e87
@ -4,17 +4,21 @@ Name[ca]=ImageFinder
|
||||
Name[ca@valencia]=ImageFinder
|
||||
Name[en_GB]=ImageFinder
|
||||
Name[fi]=ImageFinder
|
||||
Name[it]=Cercatore di immagini
|
||||
Name[nl]=ImageFinder
|
||||
Name[sv]=ImageFinder
|
||||
Name[uk]=Пошук зображень
|
||||
Name[x-test]=xxImageFinderxx
|
||||
Comment=Provides context menu with reverse image search engine support
|
||||
Comment[ca]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges
|
||||
Comment[ca@valencia]=Proporciona un menú contextual amb suport pel motor de cerca inversa d'imatges
|
||||
Comment[en_GB]=Provides context menu with reverse image search engine support
|
||||
Comment[fi]=Tarjoaa kontekstivalikon käänteisen kuvahaun tuen moottorille
|
||||
Comment[it]=Fornisce un menu contestuale con un supporto al motore di ricerca inversa di immagini
|
||||
Comment[nl]=Biedt contextmenu met ondersteuningsengine voor omgekeerd afbeeldingen zoeken
|
||||
Comment[sv]=Tillhandahåller sammanhangsberoende meny med stöd för omvänd bildsöktjänst
|
||||
Comment[uk]=Забезпечує роботу пунктів контекстного меню для зворотного пошуку зображень за допомогою служб пошуку
|
||||
Comment[x-test]=xxProvides context menu with reverse image search engine supportxx
|
||||
|
||||
Icon=:imgfinder/data/icon.png
|
||||
Type=Service
|
||||
|
@ -8,7 +8,11 @@ Name[it]=Password di KWallet
|
||||
Name[nl]=Wachtwoorden in KWallet
|
||||
Name[sv]=Plånbokens lösenord
|
||||
Name[uk]=Паролі KWallet
|
||||
Name[x-test]=xxKWallet Passwordsxx
|
||||
Comment=Provides support for storing passwords in KWallet
|
||||
Comment[ca]=Proporciona suport per emmagatzemar contrasenyes al KWallet
|
||||
Comment[it]=Fornisce un supporto per l'immagazzinamento delle password in KWallet
|
||||
Comment[x-test]=xxProvides support for storing passwords in KWalletxx
|
||||
|
||||
Icon=:kwp/data/icon.png
|
||||
Type=Service
|
||||
|
Loading…
Reference in New Issue
Block a user