alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki 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 2020-07-23 05:58:32 +02:00
parent 50a03b39a3
commit ab125ac2d5
8 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/desktoptheme/breeze-dark/metadata.desktop.cmake
View File

@ -26,6 +26,7 @@ Name[nb]=Mørk bris
Name[nds]=Breeze düüster Name[nds]=Breeze düüster
Name[nl]=Breeze Dark Name[nl]=Breeze Dark
Name[nn]=Breeze mørk Name[nn]=Breeze mørk
Name[pa]=ਬਰੀਜ਼ ਗੂੜ੍ਹਾ
Name[pl]=Ciemna bryza Name[pl]=Ciemna bryza
Name[pt]=Brisa Escura Name[pt]=Brisa Escura
Name[pt_BR]=Breeze Dark Name[pt_BR]=Breeze Dark
@ -64,6 +65,7 @@ Comment[it]=Brezza scuro del KDE VDG
Comment[ko]=KDE VDG에서 만든 어두운 Breeze Comment[ko]=KDE VDG에서 만든 어두운 Breeze
Comment[nl]=Breeze Dark door de KDE VDG Comment[nl]=Breeze Dark door de KDE VDG
Comment[nn]=Breeze mørk frå KDE VDG Comment[nn]=Breeze mørk frå KDE VDG
Comment[pa]=ਕੇਡੀਈ ਵੀਡੀਜੀ ਵਲੋਂ ਬਰੀਜ਼ ਗੂੜ੍ਹਾ
Comment[pl]=Ciemna bryza autorstwa KDE VDG Comment[pl]=Ciemna bryza autorstwa KDE VDG
Comment[pt]=Brisa Escuro da VDG do KDE Comment[pt]=Brisa Escuro da VDG do KDE
Comment[pt_BR]=Breeze Dark pelo KDE VDG Comment[pt_BR]=Breeze Dark pelo KDE VDG

1
src/desktoptheme/breeze-light/metadata.desktop.cmake
View File

@ -24,6 +24,7 @@ Name[lt]=Breeze šviesus
Name[lv]=Gaišā brīze Name[lv]=Gaišā brīze
Name[nl]=Breeze Light Name[nl]=Breeze Light
Name[nn]=Breeze lys Name[nn]=Breeze lys
Name[pa]=ਬਰੀਜ਼ ਹਲਕਾ
Name[pl]=Jasna Bryza Name[pl]=Jasna Bryza
Name[pt]=Brisa Clara Name[pt]=Brisa Clara
Name[pt_BR]=Breeze Light Name[pt_BR]=Breeze Light

1
src/desktoptheme/breeze/metadata.desktop.cmake
View File

@ -26,6 +26,7 @@ Name[nb]=Bris
Name[nds]=Breeze Name[nds]=Breeze
Name[nl]=Breeze Name[nl]=Breeze
Name[nn]=Breeze Name[nn]=Breeze
Name[pa]=ਬਰੀਜ਼
Name[pl]=Bryza Name[pl]=Bryza
Name[pt]=Brisa Name[pt]=Brisa
Name[pt_BR]=Breeze Name[pt_BR]=Breeze

1
templates/cpp-plasmoid/src/package/metadata.desktop
View File

@ -24,6 +24,7 @@ Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME} Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME} Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME} Name[nn]=%{APPNAME}
Name[pa]=%{APPNAME}
Name[pl]=%{APPNAME} Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME} Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME} Name[pt_BR]=%{APPNAME}

1
templates/plasma-wallpaper-with-qml-extension/package/metadata.desktop
View File

@ -24,6 +24,7 @@ Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME} Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME} Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME} Name[nn]=%{APPNAME}
Name[pa]=%{APPNAME}
Name[pl]=%{APPNAME} Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME} Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME} Name[pt_BR]=%{APPNAME}

1
templates/plasma-wallpaper/package/metadata.desktop
View File

@ -24,6 +24,7 @@ Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME} Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME} Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME} Name[nn]=%{APPNAME}
Name[pa]=%{APPNAME}
Name[pl]=%{APPNAME} Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME} Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME} Name[pt_BR]=%{APPNAME}

1
templates/qml-plasmoid-with-qml-extension/package/metadata.desktop
View File

@ -24,6 +24,7 @@ Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME} Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME} Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME} Name[nn]=%{APPNAME}
Name[pa]=%{APPNAME}
Name[pl]=%{APPNAME} Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME} Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME} Name[pt_BR]=%{APPNAME}

1
templates/qml-plasmoid/package/metadata.desktop
View File

@ -24,6 +24,7 @@ Name[lt]=%{APPNAME}
Name[nb]=%{APPNAME} Name[nb]=%{APPNAME}
Name[nl]=%{APPNAME} Name[nl]=%{APPNAME}
Name[nn]=%{APPNAME} Name[nn]=%{APPNAME}
Name[pa]=%{APPNAME}
Name[pl]=%{APPNAME} Name[pl]=%{APPNAME}
Name[pt]=%{APPNAME} Name[pt]=%{APPNAME}
Name[pt_BR]=%{APPNAME} Name[pt_BR]=%{APPNAME}