Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-11 09:32:12 +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 2019-08-06 04:49:17 +02:00
parent 935e422926
commit 310a2e2d2d
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/scripts/runaction/metadata.desktop
View File

@ -4,6 +4,7 @@ Name[ca]=Executa una acció
Name[ca@valencia]=Executa una acció Name[ca@valencia]=Executa una acció
Name[cs]=Spustit činnost Name[cs]=Spustit činnost
Name[da]=Kør handling Name[da]=Kør handling
Name[de]=Aktion ausführen
Name[en_GB]=Run Action Name[en_GB]=Run Action
Name[es]=Ejecutar acción Name[es]=Ejecutar acción
Name[fi]=Suorita toiminto Name[fi]=Suorita toiminto
@ -28,6 +29,7 @@ Comment[ca]=Executa diverses accions als llocs
Comment[ca@valencia]=Executa diverses accions als llocs Comment[ca@valencia]=Executa diverses accions als llocs
Comment[cs]=Spouštět různé činnosti na stránkách Comment[cs]=Spouštět různé činnosti na stránkách
Comment[da]=Kør diverse handlinger på steder Comment[da]=Kør diverse handlinger på steder
Comment[de]=Verschiedene Aktionen auf Webseiten ausführen
Comment[en_GB]=Run various actions on sites Comment[en_GB]=Run various actions on sites
Comment[es]=Ejecutar varias acciones en sitios Comment[es]=Ejecutar varias acciones en sitios
Comment[fi]=Suorita eri toimintoja sivustoilla Comment[fi]=Suorita eri toimintoja sivustoilla