Commit 5cbb31fe authored by Script Kiddy's avatar Script Kiddy
Browse files

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"
parent 771c0f08
...@@ -27,6 +27,7 @@ Name[nn]=KFind ...@@ -27,6 +27,7 @@ Name[nn]=KFind
Name[pl]=KFind Name[pl]=KFind
Name[pt]=KFind Name[pt]=KFind
Name[pt_BR]=KFind Name[pt_BR]=KFind
Name[ru]=KFind
Name[sk]=KFind Name[sk]=KFind
Name[sl]=KFind Name[sl]=KFind
Name[sr]=К‑налазач Name[sr]=К‑налазач
...@@ -62,6 +63,7 @@ GenericName[nn]=Finn filer/mapper ...@@ -62,6 +63,7 @@ GenericName[nn]=Finn filer/mapper
GenericName[pl]=Wyszukiwanie plików/katalogów GenericName[pl]=Wyszukiwanie plików/katalogów
GenericName[pt]=Procurar nos Ficheiros/Pastas GenericName[pt]=Procurar nos Ficheiros/Pastas
GenericName[pt_BR]=Procurar arquivos/pastas GenericName[pt_BR]=Procurar arquivos/pastas
GenericName[ru]=Поиск файлов и папок
GenericName[sk]=Nájsť súbory/priečinky GenericName[sk]=Nájsť súbory/priečinky
GenericName[sl]=Poiščite datoteke in mape GenericName[sl]=Poiščite datoteke in mape
GenericName[sr]=Тражење фајлова и фасцикли GenericName[sr]=Тражење фајлова и фасцикли
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment